bosh_cli 1.2915.0 → 1.2922.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f02ca6ddc4de5ea51002e19c5314b45f662f3e2e
-  data.tar.gz: f3530d1248685f5a1bfb405fb54f1e13bcf83d6b
+  metadata.gz: 62513440b2e79662bfbfe378fcfef67745286395
+  data.tar.gz: e79260a21cf9148c16bd853cca410bbb7cf70f94
 SHA512:
-  metadata.gz: 27e826747db64b638d5b1d1552ee50b03673de1d26caf411c628bc5d2b38b72f98538965e9e6003ac76215bfc721e995aa9de26a073124577a674a12d1dd2b14
-  data.tar.gz: 31c09e5037914052a47a58b472e4b4005c9d982c165f1122a413b4108e0ffc78d361ab61dbf718888b9a1dc20899e52fcf6df24226eff4cd1b50b62d752921f9
+  metadata.gz: 2e323e28b40de0026f479ac5d2dd11fc09a31dbe89d91bbb18efb5300ebb85937b8c14afbb0220a9186a42f11935813b754b78bf37b729012c7e8647309026c5
+  data.tar.gz: 378e6e027bc3a0179aed2ff390ef8e72876be39e873c4923a39ecc69d50999887441ae1a71edc5459242c6a14821ac429e2e86ee6c9716658d2388830b867775

data/lib/cli/commands/deployment.rb

@@ -1,4 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
 
 module Bosh::Cli::Command
   class Deployment < Base
@@ -126,9 +125,12 @@ module Bosh::Cli::Command
         return
       end
 
-      status, task_id = director.delete_deployment(name, :force => force)
-
-      task_report(status, task_id, "Deleted deployment `#{name}'")
+      begin
+        status, result = director.delete_deployment(name, :force => force)
+        task_report(status, result, "Deleted deployment `#{name}'")
+      rescue Bosh::Cli::ResourceNotFound
+        task_report(:done, nil, "Skipped delete of missing deployment `#{name}'")
+      end
     end
 
     # bosh validate jobs
@@ -204,17 +206,9 @@ module Bosh::Cli::Command
       err("No deployments") if deployments.empty?
 
       deployments_table = table do |t|
-        t.headings = %w(Name Release(s) Stemcell(s))
+        t.headings = ['Name', 'Release(s)', 'Stemcell(s)', 'Cloud Config']
         deployments.each do |d|
-          row = if (d.has_key?("releases") && d.has_key?("stemcells"))
-            row_for_deployments_table(d)
-          else
-            # backwards compatible but slow: pull down each deployment
-            # manifest to get releases and stemcells in use
-            row_for_deployments_table_by_manifest(d["name"])
-          end
-
-          t.add_row(row)
+          t.add_row(row_for_deployments_table(d))
           t.add_separator unless d == deployments.last
         end
       end
@@ -265,27 +259,9 @@ module Bosh::Cli::Command
       stemcells = names_and_versions_from(deployment["stemcells"])
       releases  = names_and_versions_from(deployment["releases"])
 
-      [deployment["name"], releases.join("\n"), stemcells.join("\n")]
-    end
-
-    def row_for_deployments_table_by_manifest(deployment_name)
-      raw_manifest = director.get_deployment(deployment_name)
-      if (raw_manifest.has_key?("manifest"))
-        manifest = Psych.load(raw_manifest["manifest"])
-
-        stemcells = manifest["resource_pools"].map { |rp|
-          rp["stemcell"].values_at("name", "version").join("/")
-        }.sort.uniq
-
-        releases = manifest["releases"] || [manifest["release"]]
-        releases = names_and_versions_from(releases)
-
-        [manifest["name"], releases.join("\n"), stemcells.join("\n")]
-      else
-        [deployment_name, "n/a", "n/a"]
-      end
+      [deployment["name"], releases.join("\n"), stemcells.join("\n"), deployment.fetch("cloud_config", "none")]
     end
-
+    
     def names_and_versions_from(arr)
       arr.map { |hash|
         hash.values_at("name", "version").join("/")

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2915.0'
+    VERSION = '1.2922.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2915.0
+  version: 1.2922.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-10 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.2915.0
+        version: 1.2922.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2915.0
+        version: 1.2922.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2915.0
+        version: 1.2922.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2915.0
+        version: 1.2922.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.2915.0
+        version: 1.2922.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2915.0
+        version: 1.2922.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  5653ce
+  3778c5
 email: support@cloudfoundry.com
 executables:
 - bosh