bosh_common 1.2657.0 → 1.2669.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a3c39c9f9e9c33e3ea9f197cc133bd4f3bffaa7
-  data.tar.gz: cf4d3cbe3dc7f0bd1ca2c1a2c4b764d99fd3e0ef
+  metadata.gz: ce51b12ff3c1446b5d40f082e653ffc44abf1ce9
+  data.tar.gz: 0d3da12c5fcd10cab6ade40ff8c2fd1db4a6c813
 SHA512:
-  metadata.gz: bf6d0d9ff9e45d2232efcabe36deaba45bea13f01ed7991d13a2761020ea6fed3ec6227b1c12ffe7ab24c00de912ebd036645cff84f4f084bed2532888a2f33b
-  data.tar.gz: c1acb99e04e37dab84b431836a34e4fb8431c094e50819fd5a9716a2c7376293c68a4417b4b6aa263c6070837c3dfd09ac938c448d706c889d624768de7381b2
+  metadata.gz: 4890f1bbf755437dd9726a8766fda584a8e2691da9b25ddf059edce6ca31077f717b39e86053ab2701be32e33d922252d7d975856c15068b8454453155334941
+  data.tar.gz: b4954e3b63b2db1ec10676b4b08f85833b8e724d1f45c198d7d9fe007b59204181d5995e4ef4876268ca1be9dc67021b59a4543742f1deae9df62a771470e18a

data/lib/common/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Common
-    VERSION = '1.2657.0'
+    VERSION = '1.2669.0'
   end
 end

data/lib/common/version/bosh_version.rb

@@ -1,22 +1,24 @@
 require 'common/version/semi_semantic_version'
 
-module Bosh::Common::Version
-  class BoshVersion < SemiSemanticVersion
+module Bosh::Common
+  module Version
+    class BoshVersion < SemiSemanticVersion
 
-    def self.parse(version)
-      raise ArgumentError, 'Invalid Version: nil' if version.nil?
-      version = version.to_s
+      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 =~ / /
+        #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
+        self.new(SemiSemantic::Version.parse(version))
+      end
 
-    private
+      private
 
-    def default_post_release_segment
-      raise NotImplementedError, 'Bosh post-release versions unsupported'
+      def default_post_release_segment
+        raise NotImplementedError, 'Bosh post-release versions unsupported'
+      end
     end
   end
 end

data/lib/common/version/release_version.rb

@@ -1,35 +1,37 @@
 require 'common/version/semi_semantic_version'
 
-module Bosh::Common::Version
-  class ReleaseVersion < SemiSemanticVersion
+module Bosh::Common
+  module Version
+    class ReleaseVersion < SemiSemanticVersion
 
-    DEFAULT_POST_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('dev.1')
+      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
+      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
+        #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
+        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
+      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
-      matches[:release] + '.' + matches[:dev] + "-dev"
-    end
 
-    private
+      private
 
-    def default_post_release_segment
-      DEFAULT_POST_RELEASE_SEGMENT
+      def default_post_release_segment
+        DEFAULT_POST_RELEASE_SEGMENT
+      end
     end
   end
 end

data/lib/common/version/release_version_list.rb

@@ -1,33 +1,35 @@
 require 'semi_semantic/version'
 require 'common/version/release_version'
+require 'common/version/version_list'
 
-module Bosh::Common::Version
-  class ReleaseVersionList < VersionList
+module Bosh::Common
+  module 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 [Array<#version>] Collection of version strings
+      def self.parse(versions)
+        self.new(VersionList.parse(versions, ReleaseVersion).versions)
+      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)
+      # @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
+        # 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
+        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
-          latest.increment_post_release
+          version.default_post_release
         end
-      else
-        version.default_post_release
       end
     end
   end

data/lib/common/version/semi_semantic_version.rb

@@ -1,62 +1,59 @@
 require 'semi_semantic/version'
-require 'common/version/version_list'
 
-module Bosh::Common::Version
-  class UnavailableMethodError < StandardError; end
+module Bosh::Common
+  module Version
+    class UnavailableMethodError < StandardError; end
 
-  class SemiSemanticVersion
-    include Comparable
+    class SemiSemanticVersion
+      include Comparable
 
-    DEFAULT_POST_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('build.1')
+      DEFAULT_POST_RELEASE_SEGMENT = SemiSemantic::VersionSegment.parse('build.1')
 
-    attr_reader :version
+      attr_reader :version
 
-    def self.parse(version)
-      raise ArgumentError, 'Invalid Version: nil' if version.nil?
-      version = version.to_s
+      def self.parse(version)
+        raise ArgumentError, 'Invalid Version: nil' if version.nil?
+        version = version.to_s
 
-      self.new(SemiSemantic::Version.parse(version))
-    end
+        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 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 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 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_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 increment_release
+        self.class.new(SemiSemantic::Version.new(@version.release.increment))
+      end
 
-    def <=>(other)
-      @version <=> other.version
-    end
+      def <=>(other)
+        @version <=> other.version
+      end
 
-    def to_s
-      @version.to_s
-    end
+      def to_s
+        @version.to_s
+      end
 
-    private
+      private
 
-    def default_post_release_segment
-      DEFAULT_POST_RELEASE_SEGMENT
+      def default_post_release_segment
+        DEFAULT_POST_RELEASE_SEGMENT
+      end
     end
   end
 end

data/lib/common/version/stemcell_version.rb

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

data/lib/common/version/stemcell_version_list.rb

@@ -0,0 +1,15 @@
+require 'semi_semantic/version'
+require 'common/version/stemcell_version'
+require 'common/version/version_list'
+
+module Bosh::Common
+  module Version
+    class StemcellVersionList < VersionList
+
+      # @param [Array<#version>] Collection of version strings
+      def self.parse(versions)
+        self.new(VersionList.parse(versions, StemcellVersion).versions)
+      end
+    end
+  end
+end

data/lib/common/version/version_list.rb

@@ -1,45 +1,56 @@
 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)
+module Bosh::Common
+  module 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)
+        raise TypeError, "Invalid Version Array: '#{versions.inspect}'" unless versions.kind_of?(Array)
+        @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
+
+      def ==(other)
+        @versions == other.versions
+      end
+
+      def to_s
+        @versions.map{ |v| v.to_s }.to_s
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_common
 version: !ruby/object:Gem::Version
-  version: 1.2657.0
+  version: 1.2669.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -26,7 +26,7 @@ dependencies:
         version: 1.1.0
 description: |-
   BOSH common
-  a6c527
+  bf0b96
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -39,10 +39,6 @@ files:
 - lib/common/exec.rb
 - lib/common/exec/error.rb
 - lib/common/exec/result.rb
-- lib/common/properties.rb
-- lib/common/properties/errors.rb
-- lib/common/properties/property_helper.rb
-- lib/common/properties/template_evaluation_context.rb
 - lib/common/retryable.rb
 - lib/common/ssl.rb
 - lib/common/thread_formatter.rb
@@ -53,6 +49,7 @@ files:
 - lib/common/version/release_version_list.rb
 - lib/common/version/semi_semantic_version.rb
 - lib/common/version/stemcell_version.rb
+- lib/common/version/stemcell_version_list.rb
 - lib/common/version/version_list.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:

data/lib/common/properties.rb

@@ -1,6 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-require "ostruct"
-require "common/properties/errors"
-require "common/properties/property_helper"
-require "common/properties/template_evaluation_context"

data/lib/common/properties/errors.rb

@@ -1,16 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Common
-
-  class TemplateEvaluationFailed < StandardError; end
-
-  class UnknownProperty < StandardError
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-      super("Can't find property `#{name}'")
-    end
-  end
-
-end

data/lib/common/properties/property_helper.rb

@@ -1,41 +0,0 @@
-module Bosh::Common
-  module PropertyHelper
-    # Copies property with a given name from src to dst.
-    # @param [Hash] dst Property destination
-    # @param [Hash] src Property source
-    # @param [String] name Property name (dot-separated)
-    # @param [Object] default Default value (if property is not in src)
-    def copy_property(dst, src, name, default = nil)
-      keys = name.split(".")
-      src_ref = src
-      dst_ref = dst
-
-      keys.each do |key|
-        src_ref = src_ref[key]
-        break if src_ref.nil? # no property with this name is src
-      end
-
-      keys[0..-2].each do |key|
-        dst_ref[key] ||= {}
-        dst_ref = dst_ref[key]
-      end
-
-      dst_ref[keys[-1]] ||= {}
-      dst_ref[keys[-1]] = src_ref.nil? ? default : src_ref
-    end
-
-    # @param [Hash] collection Property collection
-    # @param [String] name Dot-separated property name
-    def lookup_property(collection, name)
-      keys = name.split(".")
-      ref = collection
-
-      keys.each do |key|
-        ref = ref[key]
-        return nil if ref.nil?
-      end
-
-      ref
-    end
-  end
-end

data/lib/common/properties/template_evaluation_context.rb

@@ -1,140 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Common
-  # Helper class to evaluate templates. Used by Director, CLI and Agent.
-  class TemplateEvaluationContext
-    include PropertyHelper
-
-    # @return [String] Template name
-    attr_reader :name
-
-    # @return [Integer] Template instance index
-    attr_reader :index
-
-    # @return [Hash] Template properties
-    attr_reader :properties
-
-    # @return [Hash] Raw template properties (no openstruct)
-    attr_reader :raw_properties
-
-    # @return [Hash] Template spec
-    attr_reader :spec
-
-    # @param [Hash] spec Template spec
-    def initialize(spec)
-      unless spec.is_a?(Hash)
-        raise TemplateEvaluationFailed,
-              "Invalid spec provided for template evaluation context, " +
-              "Hash expected, #{spec.class} given"
-      end
-
-      if spec["job"].is_a?(Hash)
-        @name = spec["job"]["name"]
-      else
-        @name = nil
-      end
-
-      @index = spec["index"]
-      @spec = openstruct(spec)
-      @raw_properties = spec["properties"] || {}
-      @properties = openstruct(@raw_properties)
-    end
-
-    # @return [Binding] Template binding
-    def get_binding
-      binding.taint
-    end
-
-    # Property lookup helper
-    #
-    # @overload p(name, default_value)
-    #   Returns property value or default value if property not set
-    #   @param [String] name Property name
-    #   @param [Object] default_value Default value
-    #   @return [Object] Property value
-    #
-    # @overload p(names, default_value)
-    #   Returns first property from the list that is set or default value if
-    #   none of them are set
-    #   @param [Array<String>] names Property names
-    #   @param [Object] default_value Default value
-    #   @return [Object] Property value
-    #
-    # @overload p(names)
-    #   Looks up first property from the list that is set, raises an error
-    #   if none of them are set.
-    #   @param [Array<String>] names Property names
-    #   @return [Object] Property value
-    #   @raise [Bosh::Common::UnknownProperty]
-    #
-    # @overload p(name)
-    #   Looks up property and raises an error if it's not set
-    #   @param [String] name Property name
-    #   @return [Object] Property value
-    #   @raise [Bosh::Common::UnknownProperty]
-    def p(*args)
-      names = Array(args[0])
-
-      names.each do |name|
-        result = lookup_property(@raw_properties, name)
-        return result unless result.nil?
-      end
-
-      return args[1] if args.length == 2
-      raise UnknownProperty.new(names)
-    end
-
-    # Run a block of code if all given properties are defined
-    # @param [Array<String>] names Property names
-    # @yield [Object] property values
-    def if_p(*names)
-      values = names.map do |name|
-        value = lookup_property(@raw_properties, name)
-        return ActiveElseBlock.new(self) if value.nil?
-        value
-      end
-
-      yield *values
-      InactiveElseBlock.new
-    end
-
-    # @return [Object] Object representation where all hashes are unrolled
-    #   into OpenStruct objects. This exists mostly for backward
-    #   compatibility, as it doesn't provide good error reporting.
-    def openstruct(object)
-      case object
-        when Hash
-          mapped = object.inject({}) { |h, (k,v)| h[k] = openstruct(v); h }
-          OpenStruct.new(mapped)
-        when Array
-          object.map { |item| openstruct(item) }
-        else
-          object
-      end
-    end
-
-    private
-    class ActiveElseBlock
-      def initialize(template_context)
-        @context = template_context
-      end
-
-      def else
-        yield
-      end
-
-      def else_if_p(*names, &block)
-        @context.if_p(*names, &block)
-      end
-    end
-
-    class InactiveElseBlock
-      def else
-      end
-
-      def else_if_p(*names)
-        InactiveElseBlock.new
-      end
-    end
-  end
-end