dependabot-common 0.143.3 → 0.145.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8de338ea7c3bb3273bd23ccc824a13d3658cc694f182776b889d3f67414c68
-  data.tar.gz: 63d9ca895ad038b2ce5d80c3a35bdcb175f8b023e1b09edd85a55d7c387c0609
+  metadata.gz: 7b86579e2112d65ed03954f5590dc1dec848a75d78466533af0071a127990d86
+  data.tar.gz: 19166a908570f73192e56aaf4cafc6217f324170639798a1ee2b90866db6834c
 SHA512:
-  metadata.gz: 7850b7c2b9b02b76453f40347a79e5afca046d295a2ae160c27ec11dd05efc9359d34414ed4e28be46b7678aa8d47abbd8ecb24643cb3cc86573c88d979e7334
-  data.tar.gz: 34110bdb90cb8fef78980ccb724f98c21753f2bce36be8bca3b5896671daa19e756b4430ff24864fbb35ac2caaa57fdaa67a0f84ba0d1cbb54e0baf8b880160e
+  metadata.gz: 31ec99470bd79837c1779aca0c7a15d386b9bcf205de6ca7657412362fd9036b472a2ff918c4209ef17ae23795e5dc987600d39a1092227b5ce4caed08ac7556
+  data.tar.gz: 0c8a847875ec3a67dd84dd4113a4044888ed6e529298e503ef6941784cae1f498dd88bfe3a159b36f5d9a8d4a1d567f94a731ae40e1c0b397cd853ace39683cb

data/lib/dependabot/config/ignore_condition.rb

@@ -18,7 +18,8 @@ module Dependabot
         @update_types = update_types || []
       end
 
-      def ignored_versions(dependency)
+      def ignored_versions(dependency, security_updates_only)
+        return versions if security_updates_only
         return [ALL_VERSIONS] if versions.empty? && transformed_update_types.empty?
 
         versions_by_type(dependency) + versions
@@ -31,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
@@ -46,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

@@ -12,12 +12,13 @@ module Dependabot
         @commit_message_options = commit_message_options
       end
 
-      def ignored_versions_for(dependency)
+      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) }.
-          map { |ic| ic.ignored_versions(dependency) }.
+          map { |ic| ic.ignored_versions(dependency, security_updates_only) }.
           flatten.
           compact.
           uniq

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.3"
+  VERSION = "0.145.0"
 end

metadata

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