dependabot-common 0.143.1 → 0.143.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04061b64d2ec9c8ff56b799d8ea0c7426dadcca2701581f1917faa494ba3f76d
-  data.tar.gz: 1129318553b00a3e77274d84cff91987b9c2d20f69a57deb3f171eee4729555a
+  metadata.gz: 82f605b43ae5d4332b84cd8bca628b5621e518f26dfab590b680401b17fb2282
+  data.tar.gz: 6913eb7ddb27d985b3aa28ad9e40f239f0efbfeb4f22400a45d9755a9b566287
 SHA512:
-  metadata.gz: 81049fffec22a52e685fd08d7f8afc8947f6cd66532491d4e16eb6420cd46ba0d65e863f5f11659968572c8bc6b8d3339601fffa57631ffeb0503823ba53e03d
-  data.tar.gz: '0955f36ca302e038b4dae7d97fd4f83d4ffa3a1cb1668eb353e16f7501851ba567c6b7eebf2bed72776343cf39a54116d326c45e2261320514a0c53d3e360aba'
+  metadata.gz: 1114b083a13b2416c8be267f37bc0c2f3ac21cabf97613c879419d21cd506271972efb3d7519b1af54b092ca7b46542e53f2b6edaae3ebd342ed51c885d065cc
+  data.tar.gz: 26f6b95978c3d8492486687cf275285eee383a9b12328e06d8477ddb2707affeacd498abfa7436bfe1f5226e7d485ac84e391a1797408386c2d75ab28ec2184d

data/lib/dependabot/config/file.rb

@@ -26,6 +26,17 @@ module Dependabot
         )
       end
 
+      # Parse the YAML config file
+      def self.parse(config)
+        parsed = YAML.safe_load(config, symbolize_names: true)
+        version = parsed[:version]
+        raise InvalidConfigError, "invalid version #{version}" if version && version != 2
+
+        File.new(updates: parsed[:updates], registries: parsed[:registries])
+      end
+
+      private
+
       PACKAGE_MANAGER_LOOKUP = {
         "bundler" => "bundler",
         "cargo" => "cargo",
@@ -44,23 +55,22 @@ module Dependabot
         "terraform" => "terraform"
       }.freeze
 
-      # Parse the YAML config file
-      def self.parse(config)
-        parsed = YAML.safe_load(config, symbolize_names: true)
-        version = parsed[:version]
-        raise InvalidConfigError, "invalid version #{version}" if version && version != 2
-
-        File.new(updates: parsed[:updates], registries: parsed[:registries])
-      end
-
-      private
+      UPDATE_TYPE_LOOKUP = {
+        "version-update:semver-patch" => :ignore_patch_versions,
+        "version-update:semver-minor" => :ignore_minor_versions,
+        "version-update:semver-major" => :ignore_major_versions
+      }.freeze
 
       def ignore_conditions(cfg)
         ignores = cfg&.dig(:ignore) || []
         ignores.map do |ic|
-          Dependabot::Config::UpdateConfig::IgnoreCondition.new(
+          update_types = ic[:"update-types"]&.
+                         map { |t| UPDATE_TYPE_LOOKUP[t.downcase.strip] }&.
+                         compact
+          Dependabot::Config::IgnoreCondition.new(
             dependency_name: ic[:"dependency-name"],
-            versions: ic[:versions]
+            versions: ic[:versions],
+            update_types: update_types
           )
         end
       end

data/lib/dependabot/config/ignore_condition.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Dependabot
+  module Config
+    # Filters versions that should not be considered for dependency updates
+    class IgnoreCondition
+      UPDATE_TYPES = %i(
+        ignore_major_versions
+        ignore_minor_versions
+        ignore_patch_versions
+      ).freeze
+
+      ALL_VERSIONS = ">= 0"
+
+      attr_reader :dependency_name, :versions, :update_types
+      def initialize(dependency_name:, versions: nil, update_types: nil)
+        @dependency_name = dependency_name
+        @versions = versions || []
+        @update_types = update_types || []
+      end
+
+      def ignored_versions(dependency)
+        return [ALL_VERSIONS] if @versions.empty? && @update_types.empty?
+
+        versions_by_type(dependency) + @versions
+      end
+
+      private
+
+      def versions_by_type(dependency)
+        @update_types.flat_map do |t|
+          case t
+          when :ignore_patch_versions
+            ignore_patch(dependency.version)
+          when :ignore_minor_versions
+            ignore_minor(dependency.version)
+          when :ignore_major_versions
+            ignore_major(dependency.version)
+          else
+            []
+          end
+        end.compact
+      end
+
+      def ignore_patch(version)
+        parts = version.split(".")
+        return [] unless parts.size > 2
+
+        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('.')}"
+        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
+
+        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
+
+        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
+        lower_bound = ">= #{lower_parts.join('.')}"
+        upper_bound = "< #{upper_parts.join('.')}"
+
+        ["#{lower_bound}, #{upper_bound}"]
+      end
+    end
+  end
+end

data/lib/dependabot/config/update_config.rb

@@ -1,30 +1,43 @@
 # frozen_string_literal: true
 
+require "dependabot/config/ignore_condition"
+
 module Dependabot
   module Config
     # Configuration for a single ecosystem
     class UpdateConfig
-      attr_reader :commit_message_options
-
+      attr_reader :commit_message_options, :ignore_conditions
       def initialize(ignore_conditions: nil, commit_message_options: nil)
         @ignore_conditions = ignore_conditions || []
         @commit_message_options = commit_message_options
       end
 
-      def ignored_versions_for(dep)
+      def ignored_versions_for(dependency)
+        normalizer = name_normaliser_for(dependency)
+        dep_name = name_normaliser_for(dependency).call(dependency.name)
         @ignore_conditions.
-          select { |ic| ic.dependency_name == dep.name }. # FIXME: wildcard support
-          map(&:versions).
+          select { |ic| self.class.wildcard_match?(normalizer.call(ic.dependency_name), dep_name) }.
+          map { |ic| ic.ignored_versions(dependency) }.
           flatten.
-          compact
+          compact.
+          uniq
       end
 
-      class IgnoreCondition
-        attr_reader :dependency_name, :versions
-        def initialize(dependency_name:, versions:)
-          @dependency_name = dependency_name
-          @versions = versions
-        end
+      def self.wildcard_match?(wildcard_string, candidate_string)
+        return false unless wildcard_string && candidate_string
+
+        regex_string = "a#{wildcard_string.downcase}a".split("*").
+                       map { |p| Regexp.quote(p) }.
+                       join(".*").gsub(/^a|a$/, "")
+        regex = /^#{regex_string}$/
+        regex.match?(candidate_string.downcase)
+      end
+
+      private
+
+      def name_normaliser_for(dep)
+        name_normaliser ||= {}
+        name_normaliser[dep] ||= Dependency.name_normaliser_for_package_manager(dep.package_manager)
       end
 
       class CommitMessageOptions

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.143.1
+  version: 0.143.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -394,6 +394,7 @@ files:
 - lib/dependabot/config.rb
 - lib/dependabot/config/file.rb
 - lib/dependabot/config/file_fetcher.rb
+- lib/dependabot/config/ignore_condition.rb
 - lib/dependabot/config/update_config.rb
 - lib/dependabot/dependency.rb
 - lib/dependabot/dependency_file.rb