bosh_cli 1.2549.0 → 1.2559.0

data/lib/cli/commands/job_rename.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli::Command
   class JobRename < Base
     # bosh rename

data/lib/cli/deployment_helper.rb

@@ -1,9 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   module DeploymentHelper
-    include VersionCalc
-
     def prepare_deployment_manifest(options = {})
       deployment_required
       manifest_filename = deployment
@@ -372,7 +368,7 @@ module Bosh::Cli
         end
 
         stemcells.inject({}) do |hash, (name, versions)|
-          hash[name] = versions.sort { |v1, v2| version_cmp(v2, v1) }.first
+          hash[name] = versions.map { |v| Bosh::Common::VersionNumber.new(v) }.max.to_s
           hash
         end
       end

data/lib/cli/job_builder.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   class JobBuilder
     include PackagingHelper
@@ -236,7 +234,8 @@ module Bosh::Cli
     private
 
     def make_fingerprint
-      contents = ""
+      versioning_scheme = 2
+      contents = "v#{versioning_scheme}"
 
       files = all_templates
       files << File.join(job_dir, "spec")

data/lib/cli/package_builder.rb

@@ -211,7 +211,8 @@ module Bosh::Cli
     private
 
     def make_fingerprint
-      contents = ""
+      versioning_scheme = 2
+      contents = "v#{versioning_scheme}"
 
       signatures = glob_matches.map do |match|
         file_digest = nil

data/lib/cli/packaging_helper.rb

@@ -1,13 +1,9 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 # This relies on having the following instance variables in a host class:
 # @dev_builds_dir, @final_builds_dir, @blobstore,
 # @name, @version, @tarball_path, @final, @artefact_type
 
 module Bosh::Cli
   module PackagingHelper
-    include Bosh::Cli::VersionCalc
-
     attr_accessor :dry_run
 
     def init_indices
@@ -27,32 +23,21 @@ module Bosh::Cli
       @tarball_generated || @promoted || @will_be_promoted
     end
 
-    def older_version?
-      if @tarball_generated
-        false
-      elsif @used_final_version
-        version_cmp(@version, @final_index.latest_version) < 0
-      else
-        version_cmp(@version, @dev_index.latest_version) < 0
-      end
-    end
-
     def notes
       notes = []
 
       if @will_be_promoted
-        new_final_version = @final_index.latest_version.to_i + 1
+        new_final_version = @version
         notes << "new final version #{new_final_version}"
       elsif new_version?
-        notes << "new version"
+        notes << 'new version'
       end
 
-      notes << "older than latest" if older_version?
       notes
     end
 
     def build
-      with_indent("  ") do
+      with_indent('  ') do
         use_final_version || use_dev_version || generate_tarball
       end
       upload_tarball(@tarball_path) if final? && !dry_run?
@@ -60,20 +45,20 @@ module Bosh::Cli
     end
 
     def use_final_version
-      say("Final version:", " ")
+      say('Final version:', ' ')
 
       item = @final_index[fingerprint]
 
       if item.nil?
-        say("NOT FOUND".make_red)
+        say('NOT FOUND'.make_red)
         return nil
       end
 
-      blobstore_id = item["blobstore_id"]
-      version      = item["version"]
+      blobstore_id = item['blobstore_id']
+      version      = fingerprint
 
       if blobstore_id.nil?
-        say("No blobstore id".make_red)
+        say('No blobstore id'.make_red)
         return nil
       end
 
@@ -81,29 +66,29 @@ module Bosh::Cli
       need_fetch = true
 
       if File.exists?(filename)
-        say("FOUND LOCAL".make_green)
-        if file_checksum(filename) == item["sha1"]
+        say('FOUND LOCAL'.make_green)
+        if file_checksum(filename) == item['sha1']
           @tarball_path = filename
           need_fetch = false
         else
-          say("LOCAL CHECKSUM MISMATCH".make_red)
+          say('LOCAL CHECKSUM MISMATCH'.make_red)
           need_fetch = true
         end
       end
 
       if need_fetch
         say("Downloading `#{name} (#{version})'...".make_green)
-        tmp_file = File.open(File.join(Dir.mktmpdir, name), "w")
+        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"]
+        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")
+            'please remove it manually and re-generate the final release')
         end
       end
 
@@ -117,25 +102,25 @@ module Bosh::Cli
     end
 
     def use_dev_version
-      say("Dev version:", "   ")
+      say('Dev version:', '   ')
       item = @dev_index[fingerprint]
 
       if item.nil?
-        say("NOT FOUND".make_red)
+        say('NOT FOUND'.make_red)
         return nil
       end
 
-      version = item["version"]
+      version = fingerprint
       filename = @dev_index.filename(version)
 
       if File.exists?(filename)
-        say("FOUND LOCAL".make_green)
+        say('FOUND LOCAL'.make_green)
       else
-        say("TARBALL MISSING".make_red)
+        say('TARBALL MISSING'.make_red)
         return nil
       end
 
-      if file_checksum(filename) == item["sha1"]
+      if file_checksum(filename) == item['sha1']
         @tarball_path = filename
         @version = version
         @used_dev_version = true
@@ -147,20 +132,17 @@ module Bosh::Cli
 
     def generate_tarball
       if final?
-        err_message = "No matching build found for " +
+        err_message = 'No matching build found for ' +
             "`#{@name}' #{@artefact_type}.\n" +
             "Please consider creating a dev release first.\n" +
             "The fingerprint is `#{fingerprint}'."
         err(err_message)
       end
 
-      current_final = @final_index.latest_version.to_i
-      new_minor = minor_version(@dev_index.latest_version(current_final)) + 1
-
-      version = "#{current_final}.#{new_minor}-dev"
+      version = fingerprint
       tmp_file = Tempfile.new(name)
 
-      say("Generating...")
+      say('Generating...')
 
       copy_files
 
@@ -172,7 +154,7 @@ module Bosh::Cli
       end
 
       item = {
-        "version" => version
+        'version' => version
       }
 
       unless dry_run?
@@ -192,20 +174,20 @@ module Bosh::Cli
       say("Uploading final version #{version}...")
 
       if item
-        say("This package has already been uploaded")
+        say('This package has already been uploaded')
         return
       end
 
-      version = @final_index.latest_version.to_i + 1
+      version = fingerprint
 
       blobstore_id = nil
-      File.open(path, "r") do |f|
+      File.open(path, 'r') do |f|
         blobstore_id = @blobstore.create(f)
       end
 
       item = {
-        "blobstore_id" => blobstore_id,
-        "version" => version
+        'blobstore_id' => blobstore_id,
+        'version' => version
       }
 
       say("Uploaded, blobstore id #{blobstore_id}")
@@ -227,7 +209,7 @@ module Bosh::Cli
         file_checksum(@tarball_path)
       else
         raise RuntimeError,
-              "cannot read checksum for not yet generated package/job"
+          'cannot read checksum for not yet generated package/job'
       end
     end
 
@@ -239,11 +221,11 @@ module Bosh::Cli
     # fingerprints to change, hence the exact values below.
     def tracked_permissions(path)
       if File.directory?(path)
-        "40755"
+        '40755'
       elsif File.executable?(path)
-        "100755"
+        '100755'
       else
-        "100644"
+        '100644'
       end
     end
   end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2549.0'
+    VERSION = '1.2559.0'
   end
 end

data/lib/cli/version_calc.rb

@@ -1,7 +1,10 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 require 'common/version_number'
 
+##
+# This module is in general unsafe to use as packages and jobs
+# use their fingerprints as versions and therefore are not numerically
+# comparable. At the moment releases retain a numerically comparable
+# version which necessitates this code
 module Bosh::Cli
   module VersionCalc
 

data/lib/cli/versions_index.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   class VersionsIndex
     include VersionCalc
@@ -27,6 +25,14 @@ module Bosh::Cli
       @data["builds"][fingerprint]
     end
 
+    ##
+    # Return the last version from the version index file
+    # as jobs and packages have a non-numeric versioning
+    # scheme based on their fingerprint. This function relies
+    # on hash insertion order being preserved. While this
+    # is the behavior for Ruby 1.9.X and 2.X we should
+    # remember that this implementation is
+    # a little brittle.
     def latest_version(major = nil)
       builds = @data["builds"].values
 
@@ -38,16 +44,7 @@ module Bosh::Cli
 
       return nil if builds.empty?
 
-      sorted = builds.sort do |build1, build2|
-        cmp = version_cmp(build2["version"], build1["version"])
-        if cmp == 0
-          raise "There is a duplicate version `#{build1["version"]}' " +
-                  "in index `#{@index_file}'"
-        end
-        cmp
-      end
-
-      sorted[0]["version"]
+      builds.last["version"]
     end
 
     def version_exists?(version)
@@ -69,7 +66,7 @@ module Bosh::Cli
       end
 
       @data["builds"].each_pair do |fp, build|
-        if version_cmp(build["version"], version) == 0 && fp != fingerprint
+        if build["version"] == version && fp != fingerprint
           raise "Trying to add duplicate version `#{version}' " +
                     "into index `#{@index_file}'"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2549.0
+  version: 1.2559.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2549.0
+        version: 1.2559.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2549.0
+        version: 1.2559.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2549.0
+        version: 1.2559.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2549.0
+        version: 1.2559.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  0d3835'
+  664e0d'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -382,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2582591083377905506
+      hash: 850142297051739399
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23