dependabot-bundler 0.178.1 → 0.180.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4c8a7a3f791c3e68a3250f7040dec1824c636b1fb9bbff2b29f0621f6d55c44
-  data.tar.gz: 2a768d1157a39039a4555728e8b046965f04903d2038e6bb94f948ea26e89fed
+  metadata.gz: 1d1ddc45a87e6cc4dbb13bf925afbf9a71d550910c80c1f515aae485d59436f7
+  data.tar.gz: 8c606db8cb4755d469290aa5101964e48e67621331ee6ef846c4625ac9b66f89
 SHA512:
-  metadata.gz: 196dfca63aef59d58355af1fde2342c5721c14f908ee33581a99d7b66fcd19d279e0916425bb753fcc19734a10658f520d1894975efcdb3b27db511085fe87bc
-  data.tar.gz: 518d168d404f7756ce875fa957d784db4dbb869ed7a8e8b85450fae2494ea3a598dc991075daa3389968c91f9ae0ca26876b381e04ae6ba3b894ed6155030efd
+  metadata.gz: f0c2f00ad9bce606cab94a05e1af5821b51a3d6ac5c4b009c62a20bbd53d4b1cceea9a48017fd89ad5bc9911767b940446899e8432f801e8252f835c4a81bfe2
+  data.tar.gz: ae50631806525ff1e2048e45271b71ac088adf01e4770833b3d6108e372ef354809460faf2d4485dc96a87901d00c58d79061f9def7a227cc60d955dc03f4f43

data/helpers/v1/Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 # NOTE: Used to run native helper specs
 group :test do
   gem "debug", ">= 1.0.0"
-  gem "rspec", "3.10.0"
-  gem "rspec-its", "1.3.0"
-  gem "vcr", "6.0.0"
-  gem "webmock", "3.12.1"
+  gem "rspec", "~> 3.8"
+  gem "rspec-its", "~> 1.2"
+  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/monkey_patches/resolver_spec_group_sane_eql.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "bundler/resolver/spec_group"
+
+# Port
+# https://github.com/rubygems/bundler/commit/30a690edbdf5ee64ea54afc7d0c91d910ff2b80e
+# to fix flaky failures on Bundler 1
+
+module BundlerResolverSpecGroupSaneEql
+  def eql?(other)
+    return unless other.is_a?(self.class)
+
+    super(other)
+  end
+end
+
+Bundler::Resolver::SpecGroup.prepend(BundlerResolverSpecGroupSaneEql)

data/helpers/v1/run.rb

@@ -14,7 +14,9 @@ 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"
 
 require "functions"
 

data/helpers/v1/spec/native_spec_helper.rb

@@ -11,7 +11,9 @@ $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"
 
 require "functions"
 

data/helpers/v2/Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 # NOTE: Used to run native helper specs
 group :test do
   gem "debug", ">= 1.0.0"
-  gem "rspec", "3.10.0"
-  gem "rspec-its", "1.3.0"
-  gem "vcr", "6.0.0"
-  gem "webmock", "3.12.1"
+  gem "rspec", "~> 3.8"
+  gem "rspec-its", "~> 1.2"
+  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/native_helpers.rb

@@ -69,7 +69,7 @@ module Dependabot
         helpers_root = ENV["DEPENDABOT_NATIVE_HELPERS_PATH"]
         return File.join(helpers_root, "bundler") unless helpers_root.nil?
 
-        File.join(__dir__, "../../../helpers")
+        File.expand_path("../../../helpers", __dir__)
       end
     end
   end

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.178.1
+  version: 0.180.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-14 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.178.1
+        version: 0.180.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.178.1
+        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
@@ -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,7 +197,9 @@ 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
 - helpers/v1/spec/functions/conflicting_dependency_resolver_spec.rb
 - helpers/v1/spec/functions/dependency_source_spec.rb
@@ -273,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: