Merge pull request #26 from rubygems/multi-requirements

Update info line to join multiple ruby or rubygems requirements by ampersand

Author: sonalkr132

lib/compact_index/gem_version.rb

@@ -24,18 +24,30 @@ def <=>(other)
 
     def to_line
       line = number_and_platform.dup << " " << deps_line << "|checksum:#{checksum}"
-      line << ",ruby:#{ruby_version}" if ruby_version && ruby_version != ">= 0"
-      line << ",rubygems:#{rubygems_version}" if rubygems_version && rubygems_version != ">= 0"
+      line << ",ruby:#{ruby_version_line}" if ruby_version && ruby_version != ">= 0"
+      line << ",rubygems:#{rubygems_version_line}" if rubygems_version && rubygems_version != ">= 0"
       line
     end
 
   private
 
+    def ruby_version_line
+      join_multiple(ruby_version)
+    end
+
+    def rubygems_version_line
+      join_multiple(rubygems_version)
+    end
+
     def deps_line
       return "" if dependencies.nil?
       dependencies.map do |d|
-        [d[:gem], d.version_and_platform.split(", ").sort.join("&")].join(":")
+        [d[:gem], join_multiple(d.version_and_platform)].join(":")
       end.join(",")
     end
+
+    def join_multiple(requirements)
+      requirements.gsub(/[[:space:]]/, "").split(",").sort.join("&")
+    end
   end
 end

spec/compact_index_spec.rb

@@ -93,11 +93,21 @@
       expect(CompactIndex.info(param)).to eq("---\n1.0.1 |checksum:sum+test_gem+1.0.1,ruby:>1.8\n")
     end
 
+    it "show ruby required version with multiple requirements" do
+      param = [build_version(:number => "1.0.1", :ruby_version => "< 2.5, >=2.2")]
+      expect(CompactIndex.info(param)).to eq("---\n1.0.1 |checksum:sum+test_gem+1.0.1,ruby:<2.5&>=2.2\n")
+    end
+
     it "show rubygems required version" do
       param = [build_version(:number => "1.0.1", :rubygems_version => "=2.0")]
       expect(CompactIndex.info(param)).to eq("---\n1.0.1 |checksum:sum+test_gem+1.0.1,rubygems:=2.0\n")
     end
 
+    it "show rubygems required version with multiple requirements" do
+      param = [build_version(:number => "1.0.1", :rubygems_version => ">2.0, <3.1")]
+      expect(CompactIndex.info(param)).to eq("---\n1.0.1 |checksum:sum+test_gem+1.0.1,rubygems:<3.1&>2.0\n")
+    end
+
     it "show both rubygems and ruby required versions" do
       param = [build_version(:number => "1.0.1", :ruby_version => ">1.9", :rubygems_version => ">2.0")]
       expect(CompactIndex.info(param)).to eq("---\n1.0.1 |checksum:sum+test_gem+1.0.1,ruby:>1.9,rubygems:>2.0\n")