Merge branch 'main' into don/prior-eagle

Author: DonJayamanne

.vscode/settings.json

@@ -10,5 +10,6 @@
   "git.branchProtection": [
     "main",
     "release/*"
-  ]
-}
+  ],
+  "git.branchProtectionPrompt": "alwaysCommitToNewBranch"
+}

crates/pet-core/src/os_environment.rs

@@ -152,8 +152,5 @@ fn get_user_home() -> Option<PathBuf> {
 }
 
 fn get_env_var(key: String) -> Option<String> {
-    match env::var(key) {
-        Ok(path) => Some(path),
-        Err(_) => None,
-    }
+    env::var(key).ok()
 }

crates/pet-core/src/pyvenv_cfg.rs

@@ -22,14 +22,21 @@ pub struct PyVenvCfg {
     pub version: String,
     pub version_major: u64,
     pub version_minor: u64,
+    pub prompt: Option<String>,
 }
 
 impl PyVenvCfg {
-    fn new(version: String, version_major: u64, version_minor: u64) -> Self {
+    fn new(
+        version: String,
+        version_major: u64,
+        version_minor: u64,
+        prompt: Option<String>,
+    ) -> Self {
         Self {
             version,
             version_major,
             version_minor,
+            prompt,
         }
     }
     pub fn find(path: &Path) -> Option<Self> {
@@ -88,40 +95,85 @@ fn find(path: &Path) -> Option<PathBuf> {
 
 fn parse(file: &Path) -> Option<PyVenvCfg> {
     let contents = fs::read_to_string(file).ok()?;
+    let mut version: Option<String> = None;
+    let mut version_major: Option<u64> = None;
+    let mut version_minor: Option<u64> = None;
+    let mut prompt: Option<String> = None;
+
     for line in contents.lines() {
-        if !line.contains("version") {
-            continue;
+        if version.is_none() {
+            if let Some((ver, major, minor)) = parse_version(line, &VERSION) {
+                version = Some(ver);
+                version_major = Some(major);
+                version_minor = Some(minor);
+                continue;
+            }
+            if let Some((ver, major, minor)) = parse_version(line, &VERSION_INFO) {
+                version = Some(ver);
+                version_major = Some(major);
+                version_minor = Some(minor);
+                continue;
+            }
         }
-        if let Some(cfg) = parse_version(line, &VERSION) {
-            return Some(cfg);
+        if prompt.is_none() {
+            if let Some(p) = parse_prompt(line) {
+                prompt = Some(p);
+            }
         }
-        if let Some(cfg) = parse_version(line, &VERSION_INFO) {
-            return Some(cfg);
+        if version.is_some() && prompt.is_some() {
+            break;
         }
     }
-    None
+
+    match (version, version_major, version_minor) {
+        (Some(ver), Some(major), Some(minor)) => Some(PyVenvCfg::new(ver, major, minor, prompt)),
+        _ => None,
+    }
 }
 
-fn parse_version(line: &str, regex: &Regex) -> Option<PyVenvCfg> {
+fn parse_version(line: &str, regex: &Regex) -> Option<(String, u64, u64)> {
     if let Some(captures) = regex.captures(line) {
         if let Some(value) = captures.get(1) {
             let version = value.as_str();
-            let parts: Vec<&str> = version.splitn(3, ".").take(2).collect();
-            // .expect() below is OK because the version regex
-            // guarantees there are at least two digits.
-            let version_major = parts[0]
-                .parse()
-                .expect("python major version to be an integer");
-            let version_minor = parts[1]
-                .parse()
-                .expect("python minor version to be an integer");
-            return Some(PyVenvCfg::new(
-                version.to_string(),
-                version_major,
-                version_minor,
-            ));
+            let parts: Vec<&str> = version.split('.').collect();
+            if parts.len() >= 2 {
+                let version_major = parts[0]
+                    .parse()
+                    .expect("python major version to be an integer");
+                let version_minor = parts[1]
+                    .parse()
+                    .expect("python minor version to be an integer");
+                return Some((version.to_string(), version_major, version_minor));
+            }
         }
     }
+    None
+}
 
+fn parse_prompt(line: &str) -> Option<String> {
+    let trimmed = line.trim();
+    if trimmed.starts_with("prompt") {
+        if let Some(eq_idx) = trimmed.find('=') {
+            // let value = trimmed[eq_idx + 1..].trim();
+            let mut name = trimmed[eq_idx + 1..].trim().to_string();
+            // Strip any leading or trailing single or double quotes
+            if name.starts_with('"') {
+                name = name.trim_start_matches('"').to_string();
+            }
+            if name.ends_with('"') {
+                name = name.trim_end_matches('"').to_string();
+            }
+            // Strip any leading or trailing single or double quotes
+            if name.starts_with('\'') {
+                name = name.trim_start_matches('\'').to_string();
+            }
+            if name.ends_with('\'') {
+                name = name.trim_end_matches('\'').to_string();
+            }
+            if !name.is_empty() {
+                return Some(name);
+            }
+        }
+    }
     None
 }

crates/pet-venv/src/lib.rs

@@ -63,8 +63,15 @@ impl Locator for Venv {
             if let Some(ref prefix) = prefix {
                 symlinks.append(&mut find_executables(prefix));
             }
+
+            // Get the name from the prefix if it exists.
+            let cfg = PyVenvCfg::find(env.executable.parent()?)
+                .or_else(|| PyVenvCfg::find(&env.prefix.clone()?));
+            let name = cfg.and_then(|cfg| cfg.prompt);
+
             Some(
                 PythonEnvironmentBuilder::new(Some(PythonEnvironmentKind::Venv))
+                    .name(name)
                     .executable(Some(env.executable.clone()))
                     .version(version)
                     .prefix(prefix)