dependabot-bundler 0.119.2 → 0.120.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81dd1f983805adb8ee9e479d66b405c80f55d6c3b972d949b5586070c3fa4034
-  data.tar.gz: baa4354d85f38c2f35f635ad0c32aa3d2722cc56e6702e1819f9730af52a39ad
+  metadata.gz: bbdc15bf5ce1f5c5640a479441b79e14f538801cc9f77f4b3cbdbafd0ac6597a
+  data.tar.gz: fa7412a8c943b7ae2a22bb7e58d12e58318fafeb58d0b923c2923fdcf504179a
 SHA512:
-  metadata.gz: 757fba80ee34d60b843624d9ab42c37efbbe69986e95b049e94633f346ba30baff4ac5e52ac11f34b5fbfef5daa3171e9bda4439cb17e4db9f615dcf4dd33cd0
-  data.tar.gz: 4fa22789fb9c1ebc467e1aae77c51a36944f4e8c16561f6865b9a8e35fab84ac8ac10c65aed8899bf9ef316ce3786f8df116811554b45755e32696a13c5e4130
+  metadata.gz: f20ee639537da20840eced82883ef34a931929006c4354837832129eee4011e32157f6ed9806e9c2df13b5602719468a41fb6baeb447fd1a974da96c9a272420
+  data.tar.gz: 3bea303d985d3cc6fe14976ddf3750c66e6a25617a213194bd58a9e6a8ce9418407dd6b5667114554664ec70ff40b0e8f1f0d8a7a5dde6969995aa8c83f0ea9c

data/lib/dependabot/bundler/file_updater.rb

@@ -20,6 +20,7 @@ module Dependabot
         ]
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity
       def updated_dependency_files
         updated_files = []
 
@@ -59,6 +60,7 @@ module Dependabot
 
         updated_files
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       private
 

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

@@ -168,7 +168,7 @@ module Dependabot
           # Dependencies that have been unlocked for the update (including
           # sub-dependencies)
           unlocked_gems = definition.instance_variable_get(:@unlock).
-                          fetch(:gems)
+                          fetch(:gems).reject { |gem| __keep_on_prune?(gem) }
           bundler_opts = {
             cache_all: true,
             cache_all_platforms: true,
@@ -188,6 +188,15 @@ module Dependabot
           end
         end
 
+        # This is not officially supported and may be removed without notice.
+        def __keep_on_prune?(spec_name)
+          unless (specs = ::Bundler.settings[:persistent_gems_after_clean])
+            return false
+          end
+
+          specs.include?(spec_name)
+        end
+
         # Copied from Bundler::Runtime: Modified to only prune gems that have
         # been unlocked
         def prune_gem_cache(resolve, cache_path, unlocked_gems)
@@ -240,6 +249,7 @@ module Dependabot
           dependencies_to_unlock << gem_name
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def unlock_blocking_subdeps(dependencies_to_unlock, error)
           all_deps =  ::Bundler::LockfileParser.new(sanitized_lockfile_body).
                       specs.map(&:name).map(&:to_s)
@@ -268,6 +278,7 @@ module Dependabot
           # information to chart the full path through all conflicts unwound
           dependencies_to_unlock.append(*allowed_new_unlocks)
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def build_definition(dependencies_to_unlock)
           defn = ::Bundler::Definition.build(
@@ -407,6 +418,7 @@ module Dependabot
             rewrite(gemspec_content)
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def replacement_version_for_gemspec(gemspec_content)
           return "0.0.1" unless lockfile
 
@@ -423,6 +435,7 @@ module Dependabot
           spec = gemspec_specs.find { |s| s.name == gem_name }
           spec&.version || gemspec_specs.first&.version || "0.0.1"
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def relevant_credentials
           credentials.

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

@@ -214,6 +214,7 @@ module Dependabot
           lower_bound_req + ", <= #{latest_allowable_version}"
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def updated_version_req_lower_bound(filename)
           original_req = dependency.requirements.
                          find { |r| r.fetch(:file) == filename }&.
@@ -234,6 +235,7 @@ module Dependabot
             ">= #{version_for_requirement || 0}"
           end
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def remove_git_source(content)
           FileUpdater::GitSourceRemover.new(
@@ -261,6 +263,7 @@ module Dependabot
           @lock_ruby_version && file == gemfile
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def replacement_version_for_gemspec(gemspec_content)
           return "0.0.1" unless lockfile
 
@@ -278,6 +281,7 @@ module Dependabot
           spec = gemspec_specs.find { |s| s.name == gem_name }
           spec&.version || gemspec_specs.first&.version || "0.0.1"
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def sanitized_lockfile_content
           re = FileUpdater::LockfileUpdater::LOCKFILE_ENDING

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

@@ -252,7 +252,6 @@ module Dependabot
 
         # Updates the version in a "<" or "<=" constraint to allow the given
         # version
-        # rubocop:disable Metrics/PerceivedComplexity
         def update_greatest_version(requirement, version_to_be_permitted)
           if version_to_be_permitted.is_a?(String)
             version_to_be_permitted = Gem::Version.new(version_to_be_permitted)
@@ -278,8 +277,6 @@ module Dependabot
 
           Gem::Requirement.new("#{op} #{new_segments.join('.')}")
         end
-
-        # rubocop:enable Metrics/PerceivedComplexity
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.119.2
+  version: 0.120.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-24 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.119.2
+        version: 0.120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: 0.120.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: 0.91.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: 0.91.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement