dependabot-elm 0.107.27 → 0.107.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e950285e371058e616ca6e7689440008010843508e0b37c39e6f9b6255ca40b4
-  data.tar.gz: ca11657a5e5ccd09d72297637ab19f59974e123456bca161ff7bb6a408f9f402
+  metadata.gz: 248099b0721516f90b3bd52044a8264229222b41e462fda36e68ee386024d466
+  data.tar.gz: b7bda0674a14e01229535ae55478c179f3a7cb49152f954d1c67c2281aad9e5d
 SHA512:
-  metadata.gz: 6cb3ed1215a966ab9ddf9b80a24c418c312e43b7f9710f6773770450db5571d576553aa0c57c43cfc8f2beffca58334c1d615dd700b40a446512ede69e4cb698
-  data.tar.gz: c803b5aa7f39d176fc228cbfd1a1033532c841576ebf479bec9a6c83db7bfbd153ec36c70db6b91b8c10929f4e01f6fe7ebdb9b4241b86c99f7bb03c3e15bb51
+  metadata.gz: caa2bd41d75f570101e97f44effc6441eec7fdc4d4288aa910e254c9d45ff801c1a7883c0f6d7b44c9fabbdd10d6ff346aa35e8ea32668c09f72a248ae84f9ce
+  data.tar.gz: c565fe200dc358952d1756d2a6db1652175c2d3358aa27cbfc514eeedb098eec35564410fbb7a2cf4d54d9727139ea42cfce35a0063ac56f84b51a5235b9291b

data/lib/dependabot/elm/requirement.rb

@@ -6,12 +6,11 @@ require "dependabot/elm/version"
 module Dependabot
   module Elm
     class Requirement < Gem::Requirement
-      # Override the version pattern to allow local versions
-      PATTERN_RAW =
+      ELM_PATTERN_RAW =
         "(#{Elm::Version::VERSION_PATTERN}) (<=?) v (<=?) " \
         "(#{Elm::Version::VERSION_PATTERN})"
-      PATTERN = /\A#{PATTERN_RAW}\z/.freeze
-      EXACT_PATTERN = /\A#{Elm::Version::VERSION_PATTERN}\z/.freeze
+      ELM_PATTERN = /\A#{ELM_PATTERN_RAW}\z/.freeze
+      ELM_EXACT_PATTERN = /\A#{Elm::Version::VERSION_PATTERN}\z/.freeze
 
       # Returns an array of requirements. At least one requirement from the
       # returned array must be satisfied for a version to be valid.
@@ -19,72 +18,43 @@ module Dependabot
         [new(requirement_string)]
       end
 
-      # Override the parser to create Elm::Versions and return an
-      # array of parsed requirements
-      def self.parse(obj)
-        # If a version is given this is an equals requirement
-        if EXACT_PATTERN.match?(obj.to_s)
-          return [["=", Elm::Version.new(obj.to_s)]]
-        end
-
-        unless (matches = PATTERN.match(obj.to_s))
-          msg = "Illformed requirement #{obj.inspect}"
-          raise BadRequirementError, msg
-        end
-
-        # If the two versions specified are identical this is an equals
-        # requirement
-        if matches[1] == matches[4] && matches[3] == "<="
-          return [["=", Elm::Version.new(matches[4])]]
-        end
-
-        [
-          [matches[2].tr("<", ">"), Elm::Version.new(matches[1])],
-          [matches[3], Elm::Version.new(matches[4])]
-        ]
-      end
-
-      # Overwrite superclass method to use `flat_map`
       def initialize(*requirements)
-        if requirements.any?(&:nil?)
-          raise BadRequirementError, "Nil requirement not supported in Elm"
+        requirements = requirements.flatten.flat_map do |req_string|
+          if req_string.nil?
+            raise BadRequirementError, "Nil requirement not supported in Elm"
+          end
+
+          req_string.split(",").map do |r|
+            convert_elm_constraint_to_ruby_constraint(r)
+          end
         end
 
-        requirements = requirements.flatten
-        requirements.compact!
-        requirements.uniq!
+        super(requirements)
+      end
 
-        if requirements.empty?
-          @requirements = [DefaultRequirement]
-        else
-          @requirements = requirements.flat_map { |r| self.class.parse(r) }
-          sort_requirements!
-        end
+      def satisfied_by?(version)
+        version = Elm::Version.new(version.to_s)
+        super
       end
 
-      # Overwrite superclass method to use `flat_map`
-      def concat(new)
-        new = new.flatten
-        new.compact!
-        new.uniq!
-        new = new.flat_map { |r| self.class.parse(r) }
+      private
 
-        @requirements.concat new
-        sort_requirements!
-      end
+      # Override the parser to create Elm::Versions and return an
+      # array of parsed requirements
+      def convert_elm_constraint_to_ruby_constraint(obj)
+        # If a version is given this is an equals requirement
+        return obj if ELM_EXACT_PATTERN.match?(obj.to_s)
 
-      def sort_requirements!
-        @requirements.sort! do |l, r|
-          comp = l.last <=> r.last # first, sort by the requirement's version
-          next comp unless comp.zero?
+        return obj unless (matches = ELM_PATTERN.match(obj.to_s))
 
-          l.first <=> r.first # then, sort by the operator (for stability)
-        end
-      end
+        # If the two versions specified are identical this is an equals
+        # requirement
+        return matches[4] if matches[1] == matches[4] && matches[3] == "<="
 
-      def satisfied_by?(version)
-        version = Elm::Version.new(version.to_s)
-        super
+        [
+          [matches[2].tr("<", ">"), matches[1]].join(" "),
+          [matches[3], matches[4]].join(" ")
+        ]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-elm
 version: !ruby/object:Gem::Version
-  version: 0.107.27
+  version: 0.107.28
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.107.27
+        version: 0.107.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.107.27
+        version: 0.107.28
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: 0.71.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement