dependabot-common 0.143.4 → 0.145.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77a9d2b68d327cac78394acd6c7452e0f802512434ee5fe38b62cde2e2e8393
-  data.tar.gz: 4b532ba4ddd784f4adb93977bd34c28bdfd54ae1f8f5500ad9b3179febd1db17
+  metadata.gz: a80e631b98e75278c5ffc5528636e856a16a6b683e9c069ec86dfdf6c27884c9
+  data.tar.gz: 9626f4499aa5757d6145922a7fa9a8990fdb029f332744fd5b4d3aa7547e0feb
 SHA512:
-  metadata.gz: 922b4ae93a6beeffa8e1d11e5b6a5cb329fc7b833ae54e102a6a9dc944681df11ed32a3bdfe04e12b03e2ce96e6d0a5cf40476ba01958112206c93495a2fcd0e
-  data.tar.gz: 504b7550c05fcd284c4b41107dd92dbb362666c3258dae96cc42477c50ae6eef12adaaa8e2c68cb9bf6f8cc6f274fdad8a0f28131777f29d069c715d52e24e32
+  metadata.gz: 3e974733619012f02b59f00ab83263141d39042238ba7ac3dc49ce513048e16277e2db16d6a22536e39e322d937f95892b2a40ff5ac17c970810c0aff210903a
+  data.tar.gz: 18b1cb50a00aabb33fe82261bdf657fcd976e47fef9dd23206a83959dbaddd9534e4032fbb8ef711aae31db1e7c2dd7ef519e8c904451206dac88c2de278f2e5

data/lib/dependabot/config/ignore_condition.rb

@@ -32,6 +32,8 @@ module Dependabot
       end
 
       def versions_by_type(dependency)
+        return [] unless dependency.version
+
         transformed_update_types.flat_map do |t|
           case t
           when PATCH_VERSION_TYPE
@@ -47,53 +49,44 @@ module Dependabot
       end
 
       def ignore_patch(version)
-        parts = version.split(".")
-        return [] unless parts.size > 2
+        return [] unless rubygems_compatible?(version)
 
-        lower_parts = parts.first(2) + ["a"]
-        upper_parts = parts.first(2)
-        upper_parts[1] = upper_parts[1].to_i + 1
-        lower_bound = ">= #{lower_parts.join('.')}"
+        parts = version.split(".")
+        version_parts = parts.fill(0, parts.length...2)
+        upper_parts = version_parts.first(1) + [version_parts[1].to_i + 1]
+        lower_bound = "> #{version}"
         upper_bound = "< #{upper_parts.join('.')}"
+
         ["#{lower_bound}, #{upper_bound}"]
       end
 
       def ignore_minor(version)
-        parts = version.split(".")
-        return [] if parts.size < 2
-
-        if Gem::Version.correct?(version)
-          lower_parts = parts.first(2) + ["a"]
-          upper_parts = parts.first(1)
-          lower_parts[1] = lower_parts[1].to_i + 1
-          upper_parts[0] = upper_parts[0].to_i + 1
-        else
-          lower_parts = parts.first(1) + ["a"]
-          upper_parts = parts.first(1)
-          begin
-            upper_parts[0] = Integer(upper_parts[0]) + 1
-          rescue ArgumentError
-            upper_parts.push(999_999)
-          end
-        end
+        return [] unless rubygems_compatible?(version)
 
+        parts = version.split(".")
+        version_parts = parts.fill(0, parts.length...2)
+        lower_parts = version_parts.first(1) + [version_parts[1].to_i + 1] + ["a"]
+        upper_parts = version_parts.first(0) + [version_parts[0].to_i + 1]
         lower_bound = ">= #{lower_parts.join('.')}"
         upper_bound = "< #{upper_parts.join('.')}"
+
         ["#{lower_bound}, #{upper_bound}"]
       end
 
       def ignore_major(version)
-        parts = version.split(".")
-        return [] unless parts.size > 1
+        return [] unless rubygems_compatible?(version)
 
-        lower_parts = parts.first(1) + ["a"]
-        upper_parts = parts.first(1)
-        lower_parts[0] = lower_parts[0].to_i + 1
-        upper_parts[0] = upper_parts[0].to_i + 2
+        version_parts = version.split(".")
+        lower_parts = [version_parts[0].to_i + 1] + ["a"]
         lower_bound = ">= #{lower_parts.join('.')}"
-        upper_bound = "< #{upper_parts.join('.')}"
 
-        ["#{lower_bound}, #{upper_bound}"]
+        [lower_bound]
+      end
+
+      def rubygems_compatible?(version)
+        return false if version.nil? || version.empty?
+
+        Gem::Version.correct?(version)
       end
     end
   end

data/lib/dependabot/config/update_config.rb

@@ -14,7 +14,7 @@ module Dependabot
 
       def ignored_versions_for(dependency, security_updates_only: false)
         normalizer = name_normaliser_for(dependency)
-        dep_name = name_normaliser_for(dependency).call(dependency.name)
+        dep_name = normalizer.call(dependency.name)
 
         @ignore_conditions.
           select { |ic| self.class.wildcard_match?(normalizer.call(ic.dependency_name), dep_name) }.

data/lib/dependabot/pull_request_creator/github.rb

@@ -226,12 +226,12 @@ module Dependabot
       end
 
       def create_branch(commit)
-        ref = "heads/#{branch_name}"
+        ref = "refs/heads/#{branch_name}"
 
         begin
           branch =
             github_client_for_source.create_ref(source.repo, ref, commit.sha)
-          @branch_name = ref.gsub(%r{^heads/}, "")
+          @branch_name = ref.gsub(%r{^refs/heads/}, "")
           branch
         rescue Octokit::UnprocessableEntity => e
           # Return quietly in the case of a race
@@ -244,7 +244,7 @@ module Dependabot
 
           # Branch creation will fail if a branch called `dependabot` already
           # exists, since git won't be able to create a dir with the same name
-          ref = "heads/#{SecureRandom.hex[0..3] + branch_name}"
+          ref = "refs/heads/#{SecureRandom.hex[0..3] + branch_name}"
           retry
         end
       end

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.143.4
+  version: 0.145.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport