bosh_cli 1.2992.0 → 1.2999.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34edfaf59f459be5588c02deca70b84d2a951879
-  data.tar.gz: eb22ced0873f156e9b17fbca35ee1552f9f7860b
+  metadata.gz: 71ce11e10b7400a97f4913d79639104e0f23638b
+  data.tar.gz: 4285045ce6ab28b096101b324bdddb55a58a05bb
 SHA512:
-  metadata.gz: 459c21774abc092ee1abc7bcf096a559c390ce1ec9e292a3887ccdb145c70bc558771b2670ab471a62d5452f34fbb0a5021cabfaf0cf5b2561991a97f3325ff6
-  data.tar.gz: 715996122f90e6885d40eccf582f02bc9bcbda7b1cfd7efb24401b76cac7c54dadeec65477d66eac44202f4d8dec65864546b44771cd487ec808c91cf1adf77e
+  metadata.gz: 932270337ada50c2ac83a0ebd88651cda7b67ff5b0b237498466a96b53ad1831ad14034d53e0426e2bfde0531fe5bfdc71ede449dca4f3c87af109d6c05aeeff
+  data.tar.gz: bb685aaf474b8d566d21420f165ab0bf2b2661c61e3274433923984fc51d5a22d54fa594d642e324ffd190abe7a50b2dd72f5caee8baac77a2414a2e996db119

data/bin/bosh

@@ -7,9 +7,9 @@ begin
 
   load_threshold = 5
   if !ENV.has_key?("BOSH_CLI_SILENCE_SLOW_LOAD_WARNING") && require_cli_time > load_threshold
-    nl
+    err_nl
     warning sprintf("Loading the cli took %.1f seconds, consider cleaning your gem environment", require_cli_time)
-    nl
+    err_nl
   end
 
   Thread.abort_on_exception = true

data/lib/cli/base_command.rb

@@ -187,6 +187,13 @@ module Bosh::Cli
       say("Current deployment is #{deployment.make_green}")
     end
 
+    def show_current_state(deployment_name=nil)
+      msg = "Acting as user '#{credentials.username.to_s.make_green}'"
+      msg += " on deployment '#{deployment_name.make_green}'" if deployment_name
+      msg += " on '#{target_name.make_green}'" if target_name
+      say(msg)
+    end
+
     def no_track_unsupported
       if @options.delete(:no_track)
         say('Ignoring `' + '--no-track'.make_yellow + "' option")

data/lib/cli/client/credentials.rb

@@ -6,6 +6,10 @@ module Bosh
           @token_provider = token_provider
         end
 
+        def username
+          @token_provider.username
+        end
+
         def authorization_header
           @token_provider.token
         end
@@ -17,6 +21,10 @@ module Bosh
           @password = password
         end
 
+        def username
+          @username
+        end
+
         def authorization_header
           'Basic ' + Base64.encode64("#{@username}:#{@password}").strip
         end

data/lib/cli/client/uaa/token_provider.rb

@@ -13,17 +13,24 @@ module Bosh
           end
 
           def token
-            if @auth_info.client_auth?
-              access_info = client_access_info
-            else
-              access_info = password_access_info
-            end
-
+            access_info = get_access_info
             access_info.auth_header if access_info
           end
 
+          def username
+            get_access_info.username
+          end
+
           private
 
+          def get_access_info
+            if @auth_info.client_auth?
+              client_access_info
+            else
+              password_access_info
+            end
+          end
+
           def uaa_client
             @uaa_client ||= Bosh::Cli::Client::Uaa::Client.new(@target, @auth_info, @config)
           end

data/lib/cli/commands/backup.rb

@@ -6,6 +6,8 @@ module Bosh::Cli::Command
     option '--force', 'Overwrite if the backup file already exists'
     def backup(path=nil)
       auth_required
+      show_current_state
+
       path = backup_destination_path(path)
 
       status, task_id = director.create_backup

data/lib/cli/commands/cloud_config.rb

@@ -7,6 +7,7 @@ module Bosh::Cli::Command
 
     def show
       auth_required
+      show_current_state
 
       config = director.get_cloud_config
       if !config.nil?
@@ -19,6 +20,7 @@ module Bosh::Cli::Command
 
     def update(cloud_config_path)
       auth_required
+      show_current_state
 
       cloud_config_yaml = read_yaml_file(cloud_config_path)
 

data/lib/cli/commands/cloudcheck.rb

@@ -13,6 +13,8 @@ module Bosh::Cli::Command
            "don't attempt to resolve problems"
     def perform(deployment_name = nil)
       auth_required
+      show_current_state(deployment_name)
+      
       no_track_unsupported
       @auto_mode = options[:auto]
       @report_mode = options[:report]

data/lib/cli/commands/deployment.rb

@@ -86,7 +86,8 @@ module Bosh::Cli::Command
       recreate = !!options[:recreate]
       redact_diff = !!options[:redact_diff]
 
-      manifest_yaml = prepare_deployment_manifest(:yaml => true, :resolve_properties => true)
+      manifest = prepare_deployment_manifest(resolve_properties: true)
+      manifest_yaml = Psych.dump(manifest)
 
       inspect_deployment_changes(
         Psych.load(manifest_yaml),
@@ -95,11 +96,9 @@ module Bosh::Cli::Command
       )
       say('Please review all changes carefully'.make_yellow) if interactive?
 
-      deployment_name = File.basename(deployment)
-
       header('Deploying')
-      say("Deployment name: `#{deployment_name.make_green}'")
-      say("Director name: `#{target_name.make_green}'")
+      deployment_name = manifest['name']
+      show_current_state(deployment_name)
 
       unless confirmed?('Are you sure you want to deploy?')
         cancel_deployment
@@ -114,11 +113,13 @@ module Bosh::Cli::Command
     usage "delete deployment"
     desc "Delete deployment"
     option "--force", "ignore errors while deleting"
-    def delete(name)
+    def delete(deployment_name)
       auth_required
+      show_current_state(deployment_name)
+
       force = !!options[:force]
 
-      say("\nYou are going to delete deployment `#{name}'.".make_red)
+      say("\nYou are going to delete deployment `#{deployment_name}'.".make_red)
       nl
       say("THIS IS A VERY DESTRUCTIVE OPERATION AND IT CANNOT BE UNDONE!\n".make_red)
 
@@ -128,10 +129,10 @@ module Bosh::Cli::Command
       end
 
       begin
-        status, result = director.delete_deployment(name, :force => force)
-        task_report(status, result, "Deleted deployment `#{name}'")
+        status, result = director.delete_deployment(deployment_name, :force => force)
+        task_report(status, result, "Deleted deployment `#{deployment_name}'")
       rescue Bosh::Cli::ResourceNotFound
-        task_report(:done, nil, "Skipped delete of missing deployment `#{name}'")
+        task_report(:done, nil, "Skipped delete of missing deployment `#{deployment_name}'")
       end
     end
 
@@ -203,6 +204,8 @@ module Bosh::Cli::Command
     desc "Show the list of available deployments"
     def list
       auth_required
+      show_current_state
+
       deployments = director.list_deployments
 
       err("No deployments") if deployments.empty?
@@ -226,6 +229,7 @@ module Bosh::Cli::Command
     desc "Download deployment manifest locally"
     def download_manifest(deployment_name, save_as = nil)
       auth_required
+      show_current_state(deployment_name)
 
       if save_as && File.exists?(save_as) &&
          !confirmed?("Overwrite `#{save_as}'?")

data/lib/cli/commands/errand.rb

@@ -39,6 +39,7 @@ module Bosh::Cli::Command
     private
     def perform_run_errand(errand_name)
       deployment_name = prepare_deployment_manifest['name']
+      show_current_state(deployment_name)
 
       errands_client = Bosh::Cli::Client::ErrandsClient.new(director)
       status, task_id, errand_result = errands_client.run_errand(deployment_name, errand_name, options[:keep_alive] || FALSE)

data/lib/cli/commands/export_compiled_packages.rb

@@ -8,6 +8,7 @@ module Bosh::Cli::Command
     desc 'Download compiled packages for a specific release and stemcell combination'
     def perform(release, stemcell, download_dir)
       auth_required
+      show_current_state
 
       release = Bosh::Cli::NameVersionPair.parse(release)
       stemcell = Bosh::Cli::NameVersionPair.parse(stemcell)

data/lib/cli/commands/import_compiled_packages.rb

@@ -6,6 +6,7 @@ module Bosh::Cli::Command
     desc 'Import compiled packages for a specific release and stemcell combination'
     def perform(exported_tar_path)
       auth_required
+      show_current_state
 
       unless File.exist?(exported_tar_path)
         raise Bosh::Cli::CliError, 'Archive does not exist'

data/lib/cli/commands/job_management.rb

@@ -71,6 +71,7 @@ module Bosh::Cli
       def check_arguments(operation, job)
         auth_required
         job_must_exist_in_deployment(job)
+        show_current_state(prepare_deployment_manifest['name'])
 
         if hard? && soft?
           err('Cannot handle both --hard and --soft options, please choose one')

data/lib/cli/commands/job_rename.rb

@@ -9,6 +9,7 @@ module Bosh::Cli::Command
       auth_required
       manifest_yaml = prepare_deployment_manifest(:yaml => true)
       manifest = Psych.load(manifest_yaml)
+      show_current_state(manifest['name'])
 
       force = options[:force]
       say("You are about to rename `#{old_name.make_green}' to `#{new_name.make_green}'")

data/lib/cli/commands/locks.rb

@@ -8,6 +8,7 @@ module Bosh::Cli::Command
     desc 'Show list of current locks'
     def locks
       auth_required
+      show_current_state
 
       locks = director.list_locks
       err('No locks') if locks.empty?

data/lib/cli/commands/log_management.rb

@@ -41,6 +41,7 @@ module Bosh::Cli::Command
 
     def check_arguments(index)
       auth_required
+      show_current_state(deployment_name)
       no_track_unsupported
 
       err('Job index is expected to be a positive integer') if index !~ /^\d+$/
@@ -74,7 +75,7 @@ module Bosh::Cli::Command
     end
 
     def deployment_name
-      prepare_deployment_manifest['name']
+      @deployment_name ||= prepare_deployment_manifest['name']
     end
   end
 end

data/lib/cli/commands/maintenance.rb

@@ -13,6 +13,7 @@ module Bosh::Cli::Command
     def cleanup
       target_required
       auth_required
+      show_current_state
 
       remove_all = !!options[:all]
 

data/lib/cli/commands/property_management.rb

@@ -123,6 +123,7 @@ module Bosh::Cli::Command
       auth_required
       manifest = prepare_deployment_manifest
       @deployment_name = manifest["name"]
+      show_current_state(@deployment_name)
     end
 
     def show_header

data/lib/cli/commands/release/delete_release.rb

@@ -7,6 +7,7 @@ module Bosh::Cli::Command
       option '--force', 'ignore errors during deletion'
       def delete(name, version = nil)
         auth_required
+        show_current_state
         force = !!options[:force]
 
         desc = "#{name}"

data/lib/cli/commands/release/list_releases.rb

@@ -7,6 +7,7 @@ module Bosh::Cli::Command
       option '--jobs', 'include job templates'
       def list
         auth_required
+        show_current_state
         releases = director.list_releases.sort do |r1, r2|
           r1['name'] <=> r2['name']
         end

data/lib/cli/commands/release/upload_release.rb

@@ -11,6 +11,7 @@ module Bosh::Cli::Command
       option '--skip-if-exists', 'skips upload if release already exists'
       def upload(release_file = nil)
         auth_required
+        show_current_state
 
         upload_options = {
           :rebase => options[:rebase],

data/lib/cli/commands/snapshot.rb

@@ -8,7 +8,7 @@ module Bosh::Cli::Command
       auth_required
 
       deployment_name = prepare_deployment_manifest['name']
-      say("Deployment `#{deployment_name.make_green}'")
+      show_current_state(deployment_name)
 
       snapshots = director.list_snapshots(deployment_name, job, index)
 
@@ -40,7 +40,7 @@ module Bosh::Cli::Command
       auth_required
 
       deployment_name = prepare_deployment_manifest['name']
-      say("Deployment `#{deployment_name.make_green}'")
+      show_current_state(deployment_name)
 
       unless job && index
         unless confirmed?("Are you sure you want to take a snapshot of all deployment `#{deployment_name}'?")
@@ -60,7 +60,7 @@ module Bosh::Cli::Command
       auth_required
 
       deployment_name = prepare_deployment_manifest['name']
-      say("Deployment `#{deployment_name.make_green}'")
+      show_current_state(deployment_name)
 
       unless confirmed?("Are you sure you want to delete snapshot `#{snapshot_cid}'?")
         say('Canceled deleting snapshot'.make_green)
@@ -78,7 +78,7 @@ module Bosh::Cli::Command
       auth_required
 
       deployment_name = prepare_deployment_manifest['name']
-      say("Deployment `#{deployment_name.make_green}'")
+      show_current_state(deployment_name)
 
       unless confirmed?("Are you sure you want to delete all snapshots of deployment `#{deployment_name}'?")
         say('Canceled deleting snapshots'.make_green)
@@ -90,4 +90,4 @@ module Bosh::Cli::Command
       task_report(status, task_id, "Deleted all snapshots of deployment `#{deployment_name}'")
     end
   end
-end
+end

data/lib/cli/commands/stemcell.rb

@@ -31,6 +31,7 @@ module Bosh::Cli
     option '--skip-if-exists', 'skips upload if stemcell already exists'
     def upload(stemcell_location)
       auth_required
+      show_current_state
 
       stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? 'remote' : 'local'
       if stemcell_type == 'local'
@@ -85,6 +86,8 @@ module Bosh::Cli
     desc 'Show the list of available stemcells'
     def list
       auth_required
+      show_current_state
+
       stemcells = director.list_stemcells.sort do |sc1, sc2|
         if sc1['name'] == sc2['name']
           Bosh::Common::Version::StemcellVersion.parse_and_compare(sc1['version'], sc2['version'])
@@ -96,7 +99,7 @@ module Bosh::Cli
       err('No stemcells') if stemcells.empty?
 
       stemcells_table = table do |t|
-        t.headings = 'Name', 'Version', 'CID'
+        t.headings = 'Name', 'OS', 'Version', 'CID'
         stemcells.each do |sc|
           t << get_stemcell_table_record(sc)
         end
@@ -133,6 +136,8 @@ module Bosh::Cli
     option '--force', 'ignore errors while deleting the stemcell'
     def delete(name, version)
       auth_required
+      show_current_state
+
       force = !!options[:force]
 
       say('Checking if stemcell exists...')
@@ -187,7 +192,7 @@ module Bosh::Cli
     def get_stemcell_table_record(sc)
       deployments = sc.fetch('deployments', [])
 
-      [sc['name'], "#{sc['version']}#{deployments.empty? ? '' : '*'}", sc['cid']]
+      [sc['name'], sc['operating_system'], "#{sc['version']}#{deployments.empty? ? '' : '*'}", sc['cid']]
     end
   end
 end

data/lib/cli/commands/task.rb

@@ -14,6 +14,7 @@ module Bosh::Cli::Command
     option "--no-filter", INCLUDE_ALL
     def track(task_id = nil)
       auth_required
+      show_current_state
       use_filter = !options.key?(:no_filter)
       raw_output = options[:raw]
 
@@ -67,6 +68,7 @@ module Bosh::Cli::Command
     option "--no-filter", INCLUDE_ALL
     def list_running
       auth_required
+      show_current_state
       use_filter = !options.key?(:no_filter)
       tasks = director.list_running_tasks(get_verbose_level(use_filter))
       err("No running tasks") if tasks.empty?
@@ -80,6 +82,7 @@ module Bosh::Cli::Command
     option "--no-filter", INCLUDE_ALL
     def list_recent(count = 30)
       auth_required
+      show_current_state
       use_filter = !options.key?(:no_filter)
       tasks = director.list_recent_tasks(count, get_verbose_level(use_filter))
       err("No recent tasks") if tasks.empty?
@@ -92,6 +95,7 @@ module Bosh::Cli::Command
     desc "Cancel task once it reaches the next checkpoint"
     def cancel(task_id)
       auth_required
+      show_current_state
       task = Bosh::Cli::DirectorTask.new(director, task_id)
       task.cancel
       say("Task #{task_id} is getting canceled")

data/lib/cli/commands/user.rb

@@ -8,6 +8,7 @@ module Bosh::Cli::Command
     desc  "Create user"
     def create(username = nil, password = nil)
       auth_required
+      show_current_state
 
       if interactive?
         username = ask("Enter new username: ") if username.blank?
@@ -34,6 +35,7 @@ module Bosh::Cli::Command
     desc "Deletes the user from the director"
     def delete(username = nil)
       auth_required
+      show_current_state
 
       if interactive?
         username ||= ask("Username to delete: ")

data/lib/cli/commands/vms.rb

@@ -9,20 +9,22 @@ module Bosh::Cli::Command
     option '--vitals', 'Return VM vitals information'
     def list(deployment_name = nil)
       auth_required
+      show_current_state(deployment_name)
       no_track_unsupported
 
       if deployment_name.nil?
         deps = director.list_deployments
         err('No deployments') if deps.empty?
-        deps.each { |dep| show_deployment(dep['name'], options) }
+        deps.each do |dep|
+          say("Deployment `#{dep['name'].make_green}'")
+          show_deployment(dep['name'], options)
+        end
       else
         show_deployment deployment_name, options
       end
     end
 
     def show_deployment(name, options={})
-      say("Deployment `#{name.make_green}'")
-
       vms = director.fetch_vm_state(name)
 
       if vms.empty?

data/lib/cli/core_ext.rb

@@ -26,6 +26,10 @@ module BoshExtensions
     say("\n" * count)
   end
 
+  def err_nl
+    warn('')
+  end
+
   def err(message)
     raise Bosh::Cli::CliError, message
   end

data/lib/cli/release_tarball.rb

@@ -16,15 +16,14 @@ module Bosh::Cli
     # Unpacks tarball to @unpack_dir, returns true if succeeded, false if failed
     def unpack
       return @unpacked unless @unpacked.nil?
-      `tar -C #{@unpack_dir} -xzf #{@tarball_path} 2>&1`
-      @unpacked = $?.exitstatus == 0
+      exit_success = system("tar", "-C", @unpack_dir, "-xzf", @tarball_path, out: "/dev/null", err: "/dev/null")
+      @unpacked = !!exit_success
     end
 
     # Creates a new tarball from the current contents of @unpack_dir
     def create_from_unpacked(target_path)
       raise "Not unpacked yet!" unless @unpacked
-      `tar -C #{@unpack_dir} -pczf '#{File.expand_path(target_path)}' . 2>&1`
-      $?.exitstatus == 0
+      !!system("tar", "-C", @unpack_dir, "-pczf", File.expand_path(target_path), ".", out: "/dev/null", err: "/dev/null")
     end
 
     def exists?
@@ -76,8 +75,8 @@ module Bosh::Cli
       repacked_path = File.join(tmpdir, 'release-reformat.tgz')
 
       Dir.chdir(@unpack_dir) do
-        `tar -czf #{repacked_path} . 2>&1`
-        return repacked_path if $? == 0
+        exit_success = system("tar", "-czf", repacked_path, ".", out: "/dev/null", err: "/dev/null")
+        return repacked_path if exit_success
       end
     end
 
@@ -117,8 +116,8 @@ module Bosh::Cli
         end
 
         return nil if @skipped == 0
-        `tar -czf #{repacked_path} . 2>&1`
-        return repacked_path if $? == 0
+        exit_success = system("tar", "-czf", repacked_path, ".", out: "/dev/null", err: "/dev/null")
+        return repacked_path if exit_success
       end
     end
 
@@ -233,8 +232,7 @@ module Bosh::Cli
 
           job_tmp_dir = Dir.mktmpdir
           FileUtils.mkdir_p(job_tmp_dir)
-          `tar -C #{job_tmp_dir} -xzf #{job_file} 2>&1`
-          job_extracted = $?.exitstatus == 0
+          job_extracted = !!system("tar", "-C", job_tmp_dir, "-xzf", job_file, out: "/dev/null", err: "/dev/null")
 
           step("Extract job '#{name}'", "Cannot extract job '#{name}'") do
             job_extracted

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2992.0'
+    VERSION = '1.2999.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2992.0
+  version: 1.2999.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2992.0
+        version: 1.2999.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  2996bb
+  321dd5
 email: support@cloudfoundry.com
 executables:
 - bosh