dependabot-maven 0.372.0 → 0.373.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfaef32e6543a816ec3c52d8677c6c63ea73348889bad4b9078eab44129a5bc7
-  data.tar.gz: 9f50b3f5cf30dae29064aaf5dfca9f6471627583ea27563f2d8eaa1f66ca625a
+  metadata.gz: 1d3f17160cdfe3e8bf0255e367e134fddf4b9683ad6250d913d214247d1283a2
+  data.tar.gz: f463dd53e46376f2fb8c8d46d7af7f99b63eb6c5634063c20157a3e0a0bc3844
 SHA512:
-  metadata.gz: 334ad6d99ee53b7a71647a6ccbb530a72a00910300d824f6c1000a107ca0f4436f045dee9edecd1c68b8a34ad41cdfba5487a56582a8a70e6f63d7c50bf69908
-  data.tar.gz: 69d0944d5d774881e4f3e9260e016a14ab5aff41cff14b1b09a26bc4db09a5c5e0a97a2deed08db3ed71efaf93f652fa144b7bfd1e88be72294f40463e5aba41
+  metadata.gz: '0380e3fb5ab4a15710db2d8fbe943d4238515cdd8f61a04d566197614332d5d5fd3086605c8899ba6897558328d7b91a9df68159266fc17b79568b9336afa1e4'
+  data.tar.gz: ef9a00f454fcf6661d1d3e0e33e16d1d43b141801ef9af125798887cf93531ce4bf34b4632641c58bba6841e2b47111462ac3a840d1a04bb6b8017fbc3dbb841

data/lib/dependabot/maven/requirement.rb

@@ -6,19 +6,29 @@ require "sorbet-runtime"
 require "dependabot/requirement"
 require "dependabot/utils"
 require "dependabot/maven/version"
+require "dependabot/maven/shared/shared_requirement"
 
 module Dependabot
   module Maven
-    class Requirement < Dependabot::Requirement
+    class Requirement < Dependabot::Maven::Shared::SharedRequirement
       extend T::Sig
 
       quoted = OPS.keys.map { |k| Regexp.quote k }.join("|")
-      OR_SYNTAX = T.let(/(?<=\]|\)),/, Regexp)
       PATTERN_RAW = T.let("\\s*(#{quoted})?\\s*(#{Maven::Version::VERSION_PATTERN})\\s*".freeze, String)
       PATTERN = T.let(/\A#{PATTERN_RAW}\z/, Regexp)
       # Like PATTERN, but the leading operator is required
       RUBY_STYLE_PATTERN = T.let(/\A\s*(#{quoted})\s*(#{Maven::Version::VERSION_PATTERN})\s*\z/, Regexp)
 
+      sig { override.returns(Regexp) }
+      def self.pattern
+        PATTERN
+      end
+
+      sig { override.returns(Regexp) }
+      def self.ruby_style_pattern
+        RUBY_STYLE_PATTERN
+      end
+
       sig { params(obj: T.any(String, Gem::Version)).returns(T::Array[T.any(String, T.untyped)]) }
       def self.parse(obj)
         return ["=", Maven::Version.new(obj.to_s)] if obj.is_a?(Gem::Version)
@@ -40,105 +50,11 @@ module Dependabot
         end
       end
 
-      sig { params(requirements: T.untyped).void }
-      def initialize(*requirements)
-        requirements = requirements.flatten.flat_map do |req_string|
-          convert_java_constraint_to_ruby_constraint(req_string)
-        end
-
-        super(requirements)
-      end
-
       sig { params(version: T.untyped).returns(T::Boolean) }
       def satisfied_by?(version)
         version = Maven::Version.new(version.to_s)
         super
       end
-
-      private
-
-      sig { params(req_string: T.nilable(String)).returns(T::Array[String]) }
-      def self.split_java_requirement(req_string)
-        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(/,(?=\[|\()/)
-          [*T.must(exacts).split(","), *rest]
-        end
-      end
-      private_class_method :split_java_requirement
-
-      sig do
-        params(
-          req_string: T.nilable(String)
-        )
-          .returns(T.nilable(T.any(T::Array[String], T::Array[T.nilable(String)])))
-      end
-      def convert_java_constraint_to_ruby_constraint(req_string)
-        return unless req_string
-
-        if self.class.send(:split_java_requirement, req_string).count > 1
-          raise "Can't convert multiple Java reqs to a single Ruby one"
-        end
-
-        version_reqs = req_string.split(",").map(&:strip)
-        if version_reqs.length > 1 && !version_reqs.all? { |s| PATTERN.match?(s) }
-          return convert_java_range_to_ruby_range(req_string)
-        end
-
-        version_reqs.map do |r|
-          # if an operator is already provided, use it
-          next r if r.match?(RUBY_STYLE_PATTERN)
-
-          convert_java_equals_req_to_ruby(r)
-        end
-      end
-
-      # rubocop:disable Metrics/PerceivedComplexity
-      sig { params(req_string: String).returns(T::Array[T.nilable(String)]) }
-      def convert_java_range_to_ruby_range(req_string)
-        parts = req_string.split(",").map(&:strip)
-        lower_b = T.let(parts[0], T.nilable(String))
-        upper_b = T.let(parts[1], T.nilable(String))
-
-        lower_b =
-          if lower_b && ["(", "["].include?(lower_b) then nil
-          elsif lower_b&.start_with?("(") then "> #{lower_b.sub(/\(\s*/, '')}"
-          elsif lower_b
-            ">= #{lower_b.sub(/\[\s*/, '').strip}"
-          end
-
-        upper_b =
-          if upper_b && [")", "]"].include?(upper_b) then nil
-          elsif upper_b&.end_with?(")") then "< #{upper_b.sub(/\s*\)/, '')}"
-          elsif upper_b
-            "<= #{upper_b.sub(/\s*\]/, '').strip}"
-          end
-
-        [lower_b, upper_b].compact
-      end
-      # rubocop:enable Metrics/PerceivedComplexity
-
-      sig { params(req_string: T.nilable(String)).returns(T.nilable(String)) }
-      def convert_java_equals_req_to_ruby(req_string)
-        return convert_wildcard_req(req_string) if req_string&.end_with?("+")
-
-        # If a soft requirement is being used, treat it as an equality matcher
-        return req_string unless req_string&.start_with?("[")
-
-        req_string.gsub(/[\[\]\(\)]/, "")
-      end
-
-      sig { params(req_string: T.nilable(String)).returns(String) }
-      def convert_wildcard_req(req_string)
-        version = req_string&.split("+")&.first
-        return ">= 0" if version.nil? || version.empty?
-
-        version += "0" if version.end_with?(".")
-        "~> #{version}"
-      end
     end
   end
 end

data/lib/dependabot/maven/shared/shared_requirement.rb

@@ -0,0 +1,121 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+
+require "dependabot/requirement"
+
+module Dependabot
+  module Maven
+    module Shared
+      class SharedRequirement < Dependabot::Requirement
+        extend T::Sig
+        extend T::Helpers
+
+        abstract!
+
+        OR_SYNTAX = T.let(/(?<=\]|\)),/, Regexp)
+
+        sig { abstract.returns(Regexp) }
+        def self.pattern; end
+
+        sig { abstract.returns(Regexp) }
+        def self.ruby_style_pattern; end
+
+        sig { params(requirements: T.untyped).void }
+        def initialize(*requirements)
+          requirements = requirements.flatten.flat_map do |req_string|
+            convert_java_constraint_to_ruby_constraint(req_string)
+          end
+
+          super(requirements)
+        end
+
+        private
+
+        sig { params(req_string: T.nilable(String)).returns(T::Array[String]) }
+        def self.split_java_requirement(req_string)
+          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(/,(?=\[|\()/)
+            [*T.must(exacts).split(","), *rest]
+          end
+        end
+        private_class_method :split_java_requirement
+
+        sig do
+          params(
+            req_string: T.nilable(String)
+          )
+            .returns(T.nilable(T.any(T::Array[String], T::Array[T.nilable(String)])))
+        end
+        def convert_java_constraint_to_ruby_constraint(req_string)
+          return unless req_string
+
+          if self.class.send(:split_java_requirement, req_string).count > 1
+            raise "Can't convert multiple Java reqs to a single Ruby one"
+          end
+
+          version_reqs = req_string.split(",").map(&:strip)
+
+          if version_reqs.length > 1 && !version_reqs.all? { |s| self.class.pattern.match?(s) }
+            return convert_java_range_to_ruby_range(req_string)
+          end
+
+          version_reqs.map do |r|
+            # if an operator is already provided, use it
+            next r if r.match?(self.class.ruby_style_pattern)
+
+            convert_java_equals_req_to_ruby(r)
+          end
+        end
+
+        sig { params(req_string: String).returns(T::Array[T.nilable(String)]) }
+        def convert_java_range_to_ruby_range(req_string)
+          parts = req_string.split(",").map(&:strip)
+          lower_b = parse_lower_bound(parts[0])
+          upper_b = parse_upper_bound(parts[1])
+          [lower_b, upper_b].compact
+        end
+
+        sig { params(bound: T.nilable(String)).returns(T.nilable(String)) }
+        def parse_lower_bound(bound)
+          return nil if bound.nil? || ["(", "["].include?(bound)
+          return "> #{bound.sub(/\(\s*/, '')}" if bound.start_with?("(")
+
+          ">= #{bound.sub(/\[\s*/, '').strip}"
+        end
+
+        sig { params(bound: T.nilable(String)).returns(T.nilable(String)) }
+        def parse_upper_bound(bound)
+          return nil if bound.nil? || [")", "]"].include?(bound)
+          return "< #{bound.sub(/\s*\)/, '')}" if bound.end_with?(")")
+
+          "<= #{bound.sub(/\s*\]/, '').strip}"
+        end
+
+        sig { params(req_string: T.nilable(String)).returns(T.nilable(String)) }
+        def convert_java_equals_req_to_ruby(req_string)
+          return convert_wildcard_req(req_string) if req_string&.end_with?("+")
+
+          # If a soft requirement is being used, treat it as an equality matcher
+          return req_string unless req_string&.start_with?("[")
+
+          req_string.gsub(/[\[\]\(\)]/, "")
+        end
+
+        sig { params(req_string: T.nilable(String)).returns(String) }
+        def convert_wildcard_req(req_string)
+          version = req_string&.split("+")&.first
+          return ">= 0" if version.nil? || version.empty?
+
+          version += "0" if version.end_with?(".")
+          "~> #{version}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-maven
 version: !ruby/object:Gem::Version
-  version: 0.372.0
+  version: 0.373.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.372.0
+        version: 0.373.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.372.0
+        version: 0.373.0
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +274,7 @@ files:
 - lib/dependabot/maven/requirement.rb
 - lib/dependabot/maven/shared/shared_metadata_finder.rb
 - lib/dependabot/maven/shared/shared_package_details_fetcher.rb
+- lib/dependabot/maven/shared/shared_requirement.rb
 - lib/dependabot/maven/shared/shared_version_finder.rb
 - lib/dependabot/maven/token_bucket.rb
 - lib/dependabot/maven/update_checker.rb
@@ -288,7 +289,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.372.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.373.0
 rdoc_options: []
 require_paths:
 - lib