Improve author detection when includeIf is used (#443)

CHANGELOG.md

@@ -7,6 +7,9 @@ that were not yet released.
 
 _Unreleased_
 
+- The order of git submodule initialization was changed.  This improves the
+  automatic author detection when `includeIf` is used.  #443
+
 - The linux shim installer code will no longer fall back to symlinks when a
   hardlink cannot be created.  This is done as a symlinked shim will not
   ever function correctly on Linux.  This prevents the shim executables like

rye/src/cli/init.rs

@@ -298,7 +298,7 @@ pub fn execute(cmd: Args) -> Result<(), Error> {
             .unwrap_or_else(|| "unknown".into())
     }));
     let version = "0.1.0";
-    let author = get_default_author_with_fallback();
+    let author = get_default_author_with_fallback(&dir);
     let license = match cmd.license {
         Some(license) => Some(license),
         None => cfg.default_license(),
@@ -336,6 +336,7 @@ pub fn execute(cmd: Args) -> Result<(), Error> {
     }
 
     let imported_something = metadata.name.is_some() || metadata.dependencies.is_some();
+    let mut is_metadata_author_none = false;
 
     // if we're missing metadata after the import we update it with what's found from normal initialization.
     if metadata.name.is_none() {
@@ -348,7 +349,8 @@ pub fn execute(cmd: Args) -> Result<(), Error> {
         metadata.description = Some("Add your description here".to_string())
     }
     if metadata.author.is_none() {
-        metadata.author = author;
+        is_metadata_author_none = true;
+        metadata.author = author.clone();
     }
     if metadata.requires_python.is_none() {
         metadata.requires_python = Some(requires_python);
@@ -391,6 +393,39 @@ pub fn execute(cmd: Args) -> Result<(), Error> {
 
     let private = cmd.private;
     let name_safe = metadata.name.as_ref().unwrap().replace('-', "_");
+    let is_rust = build_system == BuildSystem::Maturin;
+
+    // if git init is successful prepare the local git repository
+    if !is_inside_git_work_tree(&dir)
+        && Command::new("git")
+            .arg("init")
+            .current_dir(&dir)
+            .stdout(Stdio::null())
+            .stderr(Stdio::null())
+            .status()
+            .map(|status| status.success())
+            .unwrap_or(false)
+    {
+        let gitignore = dir.join(".gitignore");
+
+        // create a .gitignore if one is missing
+        if !gitignore.is_file() {
+            let rv = env.render_named_str(
+                "gitignore.txt",
+                GITIGNORE_TEMPLATE,
+                context! {
+                    is_rust
+                },
+            )?;
+            fs::write(&gitignore, rv).context("failed to write .gitignore")?;
+        }
+        if is_metadata_author_none {
+            let new_author = get_default_author_with_fallback(&dir);
+            if author != new_author {
+                metadata.author = new_author;
+            }
+        }
+    }
 
     let rv = env.render_named_str(
         "pyproject.json",
@@ -410,7 +445,6 @@ pub fn execute(cmd: Args) -> Result<(), Error> {
             private,
         },
     )?;
-    let is_rust = build_system == BuildSystem::Maturin;
     fs::write(&toml, rv).context("failed to write pyproject.toml")?;
 
     let src_dir = dir.join("src");
@@ -449,32 +483,6 @@ pub fn execute(cmd: Args) -> Result<(), Error> {
         }
     }
 
-    // if git init is successful prepare the local git repository
-    if !is_inside_git_work_tree(&dir)
-        && Command::new("git")
-            .arg("init")
-            .current_dir(&dir)
-            .stdout(Stdio::null())
-            .stderr(Stdio::null())
-            .status()
-            .map(|status| status.success())
-            .unwrap_or(false)
-    {
-        let gitignore = dir.join(".gitignore");
-
-        // create a .gitignore if one is missing
-        if !gitignore.is_file() {
-            let rv = env.render_named_str(
-                "gitignore.txt",
-                GITIGNORE_TEMPLATE,
-                context! {
-                    is_rust
-                },
-            )?;
-            fs::write(&gitignore, rv).context("failed to write .gitignore")?;
-        }
-    }
-
     echo!(
         "{} Initialized project in {}",
         style("success:").green(),

rye/src/platform.rs

@@ -171,22 +171,25 @@ pub fn list_known_toolchains() -> Result<Vec<(PythonVersion, PathBuf)>, Error> {
 }
 
 /// Returns the default author from git or the config.
-pub fn get_default_author_with_fallback() -> Option<(String, String)> {
+pub fn get_default_author_with_fallback(dir: &PathBuf) -> Option<(String, String)> {
     let (mut name, mut email) = Config::current().default_author();
+    let is_name_none = name.is_none();
+    let is_email_none = email.is_none();
 
     if let Ok(rv) = Command::new("git")
         .arg("config")
         .arg("--get-regexp")
+        .current_dir(dir)
         .arg("^user.(name|email)$")
         .stdout(Stdio::piped())
         .output()
     {
         for line in std::str::from_utf8(&rv.stdout).ok()?.lines() {
             match line.split_once(' ') {
-                Some((key, value)) if key == "user.email" && email.is_none() => {
+                Some((key, value)) if key == "user.email" && is_email_none => {
                     email = Some(value.to_string());
                 }
-                Some((key, value)) if key == "user.name" && name.is_none() => {
+                Some((key, value)) if key == "user.name" && is_name_none => {
                     name = Some(value.to_string());
                 }
                 _ => {}