Merge pull request #48 from l4l/custom-registry

Support custom registries

Author: pietroalbini

CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- New method `Crate::registry` for alternative registries.
+
 ### Changed
 
 - allow workspaces by having validate_manifest now use `metadata --no-deps` instead of deprecated `read-manifest`

Cargo.toml

@@ -38,6 +38,7 @@ remove_dir_all = "0.5.2"
 base64 = "0.12.0"
 getrandom = { version = "0.1.12", features = ["std"] }
 thiserror = "1.0.20"
+git2 = "0.13.12"
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.11.0"

src/crates/cratesio.rs

@@ -4,21 +4,8 @@ use crate::prepare::PrepareError;
 use crate::Workspace;
 use failure::{Error, ResultExt};
 use log::{info, warn};
-use percent_encoding::{percent_encode, AsciiSet, CONTROLS};
 use std::path::{Path, PathBuf};
 
-const ENCODE_SET: AsciiSet = CONTROLS
-    .add(b'/')
-    .add(b'\\')
-    .add(b'<')
-    .add(b'>')
-    .add(b':')
-    .add(b'"')
-    .add(b'|')
-    .add(b'?')
-    .add(b'*')
-    .add(b' ');
-
 pub(super) struct GitRepo {
     url: String,
 }
@@ -54,7 +41,7 @@ impl GitRepo {
         workspace
             .cache_dir()
             .join("git-repos")
-            .join(percent_encode(self.url.as_bytes(), &ENCODE_SET).to_string())
+            .join(crate::utils::escape_path(self.url.as_bytes()))
     }
 
     fn suppress_password_prompt_args(&self, workspace: &Workspace) -> Vec<String> {

src/crates/git.rs

@@ -1,6 +1,6 @@
-mod cratesio;
 mod git;
 mod local;
+mod registry;
 
 use crate::Workspace;
 use failure::Error;
@@ -14,7 +14,7 @@ trait CrateTrait: std::fmt::Display {
 }
 
 enum CrateType {
-    CratesIO(cratesio::CratesIOCrate),
+    Registry(registry::RegistryCrate),
     Git(git::GitRepo),
     Local(local::Local),
 }
@@ -23,10 +23,21 @@ enum CrateType {
 pub struct Crate(CrateType);
 
 impl Crate {
+    /// Load a crate from specified registry.
+    pub fn registry(registry_index: &str, name: &str, version: &str) -> Self {
+        Crate(CrateType::Registry(registry::RegistryCrate::new(
+            registry::Registry::Alternative(registry::AlternativeRegistry::new(registry_index)),
+            name,
+            version,
+        )))
+    }
+
     /// Load a crate from the [crates.io registry](https://crates.io).
     pub fn crates_io(name: &str, version: &str) -> Self {
-        Crate(CrateType::CratesIO(cratesio::CratesIOCrate::new(
-            name, version,
+        Crate(CrateType::Registry(registry::RegistryCrate::new(
+            registry::Registry::CratesIo,
+            name,
+            version,
         )))
     }
 
@@ -75,7 +86,7 @@ impl Crate {
 
     fn as_trait(&self) -> &dyn CrateTrait {
         match &self.0 {
-            CrateType::CratesIO(krate) => krate,
+            CrateType::Registry(krate) => krate,
             CrateType::Git(repo) => repo,
             CrateType::Local(local) => local,
         }