osiris-lang 0.2.0__tar.gz → 0.2.2__tar.gz

{osiris_lang-0.2.0 → osiris_lang-0.2.2}/Cargo.lock

@@ -119,7 +119,7 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "osiris"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "nom",
  "pyo3",

{osiris_lang-0.2.0 → osiris_lang-0.2.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "osiris"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2024"
 rust-version = "1.85"
 authors = ["MJ <tywf91@gmail.com>"]

{osiris_lang-0.2.0 → osiris_lang-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osiris-lang
-Version: 0.2.0
+Version: 0.2.2
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust

{osiris_lang-0.2.0 → osiris_lang-0.2.2}/src/tooling/cli/init.rs

@@ -10,9 +10,11 @@ use super::*;
 
 const STARTER_SOURCE: &str = r#"(module main)
 
-;; `uv run osr run src/main.osr` 会编译并执行这个入口。
-(defn main []
-  (py.print "Hello from Osiris"))
+;; Python 互操作保持显式；编译阶段不会导入或执行 Python 模块。
+(py/import builtins :as py)
+
+;; `uv run osr run src/main.osr` 会编译并执行顶层表达式。
+(py.print "Hello from Osiris")
 "#;
 
 pub(super) fn run_init(arguments: &[String]) -> CliOutcome {
@@ -99,8 +101,9 @@ fn uv_init(root: &Path) -> Result<(), String> {
 }
 
 fn uv_add_osiris(root: &Path) -> Result<(), String> {
+    let requirement = format!("osiris-lang>={}", crate::version());
     let output = Command::new("uv")
-        .args(["add", "--dev", "osiris-lang"])
+        .args(["add", "--dev", &requirement])
         .current_dir(root)
         .output()
         .map_err(|error| format!("could not run uv: {error}"))?;
@@ -202,7 +205,9 @@ fn array_item<const N: usize>(entries: [&str; N]) -> Item {
 }
 
 fn has_osiris_dependency(document: &DocumentMut) -> bool {
-    dependency_items(document).any(|dependency| dependency_name(dependency) == "osiris-lang")
+    dependency_items(document).any(|dependency| {
+        dependency_name(dependency) == "osiris-lang" && dependency.contains(crate::version())
+    })
 }
 
 fn dependency_items(document: &DocumentMut) -> impl Iterator<Item = &str> {
@@ -275,4 +280,20 @@ mod tests {
         assert_eq!(dependency_name("Osiris_Lang>=0.1.0"), "osiris-lang");
         assert_eq!(dependency_name("osiris-lang[build]"), "osiris-lang");
     }
+
+    #[test]
+    fn only_the_current_compiler_requirement_skips_uv_add() {
+        let current = format!(
+            "[dependency-groups]\ndev = [\"osiris-lang>={}\"]\n",
+            crate::version()
+        )
+        .parse::<DocumentMut>()
+        .unwrap();
+        let old = "[dependency-groups]\ndev = [\"osiris-lang>=0.2.1\"]\n"
+            .parse::<DocumentMut>()
+            .unwrap();
+
+        assert!(has_osiris_dependency(&current));
+        assert!(!has_osiris_dependency(&old));
+    }
 }

{osiris_lang-0.2.0 → osiris_lang-0.2.2}/tests/cli/initialization.rs

@@ -53,9 +53,16 @@ exit 9
     assert!(configured.contains("source = [\"src\"]"));
     assert_eq!(
         fs::read_to_string(project.join(".uv-add-invocation")).unwrap(),
-        "add --dev osiris-lang\n"
+        format!("add --dev osiris-lang>={}\n", env!("CARGO_PKG_VERSION"))
+    );
+    let starter = project.join("src/main.osr");
+    assert!(starter.is_file());
+    let check = osr(&["check", path_argument(&starter)]);
+    assert!(
+        check.status.success(),
+        "{}",
+        String::from_utf8_lossy(&check.stderr)
     );
-    assert!(project.join("src/main.osr").is_file());
 }
 
 #[test]
@@ -64,18 +71,21 @@ fn init_existing_preserves_uv_project_and_is_idempotent() {
     let pyproject = fixture.directory.join("pyproject.toml");
     fs::write(
         &pyproject,
-        r#"# This comment belongs to the application.
+        format!(
+            r#"# This comment belongs to the application.
 [project]
 name = "existing-app"
 version = "2.3.4"
 dependencies = ["requests>=2"]
 
 [dependency-groups]
-dev = ["osiris-lang>=0.1.0", "pytest>=8"]
+dev = ["osiris-lang>={}", "pytest>=8"]
 
 [tool.example]
 keep = "unchanged"
 "#,
+            env!("CARGO_PKG_VERSION")
+        ),
     )
     .unwrap();
 
@@ -102,7 +112,7 @@ fn init_existing_does_not_replace_an_existing_starter() {
     let fixture = SourceFixture::new("none\n");
     fs::write(
         fixture.directory.join("pyproject.toml"),
-        "[project]\nname = \"demo\"\nversion = \"1\"\n\n[dependency-groups]\ndev = [\"osiris-lang\"]\n",
+        format!("[project]\nname = \"demo\"\nversion = \"1\"\n\n[dependency-groups]\ndev = [\"osiris-lang>={}\"]\n", env!("CARGO_PKG_VERSION")),
     )
     .unwrap();
     let starter = fixture.write("src/main.osr", "(module main)\n(def answer 42)\n");
@@ -121,7 +131,7 @@ fn init_existing_uses_the_configured_source_root() {
     let fixture = SourceFixture::new("none\n");
     fs::write(
         fixture.directory.join("pyproject.toml"),
-        "[project]\nname = \"demo\"\nversion = \"1\"\n\n[dependency-groups]\ndev = [\"osiris-lang\"]\n\n[tool.osiris]\nsource = [\"lisp\"]\n",
+        format!("[project]\nname = \"demo\"\nversion = \"1\"\n\n[dependency-groups]\ndev = [\"osiris-lang>={}\"]\n\n[tool.osiris]\nsource = [\"lisp\"]\n", env!("CARGO_PKG_VERSION")),
     )
     .unwrap();