dependabot-common 0.110.12 → 0.110.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556c0bc433573913fb1dd86b15cd7f8ed0879ba421f9780ffd7b5b7542760059
-  data.tar.gz: f7fc4d0fdc508a81e6848a9b91b75757c80071a971ef2e40bf59dd0cd7f9feda
+  metadata.gz: 41b1e5a412eb80bf0c323a70a33da82947b33a07f4d26283a68ed70cea5bb83b
+  data.tar.gz: b11fdb218f0e01ed967d8f9035cdfdfa15347d05f6e96970f0fe9b2094e88451
 SHA512:
-  metadata.gz: 2f60dcd57569cec7394602a11b7d7947d8c68e3629f55615779b3044450509f9a60d583a2be0788d0c4627fdf9b0b734d64df86f15ff3b6a3b54d149b51d8ef8
-  data.tar.gz: 65a7b6a96817fc55c9a38d710e0e84ed2b00d1abd48ada306dbe973968f89a79f1f83927f1821912e5e4746c465d44c84098d3593882fcb5678f3cfc2d5a832a
+  metadata.gz: 3661b28499e5c0a0888aa614c9caaefbb39143d8c34f81d92cb41d4532867753f38afbaf3223c5c31abb0bd0bf9b743795d2fd7f68e16605039ce74cc333aadc
+  data.tar.gz: 960b2533e9fe7d2d59d05c2aa1f38c7355dbbbbd16a6c2c846eab1000be1f2ee04da39bb579514eba03e20244db1f09463fd4d318f31a6f43657a4117d0cdd05

data/lib/dependabot/update_checkers/base.rb

@@ -186,8 +186,7 @@ module Dependabot
           new_version = latest_resolvable_version_with_no_unlock
           new_version && !new_version.to_s.start_with?(dependency.version)
         when :own
-          new_version = preferred_resolvable_version
-          new_version && !new_version.to_s.start_with?(dependency.version)
+          preferred_version_resolvable_with_unlock?
         when :all
           latest_version_resolvable_with_full_unlock?
         else raise "Unknown unlock level '#{requirements_to_unlock}'"
@@ -213,14 +212,26 @@ module Dependabot
           new_version = latest_resolvable_version_with_no_unlock
           new_version && new_version > version_class.new(dependency.version)
         when :own
-          new_version = preferred_resolvable_version
-          new_version && new_version > version_class.new(dependency.version)
+          preferred_version_resolvable_with_unlock?
         when :all
           latest_version_resolvable_with_full_unlock?
         else raise "Unknown unlock level '#{requirements_to_unlock}'"
         end
       end
 
+      def preferred_version_resolvable_with_unlock?
+        new_version = preferred_resolvable_version
+        return false unless new_version
+
+        if existing_version_is_sha?
+          return false if new_version.to_s.start_with?(dependency.version)
+        elsif new_version <= version_class.new(dependency.version)
+          return false
+        end
+
+        updated_requirements.none? { |r| r[:requirement] == :unfixable }
+      end
+
       def requirements_up_to_date?
         return true if (updated_requirements - dependency.requirements).none?
         return false unless latest_version

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.110.12"
+  VERSION = "0.110.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.110.12
+  version: 0.110.13
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr