Bump version number

[skip ci]

Cargo.toml

@@ -1,25 +1,24 @@
 [package]
 name = "hoc"
-version = "0.5.0"
+version = "0.7.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-actix-web = "1.0.0-beta.2"
+actix-web = "1.0.0-rc"
 badge = "0.2.0"
 bytes = "0.4.12"
-futures = "0.1.26"
+futures = "0.1.27"
 git2 = "0.8.0"
 lazy_static = "1.3.0"
 log = "0.4.6"
 log4rs = "0.8.3"
 number_prefix = "0.3.0"
 openssl-probe = "0.1.2"
-# pretty_env_logger = "0.3.0"
-reqwest = "0.9.16"
-serde = "1.0.90"
-serde_derive = "1.0.90"
+reqwest = "0.9.17"
+serde = "1.0.91"
+serde_derive = "1.0.91"
 serde_json = "1.0.39"
 structopt = "0.2.15"
 

Dockerfile

@@ -29,10 +29,14 @@ FROM alpine:latest
 
 RUN apk --no-cache add --update git
 
+RUN adduser -D hoc
+WORKDIR /home/hoc
+USER hoc
+
 # once we don't need a git binary anymore, this should be enough
 # FROM scratch
 # COPY --from=linuxkit/ca-certificates:v0.7 / /
 
-COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc /hoc
+COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
 
-ENTRYPOINT ["/hoc"]
+ENTRYPOINT ["/home/hoc/hoc"]

docker-compose.yml

@@ -2,11 +2,10 @@ version: "2"
 
 services:
   hoc:
-    # build: .
-    # image: local/hoc:latest
-    image: registry.gitlab.com/vbrandl/hoc:latest
+    image: vbrandl/hits-of-code:latest
     volumes:
-      - ./repos:/repos
-      - ./cache:/cache
-    ports:
-      - "127.0.0.1:8080:8080"
+      - ./repos:/home/hoc/repos
+      - ./cache:/home/hoc/cache
+    # ports:
+    #   - "127.0.0.1:8080:8080"
+    restart: always

scripts/list.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+set -e
+
+DIR=${1:-repos}
+
+find "$DIR" -mindepth 3 -maxdepth 3 -type d \
+    | sed -e "s/$DIR/https:\//g" \
+    | sort

src/main.rs

@@ -26,7 +26,7 @@ use actix_web::{
 };
 use badge::{Badge, BadgeOptions};
 use bytes::Bytes;
-use futures::{unsync::mpsc, Stream};
+use futures::{unsync::mpsc, Future, Stream};
 use git2::Repository;
 use number_prefix::{NumberPrefix, Prefixed, Standalone};
 use std::{
@@ -141,7 +141,7 @@ fn handle_hoc_request<T, F>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
     mapper: F,
-) -> Result<HttpResponse>
+) -> impl Future<Item = HttpResponse, Error = Error>
 where
     T: Service,
     F: Fn(HocResult) -> Result<HttpResponse>,
@@ -152,43 +152,45 @@ where
 fn hoc_request<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HocResult> {
-    let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
-    let service_path = format!("{}/{}", T::domain(), repo);
-    let path = format!("{}/{}", state.repos, service_path);
-    let file = Path::new(&path);
-    let url = format!("https://{}", service_path);
-    if !file.exists() {
-        if !remote_exists(&url)? {
-            warn!("Repository does not exist: {}", url);
-            return Ok(HocResult::NotFound);
+) -> impl Future<Item = HocResult, Error = Error> {
+    futures::future::result(Ok(())).and_then(move |_| {
+        let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
+        let service_path = format!("{}/{}", T::domain(), repo);
+        let path = format!("{}/{}", state.repos, service_path);
+        let file = Path::new(&path);
+        let url = format!("https://{}", service_path);
+        if !file.exists() {
+            if !remote_exists(&url)? {
+                warn!("Repository does not exist: {}", url);
+                return Ok(HocResult::NotFound);
+            }
+            info!("Cloning {} for the first time", url);
+            create_dir_all(file)?;
+            let repo = Repository::init_bare(file)?;
+            repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?;
+            repo.remote_set_url("origin", &url)?;
         }
-        info!("Cloning {} for the first time", url);
-        create_dir_all(file)?;
-        let repo = Repository::init_bare(file)?;
-        repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?;
-        repo.remote_set_url("origin", &url)?;
-    }
-    pull(&path)?;
-    let (hoc, head) = hoc(&service_path, &state.repos, &state.cache)?;
-    let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
-        Standalone(hoc) => hoc.to_string(),
-        Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
-    };
-    Ok(HocResult::Hoc {
-        hoc,
-        hoc_pretty,
-        head,
-        url,
-        repo,
-        service_path,
+        pull(&path)?;
+        let (hoc, head) = hoc(&service_path, &state.repos, &state.cache)?;
+        let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
+            Standalone(hoc) => hoc.to_string(),
+            Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
+        };
+        Ok(HocResult::Hoc {
+            hoc,
+            hoc_pretty,
+            head,
+            url,
+            repo,
+            service_path,
+        })
     })
 }
 
 fn calculate_hoc<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HttpResponse> {
+) -> impl Future<Item = HttpResponse, Error = Error> {
     let mapper = |r| match r {
         HocResult::NotFound => Ok(p404()),
         HocResult::Hoc { hoc_pretty, .. } => {
@@ -221,7 +223,7 @@ fn calculate_hoc<T: Service>(
 fn overview<T: Service>(
     state: web::Data<Arc<State>>,
     data: web::Path<(String, String)>,
-) -> Result<HttpResponse> {
+) -> impl Future<Item = HttpResponse, Error = Error> {
     let mapper = |r| match r {
         HocResult::NotFound => Ok(p404()),
         HocResult::Hoc {
@@ -314,13 +316,13 @@ fn main() -> Result<()> {
             .service(css)
             .service(favicon32)
             .service(generate)
-            .service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
-            .service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
-            .service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
-            .service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
-            .service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
-            .service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
-            .default_service(web::resource("").route(web::get().to(p404)))
+            .service(web::resource("/github/{user}/{repo}").to_async(calculate_hoc::<GitHub>))
+            .service(web::resource("/gitlab/{user}/{repo}").to_async(calculate_hoc::<Gitlab>))
+            .service(web::resource("/bitbucket/{user}/{repo}").to_async(calculate_hoc::<Bitbucket>))
+            .service(web::resource("/view/github/{user}/{repo}").to_async(overview::<GitHub>))
+            .service(web::resource("/view/gitlab/{user}/{repo}").to_async(overview::<Gitlab>))
+            .service(web::resource("/view/bitbucket/{user}/{repo}").to_async(overview::<Bitbucket>))
+            .default_service(web::resource("").route(web::get().to_async(p404)))
     })
     .workers(OPT.workers)
     .bind(interface)?