dependabot-bundler 0.113.5 → 0.113.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a92695981767e86d6dd31d437dc9f30ac3812b8633a2d12b9b479d77b12a712f
-  data.tar.gz: b474a2cefd9097017d39f6d4260db44ceb878eba917b8160d713e5cf53043ec7
+  metadata.gz: 5bc537f68ecb48a8d31acbeb8235c450e3009e2bcf61f14858b92ba891ddd3ce
+  data.tar.gz: 61b4d994eb21fe223208bbae141daa7cecff5d3079d33416ebacc2de454ee54e
 SHA512:
-  metadata.gz: bbe94b833e9d80103628bc5c29e01269cd3d511719d68c6b329d0e2160132ff653dca3fe33d4cf650e06929c8e8c1630d8ce56b15b1356b1796791705a520e6e
-  data.tar.gz: c2134ab5b324eebfdfd39c3e6254f3ade76365195e1ca861c56813214b8a1bb48e49f319720bc104b3267dbf1ef25c639465cb430eaf3ae0d7e9c36769e6edda
+  metadata.gz: 9b99e38ee8ff5ff54597de917725bc9d580558e8abd36e62c5707cd86fee1cf465aa89b17189f4a54d26c454843f328f0918e4aeec01756ca2b546da9ceb4261
+  data.tar.gz: a23c3d3a703bc0e0d2144a338f8a707d79c683d105287c2537cc2baa20e6bb83f87d4b919e5ce00c86df313919d9142f2627c0dcbac872578d77e98674e71067

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

@@ -172,6 +172,8 @@ module Dependabot
                       map(&:name).map(&:to_s)
           allowed_new_unlocks = all_deps - top_level - dependencies_to_unlock
 
+          raise if allowed_new_unlocks.none?
+
           # Unlock any sub-dependencies that Bundler reports caused the
           # conflict
           potentials_deps =
@@ -181,10 +183,15 @@ module Dependabot
               tree.find { |req| allowed_new_unlocks.include?(req.name) }
             end.compact.map(&:name)
 
-          # If there's nothing more we can unlock, give up
-          raise if potentials_deps.none?
+          # If there are specific dependencies we can unlock, unlock them
+          if potentials_deps.any?
+            return dependencies_to_unlock.append(*potentials_deps)
+          end
 
-          dependencies_to_unlock.append(*potentials_deps)
+          # Fall back to unlocking *all* sub-dependencies. This is required
+          # because Bundler's VersionConflict objects don't include enough
+          # information to chart the full path through all conflicts unwound
+          dependencies_to_unlock.append(*allowed_new_unlocks)
         end
 
         def build_definition(dependencies_to_unlock)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.113.5
+  version: 0.113.6
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.113.5
+        version: 0.113.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.113.5
+        version: 0.113.6
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement