dependabot-common 0.143.5 → 0.145.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519d829e63edf21602f5031e532dbccce99323676b624ff130e089b6f3ec44ef
-  data.tar.gz: 3fb4986daa15f8d92a5af167473d3b32ed3132699fa4f2c85ebf2060632f55e7
+  metadata.gz: 8ac0eb6a686627e7b673437c5c1da1752c604c1d4efc639c10f20d45afc2476c
+  data.tar.gz: e723d56fac036d1ceaffc0c6bf80ea9dddca274de51ead1c97dd3a4c1ad9b429
 SHA512:
-  metadata.gz: dd23c91a75da2f3a93719a031c42d259dee57c7b7f489a044c3480dee8cfb5f55a48a19a961a90064d6939710574d3ef0531755d685bbff7457475306969b16e
-  data.tar.gz: c1b8bbdadea4755383f7585752d1bcedd1f875475e31b452ffb8e74578fac2152b250bf071840361bd958eb9240b5adcb0671e04a915fc2baf86b0297f382585
+  metadata.gz: 63058f60bf2d7f8697dcab17608f59dfccd5950cac1e68f61d44411d0854179e8de14508a77a885c29a6a06d4d7ac47d77d23772a476014b8400e78ad5c04f2e
+  data.tar.gz: b9e36648341f0b0afa36bc3106ef5c3e090243186831ca1f37400719d0da653eb366d30fd7deff1fa6c9ab20cb3a86d32758626e77f17b08e9e500e508de8b15

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.5"
+  VERSION = "0.145.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.143.5
+  version: 0.145.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -298,14 +298,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement