semver_check 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4217ffcec4eca63ed8280bb221b7cf0fa8ab1dc545b85f4d51799aa3f4bdf997
-  data.tar.gz: ccfc6d8d567321e919f4c629cfaddd7935b8dda165020046bf643bf2ddf274de
+  metadata.gz: a788698d2408013afa250c7bb1b15d6db802abecb51d4809c4a71952c90da500
+  data.tar.gz: a46a370c61e3470815ceeb7ddefc1f8049c17b83feaec5829fdd4aa6fb3e2cd8
 SHA512:
-  metadata.gz: a0f7f029ea74293af76697b6b5e37a7897636de5059a792657f6e1963817cf7829f1d4ab2d306aa5d29f9e43aaca144e968d6407f2e407c46ef20fff010a98ba
-  data.tar.gz: 0c67e78f29bca2d694b0e662ad262178730d013af78c65e6bce4e4f1f7e52ae37a4b3c1cd1b332ab064f460d099e20b85b766dd8abb9d6f381cd4eb011083d80
+  metadata.gz: 4cfb9ba6a08f638cf26338ed6e1e499d655d155d278c51b13edba1a6eb4c2520cf2aff422e67f5220676dd650c5da4a6de71320cbb39b38ffc4a845c6d5fe561
+  data.tar.gz: c48338806955d42f6ed67d32bebb5a924aa567d9fbb82682a176e66350341e6982c9c12f844f1aaa327836e35ecc6021c43b65062ad2ff664af5fc2740e0db4c

data/lib/semver_check/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SemverCheck
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/semver_check.rb

@@ -22,20 +22,14 @@ module SemverCheck
                     )
                   \Z/x
 
-    INT_RESULT = {
-      n: 1,
-      o: -1,
-      s: 0
-    }.freeze
-
     MAPPING_TABLE = [
-      %w[n[nso]{2} n],
-      %w[sn[nso]{1} n],
-      %w[ssn n],
-      %w[o[nso]{2} o],
-      %w[so[nso]{1} o],
-      %w[sso o],
-      %w[sss s]
+      %w[n 1],
+      %w[sn 1],
+      %w[ssn 1],
+      %w[o -1],
+      %w[so -1],
+      %w[sso -1],
+      %w[sss 0]
     ].freeze
 
     ORDER = %i[major minor patch prerelease].freeze
@@ -72,7 +66,7 @@ module SemverCheck
           "o"
         end
       end.join
-      prerelease_sort(other, comparison)
+      buildmetadata_sort(other, prerelease_sort(other, comparison))
     end
 
     def prerelease_sort(other, comparison)
@@ -93,14 +87,26 @@ module SemverCheck
       end
     end
 
-    def match(comparison)
-      result = MAPPING_TABLE.map do |m|
-        m[1] if comparison.match?(/\A#{m[0]}\Z/)
-      end.compact
-
-      raise "Too many results" if result.length > 1
+    def buildmetadata_sort(other, comparison)
+      v_build = @version[:buildmetadata]
+      o_build = other.version[:buildmetadata]
+      if comparison.zero?
+        if v_build.nil? && !o_build.nil?
+          1
+        elsif !v_build.nil? && o_build.nil?
+          -1
+        else
+          0
+        end
+      else
+        comparison
+      end
+    end
 
-      INT_RESULT[result.first.to_sym]
+    def match(comparison)
+      MAPPING_TABLE.find do |m|
+        comparison.start_with?(m.first)
+      end.last.to_i
     end
 
     def prepare_version(version)
@@ -109,7 +115,7 @@ module SemverCheck
 
       version = version.named_captures.transform_keys(&:to_sym)
       # convert major, minor and patch to int
-      ORDER.take(3).each { |part| version[part] = version[part].to_i }
+      ORDER.first(3).each { |part| version[part] = version[part].to_i }
       version
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semver_check
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - PuLLi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2022-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Fun project to compare two SemVer strings with a bit of regex magic.
 email: