bosh_cli 1.3120.0 → 1.3122.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07bebb24e591343dc294c015139dd6819ccb421
-  data.tar.gz: b0deb9dd65fa416dc36019a8b1d2d8a6014b7232
+  metadata.gz: 7be75f81fdec3bf4a7f8461b49c0611eef227a5d
+  data.tar.gz: 42fd19e5c80ae92551bbb3292c0e9155e646fa14
 SHA512:
-  metadata.gz: 40aec8117537c126aa07018ce826d30b17bc5cce82e395368f3df64c2c035aa52cda137094eb457c353c93c5a5f3dea2902d4f8af5e5bc43e956a64b6d71cfcb
-  data.tar.gz: e6dfd1f9188ae86ef0913d278692132572e7fc7f4e8408816065fc7a609166be4a11da322096b2096b895c6b43d337e5726f64795e2a730a6251f38fc84d98eb
+  metadata.gz: 05faf5599cd614fb231ce54ea98988cef9dc0a8b6199f2ace40ba48b35d28de8dd8dfe1c9d60472779962c759461b83854e15d970808570e9099d5642659a780
+  data.tar.gz: 82c7b48e1af5942bac441706e4ea6bdb47e7d3bc773b4c700cfccbf6622c3523db19f4ec74984db6d62b5e81f6fec1a3301f6bb765ab392def9625f51c803b44

data/lib/cli/commands/deployment.rb

@@ -306,11 +306,12 @@ module Bosh::Cli::Command
 
     private
     def show_current
-      if deployment
+      config.target = target
+      if config.deployment
         if interactive?
-          say("Current deployment is `#{deployment.make_green}'")
+          say("Current deployment is `#{config.deployment.make_green}'")
         else
-          say(deployment)
+          say(config.deployment)
         end
       else
         err("Deployment not set")

data/lib/cli/commands/instances.rb

@@ -78,7 +78,6 @@ module Bosh::Cli::Command
           end
 
           row_count += 1
-          t << :separator if row_count.between?(2, sorted.size)
 
           job = "#{instance['job_name'] || 'unknown'}/#{instance['index'] || 'unknown'}"
           ips = Array(instance['ips']).join("\n")
@@ -137,6 +136,8 @@ module Bosh::Cli::Command
               (headings.size - 2).times { process_row << '' }
               t << process_row
             end
+
+            t << :separator if row_count < instances.size
           end
         end
       end

data/lib/cli/resources/job.rb

@@ -4,10 +4,9 @@ module Bosh::Cli::Resources
 
     # @param [String] directory base Release directory
     def self.discover(release_base, packages)
-      Dir[File.join(release_base, 'jobs', '*')].inject([]) do |jobs, job_base|
-        next unless File.directory?(job_base)
-        jobs << new(job_base, release_base, packages)
-      end
+      jobs_folder_contents = Dir[File.join(release_base, 'jobs', '*')]
+      job_folders = jobs_folder_contents.select { |f| File.directory?(f) }
+      job_folders.map { |job_base| new(job_base, release_base, packages) }
     end
 
     attr_reader :job_base, :release_base, :package_dependencies

data/lib/cli/runner.rb

@@ -25,6 +25,9 @@ module Bosh::Cli
       @option_parser = OptionParser.new(banner)
 
       Config.colorize = nil
+      if ENV.has_key?("BOSH_COLOR") && ENV["BOSH_COLOR"] == "false"
+        Config.colorize = false
+      end
       Config.output ||= STDOUT
 
       parse_global_options

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3120.0'
+    VERSION = '1.3122.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3120.0
+  version: 1.3122.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-29 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.3120.0
+        version: 1.3122.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3120.0
+        version: 1.3122.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3120.0
+        version: 1.3122.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3120.0
+        version: 1.3122.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.3120.0
+        version: 1.3122.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3120.0
+        version: 1.3122.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement