bosh_cli 1.2682.1.0 → 1.2685.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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cli/base_command.rb +14 -3
  3. data/lib/cli/commands/vms.rb +1 -1
  4. data/lib/cli/version.rb +1 -1
  5. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cf501aca53943011bfc61580e3671e5fc5c100e5
4
- data.tar.gz: a54903ad9ccf4cc7c6825093b63f5bf0caa942f1
3
+ metadata.gz: ce4a70b7286032542973e807ba924b8aeb50f483
4
+ data.tar.gz: 18b705df336bdd04cc4c4861d42ea93167e0bfe2
5
5
  SHA512:
6
- metadata.gz: 5c7ddc616a0ec26498626701498c86607a9850a6493444fc9321138f27257fa4f654feb6d6b136ed3fee43a6d9d57404f6a082fbf8e32989b4d6d36b094b314f
7
- data.tar.gz: 22303bf7dcf2780d0d1e7d7bd507c90cb7fd54b690c38ee531a051868173e2eff02a8c11c30a807493dcaf8bf988abb973c00f0bef85a4524113db9534504952
6
+ metadata.gz: ac9ddc5b85e13bd7db80a612157b3b8ea17a6a6101732c31a213008624f7ff2faa875a55ccbc6f062cc3e5790b75b5604bb4604285af9e0d702b970afcbc60f0
7
+ data.tar.gz: 3932601afecab862419b98507ce3547bbe526f9f1e6043355552d86cf7c88ac6381bb82b2d3fba2fd8b79de6c6cf80058e6c2312858ca03cad71cf110a263c95
data/lib/cli/base_command.rb CHANGED
@@ -204,11 +204,22 @@ module Bosh::Cli
204
204
  end
205
205
 
206
206
  def normalize_url(url)
207
- had_port = url.to_s =~ /:\d+$/
207
+ url = url.gsub(/\/$/, '')
208
208
  url = "https://#{url}" unless url.match(/^http:?/)
209
209
  uri = URI.parse(url)
210
- uri.port = DEFAULT_DIRECTOR_PORT unless had_port
211
- uri.to_s.strip.gsub(/\/$/, '')
210
+
211
+ if port = url.match(/:(\d+)$/)
212
+ port_number = port.captures[0].to_i
213
+ if port_number == URI::HTTPS::DEFAULT_PORT
214
+ uri.to_s + ":#{URI::HTTPS::DEFAULT_PORT}"
215
+ else
216
+ uri.port = port_number
217
+ uri.to_s
218
+ end
219
+ else
220
+ uri.port = DEFAULT_DIRECTOR_PORT
221
+ uri.to_s
222
+ end
212
223
  end
213
224
  end
214
225
  end
data/lib/cli/commands/vms.rb CHANGED
@@ -78,7 +78,7 @@ module Bosh::Cli::Command
78
78
  swap = vitals['swap']
79
79
  disk = vitals['disk']
80
80
 
81
- row << vitals['load'].map { |l| "#{l}%" }.join(', ')
81
+ row << vitals['load'].join(', ')
82
82
  row << "#{cpu['user']}%"
83
83
  row << "#{cpu['sys']}%"
84
84
  row << "#{cpu['wait']}%"
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.2682.1.0'
3
+ VERSION = '1.2685.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.2682.1.0
4
+ version: 1.2685.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-25 00:00:00.000000000 Z
11
+ date: 2014-08-11 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.2682.1.0
19
+ version: 1.2685.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.2682.1.0
26
+ version: 1.2685.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.2682.1.0
33
+ version: 1.2685.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.2682.1.0
40
+ version: 1.2685.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: json_pure
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2682.1.0
117
+ version: 1.2685.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.2682.1.0
124
+ version: 1.2685.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: net-ssh
127
127
  requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
194
194
  version: 0.5.4
195
195
  description: |-
196
196
  BOSH CLI
197
- 93a782
197
+ 989d8b
198
198
  email: support@cloudfoundry.com
199
199
  executables:
200
200
  - bosh