bosh_common 1.2579.0 → 1.2583.0

data/lib/common/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Common
-    VERSION = '1.2579.0'
+    VERSION = '1.2583.0'
   end
 end

data/lib/common/version_number.rb

@@ -1,53 +1,37 @@
+require 'semi_semantic/version'
+
 module Bosh::Common
   class VersionNumber
-    include Comparable
-
-    def initialize(version_value)
-      @version = version_value.to_s
-    end
+    DEFAULT_DEV_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('dev.1')
 
-    def <=>(other)
-      v1 = @version
-      v2 = other.to_s
-      return v1 <=> v2 if [v1, v2].all? { |v| v.to_s.match(/^\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}$/) }
+    def self.parse(version)
+      raise ArgumentError, 'Invalid Version: nil' if version.nil?
+      #raise ArgumentError, "Invalid Version Type: #{version.class}" if version.is_a?(String)
+      version = version.to_s
 
-      vp1 = components
-      vp2 = other.components
+      #discard anything after a space, including the space, to support compound bosh versions
+      version = version.split(' ', 2)[0] if version =~ / /
 
-      [vp1.size, vp2.size].max.times do |i|
-        result = vp1[i].to_i <=> vp2[i].to_i
-        return result unless result == 0
+      #convert old-style dev version suffix to new dev post-release segment
+      matches = /\A(?<release>.*)(\.(?<dev>[0-9]+)-dev)\z/.match(version)
+      unless matches.nil?
+        version = matches[:release] + "+dev." + matches[:dev]
       end
 
-      0
-    end
-
-    def major
-      components[0].to_i
-    end
-
-    def minor
-      components[1].to_i
-    end
-
-    def components
-      @version.split('.')
-    end
-
-    def to_s
-      @version
-    end
+      #replace underscores with periods to maintain reverse compatibility with stemcell versions
+      version = version.gsub('_', '.')
 
-    def final?
-      !@version.end_with?('-dev')
+      SemiSemantic::Version.parse(version)
     end
 
-    def next_minor
-      self.class.new("#{major}.#{minor + 1}")
+    # @param [Array<#version>] Collection of version strings
+    def self.parse_list(versions)
+      versions.map { |v| self.parse(v) }
     end
 
-    def dev
-      final? ? self.class.new("#{@version}-dev") : self
+    # @param [Array<#version>] Collection of version strings
+    def self.latest(versions)
+      versions.max
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_common
 version: !ruby/object:Gem::Version
-  version: 1.2579.0
+  version: 1.2583.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
-dependencies: []
+date: 2014-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: semi_semantic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: ! 'BOSH common
 
-  4fef83'
+  b96a92'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -57,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1323781589771077570
+      hash: 2863706142254409003
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: BOSH common