bosh_cli 1.3215.4.0 → 1.3232.0

data/lib/cli/commands/ssh.rb

@@ -31,7 +31,7 @@ module Bosh::Cli
         if command.empty?
           setup_interactive_shell(manifest.name, job, id)
         else
-          say("Executing `#{command.join(' ')}' on #{job}/#{id}")
+          say("Executing '#{command.join(' ')}' on #{job}/#{id}")
           perform_operation(:exec, manifest.name, job, id, command)
         end
       end
@@ -107,7 +107,7 @@ module Bosh::Cli
       # @param [optional,String] password
       def setup_ssh(deployment_name, job, id, password)
 
-        say("Target deployment is `#{deployment_name}'")
+        say("Target deployment is '#{deployment_name}'")
         nl
         say('Setting up ssh artifacts')
 

data/lib/cli/commands/stemcell.rb

@@ -16,13 +16,13 @@ module Bosh::Cli
       nl
 
       if stemcell.valid?
-        say("`#{tarball_path}' is a valid stemcell".make_green)
+        say("'#{tarball_path}' is a valid stemcell".make_green)
       else
         say('Validation errors:'.make_red)
         stemcell.errors.each do |error|
           say('- %s' % [error])
         end
-        err("`#{tarball_path}' is not a valid stemcell")
+        err("'#{tarball_path}' is not a valid stemcell")
       end
     end
 
@@ -72,10 +72,10 @@ If --name & --version are provided, they will be used for checking if stemcell e
 
         if !options[:fix] && exists?(name, version)
           if options[:skip_if_exists]
-            say("Stemcell `#{name}/#{version}' already exists. Skipping upload.")
+            say("Stemcell '#{name}/#{version}' already exists. Skipping upload.")
             return
           else
-            err("Stemcell `#{name}/#{version}' already exists. Increment the version if it has changed.")
+            err("Stemcell '#{name}/#{version}' already exists. Increment the version if it has changed.")
           end
         end
 
@@ -86,7 +86,7 @@ If --name & --version are provided, they will be used for checking if stemcell e
         nl
       else
         nl
-        say("Using remote stemcell `#{stemcell_location}'")
+        say("Using remote stemcell '#{stemcell_location}'")
       end
 
       selected_options = {}
@@ -161,9 +161,9 @@ If --name & --version are provided, they will be used for checking if stemcell e
 
       force = !!options[:force]
 
-      err("Stemcell `#{name}/#{version}' does not exist") unless exists?(name, version)
+      err("Stemcell '#{name}/#{version}' does not exist") unless exists?(name, version)
 
-      say("You are going to delete stemcell `#{name}/#{version}'".make_red)
+      say("You are going to delete stemcell '#{name}/#{version}'".make_red)
 
       unless confirmed?
         say('Canceled deleting stemcell'.make_green)
@@ -172,7 +172,7 @@ If --name & --version are provided, they will be used for checking if stemcell e
 
       status, task_id = director.delete_stemcell(name, version, :force => force)
 
-      task_report(status, task_id, "Deleted stemcell `#{name}/#{version}'")
+      task_report(status, task_id, "Deleted stemcell '#{name}/#{version}'")
     end
 
     private

data/lib/cli/commands/task.rb

@@ -119,16 +119,16 @@ module Bosh::Cli::Command
     def show_tasks_table(tasks)
       return if tasks.empty?
       tasks_table = table do |t|
-        t.headings = "#", "State", "Timestamp", "User", "Deployment", "Description", "Result"
+        t.headings = "#", "State", "Started", "Last Activity",  "User", "Deployment", "Description", "Result"
         tasks.map do |task|
-          t << [task["id"], task["state"], Time.at(task["timestamp"]).utc, task["user"], task["deployment"],
+          t << [task["id"], task["state"], task["started_at"] ? Time.at(task["started_at"]).utc : '-', Time.at(task["timestamp"]).utc, task["user"], task["deployment"],
                 task["description"].to_s, task["result"].to_s.truncate(80)]
         end
       end
 
-      say("\n")
+      nl
       say(tasks_table)
-      say("\n")
+      nl
     end
 
     # Returns the verbose level for the given no_filter flag

data/lib/cli/commands/user.rb

@@ -25,7 +25,7 @@ module Bosh::Cli::Command
       end
 
       if director.create_user(username, password)
-        say("User `#{username}' has been created".make_green)
+        say("User '#{username}' has been created".make_green)
       else
         err("Error creating user")
       end
@@ -45,9 +45,9 @@ module Bosh::Cli::Command
         err("Please provide a username to delete")
       end
 
-      if confirmed?("Are you sure you would like to delete the user `#{username}'?")
+      if confirmed?("Are you sure you would like to delete the user '#{username}'?")
         if director.delete_user(username)
-          say("User `#{username}' has been deleted".make_green)
+          say("User '#{username}' has been deleted".make_green)
         else
           err("Unable to delete user")
         end

data/lib/cli/commands/vms.rb

@@ -16,7 +16,7 @@ module Bosh::Cli::Command
         deps = director.list_deployments
         err('No deployments') if deps.empty?
         deps.each do |dep|
-          say("Deployment `#{dep['name'].make_green}'")
+          say("Deployment '#{dep['name'].make_green}'")
           show_deployment(dep['name'], options)
         end
       else

data/lib/cli/config.rb

@@ -34,7 +34,7 @@ module Bosh::Cli
     # @return [void]
     def self.register_command(command)
       if @commands.has_key?(command.usage)
-        raise CliError, "Duplicate command `#{command.usage}'"
+        raise CliError, "Duplicate command '#{command.usage}'"
       end
       @commands[command.usage] = command
     end

data/lib/cli/core_ext.rb

@@ -74,25 +74,25 @@ module BoshExtensions
 
     yaml = Psych::load(yaml_str)
     if expected_type && !yaml.is_a?(expected_type)
-      err("Incorrect YAML structure in `#{path}': expected #{expected_type} at the root".make_red)
+      err("Incorrect YAML structure in '#{path}': expected #{expected_type} at the root".make_red)
     end
 
     yaml
   end
 
   def read_yaml_file(path)
-    err("Cannot find file `#{path}'".make_red) unless File.exist?(path)
+    err("Cannot find file '#{path}'".make_red) unless File.exist?(path)
 
     begin
       yaml_str = ERB.new(File.read(path)).result
     rescue SystemCallError => e
-      err("Cannot load YAML file at `#{path}': #{e}".make_red)
+      err("Cannot load YAML file at '#{path}': #{e}".make_red)
     end
 
     begin
       Bosh::Cli::YamlHelper.check_duplicate_keys(yaml_str)
     rescue Exception => e # on ruby 1.9.3 Psych::SyntaxError isn't a StandardError
-      err("Incorrect YAML structure in `#{path}': #{e}".make_red)
+      err("Incorrect YAML structure in '#{path}': #{e}".make_red)
     end
     yaml_str
   end

data/lib/cli/deployment_manifest_compiler.rb

@@ -11,7 +11,7 @@ module Bosh::Cli
 
     def property(name)
       @properties[name] || raise(UndefinedProperty,
-                                 "Cannot resolve deployment property `#{name}'")
+                                 "Cannot resolve deployment property '#{name}'")
     end
 
     def result

data/lib/cli/file_with_progress_bar.rb

@@ -32,6 +32,7 @@ module Bosh
         if result && result.size > 0
           progress_bar.inc(result.size)
         else
+          progress_bar.set(size)
           progress_bar.finish
         end
 
@@ -43,6 +44,7 @@ module Bosh
         if count
           progress_bar.inc(count)
         else
+          progress_bar.set(size)
           progress_bar.finish
         end
         count

data/lib/cli/job_property_collection.rb

@@ -42,8 +42,8 @@ module Bosh::Cli
 
         if resolved.nil?
           raise InvalidPropertyMapping,
-                "Cannot satisfy property mapping `#{to}: #{from}', " +
-                "as `#{from}' is not in deployment properties"
+                "Cannot satisfy property mapping '#{to}: #{from}', " +
+                "as '#{from}' is not in deployment properties"
         end
 
         @job_properties[to] = resolved

data/lib/cli/job_state.rb

@@ -52,7 +52,7 @@ module Bosh::Cli
       end
 
       @command.nl
-      @command.say("Performing `#{operation_desc}'...")
+      @command.say("Performing '#{operation_desc}'...")
       @command.director.change_job_state(@manifest.name, @manifest.yaml, job, index_or_id, new_state, @options)
     end
 
@@ -61,7 +61,7 @@ module Bosh::Cli
       other_changes_present = @command.inspect_deployment_changes(@manifest, show_empty_changeset: false)
 
       if other_changes_present && !force
-        @command.err("Cannot perform job management when other deployment changes are present. Please use `--force' to override.")
+        @command.err("Cannot perform job management when other deployment changes are present. Please use '--force' to override.")
       end
     end
 

data/lib/cli/logs_downloader.rb

@@ -19,7 +19,7 @@ module Bosh::Cli
 
         FileUtils.mv(tmp_file, logs_destination_path)
 
-        @ui.say("Logs saved in `#{logs_destination_path.make_green}'")
+        @ui.say("Logs saved in '#{logs_destination_path.make_green}'")
         @ui.nl
 
       rescue Bosh::Cli::DirectorError => e

data/lib/cli/manifest.rb

@@ -13,7 +13,7 @@ module Bosh::Cli
 
     def load
       unless File.exists?(@deployment_file)
-        err("Cannot find deployment manifest in `#{@deployment_file}'")
+        err("Cannot find deployment manifest in '#{@deployment_file}'")
       end
 
       @hash = load_yaml_file(@deployment_file)
@@ -49,7 +49,7 @@ module Bosh::Cli
       end
 
       if name.blank? || @hash['director_uuid'].blank?
-        err("Invalid manifest `#{File.basename(@deployment_file)}': " +
+        err("Invalid manifest '#{File.basename(@deployment_file)}': " +
             'name and director UUID are required')
       end
 
@@ -84,7 +84,7 @@ module Bosh::Cli
         if stemcell['version'] == 'latest'
           latest_version = latest_stemcells[stemcell['name']]
           if latest_version.nil?
-            err("Latest version for stemcell `#{stemcell['name']}' is unknown")
+            err("Latest version for stemcell '#{stemcell['name']}' is unknown")
           end
           stemcell['version'] = latest_version
         end

data/lib/cli/public_stemcell_presenter.rb

@@ -18,7 +18,7 @@ module Bosh::Cli
       end
 
       @ui.say(stemcells_table.render)
-      @ui.say("To download use `bosh download public stemcell <stemcell_name>'. For full url use --full.")
+      @ui.say('To download use `bosh download public stemcell <stemcell_name>`. For full url use --full.')
     end
 
     def download(stemcell_name)
@@ -26,8 +26,8 @@ module Bosh::Cli
         @ui.err("'#{stemcell_name}' not found.")
       end
 
-      if File.exists?(stemcell_name) && !@ui.confirmed?("Overwrite existing file `#{stemcell_name}'?")
-        @ui.err("File `#{stemcell_name}' already exists")
+      if File.exists?(stemcell_name) && !@ui.confirmed?("Overwrite existing file '#{stemcell_name}'?")
+        @ui.err("File '#{stemcell_name}' already exists")
       end
 
       stemcell = @public_stemcells.find(stemcell_name)

data/lib/cli/release.rb

@@ -18,11 +18,11 @@ module Bosh::Cli
       @private_config_file = File.join(config_dir, "private.yml")
 
       unless File.directory?(dir)
-        err("Cannot find release directory `#{dir}'")
+        err("Cannot find release directory '#{dir}'")
       end
 
       unless File.directory?(config_dir)
-        err("Cannot find release config directory `#{config_dir}'")
+        err("Cannot find release config directory '#{config_dir}'")
       end
 
       @final_config = load_config(@final_config_file)
@@ -159,7 +159,7 @@ module Bosh::Cli
       # to migrate while the old one tells you to upgrade.
       if @dev_config.has_key?("blobstore_options") &&
           @dev_config["blobstore_options"] != "deprecated"
-        say("Found legacy dev config file `#{@dev_config_file}'".make_yellow)
+        say("Found legacy dev config file '#{@dev_config_file}'".make_yellow)
 
         new_dev_config = {
           "dev_name" => @dev_config["name"],

data/lib/cli/release_compiler.rb

@@ -47,7 +47,7 @@ module Bosh::Cli
 
     def compile
       if exists?
-        quit("You already have this version in `#{tarball_path.make_green}'")
+        quit("You already have this version in '#{tarball_path.make_green}'")
       end
 
       packages = @packages
@@ -114,7 +114,7 @@ module Bosh::Cli
 
       if found_build.nil?
         say("MISSING".make_red)
-        err("Cannot find #{build_type} with checksum `#{build.sha1}'")
+        err("Cannot find #{build_type} with checksum '#{build.sha1}'")
       end
 
       sha1 = found_build["sha1"]

data/lib/cli/release_tarball.rb

@@ -35,6 +35,7 @@ module Bosh::Cli
     end
 
     def unpack_license
+      return false if manifest_yaml['license'].nil?
       return @unpacked_license unless @unpacked_license.nil?
       exit_success = safe_fast_unpack('./license.tgz')
       @unpacked_license = !!exit_success
@@ -179,7 +180,7 @@ module Bosh::Cli
 
     def upload_packages?(package_matches = [])
       return true if package_matches.nil?
-      package_matches.size != manifest_yaml[@packages_folder].size
+      package_matches.uniq.size != manifest_yaml[@packages_folder].map { |p| p['version'] }.uniq.size
     end
 
     # Repacks tarball according to the structure of remote release

data/lib/cli/runner.rb

@@ -204,7 +204,7 @@ module Bosh::Cli
       }.flatten.uniq
     rescue
       err('Cannot load plugins, '.make_yellow +
-              "please run `gem update --system' to ".make_yellow +
+              "please run `gem update --system` to ".make_yellow +
               'update your RubyGems'.make_yellow)
     end
 

data/lib/cli/sorted_release_archiver.rb

@@ -6,23 +6,12 @@ module Bosh::Cli
 
     def archive(destination_file)
       Dir.chdir(@dir) do
+        ordered_release_files = Bosh::Common::Release::ReleaseDirectory.new('.').ordered_release_files
         success = Kernel.system('tar', '-C', @dir, '-pczf', destination_file, *ordered_release_files, out: '/dev/null', err: '/dev/null')
         if !success
           raise InvalidRelease, 'Cannot create release tarball'
         end
       end
     end
-
-    private
-
-    def ordered_release_files
-      ordered_release_files = ['./release.MF']
-      license_files = (Dir.entries('.') & ['LICENSE', 'NOTICE']).sort
-      unless license_files.empty?
-        ordered_release_files += license_files.map { |filename| "./#{filename}" }
-      end
-      ordered_release_files += ['./jobs', './packages']
-      ordered_release_files
-    end
   end
 end

data/lib/cli/uaa_login_strategy.rb

@@ -22,7 +22,7 @@ module Bosh
           end
 
           if access_info = @uaa_client.access_info(credentials)
-            @terminal.say_green("Logged in as `#{access_info.username}'")
+            @terminal.say_green("Logged in as '#{access_info.username}'")
           else
             err('Failed to log in')
           end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3215.4.0'
+    VERSION = '1.3232.0'
   end
 end

data/lib/cli/versions/local_artifact_storage.rb

@@ -12,7 +12,7 @@ module Bosh::Cli::Versions
     def put_file(sha, origin_file_path)
       destination = file_path(sha)
       unless File.exist?(origin_file_path)
-        raise "Trying to store non-existant file `#{origin_file_path}' with sha `#{sha}'"
+        raise "Trying to store non-existant file '#{origin_file_path}' with sha '#{sha}'"
       end
       FileUtils.mkdir_p(File.dirname(destination))
       FileUtils.cp(origin_file_path, destination, :preserve => true)
@@ -23,7 +23,7 @@ module Bosh::Cli::Versions
     def get_file(sha)
       destination = file_path(sha)
       unless File.exist?(destination)
-        raise "Trying to retrieve non-existant file `#{destination}' with sha `#{sha}'"
+        raise "Trying to retrieve non-existant file '#{destination}' with sha '#{sha}'"
       end
 
       File.expand_path(destination)

data/lib/cli/versions/releases_dir_migrator.rb

@@ -20,8 +20,8 @@ module Bosh::Cli::Versions
       begin
         SemiSemantic::Version.parse(format_version_string) < VersionsIndex::CURRENT_INDEX_VERSION
       rescue ArgumentError, SemiSemantic::ParseError
-        raise InvalidIndex, "Invalid versions index version in `#{index_path}', " +
-          "`#{format_version_string}' given, SemiSemantic version expected"
+        raise InvalidIndex, "Invalid versions index version in '#{index_path}', " +
+          "'#{format_version_string}' given, SemiSemantic version expected"
       end
     end
 
@@ -29,7 +29,7 @@ module Bosh::Cli::Versions
       return false unless needs_migration?
 
       unless Dir.exist?(@releases_path)
-        raise "Releases path `#{@releases_path}' does not exist"
+        raise "Releases path '#{@releases_path}' does not exist"
       end
 
       @ui.header("Migrating #{@release_type_name} releases".make_green)

data/lib/cli/versions/version_file_resolver.rb

@@ -14,7 +14,7 @@ module Bosh::Cli::Versions
         if file_sha1 == sha1
           return file_path
         end
-        say("SHA1 `#{file_sha1}' of #{desc} does not match expected SHA1 `#{sha1}'".make_red)
+        say("SHA1 '#{file_sha1}' of #{desc} does not match expected SHA1 '#{sha1}'".make_red)
       end
 
       if blobstore_id.nil?