bosh_cli 1.3120.0 → 1.3122.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cli/commands/deployment.rb +4 -3
  3. data/lib/cli/commands/instances.rb +2 -1
  4. data/lib/cli/resources/job.rb +3 -4
  5. data/lib/cli/runner.rb +3 -0
  6. data/lib/cli/version.rb +1 -1
  7. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a07bebb24e591343dc294c015139dd6819ccb421
4
- data.tar.gz: b0deb9dd65fa416dc36019a8b1d2d8a6014b7232
3
+ metadata.gz: 7be75f81fdec3bf4a7f8461b49c0611eef227a5d
4
+ data.tar.gz: 42fd19e5c80ae92551bbb3292c0e9155e646fa14
5
5
  SHA512:
6
- metadata.gz: 40aec8117537c126aa07018ce826d30b17bc5cce82e395368f3df64c2c035aa52cda137094eb457c353c93c5a5f3dea2902d4f8af5e5bc43e956a64b6d71cfcb
7
- data.tar.gz: e6dfd1f9188ae86ef0913d278692132572e7fc7f4e8408816065fc7a609166be4a11da322096b2096b895c6b43d337e5726f64795e2a730a6251f38fc84d98eb
6
+ metadata.gz: 05faf5599cd614fb231ce54ea98988cef9dc0a8b6199f2ace40ba48b35d28de8dd8dfe1c9d60472779962c759461b83854e15d970808570e9099d5642659a780
7
+ data.tar.gz: 82c7b48e1af5942bac441706e4ea6bdb47e7d3bc773b4c700cfccbf6622c3523db19f4ec74984db6d62b5e81f6fec1a3301f6bb765ab392def9625f51c803b44
data/lib/cli/commands/deployment.rb CHANGED
@@ -306,11 +306,12 @@ module Bosh::Cli::Command
306
306
 
307
307
  private
308
308
  def show_current
309
- if deployment
309
+ config.target = target
310
+ if config.deployment
310
311
  if interactive?
311
- say("Current deployment is `#{deployment.make_green}'")
312
+ say("Current deployment is `#{config.deployment.make_green}'")
312
313
  else
313
- say(deployment)
314
+ say(config.deployment)
314
315
  end
315
316
  else
316
317
  err("Deployment not set")
data/lib/cli/commands/instances.rb CHANGED
@@ -78,7 +78,6 @@ module Bosh::Cli::Command
78
78
  end
79
79
 
80
80
  row_count += 1
81
- t << :separator if row_count.between?(2, sorted.size)
82
81
 
83
82
  job = "#{instance['job_name'] || 'unknown'}/#{instance['index'] || 'unknown'}"
84
83
  ips = Array(instance['ips']).join("\n")
@@ -137,6 +136,8 @@ module Bosh::Cli::Command
137
136
  (headings.size - 2).times { process_row << '' }
138
137
  t << process_row
139
138
  end
139
+
140
+ t << :separator if row_count < instances.size
140
141
  end
141
142
  end
142
143
  end
data/lib/cli/resources/job.rb CHANGED
@@ -4,10 +4,9 @@ module Bosh::Cli::Resources
4
4
 
5
5
  # @param [String] directory base Release directory
6
6
  def self.discover(release_base, packages)
7
- Dir[File.join(release_base, 'jobs', '*')].inject([]) do |jobs, job_base|
8
- next unless File.directory?(job_base)
9
- jobs << new(job_base, release_base, packages)
10
- end
7
+ jobs_folder_contents = Dir[File.join(release_base, 'jobs', '*')]
8
+ job_folders = jobs_folder_contents.select { |f| File.directory?(f) }
9
+ job_folders.map { |job_base| new(job_base, release_base, packages) }
11
10
  end
12
11
 
13
12
  attr_reader :job_base, :release_base, :package_dependencies
data/lib/cli/runner.rb CHANGED
@@ -25,6 +25,9 @@ module Bosh::Cli
25
25
  @option_parser = OptionParser.new(banner)
26
26
 
27
27
  Config.colorize = nil
28
+ if ENV.has_key?("BOSH_COLOR") && ENV["BOSH_COLOR"] == "false"
29
+ Config.colorize = false
30
+ end
28
31
  Config.output ||= STDOUT
29
32
 
30
33
  parse_global_options
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.3120.0'
3
+ VERSION = '1.3122.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3120.0
4
+ version: 1.3122.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-27 00:00:00.000000000 Z
11
+ date: 2015-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.3120.0
19
+ version: 1.3122.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.3120.0
26
+ version: 1.3122.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh-template
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3120.0
33
+ version: 1.3122.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.3120.0
40
+ version: 1.3122.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cf-uaa-lib
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.3120.0
131
+ version: 1.3122.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.3120.0
138
+ version: 1.3122.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: net-ssh
141
141
  requirement: !ruby/object:Gem::Requirement