bosh_cli 1.2657.0 → 1.2669.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600ba43a96360d7442c352820f7d65b32b59768c
-  data.tar.gz: a4215a827e50ad57105d409ce04c3d304641ecc0
+  metadata.gz: 206c482ff9d75e5f49d6bc0950f76bbac870e316
+  data.tar.gz: 06edf9a6c160e702431e5efed54cb8bbc16ed4da
 SHA512:
-  metadata.gz: 641e53d5f4a266d2a22b648ac0fa726803f96504c00fa2776322dd885ba5868a83c78cfb85e2a84c3e44c79ff2dfa1968b0f892d94c1f8d17f770fa7865e1262
-  data.tar.gz: b074a90e8e060b6d8d78f1d3c828806390d307086a1812f9f3dd125cc648fbe14969e18e5db02b67d523f2a0e548d6d6c5df5f3565b7b238c3820e9d13d12f36
+  metadata.gz: f33ee8ddea4a3920d98e28b99b81d23af167ea7df505740b2ce3b06df28f859f03c62376660a6b17083555b0bd35e13e1c9a6cba49d24042bbed5eee2a725be0
+  data.tar.gz: 42ed8b5ca8743042d081163ecb092970489248db2fa75b33466df2effa66ac05383b8e9f861c7e4115d7ac4c12dba309fc1ef4c6aea594a2d7fc4af808bf18ec

data/lib/cli.rb

@@ -31,6 +31,8 @@ require 'zlib'
 require 'archive/tar/minitar'
 include Archive::Tar
 
+require 'bosh/template/evaluation_context'
+
 unless defined?(Bosh::Cli::VERSION)
   require 'cli/version'
 end
@@ -38,9 +40,10 @@ end
 require 'common/common'
 require 'common/exec'
 require 'common/version/release_version'
+require 'common/version/release_version_list'
 require 'common/version/bosh_version'
 require 'common/version/stemcell_version'
-require 'common/properties'
+require 'common/version/stemcell_version_list'
 
 require 'cli/config'
 require 'cli/core_ext'
@@ -58,7 +61,10 @@ require 'cli/director_task'
 require 'cli/line_wrap'
 require 'cli/backup_destination_path'
 
-require 'cli/versions_index'
+require 'cli/versions/versions_index'
+require 'cli/versions/local_version_storage'
+require 'cli/versions/release_versions_index'
+require 'cli/versions/version_file_resolver'
 require 'cli/packaging_helper'
 require 'cli/package_builder'
 require 'cli/job_builder'

data/lib/cli/commands/misc.rb

@@ -59,26 +59,6 @@ module Bosh::Cli::Command
         else
           say("  not set".make_yellow)
         end
-
-        if in_release_dir?
-          nl
-          say("Release".make_green)
-
-          dev_version = Bosh::Cli::VersionsIndex.new(
-            File.join(work_dir, "dev_releases")).latest_version
-
-          final_version = Bosh::Cli::VersionsIndex.new(
-            File.join(work_dir, "releases")).latest_version
-
-          dev = release.dev_name
-          dev += "/#{dev_version}" if dev && dev_version
-
-          final = release.final_name
-          final += "/#{final_version}" if final && final_version
-
-          print_value("dev", dev)
-          print_value("final", final)
-        end
       end
     end
 

data/lib/cli/deployment_helper.rb

@@ -374,7 +374,7 @@ module Bosh::Cli
         end
 
         stemcells.inject({}) do |hash, (name, versions)|
-          hash[name] = Bosh::Common::Version::StemcellVersion.parse_list(versions).latest.to_s
+          hash[name] = Bosh::Common::Version::StemcellVersionList.parse(versions).latest.to_s
           hash
         end
       end

data/lib/cli/job_property_collection.rb

@@ -1,11 +1,12 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
 require 'common/deep_copy'
+require 'bosh/template/property_helper'
 
 module Bosh::Cli
   class JobPropertyCollection
     include Enumerable
-    include Bosh::Common::PropertyHelper
+    include Bosh::Template::PropertyHelper
 
     # @param [JobBuilder] job_builder Which job this property collection is for
     # @param [Hash] global_properties Globally defined properties

data/lib/cli/job_property_validator.rb

@@ -1,4 +1,5 @@
 # Copyright (c) 2009-2012 VMware, Inc.
+require 'bosh/template/evaluation_context'
 
 module Bosh::Cli
   class JobPropertyValidator
@@ -108,7 +109,7 @@ module Bosh::Cli
     # @param [Hash] spec Fake instance spec
     def evaluate_template(job, template_path, spec)
       erb = ERB.new(File.read(template_path))
-      context = Bosh::Common::TemplateEvaluationContext.new(spec)
+      context = Bosh::Template::EvaluationContext.new(spec)
       begin
         erb.result(context.get_binding)
       rescue Exception => e

data/lib/cli/packaging_helper.rb

@@ -8,7 +8,12 @@ module Bosh::Cli
 
     def init_indices
       @dev_index   = VersionsIndex.new(@dev_builds_dir)
+      @dev_storage = LocalVersionStorage.new(@dev_builds_dir)
+
       @final_index = VersionsIndex.new(@final_builds_dir)
+      @final_storage = LocalVersionStorage.new(@final_builds_dir)
+
+      @final_resolver = VersionFileResolver.new(@final_storage, @blobstore)
     end
 
     def final?
@@ -55,47 +60,22 @@ module Bosh::Cli
       end
 
       blobstore_id = item['blobstore_id']
-      version      = fingerprint
+      version      = item['version'] || fingerprint
+      sha1         = item['sha1']
 
       if blobstore_id.nil?
         say('No blobstore id'.make_red)
         return nil
       end
 
-      filename = @final_index.filename(version)
-      need_fetch = true
-
-      if File.exists?(filename)
-        say('FOUND LOCAL'.make_green)
-        if file_checksum(filename) == item['sha1']
-          @tarball_path = filename
-          need_fetch = false
-        else
-          say('LOCAL CHECKSUM MISMATCH'.make_red)
-          need_fetch = true
-        end
-      end
+      desc = "#{name} (#{version})"
 
-      if need_fetch
-        say("Downloading `#{name} (#{version})'...".make_green)
-        tmp_file = File.open(File.join(Dir.mktmpdir, name), 'w')
-        @blobstore.get(blobstore_id, tmp_file)
-        tmp_file.close
-        if Digest::SHA1.file(tmp_file.path).hexdigest == item['sha1']
-          @tarball_path = @final_index.add_version(fingerprint,
-                                                   item,
-                                                   tmp_file.path)
-        else
-          err("`#{name}' (#{version}) is corrupted in blobstore " +
-                  "(id=#{blobstore_id}), " +
-            'please remove it manually and re-generate the final release')
-        end
-      end
+      @tarball_path = @final_resolver.find_file(blobstore_id, sha1, version, "package #{desc}")
 
       @version = version
       @used_final_version = true
       true
-    rescue Bosh::Blobstore::NotFound => e
+    rescue Bosh::Blobstore::NotFound
       raise BlobstoreError, "Final version of `#{name}' not found in blobstore"
     rescue Bosh::Blobstore::BlobstoreError => e
       raise BlobstoreError, "Blobstore error: #{e}"
@@ -110,24 +90,31 @@ module Bosh::Cli
         return nil
       end
 
-      version = fingerprint
-      filename = @dev_index.filename(version)
+      version = @dev_index['version'] || fingerprint
 
-      if File.exists?(filename)
-        say('FOUND LOCAL'.make_green)
-      else
+      if !@dev_storage.has_file?(version)
         say('TARBALL MISSING'.make_red)
         return nil
       end
 
-      if file_checksum(filename) == item['sha1']
-        @tarball_path = filename
-        @version = version
-        @used_dev_version = true
-      else
+      say('FOUND LOCAL'.make_green)
+      @tarball_path = @dev_storage.get_file(version)
+
+      if file_checksum(@tarball_path) != item['sha1']
         say("`#{name} (#{version})' tarball corrupted".make_red)
         return nil
       end
+
+      if final? && !dry_run?
+        # copy from dev index/storage to final index/storage
+        @final_index.add_version(fingerprint, item)
+        @tarball_path = @final_storage.put_file(version, @tarball_path)
+        item['sha1'] = Digest::SHA1.file(@tarball_path).hexdigest
+        @final_index.update_version(fingerprint, item)
+      end
+
+      @version = version
+      @used_dev_version = true
     end
 
     def generate_tarball
@@ -150,12 +137,18 @@ module Bosh::Cli
       }
 
       if final?
-        @final_index.add_version(fingerprint, item, tmp_file.path)
-        @tarball_path = @final_index.filename(version)
+        # add version (with its validation) before adding sha1
+        @final_index.add_version(fingerprint, item)
+        @tarball_path = @final_storage.put_file(fingerprint, tmp_file.path)
+        item['sha1'] = file_checksum(@tarball_path)
+        @final_index.update_version(fingerprint, item)
       elsif dry_run?
       else
-        @dev_index.add_version(fingerprint, item, tmp_file.path)
-        @tarball_path = @dev_index.filename(version)
+        # add version (with its validation) before adding sha1
+        @dev_index.add_version(fingerprint, item)
+        @tarball_path = @dev_storage.put_file(fingerprint, tmp_file.path)
+        item['sha1'] = file_checksum(@tarball_path)
+        @dev_index.update_version(fingerprint, item)
       end
 
       @version = version
@@ -167,29 +160,25 @@ module Bosh::Cli
     def upload_tarball(path)
       item = @final_index[fingerprint]
 
-      say("Uploading final version #{version}...")
+      unless item
+        say("Failed to find entry `#{fingerprint}' in index, check local storage")
+        return
+      end
 
-      if item
-        say('This package has already been uploaded')
+      if item['blobstore_id']
         return
       end
 
-      version = fingerprint
+      say("Uploading final version `#{version}'...")
 
       blobstore_id = nil
       File.open(path, 'r') do |f|
         blobstore_id = @blobstore.create(f)
       end
 
-      item = {
-        'blobstore_id' => blobstore_id,
-        'version' => version
-      }
-
-      say("Uploaded, blobstore id #{blobstore_id}")
-      @final_index.add_version(fingerprint, item, path)
-      @tarball_path = @final_index.filename(version)
-      @version = version
+      say("Uploaded, blobstore id `#{blobstore_id}'")
+      item['blobstore_id'] = blobstore_id
+      @final_index.update_version(fingerprint, item)
       @promoted = true
       true
     rescue Bosh::Blobstore::BlobstoreError => e
@@ -226,4 +215,3 @@ module Bosh::Cli
     end
   end
 end
-

data/lib/cli/release_builder.rb

@@ -21,11 +21,14 @@ module Bosh::Cli
 
       raise ReleaseVersionError.new('Version numbers cannot be specified for dev releases') if (@version && !@final)
 
-      @final_index = VersionsIndex.new(final_releases_dir, release_name)
-      @dev_index = VersionsIndex.new(dev_releases_dir, release_name)
+      @final_index = VersionsIndex.new(final_releases_dir)
+      @dev_index = VersionsIndex.new(dev_releases_dir)
       @index = @final ? @final_index : @dev_index
+      @release_storage = LocalVersionStorage.new(@index.storage_dir, release_name)
 
-      raise ReleaseVersionError.new('Release version already exists') if (@version && @index.version_exists?(@version))
+      if @version && @release_storage.has_file?(@version)
+        raise ReleaseVersionError.new('Release version already exists')
+      end
 
       @build_dir = Dir.mktmpdir
 
@@ -136,19 +139,12 @@ module Bosh::Cli
       manifest["name"] = release_name
 
       unless manifest["name"].bosh_valid_id?
-        raise InvalidRelease, "Release name `#{manifest["name"]}' " +
-                              "is not a valid BOSH identifier"
+        raise InvalidRelease, "Release name `#{manifest["name"]}' is not a valid BOSH identifier"
       end
 
-      fingerprint = make_fingerprint(manifest)
-
-      if @index[fingerprint]
-        old_version = @index[fingerprint]["version"]
-        say("This version is no different from version #{old_version}")
-        @version = old_version
-      else
-        @index.add_version(fingerprint, { "version" => version })
-      end
+      # New release versions are allowed to have the same fingerprint as old versions.
+      # For reverse compatibility, random uuids are stored instead.
+      @index.add_version(SecureRandom.uuid, { "version" => version })
 
       manifest["version"] = version
       manifest_yaml = Psych.dump(manifest)
@@ -167,7 +163,7 @@ module Bosh::Cli
 
     def generate_tarball
       generate_manifest unless @manifest_generated
-      return if @index.version_exists?(version)
+      return if @release_storage.has_file?(@version)
 
       unless @jobs_copied
         header("Copying jobs...")
@@ -211,22 +207,10 @@ module Bosh::Cli
       File.join(releases_dir, "#{release_name}-#{version}.yml")
     end
 
-    def make_fingerprint(item)
-      case item
-      when Array
-        source = item.map { |e| make_fingerprint(e) }.sort.join("")
-      when Hash
-        source = item.keys.sort.map{ |k| make_fingerprint(item[k]) }.join("")
-      else
-        source = item.to_s
-      end
-      Digest::SHA1.hexdigest(source)
-    end
-
     private
 
     def assign_version
-      latest_final_version = Bosh::Common::Version::ReleaseVersion.parse_list(@final_index.versions).latest
+      latest_final_version = ReleaseVersionsIndex.new(@final_index).latest_version
       latest_final_version ||= Bosh::Common::Version::ReleaseVersion.parse('0')
 
       if @final
@@ -234,7 +218,7 @@ module Bosh::Cli
         latest_final_version.increment_release
       else
         # Increment or Reset the post-release segment
-        dev_versions = Bosh::Common::Version::ReleaseVersion.parse_list(@dev_index.versions)
+        dev_versions = ReleaseVersionsIndex.new(@dev_index).versions
         latest_dev_version = dev_versions.latest_with_pre_release(latest_final_version)
 
         if latest_dev_version

data/lib/cli/release_compiler.rb

@@ -45,9 +45,7 @@ module Bosh::Cli
         quit("You already have this version in `#{tarball_path.make_green}'")
       end
 
-      FileUtils.cp(@manifest_file,
-                   File.join(@build_dir, "release.MF"),
-                   :preserve => true)
+      FileUtils.cp(@manifest_file, File.join(@build_dir, "release.MF"), :preserve => true)
 
       header("Copying packages")
       @packages.each do |package|
@@ -56,11 +54,8 @@ module Bosh::Cli
           say("SKIP".make_yellow)
           next
         end
-        package_filename = find_package(package)
-        if package_filename.nil?
-          err("Cannot find package `#{package.name} (#{package.version})'")
-        end
-        FileUtils.cp(package_filename,
+        package_file_path = find_package(package)
+        FileUtils.cp(package_file_path,
                      File.join(@packages_dir, "#{package.name}.tgz"),
                      :preserve => true)
       end
@@ -72,11 +67,8 @@ module Bosh::Cli
           say("SKIP".make_yellow)
           next
         end
-        job_filename = find_job(job)
-        if job_filename.nil?
-          err("Cannot find job `#{job.name} (#{job.version})")
-        end
-        FileUtils.cp(job_filename,
+        job_file_path = find_job(job)
+        FileUtils.cp(job_file_path,
                      File.join(@jobs_dir, "#{job.name}.tgz"),
                      :preserve => true)
       end
@@ -102,63 +94,49 @@ module Bosh::Cli
     end
 
     def find_package(package)
-      final_index = VersionsIndex.new(
-          File.join(@release_dir, ".final_builds", "packages", package.name))
-      dev_index = VersionsIndex.new(
-          File.join(@release_dir, ".dev_builds", "packages", package.name))
-      find_in_indices(final_index, dev_index, package)
+      final_package_dir = File.join(@release_dir, ".final_builds", "packages", package.name)
+      final_index = VersionsIndex.new(final_package_dir)
+      dev_package_dir = File.join(@release_dir, ".dev_builds", "packages", package.name)
+      dev_index = VersionsIndex.new(dev_package_dir)
+      find_in_indices(final_index, dev_index, package, 'package')
     end
 
     def find_job(job)
-      final_index = VersionsIndex.new(
-          File.join(@release_dir, ".final_builds", "jobs", job.name))
-      dev_index = VersionsIndex.new(
-          File.join(@release_dir, ".dev_builds", "jobs", job.name))
-      find_in_indices(final_index, dev_index, job)
+      final_jobs_dir = File.join(@release_dir, ".final_builds", "jobs", job.name)
+      final_index = VersionsIndex.new(final_jobs_dir)
+      dev_jobs_dir = File.join(@release_dir, ".dev_builds", "jobs", job.name)
+      dev_index = VersionsIndex.new(dev_jobs_dir)
+      find_in_indices(final_index, dev_index, job, 'job')
     end
 
-    def find_in_indices(final_index, dev_index, object)
-      desc = "#{object.name} (#{object.version})"
+    def find_version_by_sha1(index, sha1)
+      index.select{ |_, build| build['sha1'] == sha1 }.values.first
+    end
+
+    def find_in_indices(final_index, dev_index, build, build_type)
+      desc = "#{build.name} (#{build.version})"
 
       index = final_index
-      build_data = index.find_by_checksum(object.sha1)
+      found_build = find_version_by_sha1(index, build.sha1)
 
-      if build_data.nil?
+      if found_build.nil?
         index = dev_index
-        build_data = index.find_by_checksum(object.sha1)
+        found_build = find_version_by_sha1(index, build.sha1)
       end
 
-      if build_data.nil?
+      if found_build.nil?
         say("MISSING".make_red)
-        err("Cannot find object with given checksum")
+        err("Cannot find #{build_type} with checksum `#{build.sha1}'")
       end
 
-      version = build_data["version"]
-      sha1 = build_data["sha1"]
-      blobstore_id = build_data["blobstore_id"]
-      filename = index.filename(version)
+      version = found_build["version"]
+      sha1 = found_build["sha1"]
+      blobstore_id = found_build["blobstore_id"]
 
-      if File.exists?(filename)
-        say("FOUND LOCAL".make_green)
-        if Digest::SHA1.file(filename) != sha1
-          err("#{desc} is corrupted locally")
-        end
-      elsif blobstore_id
-        say("FOUND REMOTE".make_yellow)
-        say("Downloading #{blobstore_id.to_s.make_green}...")
-        tmp_file = Tempfile.new("")
-        @blobstore.get(blobstore_id, tmp_file)
-        tmp_file.close
-
-        if Digest::SHA1.file(tmp_file.path).hexdigest == sha1
-          FileUtils.mv(tmp_file.path, filename)
-        else
-          err("#{desc} is corrupted in blobstore (id=#{blobstore_id})")
-        end
-      end
-
-      File.exists?(filename) ? filename : nil
+      storage = LocalVersionStorage.new(index.storage_dir)
 
+      resolver = VersionFileResolver.new(storage, @blobstore)
+      resolver.find_file(blobstore_id, sha1, version, "#{build_type} #{desc}")
     rescue Bosh::Blobstore::BlobstoreError => e
       raise BlobstoreError, "Blobstore error: #{e}"
     end
@@ -180,5 +158,4 @@ module Bosh::Cli
       false
     end
   end
-
 end

data/lib/cli/version.rb

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

data/lib/cli/versions/local_version_storage.rb

@@ -0,0 +1,41 @@
+module Bosh::Cli
+  class LocalVersionStorage
+
+    class Sha1MismatchError < StandardError; end
+
+    attr_reader :storage_dir
+
+    def initialize(storage_dir, name_prefix=nil)
+      @storage_dir = storage_dir
+      @name_prefix = name_prefix
+    end
+
+    def put_file(version, src_file_path)
+      destination = file_path(version)
+      unless File.exist?(src_file_path)
+        raise "Trying to store non-existant file `#{src_file_path}' for version `#{version}'"
+      end
+      FileUtils.cp(src_file_path, destination, :preserve => true)
+
+      File.expand_path(destination)
+    end
+
+    def get_file(version)
+      destination = file_path(version)
+      unless File.exist?(destination)
+        raise "Trying to retrieve non-existant file `#{destination}' for version `#{version}'"
+      end
+
+      File.expand_path(destination)
+    end
+
+    def has_file?(version)
+      File.exists?(file_path(version))
+    end
+
+    def file_path(version)
+      name = @name_prefix.blank? ? "#{version}.tgz" : "#{@name_prefix}-#{version}.tgz"
+      File.join(@storage_dir, name)
+    end
+  end
+end

data/lib/cli/versions/release_versions_index.rb

@@ -0,0 +1,18 @@
+module Bosh::Cli
+  class ReleaseVersionsIndex
+
+    def initialize(versions_index)
+      @versions_index = versions_index
+    end
+
+    def latest_version
+      version_strings = @versions_index.version_strings
+      return nil if version_strings.empty?
+      Bosh::Common::Version::ReleaseVersionList.parse(version_strings).latest
+    end
+
+    def versions
+      Bosh::Common::Version::ReleaseVersionList.parse(@versions_index.version_strings)
+    end
+  end
+end

data/lib/cli/versions/version_file_resolver.rb

@@ -0,0 +1,49 @@
+module Bosh::Cli
+  class VersionFileResolver
+
+    def initialize(storage, blobstore, tmpdir=Dir.tmpdir)
+      @storage = storage
+      @blobstore = blobstore
+      @tmpdir = tmpdir
+    end
+
+    def find_file(blobstore_id, sha1, version, desc)
+      if @storage.has_file?(version)
+        say('FOUND LOCAL'.make_green)
+        file_path = @storage.get_file(version)
+        file_sha1 = Digest::SHA1.file(file_path).hexdigest
+        if file_sha1 == sha1
+          return file_path
+        end
+        say("SHA1 `#{file_sha1}' of #{desc} does not match expected SHA1 `#{sha1}'".make_red)
+      end
+
+      if blobstore_id.nil?
+        err("Cannot find #{desc}")
+      end
+
+      say('FOUND REMOTE'.make_yellow)
+      say("Downloading #{desc} from blobstore (id=#{blobstore_id})...".make_green)
+
+      tmp_file_path = File.join(@tmpdir, "bosh-tmp-file-#{SecureRandom.uuid}")
+      begin
+        File.open(tmp_file_path, 'w') do |tmp_file|
+          @blobstore.get(blobstore_id, tmp_file)
+        end
+
+        file_sha1 = Digest::SHA1.file(tmp_file_path).hexdigest
+        if file_sha1 != sha1
+          err("SHA1 `#{file_sha1}' of #{desc} from blobstore (id=#{blobstore_id}) " +
+            "does not match expected SHA1 `#{sha1}'" +
+            'please remove it manually and re-create the release')
+        end
+
+        @storage.put_file(version, tmp_file_path)
+      ensure
+        FileUtils.rm(tmp_file_path, :force => true)
+      end
+    end
+
+
+  end
+end

data/lib/cli/versions/versions_index.rb

@@ -0,0 +1,119 @@
+module Bosh::Cli
+  class VersionsIndex
+
+    attr_reader :index_file
+    attr_reader :storage_dir
+
+    def initialize(storage_dir)
+      @storage_dir = File.expand_path(storage_dir)
+      @index_file  = File.join(@storage_dir, 'index.yml')
+
+      if File.file?(@index_file)
+        init_index(load_yaml_file(@index_file, nil))
+      else
+        init_index({})
+      end
+    end
+
+    def [](key)
+      @data['builds'][key]
+    end
+
+    def each_pair(&block)
+      @data['builds'].each_pair(&block)
+    end
+
+    def latest_version
+      builds = @data['builds'].values
+
+      return nil if builds.empty?
+
+      version_strings = builds.map { |b| b['version'] }
+      Bosh::Common::Version::ReleaseVersionList.parse(version_strings).latest.to_s
+    end
+
+    def select(&block)
+      @data['builds'].select(&block)
+    end
+
+    # both (tmp_file_path=nil only used by release)
+    def add_version(new_key, new_build)
+      version = new_build['version']
+
+      if version.blank?
+        raise InvalidIndex, "Cannot save index entry without a version: `#{new_build}'"
+      end
+
+      if @data['builds'][new_key]
+        raise "Trying to add duplicate entry `#{new_key}' into index `#{@index_file}'"
+      end
+
+      self.each_pair do |key, build|
+        if build['version'] == version && key != new_key
+          raise "Trying to add duplicate version `#{version}' into index `#{@index_file}'"
+        end
+      end
+
+      create_directories
+
+      @data['builds'][new_key] = new_build
+
+      File.open(@index_file, 'w') do |f|
+        f.write(Psych.dump(@data))
+      end
+
+      version
+    end
+
+    def update_version(key, new_build)
+      old_build = @data['builds'][key]
+      unless old_build
+        raise "Cannot update non-existent entry with key `#{key}'"
+      end
+
+      if new_build['version'] != old_build['version']
+        raise "Cannot update entry `#{old_build}' with a different version: `#{new_build}'"
+      end
+
+      @data['builds'][key] = new_build
+
+      File.open(@index_file, 'w') do |f|
+        f.write(Psych.dump(@data))
+      end
+    end
+
+    def version_strings
+      @data['builds'].map { |_, build| build['version'].to_s }
+    end
+
+    def to_s
+      @data['builds'].to_s
+    end
+
+    private
+
+    def create_directories
+      begin
+        FileUtils.mkdir_p(@storage_dir)
+      rescue SystemCallError => e
+        raise InvalidIndex, "Cannot create index storage directory: #{e}"
+      end
+
+      begin
+        FileUtils.touch(@index_file)
+      rescue SystemCallError => e
+        raise InvalidIndex, "Cannot create index file: #{e}"
+      end
+    end
+
+    def init_index(data)
+      data ||= {}
+
+      unless data.kind_of?(Hash)
+        raise InvalidIndex, "Invalid versions index data type, #{data.class} given, Hash expected"
+      end
+      @data = data
+      @data['builds'] ||= {}
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 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: bosh_common
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2657.0
+        version: 1.2669.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2657.0
+        version: 1.2669.0
+- !ruby/object:Gem::Dependency
+  name: bosh-template
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2669.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2669.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2657.0
+        version: 1.2669.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2657.0
+        version: 1.2669.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +194,7 @@ dependencies:
         version: 0.5.4
 description: |-
   BOSH CLI
-  a6c527
+  bf0b96
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -268,7 +282,10 @@ files:
 - lib/cli/task_tracking/total_duration.rb
 - lib/cli/validation.rb
 - lib/cli/version.rb
-- lib/cli/versions_index.rb
+- lib/cli/versions/local_version_storage.rb
+- lib/cli/versions/release_versions_index.rb
+- lib/cli/versions/version_file_resolver.rb
+- lib/cli/versions/versions_index.rb
 - lib/cli/vm_state.rb
 - lib/cli/yaml_helper.rb
 homepage: https://github.com/cloudfoundry/bosh

data/lib/cli/versions_index.rb

@@ -1,111 +0,0 @@
-module Bosh::Cli
-  class VersionsIndex
-
-    def initialize(storage_dir, name_prefix = nil)
-      @storage_dir = File.expand_path(storage_dir)
-      @index_file  = File.join(@storage_dir, "index.yml")
-      @name_prefix = name_prefix
-
-      if File.file?(@index_file)
-        init_index(load_yaml_file(@index_file, nil))
-      else
-        init_index({})
-      end
-    end
-
-    def find_by_checksum(checksum)
-      @data["builds"].each_pair do |fingerprint, build_data|
-        return build_data if build_data["sha1"] == checksum
-      end
-      nil
-    end
-
-    def [](fingerprint)
-      @data["builds"][fingerprint]
-    end
-
-    def latest_version
-      builds = @data["builds"].values
-
-      return nil if builds.empty?
-
-      version_strings = builds.map { |b| b["version"] }
-      Bosh::Common::Version::ReleaseVersion.parse_list(version_strings).latest.to_s
-    end
-
-    def version_exists?(version)
-      File.exists?(filename(version))
-    end
-
-    def add_version(fingerprint, item, tmp_file_path = nil)
-      version = item["version"]
-
-      if version.blank?
-        raise InvalidIndex,
-              "Cannot save index entry without knowing its version"
-      end
-
-      create_directories
-
-      if tmp_file_path
-        FileUtils.cp(tmp_file_path, filename(version), :preserve => true)
-      end
-
-      @data["builds"].each_pair do |fp, build|
-        if build["version"] == version && fp != fingerprint
-          raise "Trying to add duplicate version `#{version}' " +
-                    "into index `#{@index_file}'"
-        end
-      end
-
-      @data["builds"][fingerprint] = item
-      if tmp_file_path
-        file_sha1 = Digest::SHA1.file(tmp_file_path).hexdigest
-        @data["builds"][fingerprint]["sha1"] = file_sha1
-      end
-
-      File.open(@index_file, "w") do |f|
-        f.write(Psych.dump(@data))
-      end
-
-      File.expand_path(filename(version))
-    end
-
-    def filename(version)
-      name = @name_prefix.blank? ?
-          "#{version}.tgz" : "#{@name_prefix}-#{version}.tgz"
-      File.join(@storage_dir, name)
-    end
-
-    def versions
-      @data['builds'].map { |_, build| build['version'] }
-    end
-
-    private
-
-    def create_directories
-      begin
-        FileUtils.mkdir_p(@storage_dir)
-      rescue SystemCallError => e
-        raise InvalidIndex, "Cannot create index storage directory: #{e}"
-      end
-
-      begin
-        FileUtils.touch(@index_file)
-      rescue SystemCallError => e
-        raise InvalidIndex, "Cannot create index file: #{e}"
-      end
-    end
-
-    def init_index(data)
-      data ||= {}
-
-      unless data.kind_of?(Hash)
-        raise InvalidIndex, "Invalid versions index data type, " +
-            "#{data.class} given, Hash expected"
-      end
-      @data = data
-      @data["builds"] ||= {}
-    end
-  end
-end