dependabot-maven 0.142.0 → 0.143.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf99b1bcd3beffd9b4350b5a6f3e2e116f04566dc6c023b3c4b4dd44aeca09d1
-  data.tar.gz: 0b5268394c3f5e6f3706ab96d580cd30c4fb563fae04f7312a9e2254c8ea805a
+  metadata.gz: bef11980b5beb8cf99cede4705c3732e035c5df219e73032f10bc42d107cbfb7
+  data.tar.gz: 517ea0e510a6d460ee547a178ed9c4f247fc7597dced06285af0218681cbeff3
 SHA512:
-  metadata.gz: 12d1ca8f14cd7d50e6d9743d012847389ef966ce431f00386355a1234cbaf40b2a49d358eeafc82550bf9737ad77fea56002c236dd9fa0ef4b83c97520a93d91
-  data.tar.gz: 2ea08e584beac124127d8d82ade25ab780e5c5f460eaa1d4153d5f0c02de3499c46a01462ab27c77cc022bff356cedefcca7b792e821a30b6637f02d0f71dd17
+  metadata.gz: 2444039f0d3b15f9f472264a44f0e0d5d51efd175a88932bec3becf9f0cb0e10c4dca3271b499ff169d615af68624aa99962d913710b472611a8f0e536fb8fd0
+  data.tar.gz: 2bc608e16b068fa0368617d79431d80533ac811e99d0b0df654db0dec50967cbb19b3148bdc176898d655a709936b94b0aa5bdd84a0b7b76cb3198dd7377eef7

data/lib/dependabot/maven/requirement.rb

@@ -7,6 +7,7 @@ module Dependabot
   module Maven
     class Requirement < Gem::Requirement
       quoted = OPS.keys.map { |k| Regexp.quote k }.join("|")
+      OR_SYNTAX = /(?<=\]|\)),/.freeze
       PATTERN_RAW =
         "\\s*(#{quoted})?\\s*(#{Maven::Version::VERSION_PATTERN})\\s*"
       PATTERN = /\A#{PATTERN_RAW}\z/.freeze
@@ -46,7 +47,9 @@ module Dependabot
       private
 
       def self.split_java_requirement(req_string)
-        req_string.split(/(?<=\]|\)),/).flat_map do |str|
+        return [req_string] unless req_string.match?(OR_SYNTAX)
+
+        req_string.split(OR_SYNTAX).flat_map do |str|
           next str if str.start_with?("(", "[")
 
           exacts, *rest = str.split(/,(?=\[|\()/)
@@ -62,9 +65,14 @@ module Dependabot
           raise "Can't convert multiple Java reqs to a single Ruby one"
         end
 
-        return convert_java_range_to_ruby_range(req_string) if req_string&.include?(",")
-
-        convert_java_equals_req_to_ruby(req_string)
+        # NOTE: Support ruby-style version requirements that are created from
+        # PR ignore conditions
+        version_reqs = req_string.split(",").map(&:strip)
+        if req_string.include?(",") && !version_reqs.all? { |s| PATTERN.match?(s) }
+          convert_java_range_to_ruby_range(req_string) if req_string.include?(",")
+        else
+          version_reqs.map { |r| convert_java_equals_req_to_ruby(r) }
+        end
       end
 
       def convert_java_range_to_ruby_range(req_string)
@@ -95,10 +103,11 @@ module Dependabot
       end
 
       def convert_wildcard_req(req_string)
-        version = req_string.gsub(/(?:\.|^)\+/, "")
-        return ">= 0" if version.empty?
+        version = req_string.split("+").first
+        return ">= 0" if version.nil? || version.empty?
 
-        "~> #{version}.0"
+        version += "0" if version.end_with?(".")
+        "~> #{version}"
       end
     end
   end

data/lib/dependabot/maven/update_checker/version_finder.rb

@@ -14,8 +14,6 @@ module Dependabot
       class VersionFinder
         TYPE_SUFFICES = %w(jre android java).freeze
 
-        MAVEN_RANGE_REGEX = /[\(\[].*,.*[\)\]]/.freeze
-
         def initialize(dependency:, dependency_files:, credentials:,
                        ignored_versions:, security_advisories:,
                        raise_on_ignored: false)
@@ -95,10 +93,10 @@ module Dependabot
           filtered = possible_versions
 
           ignored_versions.each do |req|
-            ignore_req = Maven::Requirement.new(parse_requirement_string(req))
+            ignore_requirements = Maven::Requirement.requirements_array(req)
             filtered =
               filtered.
-              reject { |v| ignore_req.satisfied_by?(v.fetch(:version)) }
+              reject { |v| ignore_requirements.any? { |r| r.satisfied_by?(v.fetch(:version)) } }
           end
 
           raise AllVersionsIgnored if @raise_on_ignored && filtered.empty? && possible_versions.any?
@@ -106,12 +104,6 @@ module Dependabot
           filtered
         end
 
-        def parse_requirement_string(string)
-          return string if string.match?(MAVEN_RANGE_REGEX)
-
-          string.split(",").map(&:strip)
-        end
-
         def filter_vulnerable_versions(possible_versions)
           versions_array = possible_versions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-maven
 version: !ruby/object:Gem::Version
-  version: 0.142.0
+  version: 0.143.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.142.0
+        version: 0.143.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.142.0
+        version: 0.143.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement