handle lockfile having negative patchlevels coming from Gemfile.lock

Author: hone

lib/language_pack/helpers/bundler_wrapper.rb

@@ -100,7 +100,7 @@ def ruby_version
       if output.match(/No ruby version specified/)
         ""
       else
-        output.chomp.sub('(', '').sub(')', '').sub(/(p\d+)/, ' \1').split.join('-')
+        output.chomp.sub('(', '').sub(')', '').sub(/(p-?\d+)/, ' \1').split.join('-')
       end
     end
   end

lib/language_pack/ruby_version.rb

@@ -18,7 +18,7 @@ def initialize(output = "")
     LEGACY_VERSION         = "ruby-#{LEGACY_VERSION_NUMBER}"
     RUBY_VERSION_REGEX     = %r{
         (?<ruby_version>\d+\.\d+\.\d+){0}
-        (?<patchlevel>p\d+){0}
+        (?<patchlevel>p-?\d+){0}
         (?<engine>\w+){0}
         (?<engine_version>.+){0}
 
@@ -35,12 +35,12 @@ def initialize(bundler_output, app = {})
       set_version
       parse_version
 
-      @version_without_patchlevel = @version.sub(/-p[\d]+/, '')
+      @version_without_patchlevel = @version.sub(/-p-?\d+/, '')
     end
 
     # https://github.com/bundler/bundler/issues/4621
     def version_for_download
-      if patchlevel_is_significant?
+      if patchlevel_is_significant? && @patchlevel.sub(/p/, '').to_i >= 0
         @version
       else
         version_without_patchlevel

spec/helpers/ruby_version_spec.rb

@@ -28,6 +28,14 @@
     end
   end
 
+  it "does not include patchlevels when the patchlevel is negative for download" do
+    ruby_version = LanguagePack::RubyVersion.new("ruby-2.0.0-p-1")
+    expect(ruby_version.version_for_download).to eq("ruby-2.0.0")
+
+    ruby_version = LanguagePack::RubyVersion.new("ruby-2.4.0-p-1")
+    expect(ruby_version.version_for_download).to eq("ruby-2.4.0")
+  end
+
   it "correctly sets ruby version for bundler specified versions" do
     Hatchet::App.new("mri_193").in_directory do |dir|
       ruby_version   = LanguagePack::RubyVersion.new(@bundler.install.ruby_version, is_new: true)