Merge pull request #438 from nodeg/fix_poly

Author: nodeg

CONTRIBUTING.md

@@ -5,7 +5,7 @@
 To develop tetra, you will need:
 
 * to install Bundler and Ruby development headers. On SUSE distros, use
-  `sudo zypper install ruby3.1-rubygem-bundler ruby-devel`;
+  `sudo zypper install ruby3.4-rubygem-bundler ruby3.4-devel`;
 * to get development dependencies: `bundle install`;
 
 To install a development version of tetra use:
@@ -14,8 +14,8 @@ To install a development version of tetra use:
 sudo rake install
 ```
 
-To run tests, simply run `rake`. Please note that tests are divided into fine (more similar to unit tests) and coarse
-(more similar to integration tests).
+To run tests, simply run `rake` or `bundle exec rake`. Please note that tests are divided into fine
+(more similar to unit tests) and coarse (more similar to integration tests).
 
 ## Coding style
 

README.md

@@ -36,7 +36,7 @@ rake install
 
 Test can be found in the `spec/` folder and are divided into fine (more similar to unit tests) and coarse
 (more similar to integration tests).
-To run tests manually, simply execute `rake`.
+To run tests manually, simply execute `rake` or `bundle exec rake`.
 With every Pull Request against master and consecutive pushes to that PR, several [GitHub Actions tests](https://github.com/uyuni-project/tetra/tree/master/.github/workflows)
 will run automatically.
 

lib/tetra/packages/package.rb

@@ -49,12 +49,17 @@ def outputs
     end
 
     def cleanup_description(raw, max_length)
+      # Normalize spaces and strip and truncate to max_length
+      raw = raw.gsub(/[\s]+/, " ").strip
+      raw = raw.slice(0..max_length - 1)
+
+      # Remove the last word if it was cut off (preceded by a space)
+      raw = raw.sub(/\s\w+\z/, "")
+
+      # Safely remove trailing dots linear in O(N)
+      raw = raw[0...-1] while raw.end_with?(".")
+
       raw
-        .gsub(/[\s]+/, " ")
-        .strip
-        .slice(0..max_length - 1)
-        .sub(/\s\w+$/, "")
-        .sub(/\.+$/, "")
     end
 
     def to_spec

lib/tetra/version_matcher.rb

@@ -10,11 +10,11 @@ class VersionMatcher
     # by a ., -, _, ~ or space
     # returns a [name, version] pair
     def split_version(full_name)
-      matches = full_name.match(/(.*?)(?:[\.\-\_ ~,]?([0-9].*))?$/)
+      matches = full_name.match(/\A(.*?)(?:[\.\-\_ ~,]?([0-9].*))\z/)
       if !matches.nil? && matches.length > 1
         [matches[1], matches[2]]
       else
-        [full_string, nil]
+        [full_name, nil]
       end
     end
 

spec/lib/fine/version_matcher_spec.rb

@@ -3,62 +3,74 @@
 require "spec_helper"
 
 describe Tetra::VersionMatcher do
-  let(:version_matcher) { Tetra::VersionMatcher.new }
+  let(:v_matcher) { Tetra::VersionMatcher.new }
 
   describe "#split_version" do
     it "splits full names into names and version numbers" do
-      expect(version_matcher.split_version("moio-3.2beta1")).to eq(["moio", "3.2beta1"])
-      expect(version_matcher.split_version("3.2beta1")).to eq(["", "3.2beta1"])
-      expect(version_matcher.split_version("v3.2beta1")).to eq(["v", "3.2beta1"])
+      expect(v_matcher.split_version("moio-3.2beta1")).to eq(["moio", "3.2beta1"])
+      expect(v_matcher.split_version("3.2beta1")).to eq(["", "3.2beta1"])
+      expect(v_matcher.split_version("v3.2beta1")).to eq(["v", "3.2beta1"])
+    end
+
+    it "returns the full name and nil version when no version is found" do
+      # This triggers the 'else' block where the variable name bug was
+      expect(v_matcher.split_version("simple-package-name")).to eq(["simple-package-name", nil])
+      expect(v_matcher.split_version("mypackage")).to eq(["mypackage", nil])
+    end
+
+    it "handles version strings with different separators" do
+      expect(v_matcher.split_version("package_name-1.0")).to eq(["package_name", "1.0"])
+      expect(v_matcher.split_version("package.name.1.0")).to eq(["package.name", "1.0"])
+      expect(v_matcher.split_version("package name 1.0")).to eq(["package name", "1.0"])
     end
   end
 
   describe "#chunk_distance" do
     it "computes chunk distances" do
-      expect(version_matcher.chunk_distance(nil, "1")).to eq(1)
-      expect(version_matcher.chunk_distance("alpha", nil)).to eq(5)
+      expect(v_matcher.chunk_distance(nil, "1")).to eq(1)
+      expect(v_matcher.chunk_distance("alpha", nil)).to eq(5)
 
-      expect(version_matcher.chunk_distance("1", "1")).to eq(0)
-      expect(version_matcher.chunk_distance("1", "9")).to eq(8)
-      expect(version_matcher.chunk_distance("1", "999")).to eq(99)
+      expect(v_matcher.chunk_distance("1", "1")).to eq(0)
+      expect(v_matcher.chunk_distance("1", "9")).to eq(8)
+      expect(v_matcher.chunk_distance("1", "999")).to eq(99)
 
-      expect(version_matcher.chunk_distance("snap", "SNAP")).to eq(0)
-      expect(version_matcher.chunk_distance("snap", "snippete")).to eq(5)
-      expect(version_matcher.chunk_distance("snap", "l" * 999)).to eq(99)
+      expect(v_matcher.chunk_distance("snap", "SNAP")).to eq(0)
+      expect(v_matcher.chunk_distance("snap", "snippete")).to eq(5)
+      expect(v_matcher.chunk_distance("snap", "l" * 999)).to eq(99)
 
-      expect(version_matcher.chunk_distance("1", "SNAP")).to eq(4)
+      expect(v_matcher.chunk_distance("1", "SNAP")).to eq(4)
 
-      expect(version_matcher.chunk_distance("0", "10")).to eq(10)
-      expect(version_matcher.chunk_distance("0", "9")).to eq(9)
+      expect(v_matcher.chunk_distance("0", "10")).to eq(10)
+      expect(v_matcher.chunk_distance("0", "9")).to eq(9)
     end
   end
 
   describe "#best_match" do
     it "finds the best match" do
       my_version = "1.0"
       available_versions = ["1.0", "1", "2.0", "1.0.1", "4.5.6.7.8"]
-      expect(version_matcher.best_match(my_version, available_versions)).to eq("1.0")
+      expect(v_matcher.best_match(my_version, available_versions)).to eq("1.0")
 
       available_versions = ["3.0", "2.0", "1.0.1"]
-      expect(version_matcher.best_match(my_version, available_versions)).to eq("1.0.1")
+      expect(v_matcher.best_match(my_version, available_versions)).to eq("1.0.1")
 
       available_versions = ["1.snap", "2.0", "4.0.1"]
-      expect(version_matcher.best_match(my_version, available_versions)).to eq("1.snap")
+      expect(v_matcher.best_match(my_version, available_versions)).to eq("1.snap")
 
       available_versions = ["1.10", "1.9", "2.0", "3.0.1"]
-      expect(version_matcher.best_match(my_version, available_versions)).to eq("1.9")
+      expect(v_matcher.best_match(my_version, available_versions)).to eq("1.9")
 
       my_version = "1.snap"
       available_versions = ["1.snap", "1"]
-      expect(version_matcher.best_match(my_version, available_versions)).to eq("1.snap")
+      expect(v_matcher.best_match(my_version, available_versions)).to eq("1.snap")
 
       my_version = "1.very-very_very_longish"
       available_versions = ["1.snap", "1"]
-      expect(version_matcher.best_match(my_version, available_versions)).to eq("1.snap")
+      expect(v_matcher.best_match(my_version, available_versions)).to eq("1.snap")
 
       my_version = "1.snap"
       available_versions = []
-      expect(version_matcher.best_match(my_version, available_versions)).to be_nil
+      expect(v_matcher.best_match(my_version, available_versions)).to be_nil
     end
   end
 end