Improve SSH support and remove count-line in compile (#7)

Author: rikosellic

src/executable.rs

@@ -1,8 +1,7 @@
 use crate::files;
-use colored::Colorize;
+
 use std::env;
 use std::path::{Path, PathBuf};
-use std::process::Command;
 
 pub fn locate_from_path<P>(binary: &P) -> Option<PathBuf>
 where
@@ -73,7 +72,10 @@ where
 
 // On Windows, prefer pwsh if available, otherwise fall back to powershell.
 #[cfg(target_os = "windows")]
-pub fn get_powershell_command() -> std::io::Result<Command> {
+pub fn get_powershell_command() -> std::io::Result<std::process::Command> {
+    use colored::Colorize;
+    use std::process::Command;
+
     let check_pwsh = Command::new("pwsh")
         .arg("/?")
         .stdout(std::process::Stdio::null())

src/main.rs

@@ -264,15 +264,6 @@ struct CompileArgs {
         allow_hyphen_values = true
     )]
     pass_through: Vec<String>,
-
-    #[arg(
-        short = 'c',
-        long = "count-line",
-        help = "Count the number of lines of code",
-        default_value = "false",
-        action = ArgAction::SetTrue
-    )]
-    count_line: bool,
 }
 
 #[derive(Parser, Debug)]
@@ -451,7 +442,7 @@ fn compile(args: &CompileArgs) -> Result<(), DynError> {
         release: !args.debug,
         disasm: args.disasm,
         pass_through: args.pass_through.clone(),
-        count_line: args.count_line,
+        count_line: false,
     };
 
     verus::exec_compile(&targets, &imports, &options)

src/verus.rs

@@ -1268,7 +1268,8 @@ pub mod install {
         pub branch: Option<String>,
     }
 
-    pub const VERUS_REPO: &str = "https://[email protected]/asterinas/verus.git";
+    pub const VERUS_REPO_HTTPS: &str = "https://github.com/asterinas/verus.git";
+    pub const VERUS_REPO_SSH: &str = "[email protected]:asterinas/verus.git";
 
     #[memoize]
     pub fn tools_dir() -> PathBuf {
@@ -1291,15 +1292,27 @@ pub mod install {
     }
 
     pub fn clone_repo(verus_dir: &Path) -> Result<(), DynError> {
-        info!(
-            "Cloning Verus repo {} to {} ...",
-            VERUS_REPO,
-            verus_dir.display()
-        );
+        info!("Cloning Verus repo to {} ...", verus_dir.display());
 
-        Repository::clone(VERUS_REPO, verus_dir).unwrap_or_else(|e| {
-            error!("Failed to clone verus repo: {}", e);
+        let mut builder = git2::build::RepoBuilder::new();
+        let mut callbacks = git2::RemoteCallbacks::new();
+
+        callbacks.credentials(|_url, username_from_url, _allowed_types| {
+            git2::Cred::ssh_key_from_agent(username_from_url.unwrap_or("git"))
         });
+
+        let mut fetch_opts = git2::FetchOptions::new();
+        fetch_opts.remote_callbacks(callbacks);
+        builder.fetch_options(fetch_opts);
+
+        let ssh_result = builder.clone(VERUS_REPO_SSH, verus_dir);
+        if ssh_result.is_ok() {
+            return Ok(());
+        }
+
+        Repository::clone(VERUS_REPO_HTTPS, verus_dir)
+            .map_err(|e| format!("Failed to clone verus repo: {}", e))?;
+
         Ok(())
     }
 
@@ -1440,17 +1453,6 @@ pub mod install {
         // Download Z3
         install_z3()?;
 
-        // Apply patches
-        /*let verus_patch = tools_patch_dir().join("verus-fixes.patch");
-        if verus_patch.exists() && !commands::is_patch_applied(&verus_dir, &verus_patch) {
-            status!(
-                "Applying patch {} to {} ...",
-                verus_patch.display(),
-                verus_dir.display()
-            );
-            commands::apply_patch(&verus_dir, &verus_patch);
-        }*/
-
         // Build Verus
         build_verus(options.release)?;
 
@@ -1481,10 +1483,19 @@ pub mod install {
         // Determine target branch (default to "main")
         let target_branch = branch.unwrap_or("main");
 
-        // Find the remote and fetch the target branch
+        // Find the remote and check its URL to determine authentication method
         let mut remote = repo.find_remote("origin")?;
+        let remote_url = remote.url().unwrap_or("");
+        let is_ssh = remote_url.starts_with("git@") || remote_url.contains("ssh://");
+
         let mut callbacks = git2::RemoteCallbacks::new();
-        callbacks.credentials(|_url, username_from_url, _allowed_types| {    git2::Cred::ssh_key_from_agent(username_from_url.unwrap_or("git")) });
+
+        if is_ssh {
+            // SSH repository - use SSH key authentication
+            callbacks.credentials(|_url, username_from_url, _allowed_types| {
+                git2::Cred::ssh_key_from_agent(username_from_url.unwrap_or("git"))
+            });
+        }
         let mut fetch_opts = git2::FetchOptions::new();
         fetch_opts.remote_callbacks(callbacks);
         remote.fetch(&[target_branch], Some(&mut fetch_opts), None)?;