dependabot-bundler 0.98.44 → 0.98.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7cb3781e09898d7497ddcd1ef820a7c1de8a24f201717770c166f187db4d5fd
-  data.tar.gz: 062e79b82d1a188b085c0f4ed20f3670d35b2195716876be8109afc6899dd2eb
+  metadata.gz: 9ea45b37a654508715c9632251f6a5283283c4168b89c8ef6ef4673d30947450
+  data.tar.gz: f48438372ae41c495375949f181f610d00f298edb2daea37cbcfbc11724c4411
 SHA512:
-  metadata.gz: 70fc87c69339c0bd3a1c2f64e2b8ef31c191b02d4bdba0cf99aebff2abb1232dac8ba1a0bd0d6f336dd9be0ad311b69fc20fd78b169e5263ccfb88a09c0d699d
-  data.tar.gz: 48ca6178abdb8959ca9d7b0d9ce8bbad17332077cfc3aeeea74bf75156a7b70efc80cd655a078baf41bf22ce537036c1150a8729b57c171cb760527d7e23d654
+  metadata.gz: 5a1668e74f4f7a2af0db4e51e0bbc4467c30c9868c4d2b31e0e6810a48171b9276bf803ab2c00c827343c5f39fa768cbd2628713f74b6291fa8f5c2e07faf839
+  data.tar.gz: 6e99b17fb31c263b240b3d17c7f26a896cbff3e5287168e418746c7287ec6e771af4b0533353377e104efc4a449e096f85107af5f9cc18c288822d7422a8192a

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

@@ -103,7 +103,7 @@ module Dependabot
             end
           end
         rescue Dependabot::DependencyFileNotResolvable => error
-          return if ignored_versions.any? && !dependency.appears_in_lockfile?
+          return if error_due_to_restrictive_upper_bound?(error)
           return if circular_dependency_at_new_version?(error)
           raise unless ruby_lock_error?(error)
 
@@ -119,6 +119,16 @@ module Dependabot
           error.message.include?("'#{dependency.name}'")
         end
 
+        def error_due_to_restrictive_upper_bound?(error)
+          # We see this when the dependency doesn't appear in the lockfile and
+          # has an overly restricture upper bound that we've added, either due
+          # to an ignore condition or us missing that a pre-release is required
+          # (as another dependency places a pre-release requirement on the dep)
+          return false if dependency.appears_in_lockfile?
+
+          error.message.include?("#{dependency.name} ")
+        end
+
         def ruby_lock_error?(error)
           return false unless error.message.include?(" for gem \"ruby\0\"")
           return false if @gemspec_ruby_unlocked

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.98.44
+  version: 0.98.45
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-03-28 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.98.44
+        version: 0.98.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.44
+        version: 0.98.45
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement