dependabot-bundler 0.229.0 → 0.231.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aebdf859dd5aea604a8c209c7e74ed216ccafc206c5cd19c225ee0c8971e0896
-  data.tar.gz: f3f2ec8fa7812e9d4e056e9ec22dbb6b76865aa1790461068c9617d1734cec5e
+  metadata.gz: 8631cf2ab576ccaef2da80d1bd94044d4d8a00424bfe92e691c821dc48bb72d8
+  data.tar.gz: b89f61a611b1989c8ff4d9c1c3a4606c3abe4b8a9249281f06a2674879dc5445
 SHA512:
-  metadata.gz: 619a5a6c1ae140eda8468fb3b5a75893094d990b7f4e86860ee7601012cdc61197df57e7cae17f7c25980e844ab9a169f7c88f124d88219d5e612f358b285a37
-  data.tar.gz: 6698d2264ce455a7181edda03d4b286e21070286865281982b48ae6044ad830afbbaceeb876999a2ecd3b07e9b5888205064f98c7bedef9f802fcb403939affb
+  metadata.gz: e408ac8674a6e65be74574cecd46901ec74a1f4e205f9954779a17ddb7cc628eb390229755c01d428527a0740703447dde01b7942aa164140bb5d3100a3645b7
+  data.tar.gz: f1cc908bb2eaf81ac24963fe55744b125549d17dbdb50c2e1ce0c079dce94539cefc6fe1a896079b7fa425583b41e26eecf00997cd96d9f1e17cac39d2941e9f

data/helpers/v1/lib/functions/conflicting_dependency_resolver.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Functions

data/helpers/v1/lib/functions/dependency_source.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Functions
@@ -37,13 +38,13 @@ module Functions
     def private_registry_versions
       bundler_source = specified_source || default_source
 
-      bundler_source.
-        fetchers.flat_map do |fetcher|
-          fetcher.
-            specs_with_retry([dependency_name], bundler_source).
-            search_all(dependency_name)
-        end.
-        map(&:version)
+      bundler_source
+        .fetchers.flat_map do |fetcher|
+          fetcher
+            .specs_with_retry([dependency_name], bundler_source)
+            .search_all(dependency_name)
+        end
+        .map(&:version)
     end
 
     private
@@ -67,8 +68,8 @@ module Functions
     def specified_source
       return @specified_source if defined? @specified_source
 
-      @specified_source = definition.dependencies.
-                          find { |dep| dep.name == dependency_name }&.source
+      @specified_source = definition.dependencies
+                                    .find { |dep| dep.name == dependency_name }&.source
     end
 
     def default_source

data/helpers/v1/lib/functions/file_parser.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "uri"
@@ -11,16 +12,16 @@ module Functions
     attr_reader :lockfile_name
 
     def parsed_gemfile(gemfile_name:)
-      Bundler::Definition.build(gemfile_name, nil, {}).
-        dependencies.select(&:current_platform?).
-        reject { |dep| local_sources.include?(dep.source.class) }.
-        map { |dep| serialize_bundler_dependency(dep) }
+      Bundler::Definition.build(gemfile_name, nil, {})
+                         .dependencies.select(&:current_platform?)
+                         .reject { |dep| local_sources.include?(dep.source.class) }
+                         .map { |dep| serialize_bundler_dependency(dep) }
     end
 
     def parsed_gemspec(gemspec_name:)
-      Bundler.load_gemspec_uncached(gemspec_name).
-        dependencies.
-        map { |dep| serialize_bundler_dependency(dep) }
+      Bundler.load_gemspec_uncached(gemspec_name)
+             .dependencies
+             .map { |dep| serialize_bundler_dependency(dep) }
     end
 
     private

data/helpers/v1/lib/functions/force_updater.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Functions
@@ -62,9 +63,9 @@ module Functions
 
     def new_dependencies_to_unlock_from(error:, already_unlocked:)
       potentials_deps =
-        relevant_conflicts(error, already_unlocked).
-        flat_map(&:requirement_trees).
-        reject do |tree|
+        relevant_conflicts(error, already_unlocked)
+        .flat_map(&:requirement_trees)
+        .reject do |tree|
           # If the final requirement wasn't specific, it can't be binding
           next true if tree.last.requirement == Gem::Requirement.new(">= 0")
 
@@ -79,10 +80,10 @@ module Functions
           )
         end.map(&:first)
 
-      potentials_deps.
-        reject { |dep| already_unlocked.map(&:name).include?(dep.name) }.
-        reject { |dep| [dependency_name, "ruby\0"].include?(dep.name) }.
-        uniq
+      potentials_deps
+        .reject { |dep| already_unlocked.map(&:name).include?(dep.name) }
+        .reject { |dep| [dependency_name, "ruby\0"].include?(dep.name) }
+        .uniq
     end
 
     def relevant_conflicts(error, dependencies_being_unlocked)
@@ -92,12 +93,12 @@ module Functions
       # 1) caused by a new requirement introduced by our unlocking, or
       # 2) caused by an old requirement that prohibits the update.
       # Hence, we look at the beginning and end of the requirement trees
-      error.cause.conflicts.values.
-        select do |conflict|
-          conflict.requirement_trees.any? do |t|
-            names.include?(t.last.name) || names.include?(t.first.name)
-          end
+      error.cause.conflicts.values
+           .select do |conflict|
+        conflict.requirement_trees.any? do |t|
+          names.include?(t.last.name) || names.include?(t.first.name)
         end
+      end
     end
 
     def build_definition(dependencies_to_unlock:)
@@ -115,8 +116,8 @@ module Functions
         unlock_gem(definition: definition, gem_name: gem_name)
       end
 
-      dep = definition.dependencies.
-            find { |d| d.name == dependency_name }
+      dep = definition.dependencies
+                      .find { |d| d.name == dependency_name }
 
       # If the dependency is not found in the Gemfile it means this is a
       # transitive dependency that we can't force update.
@@ -146,19 +147,19 @@ module Functions
       # subdependencies
       return [] unless lockfile
 
-      all_deps =  Bundler::LockfileParser.new(lockfile).
-                  specs.map { |x| x.name.to_s }
-      top_level = Bundler::Definition.
-                  build(gemfile_name, lockfile_name, {}).
-                  dependencies.map { |x| x.name.to_s }
+      all_deps =  Bundler::LockfileParser.new(lockfile)
+                                         .specs.map { |x| x.name.to_s }
+      top_level = Bundler::Definition
+                  .build(gemfile_name, lockfile_name, {})
+                  .dependencies.map { |x| x.name.to_s }
 
       all_deps - top_level
     end
 
     def unlock_gem(definition:, gem_name:)
       dep = definition.dependencies.find { |d| d.name == gem_name }
-      version = definition.locked_gems.specs.
-                find { |d| d.name == gem_name }.version
+      version = definition.locked_gems.specs
+                          .find { |d| d.name == gem_name }.version
 
       dep&.instance_variable_set(
         :@requirement,

data/helpers/v1/lib/functions/lockfile_updater.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "fileutils"
@@ -63,8 +64,8 @@ module Functions
     def cache_vendored_gems(definition)
       # Dependencies that have been unlocked for the update (including
       # sub-dependencies)
-      unlocked_gems = definition.instance_variable_get(:@unlock).
-                      fetch(:gems)
+      unlocked_gems = definition.instance_variable_get(:@unlock)
+                                .fetch(:gems)
       bundler_opts = {
         cache_all: true,
         cache_all_platforms: true,
@@ -129,18 +130,18 @@ module Functions
     def unlock_yanked_gem(dependencies_to_unlock, error)
       raise unless error.message.match?(GEM_NOT_FOUND_ERROR_REGEX)
 
-      gem_name = error.message.match(GEM_NOT_FOUND_ERROR_REGEX).
-                 named_captures["name"]
+      gem_name = error.message.match(GEM_NOT_FOUND_ERROR_REGEX)
+                      .named_captures["name"]
       raise if dependencies_to_unlock.include?(gem_name)
 
       dependencies_to_unlock << gem_name
     end
 
     def unlock_blocking_subdeps(dependencies_to_unlock, error)
-      all_deps =  Bundler::LockfileParser.new(lockfile).
-                  specs.map { |x| x.name.to_s }
-      top_level = build_definition([]).dependencies.
-                  map { |x| x.name.to_s }
+      all_deps =  Bundler::LockfileParser.new(lockfile)
+                                         .specs.map { |x| x.name.to_s }
+      top_level = build_definition([]).dependencies
+                                      .map { |x| x.name.to_s }
       allowed_new_unlocks = all_deps - top_level - dependencies_to_unlock
 
       raise if allowed_new_unlocks.none?
@@ -148,9 +149,9 @@ module Functions
       # Unlock any sub-dependencies that Bundler reports caused the
       # conflict
       potentials_deps =
-        error.cause.conflicts.values.
-        flat_map(&:requirement_trees).
-        filter_map do |tree|
+        error.cause.conflicts.values
+             .flat_map(&:requirement_trees)
+             .filter_map do |tree|
           tree.find { |req| allowed_new_unlocks.include?(req.name) }
         end.map(&:name)
 

data/helpers/v1/lib/functions/version_resolver.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Functions
@@ -81,10 +82,10 @@ module Functions
       # subdependencies
       return [] unless lockfile
 
-      all_deps =  ::Bundler::LockfileParser.new(lockfile).
-                  specs.map { |x| x.name.to_s }.uniq
-      top_level = build_definition([]).dependencies.
-                  map { |x| x.name.to_s }
+      all_deps =  ::Bundler::LockfileParser.new(lockfile)
+                                           .specs.map { |x| x.name.to_s }.uniq
+      top_level = build_definition([]).dependencies
+                                      .map { |x| x.name.to_s }
 
       all_deps - top_level
     end
@@ -104,8 +105,8 @@ module Functions
     def unlock_yanked_gem(dependencies_to_unlock, error)
       raise unless error.message.match?(GEM_NOT_FOUND_ERROR_REGEX)
 
-      gem_name = error.message.match(GEM_NOT_FOUND_ERROR_REGEX).
-                 named_captures["name"]
+      gem_name = error.message.match(GEM_NOT_FOUND_ERROR_REGEX)
+                      .named_captures["name"]
       raise if dependencies_to_unlock.include?(gem_name)
 
       dependencies_to_unlock << gem_name

data/helpers/v1/lib/functions.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "functions/file_parser"
@@ -10,14 +11,14 @@ require "functions/conflicting_dependency_resolver"
 module Functions
   def self.parsed_gemfile(**args)
     set_bundler_flags_and_credentials(dir: args.fetch(:dir), credentials: [])
-    FileParser.new(lockfile_name: args.fetch(:lockfile_name)).
-      parsed_gemfile(gemfile_name: args.fetch(:gemfile_name))
+    FileParser.new(lockfile_name: args.fetch(:lockfile_name))
+              .parsed_gemfile(gemfile_name: args.fetch(:gemfile_name))
   end
 
   def self.parsed_gemspec(**args)
     set_bundler_flags_and_credentials(dir: args.fetch(:dir), credentials: [])
-    FileParser.new(lockfile_name: args.fetch(:lockfile_name)).
-      parsed_gemspec(gemspec_name: args.fetch(:gemspec_name))
+    FileParser.new(lockfile_name: args.fetch(:lockfile_name))
+              .parsed_gemspec(gemspec_name: args.fetch(:gemspec_name))
   end
 
   def self.vendor_cache_dir(**args)
@@ -88,18 +89,18 @@ module Functions
     # Set flags and credentials
     set_bundler_flags_and_credentials(dir: args.fetch(:dir), credentials: args.fetch(:credentials))
 
-    Bundler::Definition.build(args.fetch(:gemfile_name), nil, {}).
-      send(:sources).
-      rubygems_remotes.
-      find { |uri| uri.host.include?("jfrog") }&.
-      host
+    Bundler::Definition.build(args.fetch(:gemfile_name), nil, {})
+                       .send(:sources)
+                       .rubygems_remotes
+                       .find { |uri| uri.host.include?("jfrog") }
+      &.host
   end
 
   def self.git_specs(**args)
     set_bundler_flags_and_credentials(dir: args.fetch(:dir), credentials: args.fetch(:credentials))
 
-    git_specs = Bundler::Definition.build(args.fetch(:gemfile_name), nil, {}).dependencies.
-                select do |spec|
+    git_specs = Bundler::Definition.build(args.fetch(:gemfile_name), nil, {}).dependencies
+                                   .select do |spec|
       spec.source.is_a?(Bundler::Source::Git)
     end
     git_specs.map do |spec|
@@ -157,12 +158,12 @@ module Functions
   end
 
   def self.private_registry_credentials(credentials)
-    credentials.
-      select { |cred| cred["type"] == "rubygems_server" }
+    credentials
+      .select { |cred| cred["type"] == "rubygems_server" }
   end
 
   def self.git_source_credentials(credentials)
-    credentials.
-      select { |cred| cred["type"] == "git_source" }
+    credentials
+      .select { |cred| cred["type"] == "git_source" }
   end
 end

data/helpers/v1/monkey_patches/definition_bundler_version_patch.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "bundler/definition"
@@ -7,8 +8,8 @@ require "bundler/definition"
 module BundlerDefinitionBundlerVersionPatch
   def expanded_dependencies
     @expanded_dependencies ||=
-      expand_dependencies(dependencies + metadata_dependencies, @remote).
-      reject { |d| d.name == "bundler" }
+      expand_dependencies(dependencies + metadata_dependencies, @remote)
+      .reject { |d| d.name == "bundler" }
   end
 end
 

data/helpers/v1/monkey_patches/definition_ruby_version_patch.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "bundler/definition"

data/helpers/v1/monkey_patches/fileutils_keyword_splat_patch.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "bundler/vendor/fileutils/lib/fileutils"
@@ -10,9 +11,9 @@ module BundlerFileUtilsKeywordSplatPatch
   def entries
     opts = {}
     opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
-    Dir.entries(path, **opts).
-      reject { |n| n == "." || n == ".." }.
-      map { |n| self.class.new(prefix, join(rel, n.untaint)) }
+    Dir.entries(path, **opts)
+       .reject { |n| n == "." || n == ".." }
+       .map { |n| self.class.new(prefix, join(rel, n.untaint)) }
   end
 end
 

data/helpers/v1/monkey_patches/git_source_patch.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "bundler/source"
@@ -35,8 +36,8 @@ module Bundler
 
       def serialize_gemspecs_in(destination)
         original_load_paths = $LOAD_PATH.dup
-        reduced_load_paths = original_load_paths.
-                             reject { |p| p.include?("/gems/") }
+        reduced_load_paths = original_load_paths
+                             .reject { |p| p.include?("/gems/") }
 
         $LOAD_PATH.shift until $LOAD_PATH.empty?
         reduced_load_paths.each { |p| $LOAD_PATH << p }

data/helpers/v1/monkey_patches/resolver_spec_group_sane_eql.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "bundler/resolver/spec_group"

data/helpers/v1/run.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 gem "bundler", "~> 1.17"

data/helpers/v1/spec/functions/conflicting_dependency_resolver_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "native_spec_helper"

data/helpers/v1/spec/functions/dependency_source_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "native_spec_helper"
@@ -22,15 +23,15 @@ RSpec.describe Functions::DependencySource do
   end
 
   before do
-    stub_request(:get, registry_url + "versions").
-      with(basic_auth: ["SECRET_CODES", ""]).
-      to_return(status: 404)
-    stub_request(:get, registry_url + "api/v1/dependencies").
-      with(basic_auth: ["SECRET_CODES", ""]).
-      to_return(status: 200)
-    stub_request(:get, gemfury_business_url).
-      with(basic_auth: ["SECRET_CODES", ""]).
-      to_return(status: 200, body: fixture("ruby", "gemfury_response"))
+    stub_request(:get, registry_url + "versions")
+      .with(basic_auth: ["SECRET_CODES", ""])
+      .to_return(status: 404)
+    stub_request(:get, registry_url + "api/v1/dependencies")
+      .with(basic_auth: ["SECRET_CODES", ""])
+      .to_return(status: 200)
+    stub_request(:get, gemfury_business_url)
+      .with(basic_auth: ["SECRET_CODES", ""])
+      .to_return(status: 200, body: fixture("ruby", "gemfury_response"))
   end
 
   describe "#private_registry_versions" do
@@ -60,22 +61,22 @@ RSpec.describe Functions::DependencySource do
 
     context "that we don't have authentication details for" do
       before do
-        stub_request(:get, registry_url + "versions").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 401)
-        stub_request(:get, registry_url + "api/v1/dependencies").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 401)
-        stub_request(:get, registry_url + "specs.4.8.gz").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 401)
+        stub_request(:get, registry_url + "versions")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 401)
+        stub_request(:get, registry_url + "api/v1/dependencies")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 401)
+        stub_request(:get, registry_url + "specs.4.8.gz")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 401)
       end
 
       it "blows up with a useful error" do
         error_class = Bundler::Fetcher::AuthenticationRequiredError
         error_message = "Authentication is required for repo.fury.io"
-        expect { private_registry_versions }.
-          to raise_error do |error|
+        expect { private_registry_versions }
+          .to raise_error do |error|
             expect(error).to be_a(error_class)
             expect(error.message).to include(error_message)
           end
@@ -84,65 +85,65 @@ RSpec.describe Functions::DependencySource do
 
     context "that we have bad authentication details for" do
       before do
-        stub_request(:get, registry_url + "versions").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 403)
-        stub_request(:get, registry_url + "api/v1/dependencies").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 403)
-        stub_request(:get, registry_url + "specs.4.8.gz").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 403)
+        stub_request(:get, registry_url + "versions")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 403)
+        stub_request(:get, registry_url + "api/v1/dependencies")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 403)
+        stub_request(:get, registry_url + "specs.4.8.gz")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 403)
       end
 
       it "blows up with a useful error" do
         error_class = Bundler::Fetcher::BadAuthenticationError
-        expect { private_registry_versions }.
-          to raise_error do |error|
+        expect { private_registry_versions }
+          .to raise_error do |error|
             expect(error).to be_a(error_class)
-            expect(error.message).
-              to include("Bad username or password for")
+            expect(error.message)
+              .to include("Bad username or password for")
           end
       end
     end
 
     context "that bad-requested, but was a private repo" do
       before do
-        stub_request(:get, registry_url + "versions").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 400)
-        stub_request(:get, registry_url + "api/v1/dependencies").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 400)
-        stub_request(:get, registry_url + "specs.4.8.gz").
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 400)
+        stub_request(:get, registry_url + "versions")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 400)
+        stub_request(:get, registry_url + "api/v1/dependencies")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 400)
+        stub_request(:get, registry_url + "specs.4.8.gz")
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 400)
       end
 
       it "blows up with a useful error" do
-        expect { private_registry_versions }.
-          to raise_error do |error|
+        expect { private_registry_versions }
+          .to raise_error do |error|
             expect(error).to be_a(Bundler::HTTPError)
-            expect(error.message).
-              to include("Could not fetch specs from")
+            expect(error.message)
+              .to include("Could not fetch specs from")
           end
       end
     end
 
     context "that doesn't have details of the gem" do
       before do
-        stub_request(:get, gemfury_business_url).
-          with(basic_auth: ["SECRET_CODES", ""]).
-          to_return(status: 404)
+        stub_request(:get, gemfury_business_url)
+          .with(basic_auth: ["SECRET_CODES", ""])
+          .to_return(status: 404)
 
         # Stub indexes to return details of other gems (but not this one)
-        stub_request(:get, registry_url + "specs.4.8.gz").
-          to_return(
+        stub_request(:get, registry_url + "specs.4.8.gz")
+          .to_return(
             status: 200,
             body: fixture("ruby", "contribsys_old_index_response")
           )
-        stub_request(:get, registry_url + "prerelease_specs.4.8.gz").
-          to_return(
+        stub_request(:get, registry_url + "prerelease_specs.4.8.gz")
+          .to_return(
             status: 200,
             body: fixture("ruby", "contribsys_old_index_prerelease_response")
           )
@@ -157,21 +158,21 @@ RSpec.describe Functions::DependencySource do
       let(:registry_url) { "https://gems.contribsys.com/" }
 
       before do
-        stub_request(:get, registry_url + "versions").
-          with(basic_auth: %w(username password)).
-          to_return(status: 404)
-        stub_request(:get, registry_url + "api/v1/dependencies").
-          with(basic_auth: %w(username password)).
-          to_return(status: 404)
-        stub_request(:get, registry_url + "specs.4.8.gz").
-          with(basic_auth: %w(username password)).
-          to_return(
+        stub_request(:get, registry_url + "versions")
+          .with(basic_auth: %w(username password))
+          .to_return(status: 404)
+        stub_request(:get, registry_url + "api/v1/dependencies")
+          .with(basic_auth: %w(username password))
+          .to_return(status: 404)
+        stub_request(:get, registry_url + "specs.4.8.gz")
+          .with(basic_auth: %w(username password))
+          .to_return(
             status: 200,
             body: fixture("ruby", "contribsys_old_index_response")
           )
-        stub_request(:get, registry_url + "prerelease_specs.4.8.gz").
-          with(basic_auth: %w(username password)).
-          to_return(
+        stub_request(:get, registry_url + "prerelease_specs.4.8.gz")
+          .with(basic_auth: %w(username password))
+          .to_return(
             status: 200,
             body: fixture("ruby", "contribsys_old_index_prerelease_response")
           )

data/helpers/v1/spec/functions/file_parser_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "native_spec_helper"

data/helpers/v1/spec/functions/force_updater_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "native_spec_helper"