bosh_common 1.2583.0 → 1.2596.0

data/lib/common/version/bosh_version.rb

@@ -0,0 +1,22 @@
+require 'common/version/semi_semantic_version'
+
+module Bosh::Common::Version
+  class BoshVersion < SemiSemanticVersion
+
+    def self.parse(version)
+      raise ArgumentError, 'Invalid Version: nil' if version.nil?
+      version = version.to_s
+
+      #discard anything after a space, including the space, to support compound bosh versions
+      version = version.split(' ', 2)[0] if version =~ / /
+
+      self.new(SemiSemantic::Version.parse(version))
+    end
+
+    private
+
+    def default_post_release_segment
+      raise NotImplementedError, 'Bosh post-release versions unsupported'
+    end
+  end
+end

data/lib/common/version/release_version.rb

@@ -0,0 +1,35 @@
+require 'common/version/semi_semantic_version'
+
+module Bosh::Common::Version
+  class ReleaseVersion < SemiSemanticVersion
+
+    DEFAULT_POST_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('dev.1')
+
+    def self.parse(version)
+      raise ArgumentError, 'Invalid Version: nil' if version.nil?
+      version = version.to_s
+
+      #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
+
+      self.new(SemiSemantic::Version.parse(version))
+    end
+
+    def to_old_format
+      matches = /\A(?<release>.*)(\+dev\.(?<dev>[0-9]+))\z/.match(to_s)
+      if matches.nil?
+        return nil
+      end
+      matches[:release] + '.' + matches[:dev] + "-dev"
+    end
+
+    private
+
+    def default_post_release_segment
+      DEFAULT_POST_RELEASE_SEGMENT
+    end
+  end
+end

data/lib/common/version/release_version_list.rb

@@ -0,0 +1,34 @@
+require 'semi_semantic/version'
+require 'common/version/release_version'
+
+module Bosh::Common::Version
+  class ReleaseVersionList < VersionList
+
+    # @param [Array<#version>] Collection of version strings
+    # @param [class] Version type to parse as (ex: SemiSemantic::Version, ReleaseVersion, StemcellVersion, BoshVersion)
+    def self.parse(versions)
+      self.new(VersionList.parse(versions, ReleaseVersion))
+    end
+
+    # @param [#version] ReleaseVersion from which to rebase the post-release segment
+    def rebase(version)
+      raise TypeError, "Failed to Rebase - Invalid Version Type: #{version.class}" unless version.is_a?(ReleaseVersion)
+
+      # Can only rebase versions with a post-release segment
+      if version.version.post_release.nil?
+        raise ArgumentError, "Failed to Rebase - Invalid Version: #{version.inspect}"
+      end
+
+      latest = latest_with_pre_release(version)
+      if latest
+        if latest.version.post_release.nil?
+          latest.default_post_release
+        else
+          latest.increment_post_release
+        end
+      else
+        version.default_post_release
+      end
+    end
+  end
+end

data/lib/common/version/semi_semantic_version.rb

@@ -0,0 +1,62 @@
+require 'semi_semantic/version'
+require 'common/version/version_list'
+
+module Bosh::Common::Version
+  class UnavailableMethodError < StandardError; end
+
+  class SemiSemanticVersion
+    include Comparable
+
+    DEFAULT_POST_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('build.1')
+
+    attr_reader :version
+
+    def self.parse(version)
+      raise ArgumentError, 'Invalid Version: nil' if version.nil?
+      version = version.to_s
+
+      self.new(SemiSemantic::Version.parse(version))
+    end
+
+    def self.parse_list(versions)
+      VersionList.parse(versions, self)
+    end
+
+    def self.parse_and_compare(a, b)
+      self.parse(a) <=> self.parse(b)
+    end
+
+    def initialize(version)
+      raise ArgumentError, "Invalid Version Type: #{version.class}" unless version.is_a?(SemiSemantic::Version)
+      @version = version
+      @version.freeze
+    end
+
+    def default_post_release
+      self.class.new(SemiSemantic::Version.new(@version.release, @version.pre_release, default_post_release_segment))
+    end
+
+    def increment_post_release
+      raise UnavailableMethodError, 'Failed to increment: post-release is nil' if @version.post_release.nil?
+      self.class.new(SemiSemantic::Version.new(@version.release, @version.pre_release, @version.post_release.increment))
+    end
+
+    def increment_release
+      self.class.new(SemiSemantic::Version.new(@version.release.increment))
+    end
+
+    def <=>(other)
+      @version <=> other.version
+    end
+
+    def to_s
+      @version.to_s
+    end
+
+    private
+
+    def default_post_release_segment
+      DEFAULT_POST_RELEASE_SEGMENT
+    end
+  end
+end

data/lib/common/version/stemcell_version.rb

@@ -0,0 +1,22 @@
+require 'common/version/semi_semantic_version'
+
+module Bosh::Common::Version
+  class StemcellVersion < SemiSemanticVersion
+
+    def self.parse(version)
+      raise ArgumentError, 'Invalid Version: nil' if version.nil?
+      version = version.to_s
+
+      #replace underscores with periods to maintain reverse compatibility with stemcell versions
+      version = version.gsub('_', '.')
+
+      self.new(SemiSemantic::Version.parse(version))
+    end
+
+    private
+
+    def default_post_release_segment
+      raise NotImplementedError, 'Stemcell post-release versions unsupported'
+    end
+  end
+end

data/lib/common/version/version_list.rb

@@ -0,0 +1,45 @@
+require 'semi_semantic/version'
+
+module Bosh::Common::Version
+  class VersionList
+    include Enumerable
+
+    attr_reader :versions
+
+    alias :latest :max
+
+    # @param [Array<#version>] Collection of version strings
+    # @param [class] Version type to parse as (ex: SemiSemanticVersion, ReleaseVersion, StemcellVersion, BoshVersion)
+    def self.parse(versions, version_type)
+      raise TypeError, "Failed to Parse - Invalid Version Type: '#{version_type.inspect}'" unless version_type <= SemiSemanticVersion
+      self.new(versions.map { |v| version_type.parse(v) })
+    end
+
+    # @param [Array<#version>] Collection of SemiSemanticVersion objects
+    def initialize(versions)
+      @versions = versions
+    end
+
+    # Gets the latest version with the same release and pre-release version as the specified version
+    # @param [#version] SemiSemanticVersion object
+    def latest_with_pre_release(version)
+      raise TypeError, "Invalid Version Type: #{version.class}" unless version.kind_of?(SemiSemanticVersion)
+      @versions.select { |v|
+        v.version.release == version.version.release && v.version.pre_release == version.version.pre_release
+      }.max
+    end
+
+    # Gets the latest version with the same release version as the specified version
+    # @param [#version] SemiSemanticVersion object
+    def latest_with_release(version)
+      raise TypeError, "Invalid Version Type: #{version.class}" unless version.kind_of?(SemiSemanticVersion)
+      @versions.select { |v|
+        v.version.release == version.version.release
+      }.max
+    end
+
+    def each(&block)
+      @versions.each(&block)
+    end
+  end
+end

data/lib/common/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_common
 version: !ruby/object:Gem::Version
-  version: 1.2583.0
+  version: 1.2596.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -29,7 +29,7 @@ dependencies:
         version: 1.1.0
 description: ! 'BOSH common
 
-  b96a92'
+  3c1470'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -50,7 +50,12 @@ files:
 - lib/common/thread_formatter.rb
 - lib/common/thread_pool.rb
 - lib/common/version.rb
-- lib/common/version_number.rb
+- lib/common/version/bosh_version.rb
+- lib/common/version/release_version.rb
+- lib/common/version/release_version_list.rb
+- lib/common/version/semi_semantic_version.rb
+- lib/common/version/stemcell_version.rb
+- lib/common/version/version_list.rb
 - README
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
@@ -73,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2863706142254409003
+      hash: -2801231138931334462
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2

data/lib/common/version_number.rb

@@ -1,37 +0,0 @@
-require 'semi_semantic/version'
-
-module Bosh::Common
-  class VersionNumber
-    DEFAULT_DEV_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('dev.1')
-
-    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
-
-      #discard anything after a space, including the space, to support compound bosh versions
-      version = version.split(' ', 2)[0] if version =~ / /
-
-      #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
-
-      #replace underscores with periods to maintain reverse compatibility with stemcell versions
-      version = version.gsub('_', '.')
-
-      SemiSemantic::Version.parse(version)
-    end
-
-    # @param [Array<#version>] Collection of version strings
-    def self.parse_list(versions)
-      versions.map { |v| self.parse(v) }
-    end
-
-    # @param [Array<#version>] Collection of version strings
-    def self.latest(versions)
-      versions.max
-    end
-  end
-end