nuget_versions 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7a65bb495d4a86c11b0b500c1ee5d4f2e9ea4a6baff4f3b34b01af063a18b2
-  data.tar.gz: c74e0a77040fc072d4e4eb9743b6cecd4e54440f4c3332f1579820adfb5baf4a
+  metadata.gz: b0bef5e659ed237d7a3e2c05cff2ade749563052eb2cc34d21cff4d6dd6c7a0c
+  data.tar.gz: 422d2ae1f8e0fe63ae046a63d0a220dd05f409f1f825e5d13c6c781d4f27c94c
 SHA512:
-  metadata.gz: d6e239cd9e1bed9ae4d22bb20014ff5fafbf7cbe942c0d1d1efb7db92380698e0b1fff0faeeda37c7f6b63ddccfa6b1cc2331a72945ff2cef9990a868fc7bd3f
-  data.tar.gz: 0570d76877c6b58c39f646713b01bf9a4ff7b250cc06232fd0458ab8ee086e1a33f3a81a9ba5d6bf9cc99de654008446ac8f38adff831665b7867871f27108a0
+  metadata.gz: 58e1cd3b428a053b83a82827cd6c20a95c3fcc1ea78e8b9dd925def07d334b004ddc8abf63dd3aa94ed328eb7f1f9d58f6a86f6bcc1f761e9e38567e0c3930ca
+  data.tar.gz: 394f472ca81caa5a782f5ea1b1b080a1c92f35c745942a6d4b4fc48f7a2682584ddcdd532f3a94740ea4d44ca62caf3a6aef9c5c2cbd2bf8bb2af9328f66f85a

data/lib/nuget_versions/nuget_version.rb

@@ -21,11 +21,15 @@ module NuGetVersions
     def initialize(major, minor, patch, revision = 0, release_labels = nil, metadata = nil)
       super(major, minor, patch, release_labels, metadata)
 
-      @revision = revision
+      @revision = Integer(revision, revision.is_a?(String) ? 10 : 0)
     end
 
     attr_reader :revision
 
+    def revision=(new_value)
+      @revision = Integer(new_value, new_value.is_a?(String) ? 10 : 0)
+    end
+
     attr_accessor :original_version
 
     def to_s
@@ -52,23 +56,29 @@ module NuGetVersions
       value = value.to_s if !value.is_a? String
       original_value = value
 
+      return nil if value.empty?
+
       value = value.split("+", 2)
 
       metadata = (value.length == 2) ? value.last : nil
 
       value = value.first.split("-", 2)
 
-      release_labels = (value.length == 2) ? value.last : nil
+      return nil if value.empty?
+
+      release_labels = (value.length == 2) ? value.last.split('.') : nil
 
       parts = value.first.split(".")
 
-      return nil if value.length > 4
+      return nil if parts.length < 2 || parts.length > 4
+      return nil if release_labels && !SemanticVersion.try_validate_identifiers(release_labels)
+      return nil if metadata && !SemanticVersion.try_validate_identifier(metadata)
 
       begin
-        major = Integer(parts[0])
-        minor = (parts.length >= 2) ? Integer(parts[1]) : 0
-        patch = (parts.length >= 3) ? Integer(parts[2]) : 0
-        revision = (parts.length >= 4) ? Integer(parts[3]) : 0
+        major = Integer(parts[0], 10)
+        minor = (parts.length >= 2) ? Integer(parts[1], 10) : 0
+        patch = (parts.length >= 3) ? Integer(parts[2], 10) : 0
+        revision = (parts.length >= 4) ? Integer(parts[3], 10) : 0
       rescue
         return nil
       end

data/lib/nuget_versions/semantic_version.rb

@@ -17,15 +17,17 @@ module NuGetVersions
     # - release_labels: Prerelease label
     # - metadata: Build metadata
     def initialize(major, minor, patch, release_labels = nil, metadata = nil)
-      @major = major
-      @minor = minor
-      @patch = patch
+      @major = Integer(major, major.is_a?(String) ? 10 : 0)
+      @minor = Integer(minor, minor.is_a?(String) ? 10 : 0)
+      @patch = Integer(patch, patch.is_a?(String) ? 10 : 0)
 
       if !release_labels.nil?
         release_labels = release_labels.to_s.split('.') if !release_labels.kind_of? Array
+        SemanticVersion.validate_identifiers release_labels
         @release_labels = release_labels
       end
 
+      SemanticVersion.validate_identifier metadata if !metadata.nil?
       @metadata = metadata
     end
 
@@ -35,11 +37,43 @@ module NuGetVersions
     attr_reader :release_labels
     attr_reader :metadata
 
+    def major=(new_value)
+      @major = Integer(new_value, new_value.is_a?(String) ? 10 : 0)
+    end
+
+    def minor=(new_value)
+      @minor = Integer(new_value, new_value.is_a?(String) ? 10 : 0)
+    end
+
+    def patch=(new_value)
+      @patch = Integer(new_value, new_value.is_a?(String) ? 10 : 0)
+    end
+
+    def release_labels=(new_value)
+      return @release_labels = nil if new_value.nil?
+      new_value = new_value.to_s.split('.') if !new_value.kind_of? Array
+      SemanticVersion.validate_identifiers new_value
+      @release_labels = new_value
+    end
+
+    def metadata=(new_value)
+      return @metadata = nil if new_value.nil?
+      SemanticVersion.validate_identifier new_value
+      @metadata = new_value
+    end
+
     def release
-      return "" if @release_labels.nil?
+      return nil if @release_labels.nil?
       @release_labels.join('.')
     end
 
+    def release=(new_value)
+      return @release_labels = nil if new_value.nil?
+      new_value = new_value.split('.')
+      SemanticVersion.validate_identifiers new_value
+      @release_labels = new_value
+    end
+
     def is_prerelease?
       !@release_labels.nil? && !@release_labels.all?(&:empty?)
     end
@@ -96,27 +130,50 @@ module NuGetVersions
 
       value = value.to_s if !value.is_a? String
 
+      return nil if value.empty?
+
       value = value.split("+", 2)
 
       metadata = (value.length == 2) ? value.last : nil
 
       value = value.first.split("-", 2)
 
-      release_labels = (value.length == 2) ? value.last : nil
+      return nil if value.empty?
+
+      release_labels = (value.length == 2) ? value.last.split('.') : nil
 
       parts = value.first.split(".")
 
-      return nil if value.length > 3
+      return nil if parts.length != 3
+      return nil if release_labels && !SemanticVersion.try_validate_identifiers(release_labels)
+      return nil if metadata && !SemanticVersion.try_validate_identifier(metadata)
 
       begin
-        major = Integer(parts[0])
-        minor = (parts.length >= 2) ? Integer(parts[1]) : 0
-        patch = (parts.length >= 3) ? Integer(parts[2]) : 0
+        major = Integer(parts[0], 10)
+        minor = (parts.length >= 2) ? Integer(parts[1], 10) : 0
+        patch = (parts.length >= 3) ? Integer(parts[2], 10) : 0
       rescue
         return nil
       end
 
       return SemanticVersion.new(major, minor, patch, release_labels, metadata)
     end
+
+  protected
+    def self.validate_identifiers(array)
+      array.each { |identifier| validate_identifier(identifier) }
+    end
+
+    def self.validate_identifier(identifier)
+      raise "Invalid semantic version identifier: #{identifier}" if !try_validate_identifier(identifier)
+    end
+
+    def self.try_validate_identifiers(array)
+      array.all? { |identifier| try_validate_identifier(identifier) }
+    end
+
+    def self.try_validate_identifier(identifier)
+      return identifier.count("^A-Za-z0-9-").zero?
+    end
   end
 end

data/lib/nuget_versions/version_comparer.rb

@@ -18,25 +18,27 @@ module NuGetVersions
           return -1 if b.kind_of?(NuGetVersion) && (b.revision > 0)
         end
 
-        a_labels = a.release_labels
-        b_labels = b.release_labels
+        a_labels = a.release_labels || []
+        b_labels = b.release_labels || []
 
-        count = [a_labels.length, b_labels.length].min
+        count = [a_labels.length, b_labels.length].max
 
         for i in 0..(count - 1)
-          return -1 if i >= a_labels.length
-          return +1 if i >= b_labels.length
+          return +1 if i >= a_labels.length
+          return -1 if i >= b_labels.length
 
           a_release = a_labels[i].to_s
           b_release = b_labels[i].to_s
 
-          a_release_int = Integer(a_labels[i]) rescue nil
-          b_release_int = Integer(b_labels[i]) rescue nil
+          a_release_int = Integer(a_release, 10) rescue nil
+          b_release_int = Integer(b_release, 10) rescue nil
 
-          return a_release_int <=> b_release_int if !(a_release_int.nil? || b_release_int.nil?)
+          if !(a_release_int.nil? || b_release_int.nil?)
+            return result if (result = a_release_int <=> b_release_int) != 0
+          end
 
-          return +1 if !a_release_int.nil?
-          return -1 if !b_release_int.nil?
+          return +1 if !a_release_int.nil? && b_release_int.nil?
+          return -1 if a_release_int.nil? && !b_release_int.nil?
 
           return result if (result = a_release.casecmp(b_release)) != 0
         end

data/lib/nuget_versions.rb

@@ -1,3 +1,3 @@
-require 'nuget_versions/semantic_version.rb'
-require 'nuget_versions/nuget_version.rb'
-require 'nuget_versions/version_comparer.rb'
+require_relative 'nuget_versions/semantic_version.rb'
+require_relative 'nuget_versions/nuget_version.rb'
+require_relative 'nuget_versions/version_comparer.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuget_versions
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonathan Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Provides facilities for parsing & working with NuGet Versions, which
   are a superset of Semantic Versions 2.0.
 email: