dependabot-bundler 0.138.7 → 0.140.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b879a336288560d831472f3d6163c9fc391159001388ce2b1454154af3b7e026
-  data.tar.gz: cd9f4ca835e065ba322f6edf43830954714396e2e33a292cbdb0ca8defe776bb
+  metadata.gz: a92384ff46ace24160a66d14fc4b83d3faf1808b9185cdf18e3021c67e1f2081
+  data.tar.gz: '019ae4c1bdb58b45695a9e6638e2fc25fa6f8d373b6531091d561d531bb19d15'
 SHA512:
-  metadata.gz: e688088af198726160d18a81d649ced5627ac3311b80449698d1854ca656d9bf411f792553a99ad9cc45b012af97df82c5cac0753bed375c5a4009867759df3e
-  data.tar.gz: aa6730e552463a32bef72bc0ceb7209ead39f327994b547fb3345a167cbbf7f7cc0c10a8e5f756b2d2ec41e7227e11fffef60e716bb158e7e40025c77fa1a39a
+  metadata.gz: ca6256aee46bcf4b60fd8bb28fd9a91563565f92882bb428f36b89eca72006aaa15fb3e018f81dccff740412e08cb516e89dfd07352edf680c6e1d6da6bbc061
+  data.tar.gz: dac59149fb74050f1c868c9185f82648064a59a99db90b08bb946f229cf70d5a1951d85985e11bf8f1d8d3fae26f474a8262ac85be01cdca82ea8a175fd13c64

data/helpers/v1/spec/functions/version_resolver_spec.rb

@@ -84,8 +84,7 @@ RSpec.describe Functions::VersionResolver do
         stub_request(:get, old_index_url + "?gems=business,statesman").
           to_return(
             status: 200,
-            body: fixture("ruby",
-                          "rubygems_responses",
+            body: fixture("rubygems_responses",
                           "dependencies-default-gemfile")
           )
       end

data/helpers/v1/spec/shared_contexts.rb

@@ -41,18 +41,18 @@ RSpec.shared_context "stub rubygems compact index" do
     stub_request(:get, "https://index.rubygems.org/versions").
       to_return(
         status: 200,
-        body: fixture("ruby", "rubygems_responses", "index")
+        body: fixture("rubygems_responses", "index")
       )
 
     # Stub the Rubygems response for each dependency we have a fixture for
     fixtures =
-      Dir[File.join("../../spec", "fixtures", "ruby", "rubygems_responses", "info-*")]
+      Dir[File.join("../../spec", "fixtures", "rubygems_responses", "info-*")]
     fixtures.each do |path|
       dep_name = path.split("/").last.gsub("info-", "")
       stub_request(:get, "https://index.rubygems.org/info/#{dep_name}").
         to_return(
           status: 200,
-          body: fixture("ruby", "rubygems_responses", "info-#{dep_name}")
+          body: fixture("rubygems_responses", "info-#{dep_name}")
         )
     end
   end

data/helpers/v2/run.rb

@@ -11,7 +11,7 @@ require "git_source_patch"
 
 require "functions"
 
-MIN_BUNDLER_VERSION = "2.0.0"
+MIN_BUNDLER_VERSION = "2.1.0"
 
 def validate_bundler_version!
   return true if correct_bundler_version?

data/helpers/v2/spec/functions/version_resolver_spec.rb

@@ -84,8 +84,7 @@ RSpec.describe Functions::VersionResolver do
         stub_request(:get, old_index_url + "?gems=business,statesman").
           to_return(
             status: 200,
-            body: fixture("ruby",
-                          "rubygems_responses",
+            body: fixture("rubygems_responses",
                           "dependencies-default-gemfile")
           )
       end

data/helpers/v2/spec/shared_contexts.rb

@@ -42,18 +42,18 @@ RSpec.shared_context "stub rubygems compact index" do
     stub_request(:get, "https://index.rubygems.org/versions").
       to_return(
         status: 200,
-        body: fixture("ruby", "rubygems_responses", "index")
+        body: fixture("rubygems_responses", "index")
       )
 
     # Stub the Rubygems response for each dependency we have a fixture for
     fixtures =
-      Dir[File.join("../../spec", "fixtures", "ruby", "rubygems_responses", "info-*")]
+      Dir[File.join("../../spec", "fixtures", "rubygems_responses", "info-*")]
     fixtures.each do |path|
       dep_name = path.split("/").last.gsub("info-", "")
       stub_request(:get, "https://index.rubygems.org/info/#{dep_name}").
         to_return(
           status: 200,
-          body: fixture("ruby", "rubygems_responses", "info-#{dep_name}")
+          body: fixture("rubygems_responses", "info-#{dep_name}")
         )
     end
   end

data/lib/dependabot/bundler/file_parser.rb

@@ -313,7 +313,7 @@ module Dependabot
       end
 
       def bundler_version
-        @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+        @bundler_version ||= Helpers.bundler_version(lockfile)
       end
     end
   end

data/lib/dependabot/bundler/file_updater.rb

@@ -163,7 +163,7 @@ module Dependabot
       end
 
       def bundler_version
-        @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+        @bundler_version ||= Helpers.bundler_version(lockfile)
       end
     end
   end

data/lib/dependabot/bundler/file_updater/lockfile_updater.rb

@@ -305,7 +305,7 @@ module Dependabot
         end
 
         def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+          @bundler_version ||= Helpers.bundler_version(lockfile)
         end
       end
     end

data/lib/dependabot/bundler/helpers.rb

@@ -5,23 +5,34 @@ module Dependabot
     module Helpers
       V1 = "1"
       V2 = "2"
+      # If we are updating a project with no Gemfile.lock, we default to the
+      # newest version we support
+      DEFAULT = V2
+      # If we are updating a project with a Gemfile.lock that does not specify
+      # the version it was bundled with, with failover to V1 on the assumption
+      # it was created with an old version that didn't add this information
+      FAILOVER = V1
 
-      # NOTE: options is a manditory argument to ensure we pass it from all calling classes
-      def self.bundler_version(_lockfile, options:)
-        # For now, force V2 if bundler_2_available
-        return V2 if options[:bundler_2_available]
+      BUNDLER_MAJOR_VERSION_REGEX = /BUNDLED WITH\s+(?<version>\d+)\./m.freeze
 
-        # TODO: Add support for bundler v2 based on lockfile
-        # return V2 if lockfile.content.match?(/BUNDLED WITH\s+2/m)
+      def self.bundler_version(lockfile)
+        return DEFAULT unless lockfile
 
-        V1
+        if (matches = lockfile.content.match(BUNDLER_MAJOR_VERSION_REGEX))
+          matches[:version].to_i >= 2 ? V2 : V1
+        else
+          FAILOVER
+        end
       end
 
       def self.detected_bundler_version(lockfile)
         return "unknown" unless lockfile
-        return V2 if lockfile.content.match?(/BUNDLED WITH\s+2/m)
 
-        V1
+        if (matches = lockfile.content.match(BUNDLER_MAJOR_VERSION_REGEX))
+          matches[:version]
+        else
+          FAILOVER
+        end
       end
     end
   end

data/lib/dependabot/bundler/update_checker/conflicting_dependency_resolver.rb

@@ -50,7 +50,7 @@ module Dependabot
         private
 
         def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+          @bundler_version ||= Helpers.bundler_version(lockfile)
         end
       end
     end

data/lib/dependabot/bundler/update_checker/force_updater.rb

@@ -152,7 +152,7 @@ module Dependabot
         end
 
         def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+          @bundler_version ||= Helpers.bundler_version(lockfile)
         end
       end
     end

data/lib/dependabot/bundler/update_checker/latest_version_finder/dependency_source.rb

@@ -147,7 +147,7 @@ module Dependabot
           end
 
           def bundler_version
-            @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+            @bundler_version ||= Helpers.bundler_version(lockfile)
           end
         end
       end

data/lib/dependabot/bundler/update_checker/version_resolver.rb

@@ -225,7 +225,7 @@ module Dependabot
         end
 
         def bundler_version
-          @bundler_version ||= Helpers.bundler_version(lockfile, options: options)
+          @bundler_version ||= Helpers.bundler_version(lockfile)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.138.7
+  version: 0.140.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.138.7
+        version: 0.140.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.138.7
+        version: 0.140.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement