dependabot-bundler 0.180.0 → 0.180.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ba8171e8e22f284c407e5ed16eb159443a9fcd3a44b1bf3e4a4c260b5b5069
-  data.tar.gz: 6e0e55cd7b2c88f0b499c2f286c611d025951b2f9e4c3ec4652af78a30a2007e
+  metadata.gz: 1d1ddc45a87e6cc4dbb13bf925afbf9a71d550910c80c1f515aae485d59436f7
+  data.tar.gz: 8c606db8cb4755d469290aa5101964e48e67621331ee6ef846c4625ac9b66f89
 SHA512:
-  metadata.gz: 336081970fad143eb952767456dd7509ad50ac7f6927509204b2053d598e35ef8587ecc5cb5d3c4f8380e3ade4d53217a880990a1d68e00e1694209121771105
-  data.tar.gz: 456c96be4808d20dbea49ea9a04ceb91fe232ea1dd75adce79283f6af0f841e2e2fa5eff7c166f037448990d66b30a2fa2235c86a9315fbdb85a4d1247c2d819
+  metadata.gz: f0c2f00ad9bce606cab94a05e1af5821b51a3d6ac5c4b009c62a20bbd53d4b1cceea9a48017fd89ad5bc9911767b940446899e8432f801e8252f835c4a81bfe2
+  data.tar.gz: ae50631806525ff1e2048e45271b71ac088adf01e4770833b3d6108e372ef354809460faf2d4485dc96a87901d00c58d79061f9def7a227cc60d955dc03f4f43

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/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.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-23 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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.180.0
+        version: 0.180.1
 - !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