Expose AlternativeRegistry to API

Author: l4l

src/crates/mod.rs

@@ -7,6 +7,8 @@ use failure::Error;
 use log::info;
 use std::path::Path;
 
+pub use registry::AlternativeRegistry;
+
 trait CrateTrait: std::fmt::Display {
     fn fetch(&self, workspace: &Workspace) -> Result<(), Error>;
     fn purge_from_cache(&self, workspace: &Workspace) -> Result<(), Error>;
@@ -24,12 +26,11 @@ pub struct Crate(CrateType);
 
 impl Crate {
     /// Load a crate from specified registry.
-    pub fn registry(registry_index: &str, name: &str, version: &str, key: Option<String>) -> Self {
+    pub fn registry(registry: AlternativeRegistry, name: &str, version: &str) -> Self {
         Crate(CrateType::Registry(registry::RegistryCrate::new(
-            registry::Registry::Alternative(registry::AlternativeRegistry::new(registry_index)),
+            registry::Registry::Alternative(registry),
             name,
             version,
-            key,
         )))
     }
 
@@ -39,7 +40,6 @@ impl Crate {
             registry::Registry::CratesIo,
             name,
             version,
-            None,
         )))
     }
 

src/crates/registry.rs

@@ -10,17 +10,26 @@ use tar::Archive;
 
 static CRATES_ROOT: &str = "https://static.crates.io/crates";
 
-pub(crate) struct AlternativeRegistry {
+/// A type for alternative registry as described in rust-lang/rfcs#2141
+pub struct AlternativeRegistry {
     registry_index: String,
+    key: Option<String>,
 }
 
 impl AlternativeRegistry {
-    pub(crate) fn new(registry_index: impl Into<String>) -> AlternativeRegistry {
+    /// Registry for specified registry index
+    pub fn new(registry_index: impl Into<String>) -> AlternativeRegistry {
         AlternativeRegistry {
             registry_index: registry_index.into(),
+            key: None,
         }
     }
 
+    /// Specify private ssh key for registry authentication.
+    pub fn authenticate_with_ssh_key(&mut self, key: String) {
+        self.key = Some(key);
+    }
+
     fn index(&self) -> &str {
         self.registry_index.as_str()
     }
@@ -55,7 +64,6 @@ pub(super) struct RegistryCrate {
     registry: Registry,
     name: String,
     version: String,
-    key: Option<String>,
 }
 
 #[derive(serde::Deserialize)]
@@ -64,12 +72,11 @@ struct IndexConfig {
 }
 
 impl RegistryCrate {
-    pub(super) fn new(registry: Registry, name: &str, version: &str, key: Option<String>) -> Self {
+    pub(super) fn new(registry: Registry, name: &str, version: &str) -> Self {
         RegistryCrate {
             registry,
             name: name.into(),
             version: version.into(),
-            key: key.map(Into::into),
         }
     }
 
@@ -95,7 +102,7 @@ impl RegistryCrate {
                 if !index_path.exists() {
                     let url = alt.index();
                     let mut fo = git2::FetchOptions::new();
-                    if let Some(key) = self.key.as_deref() {
+                    if let Some(key) = alt.key.as_deref() {
                         fo.remote_callbacks({
                             let mut callbacks = git2::RemoteCallbacks::new();
                             callbacks.credentials(

src/lib.rs

@@ -37,7 +37,7 @@ mod utils;
 mod workspace;
 
 pub use crate::build::{Build, BuildBuilder, BuildDirectory};
-pub use crate::crates::Crate;
+pub use crate::crates::{AlternativeRegistry, Crate};
 pub use crate::prepare::PrepareError;
 pub use crate::toolchain::Toolchain;
 pub use crate::workspace::{Workspace, WorkspaceBuilder};

tests/integration/crates_alt.rs

@@ -1,13 +1,14 @@
 use failure::Error;
-use rustwide::Crate;
+use rustwide::{AlternativeRegistry, Crate};
 
 const INDEX_URL: &str = "https://github.com/rust-lang/staging.crates.io-index";
 
 #[test]
 fn test_fetch() -> Result<(), Error> {
     let workspace = crate::utils::init_workspace()?;
 
-    let krate = Crate::registry(INDEX_URL, "foo", "0.4.0");
+    let alt = AlternativeRegistry::new(INDEX_URL);
+    let krate = Crate::registry(alt, "foo", "0.4.0");
     krate.fetch(&workspace)?;
 
     Ok(())