dependabot-bundler 0.179.0 → 0.180.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0b7f36161c154701d4786b521cb6f1f1a670bd532657bec1a2e778455baa71
-  data.tar.gz: e4fb69f5997088cf2b357eee4326623c0505965a7cc07294d8b3ec0af2806149
+  metadata.gz: 0535faef344ee4973a4c817621bef0ebe3dbfa74bfb0eca094ab3ed68dff50a8
+  data.tar.gz: 4272ece9cf9e2fc630ebbf41773d3c7158763804428b67db7aa55b6c89cb64dd
 SHA512:
-  metadata.gz: 0b6e7c768c04de86a36efc45eeb05e137f644741382bb6185322804986ebdb21568870d7d35a6b940fd8a5c4fd5c1eddb01dc2b9176589ec3cedd022aa7edc81
-  data.tar.gz: 8c0f2295f33510a0dde7f75becc592fd064fd79092d77457bd2eef726c426b1bc06298cc98c34832c68591ecd5287629b48751131abb85dfa5c9eecbb7659bd9
+  metadata.gz: 529d04b309784b29ec1e64047dc2fbe0cc7522460e16cbfe1d475c9a6f2dfcf04b94efcdfc41d0ea40d3cd0cf8d8079ec848e151b54d5a55c872973f68b187ff
+  data.tar.gz: 0c132e54905614a067d18683dd33d28bdafd15246aa46e832b21eca90f2df3c884427ff62bf063a454f6d1e7c071978d68e7dddba34a793442eb6c37a5969298

data/helpers/v1/Gemfile

@@ -7,6 +7,6 @@ group :test do
   gem "debug", ">= 1.0.0"
   gem "rspec", "~> 3.8"
   gem "rspec-its", "~> 1.2"
-  gem "vcr", "6.0.0"
+  gem "vcr", "6.1.0"
   gem "webmock", "~> 3.4"
 end

data/helpers/v1/lib/functions.rb

@@ -144,6 +144,9 @@ module Functions
         token.gsub("@", "%40F").gsub("?", "%3F")
       )
     end
+
+    # Use HTTPS for GitHub if lockfile
+    Bundler.settings.set_command_option("github.https", "true")
   end
 
   def self.relevant_credentials(credentials)

data/helpers/v1/monkey_patches/fileutils_keyword_splat_patch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "bundler/vendor/fileutils/lib/fileutils"
+
+# Port
+# https://github.com/ruby/fileutils/commit/a5eca84a4240e29bb7886c3ef7085d464a972dd0
+# to fix keyword argument errors on Ruby 3.1
+
+module BundlerFileUtilsKeywordSplatPatch
+  def entries
+    opts = {}
+    opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
+    Dir.entries(path, **opts).
+      reject { |n| [".", ".."].include?(n) }.
+      map { |n| self.class.new(prefix, join(rel, n.untaint)) }
+  end
+end
+
+Bundler::FileUtils::Entry_.prepend(BundlerFileUtilsKeywordSplatPatch)

data/helpers/v1/run.rb

@@ -14,6 +14,7 @@ end
 # Bundler monkey patches
 require "definition_ruby_version_patch"
 require "definition_bundler_version_patch"
+require "fileutils_keyword_splat_patch"
 require "git_source_patch"
 require "resolver_spec_group_sane_eql"
 

data/helpers/v1/spec/native_spec_helper.rb

@@ -11,6 +11,7 @@ $LOAD_PATH.unshift(File.expand_path("../monkey_patches", __dir__))
 # Bundler monkey patches
 require "definition_ruby_version_patch"
 require "definition_bundler_version_patch"
+require "fileutils_keyword_splat_patch"
 require "git_source_patch"
 require "resolver_spec_group_sane_eql"
 

data/helpers/v2/Gemfile

@@ -7,6 +7,6 @@ group :test do
   gem "debug", ">= 1.0.0"
   gem "rspec", "~> 3.8"
   gem "rspec-its", "~> 1.2"
-  gem "vcr", "6.0.0"
+  gem "vcr", "6.1.0"
   gem "webmock", "~> 3.4"
 end

data/helpers/v2/lib/functions.rb

@@ -150,9 +150,7 @@ module Functions
     # NOTE: Prevent bundler from printing resolution information
     Bundler.ui = Bundler::UI::Silent.new
 
-    # Use HTTPS for GitHub if lockfile
     Bundler.settings.set_command_option("forget_cli_options", "true")
-    Bundler.settings.set_command_option("github.https", "true")
   end
 
   def self.relevant_credentials(credentials)

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.179.0
+  version: 0.180.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-28 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.179.0
+        version: 0.180.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.179.0
+        version: 0.180.2
 - !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
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - helpers/v1/lib/functions/version_resolver.rb
 - helpers/v1/monkey_patches/definition_bundler_version_patch.rb
 - helpers/v1/monkey_patches/definition_ruby_version_patch.rb
+- helpers/v1/monkey_patches/fileutils_keyword_splat_patch.rb
 - helpers/v1/monkey_patches/git_source_patch.rb
 - helpers/v1/monkey_patches/resolver_spec_group_sane_eql.rb
 - helpers/v1/run.rb
@@ -274,12 +275,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 requirements: []
 rubygems_version: 3.2.32
 signing_key: