dependabot-bundler 0.138.6 → 0.140.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3d36ca3b3e551d275fc329fe27939c731c3e05695cf76846ba5be506da0e2d
-  data.tar.gz: f627259209e3090d9b282f0932f32c6ffa2d2d081b97c234d187e32c6dbdfafa
+  metadata.gz: bce8d52153fd3739d59eb3736a7c6c4dd9384047f71a02fb90024a33857b8897
+  data.tar.gz: 6860d643aeaedb2eb3d82e370d5e342a2fd4f92cbfc5eb957d03bd614cc36413
 SHA512:
-  metadata.gz: b39fa17ad13ab8a1603019f65824b512dc177ecf2b0fbd83d7e68cce6aced760145ee8f9c19bd732d88985fe1a51c854baaa2df8cab5121bd3e9cdd8bd1c2cec
-  data.tar.gz: 678d74afcbadb4a37959e769d43a8b6a8e1711501ab3826a6dac9bc71ab10ed1263a4b032f15f992e21505fc14f5366932078dd4b2520d4ebef1e54c7d644687
+  metadata.gz: f1470f081ad88acde187ed65e92454e49ac8a991ace972654ffe51c91c58cd2580331916eba291e5f21d1ea1d0c43e6ea8151ab45eb4e587913425fcd81efd03
+  data.tar.gz: efabc72e5095ab55ab616f9bf140e05d2ff8272704af862fe13df49876e62c8722d0297cd40eca6629b24973785dddf20c7bd6b60a6fc9c7e35914b004c505c0

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.rb

@@ -359,20 +359,18 @@ module Dependabot
         @version_resolver ||= {}
         @version_resolver[remove_git_source] ||= {}
         @version_resolver[remove_git_source][unlock_requirement] ||=
-          begin
-            VersionResolver.new(
-              dependency: dependency,
-              unprepared_dependency_files: dependency_files,
-              repo_contents_path: repo_contents_path,
-              credentials: credentials,
-              ignored_versions: ignored_versions,
-              raise_on_ignored: raise_on_ignored,
-              remove_git_source: remove_git_source,
-              unlock_requirement: unlock_requirement,
-              latest_allowable_version: latest_version,
-              options: options
-            )
-          end
+          VersionResolver.new(
+            dependency: dependency,
+            unprepared_dependency_files: dependency_files,
+            repo_contents_path: repo_contents_path,
+            credentials: credentials,
+            ignored_versions: ignored_versions,
+            raise_on_ignored: raise_on_ignored,
+            remove_git_source: remove_git_source,
+            unlock_requirement: unlock_requirement,
+            latest_allowable_version: latest_version,
+            options: options
+          )
       end
 
       def latest_version_finder(remove_git_source:)

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.6
+  version: 0.140.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-07 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.6
+        version: 0.140.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.138.6
+        version: 0.140.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement