dependabot-bundler 0.180.0 → 0.180.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ba8171e8e22f284c407e5ed16eb159443a9fcd3a44b1bf3e4a4c260b5b5069
-  data.tar.gz: 6e0e55cd7b2c88f0b499c2f286c611d025951b2f9e4c3ec4652af78a30a2007e
+  metadata.gz: ae082832d77255bfa740e7c46ae5572f06034a689305912b20aa2b2139857536
+  data.tar.gz: 90fa21772fbee738a5c59475df24ba1f20408ee54d3311ea69f3ce81e5130777
 SHA512:
-  metadata.gz: 336081970fad143eb952767456dd7509ad50ac7f6927509204b2053d598e35ef8587ecc5cb5d3c4f8380e3ade4d53217a880990a1d68e00e1694209121771105
-  data.tar.gz: 456c96be4808d20dbea49ea9a04ceb91fe232ea1dd75adce79283f6af0f841e2e2fa5eff7c166f037448990d66b30a2fa2235c86a9315fbdb85a4d1247c2d819
+  metadata.gz: 6e943aeaf90030a1b19df2dbc191006202cc26345c6f751df4401e49fe1830c27205636191795cb61ed5895d46cdaaa515ac94f49bdfc375069d94d306fe13dc
+  data.tar.gz: 2817bd3bf41db3d2fedfb6919f0f10fdcf56bed991b075d1c4a2fa68957bc5519340b4c59382715968ad67d85a472de98f3c910951971ad9445df4a05db33f89

data/helpers/v2/build

@@ -22,6 +22,6 @@ cd "$install_dir"
 
 # NOTE: Sets `BUNDLED WITH` to match the installed v2 version in Gemfile.lock
 # forcing specs and native helpers to run with the same version
-BUNDLER_VERSION=2.3.8 bundle config --local path ".bundle"
-BUNDLER_VERSION=2.3.8 bundle config --local without "test"
-BUNDLER_VERSION=2.3.8 bundle install
+BUNDLER_VERSION=2.3.9 bundle config --local path ".bundle"
+BUNDLER_VERSION=2.3.9 bundle config --local without "test"
+BUNDLER_VERSION=2.3.9 bundle install

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

@@ -16,7 +16,6 @@ module Dependabot
         require_relative "gemspec_updater"
         require_relative "gemspec_sanitizer"
         require_relative "gemspec_dependency_name_finder"
-        require_relative "ruby_requirement_setter"
 
         LOCKFILE_ENDING =
           /(?<ending>\s*(?:RUBY VERSION|BUNDLED WITH).*)/m.freeze
@@ -80,23 +79,10 @@ module Dependabot
               )
             end
           post_process_lockfile(lockfile_body)
-        rescue SharedHelpers::HelperSubprocessFailed => e
-          raise unless ruby_lock_error?(e)
-
-          @dont_lock_ruby_version = true
-          retry
-        end
-
-        def ruby_lock_error?(error)
-          return false unless error.error_class == "Bundler::VersionConflict"
-          return false unless error.message.include?(" for gem \"ruby\0\"")
-          return false if @dont_lock_ruby_version
-
-          dependency_files.any? { |f| f.name.end_with?(".gemspec") }
         end
 
         def write_temporary_dependency_files
-          File.write(gemfile.name, prepared_gemfile_content(gemfile))
+          File.write(gemfile.name, updated_gemfile_content(gemfile))
           File.write(lockfile.name, sanitized_lockfile_body)
 
           top_level_gemspecs.each do |gemspec|
@@ -236,21 +222,6 @@ module Dependabot
         end
         # rubocop:enable Metrics/PerceivedComplexity
 
-        def prepared_gemfile_content(file)
-          content =
-            GemfileUpdater.new(
-              dependencies: dependencies,
-              gemfile: file
-            ).updated_gemfile_content
-          return content if @dont_lock_ruby_version
-
-          top_level_gemspecs.each do |gs|
-            content = RubyRequirementSetter.new(gemspec: gs).rewrite(content)
-          end
-
-          content
-        end
-
         def updated_gemfile_content(file)
           GemfileUpdater.new(
             dependencies: dependencies,

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

@@ -73,7 +73,7 @@ module Dependabot
         class Rewriter < Parser::TreeRewriter
           # TODO: Ideally we wouldn't have to ignore all of these, but
           # implementing each one will be tricky.
-          SKIPPED_TYPES = %i(send lvar dstr begin if splat const or).freeze
+          SKIPPED_TYPES = %i(send lvar dstr begin if case splat const or).freeze
 
           def initialize(dependency:, file_type:, updated_requirement:,
                          insert_if_bare:)

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

@@ -11,7 +11,7 @@ module Dependabot
         class RubyVersionNotFound < StandardError; end
 
         RUBY_VERSIONS = %w(
-          1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.7 2.7.3 3.0.1
+          1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.7 2.7.3 3.0.1 3.1.1
         ).freeze
 
         attr_reader :gemspec

data/lib/dependabot/bundler/helpers.rb

@@ -4,7 +4,7 @@ module Dependabot
   module Bundler
     module Helpers
       V1 = "1.17.3"
-      V2 = "2.3.8"
+      V2 = "2.3.9"
       # If we are updating a project with no Gemfile.lock, we default to the
       # newest version we support
       DEFAULT = V2

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

@@ -139,7 +139,8 @@ module Dependabot
         end
 
         def ruby_lock_error?(error)
-          return false unless error.message.include?(" for gem \"ruby\0\"")
+          return false unless error.message.include?(" for the Ruby\0 version") || # Bundler 2
+                              error.message.include?(" for gem \"ruby\0\"") # Bundler 1
           return false if @gemspec_ruby_unlocked
 
           dependency_files.any? { |f| f.name.end_with?(".gemspec") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.180.0
+  version: 0.180.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-04-04 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.180.0
+        version: 0.180.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.180.0
+        version: 0.180.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement