rpr-cli 0.3.8__tar.gz → 0.3.10__tar.gz

{rpr_cli-0.3.8 → rpr_cli-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rpr-cli
-Version: 0.3.8
+Version: 0.3.10
 Requires-Dist: typer>=0.24.1
 Requires-Dist: jinja2>=3.1.5
 Requires-Dist: pyyaml>=6.0.2
@@ -87,6 +87,19 @@ source and experiments to remain in rename scope. Binary contents, VCS data, and
 symlink targets are never changed. The outer workspace directory keeps its
 existing name.
 
+After applying the rename, RPR synchronizes Node and Python dependencies and
+runs uncached Nx build, Rust-engine build, and typecheck targets with the Nx
+daemon disabled. This verifies the renamed project graph and commands without
+deleting the existing Nx cache. Pass `--skip-verify` to omit these checks; a
+dry run previews them without executing anything. If verification fails, the
+rename remains applied and RPR prints the command to retry.
+
+The success output includes a guarded command for optionally renaming the outer
+workspace directory. Git remotes and hosted repository names are never changed.
+When a hosted repository still matches the old project name, rename it through
+the hosting provider if desired and then update its local URL with
+`git remote set-url`. Local and remote branch names are unaffected.
+
 `rpr init <project-name>` creates the project directory when it does not exist. If the directory already exists and is not an NX workspace, RPR initializes Git and runs `nx init` inside that directory.
 
 By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
@@ -271,9 +284,11 @@ No `PYPI_API_TOKEN` secret is required when publishing through GitHub Actions OI
 Release flow:
 
 ```bash
-# update src/rpr/__init__.py and rpr-parser/Cargo.toml to the same version
-git commit -am "Release 0.3.8"
-git tag v0.3.8
+rpr version bump patch             # updates Python, Cargo.toml, and Cargo.lock
+# Or repair/set an explicit version: rpr version set 0.3.9
+git add src/rpr/__init__.py rpr-parser/Cargo.toml rpr-parser/Cargo.lock
+git commit -m "Release 0.3.9"
+git tag v0.3.9
 git push origin main --tags
 ```
 

{rpr_cli-0.3.8 → rpr_cli-0.3.10}/README.md

@@ -70,6 +70,19 @@ source and experiments to remain in rename scope. Binary contents, VCS data, and
 symlink targets are never changed. The outer workspace directory keeps its
 existing name.
 
+After applying the rename, RPR synchronizes Node and Python dependencies and
+runs uncached Nx build, Rust-engine build, and typecheck targets with the Nx
+daemon disabled. This verifies the renamed project graph and commands without
+deleting the existing Nx cache. Pass `--skip-verify` to omit these checks; a
+dry run previews them without executing anything. If verification fails, the
+rename remains applied and RPR prints the command to retry.
+
+The success output includes a guarded command for optionally renaming the outer
+workspace directory. Git remotes and hosted repository names are never changed.
+When a hosted repository still matches the old project name, rename it through
+the hosting provider if desired and then update its local URL with
+`git remote set-url`. Local and remote branch names are unaffected.
+
 `rpr init <project-name>` creates the project directory when it does not exist. If the directory already exists and is not an NX workspace, RPR initializes Git and runs `nx init` inside that directory.
 
 By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
@@ -254,9 +267,11 @@ No `PYPI_API_TOKEN` secret is required when publishing through GitHub Actions OI
 Release flow:
 
 ```bash
-# update src/rpr/__init__.py and rpr-parser/Cargo.toml to the same version
-git commit -am "Release 0.3.8"
-git tag v0.3.8
+rpr version bump patch             # updates Python, Cargo.toml, and Cargo.lock
+# Or repair/set an explicit version: rpr version set 0.3.9
+git add src/rpr/__init__.py rpr-parser/Cargo.toml rpr-parser/Cargo.lock
+git commit -m "Release 0.3.9"
+git tag v0.3.9
 git push origin main --tags
 ```
 

{rpr_cli-0.3.8 → rpr_cli-0.3.10}/rpr-parser/Cargo.lock

@@ -1981,7 +1981,7 @@ dependencies = [
 
 [[package]]
 name = "rpr-parser"
-version = "0.3.8"
+version = "0.3.10"
 dependencies = [
  "dirs",
  "dotenvy",

{rpr_cli-0.3.8 → rpr_cli-0.3.10}/rpr-parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rpr-parser"
-version = "0.3.8"
+version = "0.3.10"
 edition = "2021"
 
 [lib]

{rpr_cli-0.3.8 → rpr_cli-0.3.10}/rpr-parser/src/rename.rs

@@ -158,16 +158,27 @@ impl Replacer {
         let mut position = 0;
         let mut replacements = 0;
         while position < text.len() {
-            if let Some(token) = self.match_new(text, position) {
-                output.push_str(token);
-                position += token.len();
-                continue;
-            }
-            if let Some((old, new)) = self.match_old(text, position) {
-                output.push_str(new);
-                position += old.len();
-                replacements += 1;
-                continue;
+            let new_match = self.match_new(text, position);
+            let old_match = self.match_old(text, position);
+            match (old_match, new_match) {
+                (Some((old, new)), Some(existing)) if old.len() > existing.len() => {
+                    output.push_str(new);
+                    position += old.len();
+                    replacements += 1;
+                    continue;
+                }
+                (_, Some(existing)) => {
+                    output.push_str(existing);
+                    position += existing.len();
+                    continue;
+                }
+                (Some((old, new)), None) => {
+                    output.push_str(new);
+                    position += old.len();
+                    replacements += 1;
+                    continue;
+                }
+                (None, None) => {}
             }
             let ch = text[position..]
                 .chars()
@@ -182,12 +193,16 @@ impl Replacer {
     fn has_stale_reference(&self, text: &str) -> bool {
         let mut position = 0;
         while position < text.len() {
-            if let Some(token) = self.match_new(text, position) {
-                position += token.len();
-                continue;
-            }
-            if self.match_old(text, position).is_some() {
-                return true;
+            let new_match = self.match_new(text, position);
+            let old_match = self.match_old(text, position);
+            match (old_match, new_match) {
+                (Some((old, _)), Some(existing)) if old.len() > existing.len() => return true,
+                (_, Some(existing)) => {
+                    position += existing.len();
+                    continue;
+                }
+                (Some(_), None) => return true,
+                (None, None) => {}
             }
             position += text[position..].chars().next().unwrap().len_utf8();
         }
@@ -288,6 +303,7 @@ pub fn plan(root: PathBuf, new_name: String) -> Result<NativeRenamePlan, String>
     validate_new_name(&old_name, &new_name)?;
     let replacer = Replacer::new(build_replacements(&old_name, &new_name, variables));
     let (entries, mut skipped) = walk_workspace(&root)?;
+    validate_unicode_paths(&root, &entries, &skipped)?;
     let files: Vec<_> = entries
         .iter()
         .filter(|entry| entry.is_file())
@@ -653,11 +669,37 @@ fn build_path_moves(
 fn rename_relative_path(path: &Path, replacer: &Replacer) -> PathBuf {
     let mut output = PathBuf::new();
     for component in path.components() {
-        output.push(replacer.replace(&component.as_os_str().to_string_lossy()).0);
+        let component = component
+            .as_os_str()
+            .to_str()
+            .expect("workspace paths were validated as Unicode");
+        output.push(replacer.replace(component).0);
     }
     output
 }
 
+fn validate_unicode_paths(
+    root: &Path,
+    entries: &[PathBuf],
+    skipped: &[SkippedPath],
+) -> Result<(), String> {
+    for entry in entries.iter().chain(skipped.iter().map(|item| &item.path)) {
+        let relative = entry
+            .strip_prefix(root)
+            .expect("walked path is beneath root");
+        if relative
+            .components()
+            .any(|component| component.as_os_str().to_str().is_none())
+        {
+            return Err(format!(
+                "Workspace path is not valid Unicode and cannot be renamed safely: {:?}",
+                entry.as_os_str()
+            ));
+        }
+    }
+    Ok(())
+}
+
 fn update_config(text: &str, new_name: &str) -> Result<(String, usize), String> {
     let mut config: Value = serde_yaml::from_str(text)
         .map_err(|error| format!("Renamed .rpr.yaml would be invalid: {error}"))?;
@@ -1005,6 +1047,28 @@ mod tests {
         assert_eq!(count, 1);
     }
 
+    #[test]
+    fn longest_token_wins_for_shortening_and_expansion() {
+        let shortening = Replacer::new(HashMap::from([
+            ("foo-bar".into(), "foo".into()),
+            ("foo_bar".into(), "foo".into()),
+            ("FooBar".into(), "Foo".into()),
+        ]));
+        let (output, count) =
+            shortening.replace("nx serve foo-bar-web; from foo_bar_domain import FooBarService");
+        assert_eq!(
+            output,
+            "nx serve foo-web; from foo_domain import FooService"
+        );
+        assert_eq!(count, 3);
+        assert!(!shortening.has_stale_reference(&output));
+
+        let expansion = Replacer::new(HashMap::from([("foo".into(), "foo-bar".into())]));
+        let (output, count) = expansion.replace("foo foo-bar");
+        assert_eq!(output, "foo-bar foo-bar");
+        assert_eq!(count, 1);
+    }
+
     #[test]
     fn bootstrap_defaults_cover_named_virtual_environments() {
         let temp = tempfile::tempdir().unwrap();
@@ -1046,6 +1110,40 @@ mod tests {
             .contains("new_app_domain"));
     }
 
+    #[test]
+    fn shortening_rename_updates_nested_paths_and_references() {
+        let temp = workspace();
+        let plan = plan(temp.path().to_path_buf(), "my".into()).unwrap();
+
+        apply(&plan).unwrap();
+
+        let renamed = temp
+            .path()
+            .join("packages/python/my_domain/src/my_domain/main.py");
+        assert!(renamed.is_file());
+        assert!(fs::read_to_string(renamed).unwrap().contains("my_domain"));
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn non_unicode_workspace_path_aborts_planning() {
+        use std::ffi::OsString;
+        use std::os::unix::ffi::OsStringExt;
+
+        let temp = workspace();
+        let invalid = temp
+            .path()
+            .join(OsString::from_vec(b"my-app-\xff.txt".to_vec()));
+        write(&invalid, b"my-app\n");
+
+        let error = plan(temp.path().to_path_buf(), "new-app".into())
+            .err()
+            .expect("non-Unicode path should fail planning");
+
+        assert!(error.contains("not valid Unicode"));
+        assert!(temp.path().join("packages/python/my_app_domain").is_dir());
+    }
+
     #[test]
     fn ignored_virtual_environment_is_never_planned_or_validated() {
         let temp = workspace();

rpr_cli-0.3.10/src/rpr/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.10"

{rpr_cli-0.3.8 → rpr_cli-0.3.10}/src/rpr/cli.py

@@ -33,6 +33,13 @@ sync_app = typer.Typer(
 )
 app.add_typer(sync_app, name="sync")
 
+version_app = typer.Typer(
+    name="version",
+    help="Manage synchronized Python and Rust release versions.",
+    no_args_is_help=True,
+)
+app.add_typer(version_app, name="version")
+
 refresh_app = typer.Typer(
     name="refresh",
     help="Refresh repo-owned manifests from upstream registries.",
@@ -61,6 +68,7 @@ from rpr.commands.generate import ui as _ui_mod  # noqa: E402, F401
 from rpr.commands.generate import engine as _engine_mod  # noqa: E402, F401
 from rpr.commands.generate import storybook as _storybook_mod  # noqa: E402, F401
 from rpr.commands import sync as _sync_mod  # noqa: E402, F401
+from rpr.commands import version as _version_mod  # noqa: E402, F401
 from rpr.commands import refresh as _refresh_mod  # noqa: E402, F401
 from rpr.commands import update as _update_mod  # noqa: E402, F401
 from rpr.commands import add as _add_mod  # noqa: E402, F401