bosh_cli 1.2697.0 → 1.2707.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40d0e6b6b3590d647456bfcd5f92b945d3080a92
-  data.tar.gz: 7020682a8b275f9798ecfaf479bc0ec3ff2643f3
+  metadata.gz: 6a47c8ce74bce4953701eef1707ae6ad0a8c1610
+  data.tar.gz: 89fcf0da09e7d6f9458c5930536473ca0cd92388
 SHA512:
-  metadata.gz: bb1234786ba00ce72c403952322dad8738801c6aa4f7e9d8ce731353e644a9a67a398e36656cefd71a7410b071f1565d4758fa557650225a7fca5216ba912edc
-  data.tar.gz: 042e42a797aedbca4437fa3724290563617db7f0ee204670bdbc352e7791ed9169942def17e8574d29b88262dc62ac20de685370f7f6305a84ea58a372e0f89e
+  metadata.gz: bba4b12fa020695185b658a001793b789834c558860ec9474e5554da42b112951e2438a03fff01e76ef4e0ce0ee6c9bfc700d408fcf2496fbacc17b52083dbf0
+  data.tar.gz: 797d866bf4e07d239294a66815665069c081c5b1f37664b5249dea58de7d9a4857f644614cc4402186ab49ee046ff28dbe2e3dd5d6f74b3e78de798592dafac9

data/lib/cli/changeset_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2012 VMware, Inc.
+# encoding: UTF-8
 
 module Bosh::Cli
   class HashChangeset
@@ -50,7 +50,7 @@ module Bosh::Cli
     end
 
     def summary(level = 0)
-      indent = "  " * level
+      indent = '  ' * level
       out = []
 
       @children.each_pair do |k, v|
@@ -61,11 +61,11 @@ module Bosh::Cli
         elsif v.leaf?
           case v.state
           when :added
-            out << indent + "added #{k}: ".make_yellow + v.new.to_s
+            out << indent + "+ #{k}: ".make_yellow + v.new.to_s
           when :removed
-            out << indent + "removed #{k}: ".make_red + v.old.to_s
+            out << indent + "- #{k}: ".make_red + v.old.to_s
           when :changed
-            out << indent + "changed #{k}: ".make_yellow
+            out << indent + "± #{k}: ".make_yellow
             out << diff(v.old, v.new, indent + "  ")
           end
         else

data/lib/cli/client/director.rb

@@ -122,13 +122,7 @@ module Bosh
         end
 
         def list_running_tasks(verbose = 1)
-
-          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' +
-                       "&verbose=#{verbose}")
-          end
+          get_json("/tasks?state=processing,cancelling,queued&verbose=#{verbose}")
         end
 
         def list_recent_tasks(count = 30, verbose = 1)
@@ -700,7 +694,13 @@ module Bosh
             :header => headers,
           }, &block)
 
-        rescue URI::Error, SocketError, Errno::ECONNREFUSED, Timeout::Error, HTTPClient::TimeoutError, HTTPClient::KeepAliveDisconnected => e
+        rescue URI::Error,
+               SocketError,
+               Errno::ECONNREFUSED,
+               Timeout::Error,
+               HTTPClient::TimeoutError,
+               HTTPClient::KeepAliveDisconnected,
+               OpenSSL::SSL::SSLError => e
           raise DirectorInaccessible, "cannot access director (#{e.message})"
 
         rescue HTTPClient::BadResponseError => e

data/lib/cli/commands/deployment.rb

@@ -88,20 +88,22 @@ module Bosh::Cli::Command
       manifest_yaml = prepare_deployment_manifest(
         :yaml => true, :resolve_properties => true)
 
-      if interactive?
-        inspect_deployment_changes(Psych.load(manifest_yaml))
-        say("Please review all changes carefully".make_yellow)
-      end
+      inspect_deployment_changes(Psych.load(manifest_yaml), interactive: interactive?)
+      say('Please review all changes carefully'.make_yellow) if interactive?
+
+      deployment_name = File.basename(deployment)
 
-      desc = "`#{File.basename(deployment).make_green}' to `#{target_name.make_green}'"
+      header('Deploying')
+      say("Deployment name: `#{deployment_name.make_green}'")
+      say("Director name: `#{target_name.make_green}'")
 
-      unless confirmed?("Deploying #{desc}")
+      unless confirmed?('Are you sure you want to deploy?')
         cancel_deployment
       end
 
       status, task_id = director.deploy(manifest_yaml, :recreate => recreate)
 
-      task_report(status, task_id, "Deployed #{desc}")
+      task_report(status, task_id, "Deployed `#{deployment_name.make_green}' to `#{target_name.make_green}'")
     end
 
     # bosh delete deployment

data/lib/cli/deployment_helper.rb

@@ -8,6 +8,8 @@ module Bosh::Cli
         err("Cannot find deployment manifest in `#{manifest_filename}'")
       end
 
+      header('Processing deployment manifest')
+
       manifest = load_yaml_file(manifest_filename)
       manifest_yaml = File.read(manifest_filename)
 
@@ -89,11 +91,8 @@ module Bosh::Cli
     # a meaningful return value.
     # @return Boolean Were there any changes in deployment manifest?
     def inspect_deployment_changes(manifest, options = {})
-      show_empty_changeset = true
-
-      if options.has_key?(:show_empty_changeset)
-        show_empty_changeset = options[:show_empty_changeset]
-      end
+      show_empty_changeset = options.fetch(:show_empty_changeset, true)
+      interactive = options.fetch(:interactive, false)
 
       manifest = manifest.dup
       current_deployment = director.get_deployment(manifest['name'])
@@ -106,8 +105,7 @@ module Bosh::Cli
       current_manifest = Psych.load(current_deployment['manifest'])
 
       unless current_manifest.is_a?(Hash)
-        err('Current deployment manifest format is invalid, ' +
-              'check if director works properly')
+        err('Current deployment manifest format is invalid, check if director works properly')
       end
 
       diff = Bosh::Cli::HashChangeset.new
@@ -115,8 +113,7 @@ module Bosh::Cli
       diff.add_hash(normalize_deployment_manifest(current_manifest), :old)
       @_diff_key_visited = { 'name' => 1, 'director_uuid' => 1 }
 
-      say('Detecting changes in deployment...'.make_green)
-      nl
+      header('Detecting deployment changes')
 
       if !diff.changed? && !show_empty_changeset
         return false
@@ -124,14 +121,16 @@ module Bosh::Cli
 
       if diff[:release]
         print_summary(diff, :release)
-        warn_about_release_changes(diff[:release])
+        warn_about_release_changes(diff[:release]) if interactive
         nl
       end
 
       if diff[:releases]
         print_summary(diff, :releases)
-        diff[:releases].each do |release_diff|
-          warn_about_release_changes(release_diff)
+        if interactive
+          diff[:releases].each do |release_diff|
+            warn_about_release_changes(release_diff)
+          end
         end
         nl
       end
@@ -143,7 +142,35 @@ module Bosh::Cli
       nl
 
       print_summary(diff, :resource_pools)
+      warn_about_stemcell_changes(diff) if interactive
+      nl
+
+      print_summary(diff, :disk_pools)
+      nl
+
+      print_summary(diff, :networks)
+      nl
+
+      print_summary(diff, :jobs)
+      nl
+
+      print_summary(diff, :properties)
+      nl
+
+      diff.keys.each do |key|
+        unless @_diff_key_visited[key]
+          print_summary(diff, key)
+          nl
+        end
+      end
 
+      diff.changed?
+    rescue Bosh::Cli::ResourceNotFound
+      say('Cannot get current deployment information from director, possibly a new deployment'.make_red)
+      true
+    end
+
+    def warn_about_stemcell_changes(diff)
       old_stemcells = Set.new
       new_stemcells = Set.new
 
@@ -159,40 +186,18 @@ module Bosh::Cli
       end
 
       if old_stemcells != new_stemcells
-        unless confirmed?('Stemcell update has been detected. ' +
-                            'Are you sure you want to update stemcells?')
+        unless confirmed?('Stemcell update has been detected. Are you sure you want to update stemcells?')
           cancel_deployment
         end
       end
 
       if old_stemcells.size != new_stemcells.size
         say('Stemcell update seems to be inconsistent with current '.make_red +
-              'deployment. Please carefully review changes above.'.make_red)
+          'deployment. Please carefully review changes above.'.make_red)
         unless confirmed?('Are you sure this configuration is correct?')
           cancel_deployment
         end
       end
-
-      nl
-      print_summary(diff, :networks)
-      nl
-      print_summary(diff, :jobs)
-      nl
-      print_summary(diff, :properties)
-      nl
-
-      diff.keys.each do |key|
-        unless @_diff_key_visited[key]
-          print_summary(diff, key)
-          nl
-        end
-      end
-
-      diff.changed?
-    rescue Bosh::Cli::ResourceNotFound
-      say('Cannot get current deployment information from director, ' +
-            'possibly a new deployment'.make_red)
-      true
     end
 
     def latest_release_versions

data/lib/cli/deployment_manifest.rb

@@ -9,7 +9,7 @@ module Bosh::Cli
     def normalize
       normalized = Bosh::Common::DeepCopy.copy(manifest_hash)
 
-      %w(releases networks jobs resource_pools).each do |section|
+      %w(releases networks jobs resource_pools disk_pools).each do |section|
         normalized[section] ||= []
 
         unless normalized[section].kind_of?(Array)
@@ -63,4 +63,4 @@ module Bosh::Cli
       err("Deployment manifest error: #{err}")
     end
   end
-end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2697.0'
+    VERSION = '1.2707.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2697.0
+  version: 1.2707.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-27 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.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +194,13 @@ dependencies:
         version: 0.5.4
 description: |-
   BOSH CLI
-  ca0ac0
+  3e8bee
 email: support@cloudfoundry.com
 executables:
 - bosh
 extensions: []
 extra_rdoc_files: []
 files:
-- README
 - bin/bosh
 - lib/cli.rb
 - lib/cli/backup_destination_path.rb

data/README

@@ -1,4 +0,0 @@
-Copyright (c) 2009-2012 VMware, Inc.
-
-BOSH CLI is a command-line interface to VMware AppCloud Outer Shell.
-