bosh_cli 1.2579.0 → 1.2596.0

data/lib/cli.rb

@@ -37,12 +37,15 @@ end
 
 require 'common/common'
 require 'common/exec'
+require 'common/version/release_version'
+require 'common/version/bosh_version'
+require 'common/version/stemcell_version'
+require 'common/properties'
 
 require 'cli/config'
 require 'cli/core_ext'
 require 'cli/errors'
 require 'cli/yaml_helper'
-require 'cli/version_calc'
 require 'cli/dependency_helper'
 require 'cli/deployment_manifest'
 require 'cli/manifest_warnings'
@@ -72,7 +75,6 @@ require 'cli/blob_manager'
 
 require 'cli/logs_downloader'
 
-require 'common/properties'
 require 'cli/job_property_collection'
 require 'cli/job_property_validator'
 

data/lib/cli/client/director.rb

@@ -1,5 +1,4 @@
 # Copyright (c) 2009-2012 VMware, Inc.
-require 'cli/version_calc'
 require 'cli/core_ext'
 require 'cli/errors'
 
@@ -12,7 +11,6 @@ module Bosh
   module Cli
     module Client
       class Director
-        include Bosh::Cli::VersionCalc
 
         DIRECTOR_HTTP_ERROR_CODES = [400, 403, 404, 500]
 
@@ -124,7 +122,8 @@ module Bosh
         end
 
         def list_running_tasks(verbose = 1)
-          if version_less(get_version, '0.3.5')
+
+          if Bosh::Common::Version::BoshVersion.parse(get_version) < Bosh::Common::Version::BoshVersion.parse('0.3.5')
             get_json('/tasks?state=processing')
           else
             get_json('/tasks?state=processing,cancelling,queued' +
@@ -199,7 +198,7 @@ module Bosh
           url = "/stemcells/#{name}/#{version}"
 
           extras = []
-          extras << 'force=true' if force
+          extras << ['force', 'true'] if force
 
           request_and_track(:delete, add_query_string(url, extras), options)
         end
@@ -211,7 +210,7 @@ module Bosh
           url = "/deployments/#{name}"
 
           extras = []
-          extras << 'force=true' if force
+          extras << ['force', 'true'] if force
 
           request_and_track(:delete, add_query_string(url, extras), options)
         end
@@ -224,8 +223,8 @@ module Bosh
           url = "/releases/#{name}"
 
           extras = []
-          extras << 'force=true' if force
-          extras << "version=#{version}" if version
+          extras << ['force', 'true'] if force
+          extras << ['version', version] if version
 
           request_and_track(:delete, add_query_string(url, extras), options)
         end
@@ -240,7 +239,7 @@ module Bosh
           url = '/deployments'
 
           extras = []
-          extras << 'recreate=true' if recreate
+          extras << ['recreate', 'true'] if recreate
 
           request_and_track(:post, add_query_string(url, extras), options)
         end
@@ -325,8 +324,8 @@ module Bosh
           url = "/deployments/#{deployment_name}/jobs/#{old_name}"
 
           extras = []
-          extras << "new_name=#{new_name}"
-          extras << 'force=true' if force
+          extras << ['new_name', new_name]
+          extras << ['force', 'true'] if force
 
           options[:content_type] = 'text/yaml'
           options[:payload]      = manifest_yaml
@@ -730,7 +729,7 @@ module Bosh
 
         def add_query_string(url, parts)
           if parts.size > 0
-            "#{url}?#{parts.join('&')}"
+            "#{url}?#{URI.encode_www_form(parts)}"
           else
             url
           end

data/lib/cli/command_handler.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   class CommandHandler
 
@@ -15,6 +13,8 @@ module Bosh::Cli
     # @return [Bosh::Cli::Runner]
     attr_accessor :runner
 
+    attr_reader :options
+
     # @param [Class] klass
     # @param [UnboundMethod] method
     # @param [String] usage
@@ -56,7 +56,7 @@ module Bosh::Cli
       begin
         command.send(@method.name, *args)
         command.exit_code
-      rescue ArgumentError => e
+      rescue ArgumentError => _
         err("Usage: #{usage_with_params}")
       end
     end
@@ -131,4 +131,4 @@ module Bosh::Cli
     end
 
   end
-end
+end

data/lib/cli/commands/maintenance.rb

@@ -2,7 +2,6 @@
 
 module Bosh::Cli::Command
   class Maintenance < Base
-    include Bosh::Cli::VersionCalc
 
     RELEASES_TO_KEEP = 2
     STEMCELLS_TO_KEEP = 2
@@ -57,12 +56,13 @@ module Bosh::Cli::Command
 
       delete_list = []
       say('Deleting old stemcells')
-
-      stemcells_by_name.each_pair do |name, stemcells|
-        stemcells.sort! do |sc1, sc2|
-          version_cmp(sc1['version'], sc2['version'])
+      stemcells_by_name.each_pair do |_, stemcells|
+        stemcells.reject! { |stemcell| !stemcell['deployments'].empty? }
+        sorted_stemcells = stemcells.sort do |sc1, sc2|
+          Bosh::Common::Version::StemcellVersion.parse(sc1['version']) <=> Bosh::Common::Version::StemcellVersion.parse(sc2['version'])
         end
-        delete_list += stemcells[0...(-n_to_keep)]
+
+        delete_list += sorted_stemcells[0...(-n_to_keep)]
       end
 
       if delete_list.size > 0
@@ -84,16 +84,27 @@ module Bosh::Cli::Command
 
       director.list_releases.each do |release|
         name = release['name']
-        versions = if release['versions']
-          release['versions']
+        if release['release_versions']
+          # reverse compatibility with old director response format
+          versions = release['release_versions'].map { |release_version| release_version['version'] }
+          currently_deployed = release['release_versions'].
+            select { |release_version| release_version['currently_deployed'] }.
+            map{ |release_version| release_version['version'] }
         else
-          release['release_versions'].map { |release_version| release_version['version'] }
+          versions = release['versions']
+          currently_deployed = release['in_use']
         end
 
-        versions.sort! { |v1, v2| version_cmp(v1, v2) }
+        version_tuples = versions.map do |v|
+          {
+            provided: v,
+            parsed: Bosh::Common::Version::ReleaseVersion.parse(v)
+          }
+        end
+        versions = version_tuples.sort_by { |v| v[:parsed] }.map { |v| v[:provided] }
 
         versions[0...(-n_to_keep)].each do |version|
-          delete_list << [name, version]
+          delete_list << [name, version] unless currently_deployed.include?(version)
         end
       end
 

data/lib/cli/commands/release.rb

@@ -1,23 +1,20 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli::Command
   class Release < Base
-    DEFAULT_RELEASE_NAME = "bosh-release"
+    DEFAULT_RELEASE_NAME = 'bosh-release'
 
     include Bosh::Cli::DependencyHelper
-    include Bosh::Cli::VersionCalc
 
     # bosh init release
-    usage "init release"
-    desc "Initialize release directory"
-    option "--git", "initialize git repository"
+    usage 'init release'
+    desc 'Initialize release directory'
+    option '--git', 'initialize git repository'
     def init(base = nil)
       if base
         FileUtils.mkdir_p(base)
         Dir.chdir(base)
       end
 
-      err("Release already initialized") if in_release_dir?
+      err('Release already initialized') if in_release_dir?
       git_init if options[:git]
 
       %w[config jobs packages src blobs].each do |dir|
@@ -25,50 +22,64 @@ module Bosh::Cli::Command
       end
 
       # Initialize an empty blobs index
-      File.open(File.join("config", "blobs.yml"), "w") do |f|
+      File.open(File.join('config', 'blobs.yml'), 'w') do |f|
         Psych.dump({}, f)
       end
 
-      say("Release directory initialized".make_green)
+      say('Release directory initialized'.make_green)
     end
 
     # bosh create release
-    usage "create release"
-    desc "Create release (assumes current directory to be a release repository)"
-    option "--force", "bypass git dirty state check"
-    option "--final", "create final release"
-    option "--with-tarball", "create release tarball"
-    option "--dry-run", "stop before writing release manifest"
+    usage 'create release'
+    desc 'Create release (assumes current directory to be a release repository)'
+    option '--force', 'bypass git dirty state check'
+    option '--final', 'create final release'
+    option '--with-tarball', 'create release tarball'
+    option '--dry-run', 'stop before writing release manifest'
+    option '--version VERSION', 'specify a custom version number (ex: 1.0.0 or 1.0-beta.2+dev.10)'
     def create(manifest_file = nil)
       check_if_release_dir
 
       if manifest_file && File.file?(manifest_file)
-        release_filename = create_from_manifest(manifest_file)
+        if options[:version]
+          err('Cannot specify a custom version number when creating from a manifest. The manifest already specifies a version.'.make_red)
+        end
+
+        say('Recreating release from the manifest')
+        Bosh::Cli::ReleaseCompiler.compile(manifest_file, release.blobstore)
+        release_filename = manifest_file
       else
-        release_filename = create_from_spec
+        version = options[:version]
+        version = Bosh::Common::Version::ReleaseVersion.parse(version).to_s unless version.nil?
+
+        release_filename = create_from_spec(version)
       end
 
       if release_filename
         release.latest_release_filename = release_filename
         release.save_config
       end
+    rescue SemiSemantic::ParseError
+      err("Invalid version: `#{version}'. Please specify a valid version (ex: 1.0.0 or 1.0-beta.2+dev.10).".make_red)
+    rescue Bosh::Cli::ReleaseVersionError => e
+      err(e.message.make_red)
     end
 
     # bosh verify release
-    usage "verify release"
-    desc "Verify release"
+    usage 'verify release'
+    desc 'Verify release'
     def verify(tarball_path)
       tarball = Bosh::Cli::ReleaseTarball.new(tarball_path)
 
       nl
-      say("Verifying release...")
+      say('Verifying release...')
       tarball.validate
       nl
 
       if tarball.valid?
         say("`#{tarball_path}' is a valid release".make_green)
       else
-        say("Validation errors:".make_red)
+        say('Validation errors:'.make_red)
         tarball.errors.each do |error|
           say("- #{error}")
         end
@@ -76,13 +87,13 @@ module Bosh::Cli::Command
       end
     end
 
-    usage "upload release"
-    desc "Upload release (release_file can be a local file or a remote URI)"
-    option "--rebase",
-           "Rebases this release onto the latest version",
-           "known by director (discards local job/package",
-           "versions in favor of versions assigned by director)"
-    option "--skip-if-exists", "skips upload if release already exists"
+    usage 'upload release'
+    desc 'Upload release (release_file can be a local file or a remote URI)'
+    option '--rebase',
+      'Rebases this release onto the latest version',
+      'known by director (discards local job/package',
+      'versions in favor of versions assigned by director)'
+    option '--skip-if-exists', 'skips upload if release already exists'
     def upload(release_file = nil)
       auth_required
 
@@ -96,10 +107,10 @@ module Bosh::Cli::Command
         check_if_release_dir
         release_file = release.latest_release_filename
         if release_file.nil?
-          err("The information about latest generated release is missing, please provide release filename")
+          err('The information about latest generated release is missing, please provide release filename')
         end
         unless confirmed?("Upload release `#{File.basename(release_file).make_green}' to `#{target_name.make_green}'")
-          err("Canceled upload")
+          err('Canceled upload')
         end
       end
 
@@ -120,55 +131,60 @@ module Bosh::Cli::Command
       end
     end
 
-    usage "reset release"
-    desc "Reset dev release"
+    usage 'reset release'
+    desc 'Reset dev release'
     def reset
       check_if_release_dir
 
-      say("Your dev release environment will be completely reset".make_red)
+      say('Your dev release environment will be completely reset'.make_red)
       if confirmed?
-        say("Removing dev_builds index...")
-        FileUtils.rm_rf(".dev_builds")
-        say("Clearing dev name...")
+        say('Removing dev_builds index...')
+        FileUtils.rm_rf('.dev_builds')
+        say('Clearing dev name...')
         release.dev_name = nil
         release.save_config
-        say("Removing dev tarballs...")
-        FileUtils.rm_rf("dev_releases")
+        say('Removing dev tarballs...')
+        FileUtils.rm_rf('dev_releases')
 
-        say("Release has been reset".make_green)
+        say('Release has been reset'.make_green)
       else
-        say("Canceled")
+        say('Canceled')
       end
     end
 
-    usage "releases"
-    desc "Show the list of available releases"
-    option "--jobs", "include job templates"
+    usage 'releases'
+    desc 'Show the list of available releases'
+    option '--jobs', 'include job templates'
     def list
       auth_required
       releases = director.list_releases.sort do |r1, r2|
-        r1["name"] <=> r2["name"]
+        r1['name'] <=> r2['name']
       end
 
-      err("No releases") if releases.empty?
+      err('No releases') if releases.empty?
 
-      if releases.first.has_key? "release_versions"
+      currently_deployed = false
+      uncommited_changes = false
+      if releases.first.has_key? 'release_versions'
         releases_table = build_releases_table(releases, options)
-      elsif releases.first.has_key? "versions"
+        currently_deployed, uncommited_changes = release_version_details(releases)
+      elsif releases.first.has_key? 'versions'
         releases_table = build_releases_table_for_old_director(releases)
+        currently_deployed, uncommited_changes = release_version_details_for_old_director(releases)
       end
 
       nl
       say(releases_table.render)
-      say("(*) Currently deployed") if releases_table.to_s =~ /\*/
-      say("(+) Uncommitted changes") if releases_table.to_s =~ /^\|.*\+{1}.*\|$/
+
+      say('(*) Currently deployed') if currently_deployed
+      say('(+) Uncommitted changes') if uncommited_changes
       nl
-      say("Releases total: %d" % releases.size)
+      say('Releases total: %d' % releases.size)
     end
 
-    usage "delete release"
-    desc "Delete release (or a particular release version)"
-    option "--force", "ignore errors during deletion"
+    usage 'delete release'
+    desc 'Delete release (or a particular release version)'
+    option '--force', 'ignore errors during deletion'
     def delete(name, version = nil)
       auth_required
       force = !!options[:force]
@@ -186,12 +202,11 @@ module Bosh::Cli::Command
         status, task_id = director.delete_release(name, force: force, version: version)
         task_report(status, task_id, "Deleted `#{desc}'")
       else
-        say("Canceled deleting release".make_green)
+        say('Canceled deleting release'.make_green)
       end
     end
 
-
-    protected
+    private
 
     def upload_manifest(manifest_path, upload_options = {})
       package_matches = match_remote_packages(File.read(manifest_path))
@@ -205,7 +220,7 @@ module Bosh::Cli::Command
       need_repack = true
 
       unless compiler.exists?
-        compiler.tarball_path = File.join(tmpdir, "release.tgz")
+        compiler.tarball_path = File.join(tmpdir, 'release.tgz')
         compiler.compile
         need_repack = false
       end
@@ -225,17 +240,27 @@ module Bosh::Cli::Command
       nl
 
       unless tarball.valid?
-        err("Release is invalid, please fix, verify and upload again")
+        err('Release is invalid, please fix, verify and upload again')
+      end
+
+      if should_convert_to_old_format?(tarball.version)
+        msg = "You are using CLI > 1.2579.0 with a director that doesn't support" +
+          'the new version format you are using. Upgrade your ' +
+          'director to match the version of your CLI or downgrade your ' +
+          'CLI to 1.2579.0 to avoid versioning mismatch issues.'
+
+        say(msg.make_yellow)
+        tarball_path = tarball.convert_to_old_format
       end
 
       remote_release = get_remote_release(tarball.release_name) rescue nil
       if remote_release && !rebase
-        if remote_release["versions"].include?(tarball.version)
+        if remote_release['versions'].include?(tarball.version)
           if upload_options[:skip_if_exists]
             say("Release `#{tarball.release_name}/#{tarball.version}' already exists. Skipping upload.")
             return
           else
-            err("This release version has already been uploaded")
+            err('This release version has already been uploaded')
           end
         end
       end
@@ -244,11 +269,11 @@ module Bosh::Cli::Command
         if repack
           package_matches = match_remote_packages(tarball.manifest)
 
-          say("Checking if can repack release for faster upload...")
+          say('Checking if can repack release for faster upload...')
           repacked_path = tarball.repack(package_matches)
 
           if repacked_path.nil?
-            say("Uploading the whole release".make_green)
+            say('Uploading the whole release'.make_green)
           else
             say("Release repacked (new size is #{pretty_size(repacked_path)})".make_green)
             tarball_path = repacked_path
@@ -260,36 +285,30 @@ module Bosh::Cli::Command
       end
 
       if rebase
-        say("Uploading release (#{"will be rebased".make_yellow})")
+        say("Uploading release (#{'will be rebased'.make_yellow})")
         status, task_id = director.rebase_release(tarball_path)
-        task_report(status, task_id, "Release rebased")
+        task_report(status, task_id, 'Release rebased')
       else
         say("\nUploading release\n")
         status, task_id = director.upload_release(tarball_path)
-        task_report(status, task_id, "Release uploaded")
+        task_report(status, task_id, 'Release uploaded')
       end
     end
 
     def upload_remote_release(release_location, upload_options = {})
       nl
       if upload_options[:rebase]
-        say("Using remote release `#{release_location}' (#{"will be rebased".make_yellow})")
+        say("Using remote release `#{release_location}' (#{'will be rebased'.make_yellow})")
         status, task_id = director.rebase_remote_release(release_location)
-        task_report(status, task_id, "Release rebased")
+        task_report(status, task_id, 'Release rebased')
       else
         say("Using remote release `#{release_location}'")
         status, task_id = director.upload_remote_release(release_location)
-        task_report(status, task_id, "Release uploaded")
+        task_report(status, task_id, 'Release uploaded')
       end
     end
-    
-    def create_from_manifest(manifest_file)
-      say("Recreating release from the manifest")
-      Bosh::Cli::ReleaseCompiler.compile(manifest_file, release.blobstore)
-      manifest_file
-    end
 
-    def create_from_spec
+    def create_from_spec(version)
       final = options[:final]
       force = options[:force]
       manifest_only = !options[:with_tarball]
@@ -304,22 +323,22 @@ module Bosh::Cli::Command
       if final
         confirm_final_release(dry_run)
         save_final_release_name if release.final_name.blank?
-        header("Building FINAL release".make_green)
+        header('Building FINAL release'.make_green)
       else
         save_dev_release_name if release.dev_name.blank?
-        header("Building DEV release".make_green)
+        header('Building DEV release'.make_green)
       end
 
-      header("Building packages")
+      header('Building packages')
       packages = build_packages(dry_run, final)
 
-      header("Building jobs")
+      header('Building jobs')
       jobs = build_jobs(packages.map(&:name), dry_run, final)
 
-      header("Building release")
-      release_builder = build_release(dry_run, final, jobs, manifest_only, packages)
+      header('Building release')
+      release_builder = build_release(dry_run, final, jobs, manifest_only, packages, version)
 
-      header("Release summary")
+      header('Release summary')
       show_summary(release_builder)
       nl
 
@@ -341,7 +360,7 @@ module Bosh::Cli::Command
     def confirm_final_release(dry_run)
       confirmed = non_interactive? || agree("Are you sure you want to generate #{'final'.make_red} version? ")
       if !dry_run && !confirmed
-        say("Canceled release generation".make_green)
+        say('Canceled release generation'.make_green)
         exit(1)
       end
     end
@@ -378,10 +397,10 @@ module Bosh::Cli::Command
           index
         end
         sorted_packages = tsort_packages(package_index)
-        header("Resolving dependencies")
-        say("Dependencies resolved, correct build order is:")
+        header('Resolving dependencies')
+        say('Dependencies resolved, correct build order is:')
         sorted_packages.each do |package_name|
-          say("- %s" % [package_name])
+          say('- %s' % [package_name])
         end
         nl
       end
@@ -389,9 +408,10 @@ module Bosh::Cli::Command
       packages
     end
 
-    def build_release(dry_run, final, jobs, manifest_only, packages)
+    def build_release(dry_run, final, jobs, manifest_only, packages, version)
       release_builder = Bosh::Cli::ReleaseBuilder.new(release, packages, jobs, final: final,
-                                                      commit_hash: commit_hash, uncommitted_changes: dirty_state?)
+                                                      commit_hash: commit_hash, version: version,
+                                                      uncommitted_changes: dirty_state?)
 
       unless dry_run
         if manifest_only
@@ -425,18 +445,18 @@ module Bosh::Cli::Command
     def save_final_release_name
       release.final_name = DEFAULT_RELEASE_NAME
       if interactive?
-        release.final_name = ask("Please enter final release name: ").to_s
-        err("Canceled release creation, no name given") if release.final_name.blank?
+        release.final_name = ask('Please enter final release name: ').to_s
+        err('Canceled release creation, no name given') if release.final_name.blank?
       end
       release.save_config
     end
 
     def save_dev_release_name
       if interactive?
-        release.dev_name = ask("Please enter development release name: ") do |q|
+        release.dev_name = ask('Please enter development release name: ') do |q|
           q.default = release.final_name if release.final_name
         end.to_s
-        err("Canceled release creation, no name given") if release.dev_name.blank?
+        err('Canceled release creation, no name given') if release.dev_name.blank?
       else
         release.dev_name = release.final_name ? release.final_name : DEFAULT_RELEASE_NAME
       end
@@ -448,7 +468,7 @@ module Bosh::Cli::Command
       if $? != 0
         say("error running 'git init':\n#{out}")
       else
-        File.open(".gitignore", "w") do |f|
+        File.open('.gitignore', 'w') do |f|
           f << <<-EOS.gsub(/^\s{10}/, '')
           config/dev.yml
           config/private.yml
@@ -472,14 +492,11 @@ module Bosh::Cli::Command
       say("Unable to run 'git init'".make_red)
     end
 
-
-    private
-
     # if we aren't already in a release directory, try going up two levels
     # to see if that is a release directory, and then use that as the base
     def find_release_dir(manifest_path)
       unless in_release_dir?
-        dir = File.expand_path("../..", manifest_path)
+        dir = File.expand_path('../..', manifest_path)
         Dir.chdir(dir)
         if in_release_dir?
           @release = Bosh::Cli::Release.new(dir)
@@ -503,17 +520,17 @@ module Bosh::Cli::Command
         end
       end
 
-      say("Packages")
+      say('Packages')
       say(packages_table)
       nl
-      say("Jobs")
+      say('Jobs')
       say(jobs_table)
 
       affected_jobs = builder.affected_jobs
 
       if affected_jobs.size > 0
         nl
-        say("Jobs affected by changes in this release")
+        say('Jobs affected by changes in this release')
 
         affected_jobs_table = table do |t|
           t.headings = %w(Name Version)
@@ -530,7 +547,7 @@ module Bosh::Cli::Command
       result = []
       result << artefact.name
       result << artefact.version
-      result << artefact.notes.join(", ")
+      result << artefact.notes.join(', ')
       result
     end
 
@@ -538,10 +555,10 @@ module Bosh::Cli::Command
       release = director.get_release(name)
 
       unless release.is_a?(Hash) &&
-          release.has_key?("jobs") &&
-          release.has_key?("packages")
+          release.has_key?('jobs') &&
+          release.has_key?('packages')
         raise Bosh::Cli::DirectorError,
-              "Cannot find version, jobs and packages info in the director response, maybe old director?"
+          'Cannot find version, jobs and packages info in the director response, maybe old director?'
       end
 
       release
@@ -553,7 +570,7 @@ module Bosh::Cli::Command
       msg = "You are using CLI >= 0.20 with director that doesn't support " +
           "package matches.\nThis will result in uploading all packages " +
           "and jobs to your director.\nIt is recommended to update your " +
-          "director or downgrade your CLI to 0.19.6"
+        'director or downgrade your CLI to 0.19.6'
 
       say(msg.make_yellow)
       exit(1) unless confirmed?
@@ -561,13 +578,13 @@ module Bosh::Cli::Command
 
     def build_releases_table_for_old_director(releases)
       table do |t|
-        t.headings = "Name", "Versions"
+        t.headings = 'Name', 'Versions'
         releases.each do |release|
-          versions = release["versions"].sort { |v1, v2|
-            version_cmp(v1, v2)
-          }.map { |v| ((release["in_use"] || []).include?(v)) ? "#{v}*" : v }
+          versions = release['versions'].sort { |v1, v2|
+            Bosh::Common::Version::ReleaseVersion.parse_and_compare(v1, v2)
+          }.map { |v| ((release['in_use'] || []).include?(v)) ? "#{v}*" : v }
 
-          t << [release["name"], versions.join(", ")]
+          t << [release['name'], versions.join(', ')]
         end
       end
     end
@@ -578,11 +595,11 @@ module Bosh::Cli::Command
     def build_releases_table(releases, options = {})
       show_jobs = options[:jobs]
       table do |t|
-        t.headings = "Name", "Versions", "Commit Hash"
-        t.headings << "Jobs" if show_jobs
+        t.headings = 'Name', 'Versions', 'Commit Hash'
+        t.headings << 'Jobs' if show_jobs
         releases.each do |release|
           versions, commit_hashes = formatted_versions(release).transpose
-          row = [release["name"], versions.join("\n"), commit_hashes.join("\n")]
+          row = [release['name'], versions.join("\n"), commit_hashes.join("\n")]
           if show_jobs
             jobs = formatted_jobs(release).transpose
             row << jobs.join("\n")
@@ -593,25 +610,25 @@ module Bosh::Cli::Command
     end
 
     def formatted_versions(release)
-      sort_versions(release["release_versions"]).map { |v| formatted_version_and_commit_hash(v) }
+      sort_versions(release['release_versions']).map { |v| formatted_version_and_commit_hash(v) }
     end
 
     def sort_versions(versions)
-      versions.sort { |v1, v2| version_cmp(v1["version"], v2["version"]) }
+      versions.sort { |v1, v2| Bosh::Common::Version::ReleaseVersion.parse_and_compare(v1['version'], v2['version']) }
     end
 
     def formatted_version_and_commit_hash(version)
-      version_number = version["version"] + (version["currently_deployed"] ? "*" : "")
-      commit_hash = version["commit_hash"] + (version["uncommitted_changes"] ? "+" : "")
+      version_number = version['version'] + (version['currently_deployed'] ? '*' : '')
+      commit_hash = version['commit_hash'] + (version['uncommitted_changes'] ? '+' : '')
       [version_number, commit_hash]
     end
 
     def formatted_jobs(release)
-      sort_versions(release["release_versions"]).map do |v|
-        if job_names = v["job_names"]
-          [job_names.join(", ")]
+      sort_versions(release['release_versions']).map do |v|
+        if job_names = v['job_names']
+          [job_names.join(', ')]
         else
-          ["n/a  "] # with enough whitespace to match "Jobs" header
+          ['n/a  '] # with enough whitespace to match "Jobs" header
         end
       end
     end
@@ -622,5 +639,46 @@ module Bosh::Cli::Command
     rescue Bosh::Exec::Error => e
       '00000000'
     end
+
+    def release_version_details(releases)
+      currently_deployed = false
+      uncommitted_changes = false
+      releases.each do |release|
+        release['release_versions'].each do |version|
+          currently_deployed ||= version['currently_deployed']
+          uncommitted_changes ||= version['uncommitted_changes']
+          if currently_deployed && uncommitted_changes
+            return true, true
+          end
+        end
+      end
+      return currently_deployed, uncommitted_changes
+    end
+
+    def release_version_details_for_old_director(releases)
+      currently_deployed = false
+      # old director did not support uncommitted changes
+      uncommitted_changes = false
+      releases.each do |release|
+        currently_deployed ||= release['in_use'].any?
+        if currently_deployed
+          return true, uncommitted_changes
+        end
+      end
+      return currently_deployed, uncommitted_changes
+    end
+
+    def should_convert_to_old_format?(version)
+      director_version = director.get_status['version']
+      new_format_director_version = '1.2580.0'
+      if Bosh::Common::Version::BoshVersion.parse(director_version) >=
+        Bosh::Common::Version::BoshVersion.parse(new_format_director_version)
+        return false
+      end
+
+      old_format = Bosh::Common::Version::ReleaseVersion.parse(version).to_old_format
+      old_format && version != old_format
+    end
+
   end
 end

data/lib/cli/commands/stemcell.rb

@@ -3,7 +3,6 @@ require 'cli/public_stemcells'
 
 module Bosh::Cli
   class Command::Stemcell < Command::Base
-    include Bosh::Cli::VersionCalc
     STEMCELL_EXISTS_ERROR_CODE = 50002
 
     usage 'verify stemcell'
@@ -87,9 +86,11 @@ module Bosh::Cli
     def list
       auth_required
       stemcells = director.list_stemcells.sort do |sc1, sc2|
-        sc1['name'] == sc2['name'] ?
-            version_cmp(sc1['version'], sc2['version']) :
-            sc1['name'] <=> sc2['name']
+        if sc1['name'] == sc2['name']
+          Bosh::Common::Version::StemcellVersion.parse_and_compare(sc1['version'], sc2['version'])
+        else
+          sc1['name'] <=> sc2['name']
+        end
       end
 
       err('No stemcells') if stemcells.empty?

data/lib/cli/deployment_helper.rb

@@ -200,7 +200,13 @@ module Bosh::Cli
         director.list_releases.inject({}) do |hash, release|
           name = release['name']
           versions = release['versions'] || release['release_versions'].map { |release_version| release_version['version'] }
-          latest_version = versions.map { |v| Bosh::Common::VersionNumber.new(v) }.max
+          parsed_versions = versions.map do |version|
+            {
+              original: version,
+              parsed: Bosh::Common::Version::ReleaseVersion.parse(version)
+            }
+          end
+          latest_version = parsed_versions.sort_by {|v| v[:parsed] }.last[:original]
           hash[name] = latest_version.to_s
           hash
         end
@@ -368,7 +374,7 @@ module Bosh::Cli
         end
 
         stemcells.inject({}) do |hash, (name, versions)|
-          hash[name] = versions.map { |v| Bosh::Common::VersionNumber.new(v) }.max.to_s
+          hash[name] = Bosh::Common::Version::StemcellVersion.parse_list(versions).latest.to_s
           hash
         end
       end

data/lib/cli/errors.rb

@@ -18,33 +18,35 @@ module Bosh::Cli
     error_code(42)
   end
 
-  class UnknownCommand       < CliError; error_code(100); end
-  class ConfigError          < CliError; error_code(101); end
-  class DirectorMissing      < CliError; error_code(102); end
-  class DirectorInaccessible < CliError; error_code(103); end
-
-  class DirectorError        < CliError; error_code(201); end
-  class AuthError            < DirectorError; error_code(202); end
-  class MissingTask          < DirectorError; error_code(203); end
-  class TaskTrackError       < DirectorError; error_code(204); end
-  class ResourceNotFound     < DirectorError; error_code(205); end
-
-  class CliExit              < CliError; error_code(400); end
-  class GracefulExit         < CliExit;  error_code(401); end
-
-  class InvalidPackage       < CliError; error_code(500); end
-  class InvalidJob           < CliError; error_code(501); end
-  class InvalidRelease       < CliError; error_code(503); end
-  class MissingDependency    < CliError; error_code(504); end
-  class CircularDependency   < CliError; error_code(505); end
-  class InvalidIndex         < CliError; error_code(506); end
-  class BlobstoreError       < CliError; error_code(507); end
-  class PackagingError       < CliError; error_code(508); end
-  class UndefinedProperty    < CliError; error_code(509); end
-  class MalformedManifest    < CliError; error_code(511); end
-  class MissingTarget        < CliError; error_code(512); end
-  class InvalidProperty      < CliError; error_code(513); end
-  class InvalidManifest      < CliError; error_code(514); end
-  class PropertyMismatch     < CliError; error_code(515); end
+  class UnknownCommand         < CliError; error_code(100); end
+  class ConfigError            < CliError; error_code(101); end
+  class DirectorMissing        < CliError; error_code(102); end
+  class DirectorInaccessible   < CliError; error_code(103); end
+
+  class DirectorError          < CliError; error_code(201); end
+  class AuthError              < DirectorError; error_code(202); end
+  class MissingTask            < DirectorError; error_code(203); end
+  class TaskTrackError         < DirectorError; error_code(204); end
+  class ResourceNotFound       < DirectorError; error_code(205); end
+
+  class CliExit                < CliError; error_code(400); end
+  class GracefulExit           < CliExit;  error_code(401); end
+
+  class InvalidPackage         < CliError; error_code(500); end
+  class InvalidJob             < CliError; error_code(501); end
+  class InvalidRelease         < CliError; error_code(503); end
+  class MissingDependency      < CliError; error_code(504); end
+  class CircularDependency     < CliError; error_code(505); end
+  class InvalidIndex           < CliError; error_code(506); end
+  class BlobstoreError         < CliError; error_code(507); end
+  class PackagingError         < CliError; error_code(508); end
+  class UndefinedProperty      < CliError; error_code(509); end
+  class MalformedManifest      < CliError; error_code(511); end
+  class MissingTarget          < CliError; error_code(512); end
+  class InvalidProperty        < CliError; error_code(513); end
+  class InvalidManifest        < CliError; error_code(514); end
+  class PropertyMismatch       < CliError; error_code(515); end
   class InvalidPropertyMapping < CliError; error_code(516); end
+
+  class ReleaseVersionError    < CliError; error_code(600); end
 end

data/lib/cli/release_builder.rb

@@ -1,9 +1,6 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   class ReleaseBuilder
     include Bosh::Cli::DependencyHelper
-    include Bosh::Cli::VersionCalc
 
     DEFAULT_RELEASE_NAME = "bosh_release"
 
@@ -20,11 +17,16 @@ module Bosh::Cli
       @uncommitted_changes = options.fetch(:uncommitted_changes, true)
       @packages = packages
       @jobs = jobs
+      @version = options.fetch(:version, nil)
+
+      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)
       @index = @final ? @final_index : @dev_index
 
+      raise ReleaseVersionError.new('Release version already exists') if (@version && @index.version_exists?(@version))
+
       @build_dir = Dir.mktmpdir
 
       in_build_dir do
@@ -41,7 +43,7 @@ module Bosh::Cli
 
     # @return [String] Release version
     def version
-      @version ||= assign_version
+      @version ||= assign_version.to_s
     end
 
     # @return [Boolean] Is release final?
@@ -145,11 +147,10 @@ module Bosh::Cli
         say("This version is no different from version #{old_version}")
         @version = old_version
       else
-        @version = assign_version
-        @index.add_version(fingerprint, { "version" => @version })
+        @index.add_version(fingerprint, { "version" => version })
       end
 
-      manifest["version"] = @version
+      manifest["version"] = version
       manifest_yaml = Psych.dump(manifest)
 
       say("Writing manifest...")
@@ -166,7 +167,7 @@ module Bosh::Cli
 
     def generate_tarball
       generate_manifest unless @manifest_generated
-      return if @index.version_exists?(@version)
+      return if @index.version_exists?(version)
 
       unless @jobs_copied
         header("Copying jobs...")
@@ -224,27 +225,32 @@ module Bosh::Cli
 
     private
 
-    def version=(version)
-      @version = version
-    end
-
     def assign_version
-      latest_final_version = @final_index.latest_version.to_i
-      latest_dev_version = @dev_index.latest_version(latest_final_version)
+      latest_final_version = Bosh::Common::Version::ReleaseVersion.parse_list(@final_index.versions).latest
+      latest_final_version ||= Bosh::Common::Version::ReleaseVersion.parse('0')
 
       if @final
-        latest_final_version + 1
+        # Drop pre-release and post-release segments, and increment the release segment
+        latest_final_version.increment_release
       else
-        major = latest_final_version
-        minor = minor_version(latest_dev_version).to_i + 1
-        "#{major}.#{minor}-dev"
+        # Increment or Reset the post-release segment
+        dev_versions = Bosh::Common::Version::ReleaseVersion.parse_list(@dev_index.versions)
+        latest_dev_version = dev_versions.latest_with_pre_release(latest_final_version)
+
+        if latest_dev_version
+          if latest_dev_version.version.post_release.nil?
+            latest_dev_version.default_post_release
+          else
+            latest_dev_version.increment_post_release
+          end
+        else
+          latest_final_version.default_post_release
+        end
       end
     end
 
     def in_build_dir(&block)
       Dir.chdir(build_dir) { yield }
     end
-
   end
-
 end

data/lib/cli/release_tarball.rb

@@ -30,6 +30,26 @@ module Bosh::Cli
       File.read(File.join(@unpack_dir, "release.MF"))
     end
 
+    def convert_to_old_format
+      step('Converting to old format',
+           "Cannot extract tarball #{@tarball_path}", :fatal) do
+        unpack
+      end
+
+      manifest_file = File.expand_path('release.MF', @unpack_dir)
+      manifest = load_yaml_file(manifest_file)
+      old_format_version = Bosh::Common::Version::ReleaseVersion.parse(manifest['version']).to_old_format
+      manifest['version'] = old_format_version
+      write_yaml(manifest, manifest_file)
+      tmpdir = Dir.mktmpdir
+      repacked_path = File.join(tmpdir, 'release-reformat.tgz')
+
+      Dir.chdir(@unpack_dir) do
+        `tar -czf #{repacked_path} . 2>&1`
+        return repacked_path if $? == 0
+      end
+    end
+
     # Repacks tarball according to the structure of remote release
     # Return path to repackaged tarball or nil if repack has failed
     def repack(package_matches = [])

data/lib/cli/stemcell.rb

@@ -23,7 +23,7 @@ module Bosh::Cli
       tar = nil
       step("Read tarball",
            "Cannot read tarball #{@stemcell_file}", :fatal) do
-        tgz = Zlib::GzipReader.new(File.open(@stemcell_file))
+        tgz = Zlib::GzipReader.new(File.open(@stemcell_file,'rb'))
         tar = Minitar.open(tgz)
         !!tar
       end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2579.0'
+    VERSION = '1.2596.0'
   end
 end

data/lib/cli/versions_index.rb

@@ -1,6 +1,5 @@
 module Bosh::Cli
   class VersionsIndex
-    include VersionCalc
 
     def initialize(storage_dir, name_prefix = nil)
       @storage_dir = File.expand_path(storage_dir)
@@ -25,26 +24,13 @@ 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)
+    def latest_version
       builds = @data["builds"].values
 
-      if major
-        builds = builds.select do |build|
-          major_version(build["version"]) == major
-        end
-      end
-
       return nil if builds.empty?
 
-      builds.last["version"]
+      version_strings = builds.map { |b| b["version"] }
+      Bosh::Common::Version::ReleaseVersion.parse_list(version_strings).latest.to_s
     end
 
     def version_exists?(version)
@@ -91,6 +77,10 @@ module Bosh::Cli
       File.join(@storage_dir, name)
     end
 
+    def versions
+      @data['builds'].map { |_, build| build['version'] }
+    end
+
     private
 
     def create_directories
@@ -115,7 +105,6 @@ module Bosh::Cli
             "#{data.class} given, Hash expected"
       end
       @data = data
-      @data.delete("latest_version") # Indices used to track latest versions
       @data["builds"] ||= {}
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2579.0
+  version: 1.2596.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-06-07 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.2579.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2596.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.2579.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2596.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,7 @@ dependencies:
         version: 0.5.4
 description: ! 'BOSH CLI
 
-  4fef83'
+  3c1470'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -292,7 +292,6 @@ files:
 - lib/cli/task_tracking/total_duration.rb
 - lib/cli/validation.rb
 - lib/cli/version.rb
-- lib/cli/version_calc.rb
 - lib/cli/versions_index.rb
 - lib/cli/vm_state.rb
 - lib/cli/yaml_helper.rb
@@ -318,10 +317,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 818966272936491420
+      hash: 1028233858032773438
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: BOSH CLI

data/lib/cli/version_calc.rb

@@ -1,38 +0,0 @@
-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
-
-    # Returns 0 if two versions are the same,
-    # 1 if v1 > v2
-    # -1 if v1 < v2
-    def version_cmp(v1 = "0", v2 = "0")
-      Bosh::Common::VersionNumber.new(v1) <=> Bosh::Common::VersionNumber.new(v2)
-    end
-
-    def version_greater(v1, v2)
-      version_cmp(v1, v2) > 0
-    end
-
-    def version_less(v1, v2)
-      version_cmp(v1, v2) < 0
-    end
-
-    def version_same(v1, v2)
-      version_cmp(v1, v2) == 0
-    end
-
-    def major_version(v)
-      Bosh::Common::VersionNumber.new(v).major
-    end
-
-    def minor_version(v)
-      Bosh::Common::VersionNumber.new(v).minor
-    end
-  end
-end