atk_toolbox 0.0.72 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 292370d8f93d0be1d1a038005d5b14fed743273c2fd2bdda8611c8d61f76bc73
-  data.tar.gz: 5679595615ab2e5b3ab686897138fb3a02cc697e26475091ed44c5f3ce5adbc9
+  metadata.gz: 6bbdfa878da22ecddbecdc8b42aa91de1f1909fcf196fc42a8921f7ba50dbfd8
+  data.tar.gz: a9d50f7fb7088fc13367d208a8104beaa93fc09148ee28a922b95d2ea4df9d7f
 SHA512:
-  metadata.gz: 8164660ffd136f44ad7d5dacbb923c59eafafc0ad2a3a9e13392275a41c2786cfcfd8b1db746e5cab16945c50c0c8b2ad8a4555c15f7e10516d925d82e356c1e
-  data.tar.gz: 3aacdae8f1458b1dc4db098621368cf4601e3a24c89cab39a93e9258058f58d5ebb3b222ee317c19ac2eb1eaab0fe5d30e28b82de5f4183b7949fa9301fab77a
+  metadata.gz: e3fdad11b9fc752247b9e08fe0ee41b835417c0e2c9263319a6e07710029648beaa1e5eb128fe257290529023517f0888f9d07497f56c9e49cf3b1465884e821
+  data.tar.gz: 5e5ff39ad96783d852af79b776b224d834049ac47d42e4985052a6b629bff94794c9979d8b2b13ee17220a009f16407141d3c498e9d58b81d9517c5bb4733d0d

data/lib/atk/version.rb

@@ -1,38 +1,74 @@
 # create a variable for the current ruby version
 
 class Version
-    attr_accessor :major, :minor, :patch
+    attr_accessor :major, :minor, :patch, :levels
     
     def initialize(version_as_string)
-        # TODO: make this more safe/better error handling
-        @major, @minor, @patch = version_as_string.split('.').map{|each| each.to_i}
-        @as_string = version_as_string
+        @levels = version_as_string.split('.')
+        @comparable = @levels[0] =~ /\A\d+\z/
+        # convert values into integers where possible
+        index = -1
+        for each in @levels.dup
+            index += 1
+            if each =~ /\A\d+\z/
+                @levels[index] = each.to_i
+            end
+        end
+        @major, @minor, @patch, *_ = @levels
+    end
+    
+    def comparable?
+        return @comparable
     end
     
     def <=>(other_version)
         if not other_version.is_a?(Version)
             raise "When doing version comparision, both sides must be a version object"
         end
-        major_size = (@major <=> other_version.major * 100)
-        minor_size = (@minor <=> other_version.minor * 10 )
-        patch_size = (@patch <=> other_version.patch * 1 )
-        return (major_size + minor_size + patch_size) <=> 0
+        if other_version.to_s == self.to_s
+            return 0
+        end
+        
+        if other_version.comparable? && self.comparable?
+            self_levels = @levels.dup
+            other_levels = other_version.levels.dup
+            loop do
+                if self_levels.size == 0 || other_levels.size == 0
+                    if self_levels.size > other_levels.size
+                        return 1
+                    elsif self_levels.size < other_levels.size
+                        return -1
+                    else
+                        return 0
+                    end
+                end
+                comparision = self_levels.shift() <=> other_levels.shift()
+                if comparision != 0
+                    return comparision
+                end
+            end
+        else
+            return nil
+        end
     end
     
     def >(other_version)
-        return (self <=> other_version) == 1
+        value = (self <=> other_version)
+        return value && value == 1
     end
     
     def <(other_version)
-        return (self <=> other_version) == -1
+        value = (self <=> other_version)
+        return value && value == -1
     end
     
     def ==(other_version)
-        return (self <=> other_version) == 0
+        value = (self <=> other_version)
+        return value && value == 0
     end
     
     def to_s
-        return "#{@major}.#{@minor}.#{@patch}"
+        return @levels.map(&:to_s).join('.')
     end
 end
 

data/lib/atk/yaml_info_parser.rb

@@ -284,6 +284,6 @@ class Info
     end
     
     def self.source_path()
-        return "."/"info.yaml"
+        return Dir.pwd/"info.yaml"
     end
 end

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-  VERSION = '0.0.72'
+  VERSION = '0.0.73'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.72
+  version: 0.0.73
 platform: ruby
 authors:
 - Jeff Hykin
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: The Ruby gem for all the standard tools ATK uses internally