Bump version number

Bump reqwest from 0.9.20 to 0.9.22

.github/workflows/rust.yml

@@ -0,0 +1,15 @@
+name: Rust
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

.gitlab-ci.yml

@@ -1,6 +1,6 @@
-image: docker:stable
+image: docker:19.03
 services:
-  - docker:dind
+  - docker:19.03-dind
 
 stages:
   - build
@@ -9,6 +9,8 @@ stages:
 variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
+  # DOCKER_TLS_CERTDIR: "/certs"
+  DOCKER_TLS_CERTDIR: ""
   CONTAINER_BUILDER_IMAGE: $CI_REGISTRY_IMAGE:builder-latest
   CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest

Cargo.toml

@@ -1,27 +1,27 @@
 [package]
 name = "hoc"
-version = "0.10.0"
+version = "0.11.4"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-actix-web = "1.0.3"
+actix-web = "1.0.8"
 badge = "0.2.0"
 bytes = "0.4.12"
-futures = "0.1.28"
+futures = "0.1.29"
 git2 = "0.9.1"
-lazy_static = "1.3.0"
+lazy_static = "1.4.0"
-log = "0.4.6"
+log = "0.4.8"
 log4rs = "0.8.3"
 number_prefix = "0.3.0"
 openssl-probe = "0.1.2"
-reqwest = "0.9.17"
+reqwest = "0.9.22"
-serde = "1.0.93"
+serde = "1.0.101"
-serde_derive = "1.0.94"
+serde_derive = "1.0.101"
-serde_json = "1.0.40"
+serde_json = "1.0.41"
-structopt = "0.2.18"
+structopt = "0.3.3"
 
 [build-dependencies]
-ructe = "0.6.4"
+ructe = "0.7.2"
 vergen = "3.0.4"

scripts/find-active.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+set -e
+
+DIR=${1:-repos}
+
+for url in $(./scripts/list.sh "${DIR}")
+do
+    (curl "${url}" --silent | grep -q hitsofcode) && echo "${url}" &
+done

scripts/load-active.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+set -e
+
+ACTIVE=${1}
+
+if [ -z "${ACTIVE}" ]
+then
+    echo "Usage: $0 <list of active repos>"
+    exit 1
+fi
+
+while IFS= read -r url
+do
+    imgs=$(curl "${url}" --silent | grep hitsofcode | grep -o -P 'https://camo.githubusercontent.com/[a-z0-9]+/[a-z0-9]+')
+    [ -z "${imgs}" ] || echo "${url}"
+    for img in ${imgs}
+    do
+        curl "$img" --silent > /dev/null &
+    done
+done < "${ACTIVE}"

src/config.rs

@@ -46,14 +46,6 @@ pub(crate) struct Opt {
     )]
     /// The logfile
     pub(crate) logfile: PathBuf,
-    #[structopt(subcommand)]
-    pub(crate) migrate: Option<Migration>,
-}
-
-#[derive(StructOpt, Debug, Clone, Copy)]
-pub(crate) enum Migration {
-    #[structopt(name = "migrate-commit-count")]
-    CacheCommitCount,
 }
 
 pub(crate) fn init() -> Result<()> {

src/main.rs

@@ -18,7 +18,6 @@ mod statics;
 
 use crate::{
     cache::CacheState,
-    config::Migration,
     error::{Error, Result},
     service::{Bitbucket, FormService, GitHub, Gitlab, Service},
     statics::{CLIENT, CSS, FAVICON, OPT, REPO_COUNT, VERSION_INFO},
@@ -35,7 +34,7 @@ use git2::Repository;
 use number_prefix::{NumberPrefix, Prefixed, Standalone};
 use std::{
     borrow::Cow,
-    fs::{create_dir_all, read_dir, rename},
+    fs::create_dir_all,
     path::Path,
     process::Command,
     sync::atomic::Ordering,
@@ -138,8 +137,12 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String, u64)
     Ok((cache.count, head, commits))
 }
 
-fn remote_exists(url: &str) -> Result<bool> {
+fn remote_exists(url: &str) -> impl Future<Item = bool, Error = Error> {
-    Ok(CLIENT.head(url).send()?.status() == reqwest::StatusCode::OK)
+    CLIENT
+        .head(url)
+        .send()
+        .map(|resp| resp.status() == reqwest::StatusCode::OK)
+        .from_err()
 }
 
 enum HocResult {
@@ -164,15 +167,15 @@ where
     T: Service,
     F: Fn(HocResult) -> Result<HttpResponse>,
 {
-    futures::future::result(Ok(()))
+    let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
-        .and_then(move |_| {
+    let service_path = format!("{}/{}", T::domain(), repo);
-            let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
+    let path = format!("{}/{}", state.repos, service_path);
-            let service_path = format!("{}/{}", T::domain(), repo);
+    let url = format!("https://{}", service_path);
-            let path = format!("{}/{}", state.repos, service_path);
+    remote_exists(&url)
+        .and_then(move |remote_exists| {
             let file = Path::new(&path);
-            let url = format!("https://{}", service_path);
             if !file.exists() {
-                if !remote_exists(&url)? {
+                if !remote_exists {
                     warn!("Repository does not exist: {}", url);
                     return Ok(HocResult::NotFound);
                 }
@@ -352,6 +355,7 @@ fn start_server() -> Result<()> {
         App::new()
             .data(state.clone())
             .wrap(middleware::Logger::default())
+            .wrap(middleware::NormalizePath)
             .service(index)
             .service(css)
             .service(favicon32)
@@ -372,39 +376,7 @@ fn start_server() -> Result<()> {
     .run()?)
 }
 
-fn migrate_cache() -> Result<()> {
-    let mut backup_cache = OPT.cachedir.clone();
-    backup_cache.set_extension("bak");
-    rename(&OPT.cachedir, backup_cache)?;
-    let outdir = OPT.outdir.display().to_string();
-    let cachedir = OPT.cachedir.display().to_string();
-    for service in read_dir(&OPT.outdir)? {
-        let service = service?;
-        for namespace in read_dir(service.path())? {
-            let namespace = namespace?;
-            for repo in read_dir(namespace.path())? {
-                let repo_path = repo?.path().display().to_string();
-                let repo_path: String =
-                    repo_path
-                        .split(&outdir)
-                        .fold(String::new(), |mut acc, next| {
-                            acc.push_str(next);
-                            acc
-                        });
-                println!("{}", repo_path);
-                hoc(&repo_path, &outdir, &cachedir)?;
-            }
-        }
-    }
-    Ok(())
-}
-
 fn main() -> Result<()> {
     config::init()?;
-    match &OPT.migrate {
+    start_server()
-        None => start_server(),
-        Some(migration) => match migration {
-            Migration::CacheCommitCount => migrate_cache(),
-        },
-    }
 }

src/statics.rs

@@ -15,7 +15,7 @@ pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");
 pub(crate) const FAVICON: &[u8] = include_bytes!("../static/favicon32.png");
 
 lazy_static! {
-    pub(crate) static ref CLIENT: reqwest::Client = reqwest::Client::new();
+    pub(crate) static ref CLIENT: reqwest::r#async::Client = reqwest::r#async::Client::new();
     pub(crate) static ref OPT: Opt = Opt::from_args();
     pub(crate) static ref REPO_COUNT: AtomicUsize =
         AtomicUsize::new(count_repositories(&OPT.outdir).unwrap());