dependabot-bundler 0.178.0 → 0.180.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0c8c8c515a14a088d51dcedcfc96331538ade00aa2a4adb37fc6bbbdac58cb
-  data.tar.gz: '016822f022016965e9c9355cf821b3f45e5c32815d6c2408eda021c06fb74dd9'
+  metadata.gz: 22ba8171e8e22f284c407e5ed16eb159443a9fcd3a44b1bf3e4a4c260b5b5069
+  data.tar.gz: 6e0e55cd7b2c88f0b499c2f286c611d025951b2f9e4c3ec4652af78a30a2007e
 SHA512:
-  metadata.gz: 1228ecb3da6432ddc78440abc5a22c5b587719ca92fa4bdd5c730ed047d68b04600473a67240b5ea6367fa068606e0757e2cf7cb063fca5644de5b5e099d37c1
-  data.tar.gz: 6f29eeb844a12b53a39759243e8ba6b3c42a324cc54c7b1e10b7f8b8cf34cfcac11cbe5b0e9aa21ef6d0633667a66c077e886dc567d9fd7c054a3ec58d019c7f
+  metadata.gz: 336081970fad143eb952767456dd7509ad50ac7f6927509204b2053d598e35ef8587ecc5cb5d3c4f8380e3ade4d53217a880990a1d68e00e1694209121771105
+  data.tar.gz: 456c96be4808d20dbea49ea9a04ceb91fe232ea1dd75adce79283f6af0f841e2e2fa5eff7c166f037448990d66b30a2fa2235c86a9315fbdb85a4d1247c2d819

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.178.0
+  version: 0.180.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-18 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.0
+        version: 0.180.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.178.0
+        version: 0.180.0
 - !ruby/object:Gem::Dependency
   name: debug
   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: