new: Support gofmt and loosen version range. (#25)

moonrepo · May 9, 2024 · df434d1 · df434d1
1 parent b3454fb
commit df434d1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.11.1
+
+#### 🚀 Updates
+
+- Added `gofmt` as a secondary shim/binary.
+- Updated `go.mod` version parsing to use better ranges.
+
 ## 0.11.0
 
 #### 🚀 Updates

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "go_plugin"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 license = "MIT"
 publish = false

diff --git a/src/proto.rs b/src/proto.rs
@@ -52,7 +52,9 @@ pub fn parse_version_file(
     if input.file == "go.mod" || input.file == "go.work" {
         for line in input.content.split('\n') {
             if let Some(v) = line.strip_prefix("go ") {
-                version = Some(UnresolvedVersionSpec::parse(v)?);
+                let range = format!("^{}", from_go_version(v));
+
+                version = Some(UnresolvedVersionSpec::parse(range)?);
                 break;
             }
         }
@@ -144,6 +146,10 @@ pub fn locate_executables(
         primary: Some(ExecutableConfig::new(
             env.os.get_exe_name(format!("bin/{}", BIN)),
         )),
+        secondary: HashMap::from_iter([(
+            "gofmt".into(),
+            ExecutableConfig::new(env.os.get_exe_name("bin/gofmt")),
+        )]),
         ..LocateExecutablesOutput::default()
     }))
 }

diff --git a/tests/snapshots/shims_test__creates_shims.snap b/tests/snapshots/shims_test__creates_shims.snap
@@ -3,5 +3,9 @@ source: tests/shims_test.rs
 expression: "std::fs::read_to_string(sandbox.path().join(\".proto/shims/registry.json\")).unwrap()"
 ---
 {
-  "go-test": {}
+  "go-test": {},
+  "gofmt": {
+    "alt_bin": true,
+    "parent": "go-test"
+  }
 }
diff --git a/tests/versions_test.rs b/tests/versions_test.rs
@@ -5,7 +5,7 @@ generate_resolve_versions_tests!("go-test", {
     "1.11" => "1.11.13",
     "1.9.0-rc2" => "1.9.0-rc2",
     "1.21.0" => "1.21.0",
-    "1.21" => "1.21.9",
+    "1.21" => "1.21.10",
 });
 
 #[test]
@@ -50,7 +50,7 @@ require (
 
     assert_eq!(
         output.version.unwrap(),
-        UnresolvedVersionSpec::parse("1.20").unwrap()
+        UnresolvedVersionSpec::parse("^1.20.0").unwrap()
     );
 }
 
@@ -92,7 +92,7 @@ use (
 
     assert_eq!(
         output.version.unwrap(),
-        UnresolvedVersionSpec::parse("1.18").unwrap()
+        UnresolvedVersionSpec::parse("^1.18.0").unwrap()
     );
 }