dependabot-bundler 0.98.37 → 0.98.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7dd14e5c6f735e9eb1ce2f765da082ff8c51f4619d58d65bce09d3a26c0a24
-  data.tar.gz: 24e79dec9d75be1cfa4c6c8d925a2a7a1cce2ffb2fc8a6555364302d8f907e37
+  metadata.gz: 825ba20231d07bef92e85f5e6c050b081635e7eba517fbd0a36eab2c3e21efab
+  data.tar.gz: 0a9b6bf93a888d65afe04e0105c07016e400c5541b6387db172f1362582fd4b8
 SHA512:
-  metadata.gz: 668a852434932a1b42eea2b47ccaf47640facd3dbead767baac1777447552b95485a23544e3889278b8f7be6a5db06c24b2953734f7f7b1b14c2b36bd7783aca
-  data.tar.gz: 8205569e193a87a78fdc40a5bed65e5de740701628c753f5379aec185312c33e68c02fd3db97be862f2c787a6f1ec36e4f92beafa7aa4965cbe15c7e28284e15
+  metadata.gz: b51ec6c9ee85f4e0d23ebf5fefbffb75486cc7239c643eb8fbbada6e5d4a9575b0a3df6154d3224af8f14cd3e2b88d0b98fa8dbf72c3774a4e9ce72c4ccc0e72
+  data.tar.gz: 7dedda8e6b260d0dad124cc696b605b1ddbc8262a0ee9e5430f26ab6716a3d14784367ff26bcc0843bf6a926ef401b78b935639e8706ace33475ddeb507467f9

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

@@ -20,6 +20,7 @@ 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
@@ -93,10 +94,22 @@ module Dependabot
               end
             end
           post_process_lockfile(lockfile_body)
+        rescue Dependabot::DependencyFileNotResolvable => error
+          raise unless ruby_lock_error?(error)
+
+          @dont_lock_ruby_version = true
+          retry
+        end
+
+        def ruby_lock_error?(error)
+          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, updated_gemfile_content(gemfile))
+          File.write(gemfile.name, prepared_gemfile_content(gemfile))
           File.write(lockfile.name, sanitized_lockfile_body)
 
           top_level_gemspecs.each do |gemspec|
@@ -340,6 +353,21 @@ module Dependabot
             end
         end
 
+        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 → file_updater}/ruby_requirement_setter.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "parser/current"
-require "dependabot/bundler/update_checker"
+require "dependabot/bundler/file_updater"
 
 module Dependabot
   module Bundler
-    class UpdateChecker
+    class FileUpdater
       class RubyRequirementSetter
         RUBY_VERSIONS =
           %w(1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.5 2.5.5 2.6.2).freeze

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

@@ -8,7 +8,7 @@ require "dependabot/bundler/file_updater/git_source_remover"
 require "dependabot/bundler/file_updater/requirement_replacer"
 require "dependabot/bundler/file_updater/gemspec_dependency_name_finder"
 require "dependabot/bundler/file_updater/lockfile_updater"
-require "dependabot/bundler/update_checker/ruby_requirement_setter"
+require "dependabot/bundler/file_updater/ruby_requirement_setter"
 
 module Dependabot
   module Bundler
@@ -240,8 +240,8 @@ module Dependabot
 
         def lock_ruby_version(gemfile_content)
           top_level_gemspecs.each do |gs|
-            gemfile_content =
-              RubyRequirementSetter.new(gemspec: gs).rewrite(gemfile_content)
+            gemfile_content = FileUpdater::RubyRequirementSetter.
+                              new(gemspec: gs).rewrite(gemfile_content)
           end
 
           gemfile_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.98.37
+  version: 0.98.38
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.37
+        version: 0.98.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.37
+        version: 0.98.38
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - lib/dependabot/bundler/file_updater/git_source_remover.rb
 - lib/dependabot/bundler/file_updater/lockfile_updater.rb
 - lib/dependabot/bundler/file_updater/requirement_replacer.rb
+- lib/dependabot/bundler/file_updater/ruby_requirement_setter.rb
 - lib/dependabot/bundler/metadata_finder.rb
 - lib/dependabot/bundler/requirement.rb
 - lib/dependabot/bundler/update_checker.rb
@@ -168,7 +169,6 @@ files:
 - lib/dependabot/bundler/update_checker/force_updater.rb
 - lib/dependabot/bundler/update_checker/latest_version_finder.rb
 - lib/dependabot/bundler/update_checker/requirements_updater.rb
-- lib/dependabot/bundler/update_checker/ruby_requirement_setter.rb
 - lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb
 - lib/dependabot/bundler/update_checker/version_resolver.rb
 - lib/dependabot/bundler/version.rb