bosh_cli 1.2005.0 → 1.2063.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.
@@ -14,19 +14,25 @@ module Bosh::Cli::Command
14
14
  # bosh status
15
15
  usage "status"
16
16
  desc "Show current status (current target, user, deployment info etc)"
17
+ option "--uuid", "Only print director UUID"
17
18
  def status
18
- say("Config".make_green)
19
- print_value("", config.filename)
20
-
21
- nl
22
- say("Director".make_green)
23
- if target.nil?
24
- say(" not set".make_yellow)
25
- else
19
+ if options[:uuid]
26
20
  begin
27
- timeout(config.status_timeout || DEFAULT_STATUS_TIMEOUT) do
28
- director = Bosh::Cli::Client::Director.new(target)
29
- status = director.get_status
21
+ say(get_director_status["uuid"])
22
+ rescue => e
23
+ err("Error fetching director status: #{e.message}")
24
+ end
25
+ else
26
+ say("Config".make_green)
27
+ print_value("", config.filename)
28
+
29
+ nl
30
+ say("Director".make_green)
31
+ if target.nil?
32
+ say(" not set".make_yellow)
33
+ else
34
+ begin
35
+ status = get_director_status
30
36
 
31
37
  print_value("Name", status["name"])
32
38
  print_value("URL", target_url)
@@ -42,41 +48,41 @@ module Bosh::Cli::Command
42
48
  config.target_uuid = status["uuid"]
43
49
  config.save
44
50
  end
51
+ rescue TimeoutError
52
+ say(" timed out fetching director status".make_red)
53
+ rescue => e
54
+ say(" error fetching director status: #{e.message}".make_red)
45
55
  end
46
- rescue TimeoutError
47
- say(" timed out fetching director status".make_red)
48
- rescue => e
49
- say(" error fetching director status: #{e.message}".make_red)
50
56
  end
51
- end
52
57
 
53
- nl
54
- say("Deployment".make_green)
58
+ nl
59
+ say("Deployment".make_green)
55
60
 
56
- if deployment
57
- print_value("Manifest", deployment)
58
- else
59
- say(" not set".make_yellow)
60
- end
61
+ if deployment
62
+ print_value("Manifest", deployment)
63
+ else
64
+ say(" not set".make_yellow)
65
+ end
61
66
 
62
- if in_release_dir?
63
- nl
64
- say("Release".make_green)
67
+ if in_release_dir?
68
+ nl
69
+ say("Release".make_green)
65
70
 
66
- dev_version = Bosh::Cli::VersionsIndex.new(
67
- File.join(work_dir, "dev_releases")).latest_version
71
+ dev_version = Bosh::Cli::VersionsIndex.new(
72
+ File.join(work_dir, "dev_releases")).latest_version
68
73
 
69
- final_version = Bosh::Cli::VersionsIndex.new(
70
- File.join(work_dir, "releases")).latest_version
74
+ final_version = Bosh::Cli::VersionsIndex.new(
75
+ File.join(work_dir, "releases")).latest_version
71
76
 
72
- dev = release.dev_name
73
- dev += "/#{dev_version}" if dev && dev_version
77
+ dev = release.dev_name
78
+ dev += "/#{dev_version}" if dev && dev_version
74
79
 
75
- final = release.final_name
76
- final += "/#{final_version}" if final && final_version
80
+ final = release.final_name
81
+ final += "/#{final_version}" if final && final_version
77
82
 
78
- print_value("dev", dev)
79
- print_value("final", final)
83
+ print_value("dev", dev)
84
+ print_value("final", final)
85
+ end
80
86
  end
81
87
  end
82
88
 
@@ -348,5 +354,11 @@ module Bosh::Cli::Command
348
354
 
349
355
  "(#{result.join(", ")})"
350
356
  end
357
+
358
+ def get_director_status
359
+ timeout(config.status_timeout || DEFAULT_STATUS_TIMEOUT) do
360
+ Bosh::Cli::Client::Director.new(target).get_status
361
+ end
362
+ end
351
363
  end
352
364
  end
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.2005.0'
3
+ VERSION = '1.2063.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2005.0
4
+ version: 1.2063.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-02-16 00:00:00.000000000 Z
12
+ date: 2014-02-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 1.2005.0
21
+ version: 1.2063.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ~>
28
28
  - !ruby/object:Gem::Version
29
- version: 1.2005.0
29
+ version: 1.2063.0
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: json_pure
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2005.0
117
+ version: 1.2063.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.2005.0
125
+ version: 1.2063.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: net-ssh
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
269
269
  version: '0'
270
270
  description: ! 'BOSH CLI
271
271
 
272
- f36cae'
272
+ 941741'
273
273
  email: support@cloudfoundry.com
274
274
  executables:
275
275
  - bosh
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
376
376
  version: '0'
377
377
  segments:
378
378
  - 0
379
- hash: -518499073328633117
379
+ hash: -4174074309811955679
380
380
  requirements: []
381
381
  rubyforge_project:
382
382
  rubygems_version: 1.8.23