dependabot-maven 0.143.0 → 0.143.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceef68bb9cd96abacaebefb8f54a6a0aa493f1cf01eb6abef56f05c68a15aeeb
-  data.tar.gz: 0b83dd0fabb5c31cc1eca98ca4688dd0a450eb3082719b434534a6bb4776a615
+  metadata.gz: 999a155b4286ad444b3ea6994f850c94eb17c3142f82513720e4184948ba80e6
+  data.tar.gz: 74e0aba3214a910154d3707bb54c9b720c6207e3b6bc2e8b10b967a23dd9a8ff
 SHA512:
-  metadata.gz: 277181d30fddd6aebc0d2f7493b0aca2a0d7590a18a1edf42ee56277ab3d529a3f8d02c79f58e15a063a8d6a43d81554acbc5a6fe1c37a15ce00a3b36211045f
-  data.tar.gz: 25d7d938d1fece4c7a0d0b3ba6a04166a46aa61c8f9ffce43f5aa10014e8791c43a8dd69a533c3426a19820eb9133d84daed6ac71b023ad4e1a5021fbe7461cc
+  metadata.gz: fc80e0a1337850473d8057b8d7e0dc83e7b226218aa391bc22a19495bab903dc7563bba301a6fbbc4188368e3798fdd368e949f6cfcb2c6da2c12038b9407039
+  data.tar.gz: 3aba61db57419b4b321c51213c985977553226316324981663d4aa118966a937b8cfc7a7258727beda118e582c6f17d2c362df8b8d306327d02916182fbfbbc6

data/lib/dependabot/maven/requirement.rb

@@ -33,14 +33,7 @@ module Dependabot
 
       def initialize(*requirements)
         requirements = requirements.flatten.flat_map do |req_string|
-          # NOTE: Support ruby-style version requirements that are created from
-          # PR ignore conditions
-          version_reqs = req_string.split(",").map(&:strip)
-          if version_reqs.all? { |s| Gem::Requirement::PATTERN.match?(s) }
-            version_reqs
-          else
-            convert_java_constraint_to_ruby_constraint(req_string)
-          end
+          convert_java_constraint_to_ruby_constraint(req_string)
         end
 
         super(requirements)
@@ -72,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)
@@ -105,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-maven
 version: !ruby/object:Gem::Version
-  version: 0.143.0
+  version: 0.143.1
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.143.0
+        version: 0.143.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.143.0
+        version: 0.143.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement