bosh_cli 1.2682.1.0 → 1.2685.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf501aca53943011bfc61580e3671e5fc5c100e5
-  data.tar.gz: a54903ad9ccf4cc7c6825093b63f5bf0caa942f1
+  metadata.gz: ce4a70b7286032542973e807ba924b8aeb50f483
+  data.tar.gz: 18b705df336bdd04cc4c4861d42ea93167e0bfe2
 SHA512:
-  metadata.gz: 5c7ddc616a0ec26498626701498c86607a9850a6493444fc9321138f27257fa4f654feb6d6b136ed3fee43a6d9d57404f6a082fbf8e32989b4d6d36b094b314f
-  data.tar.gz: 22303bf7dcf2780d0d1e7d7bd507c90cb7fd54b690c38ee531a051868173e2eff02a8c11c30a807493dcaf8bf988abb973c00f0bef85a4524113db9534504952
+  metadata.gz: ac9ddc5b85e13bd7db80a612157b3b8ea17a6a6101732c31a213008624f7ff2faa875a55ccbc6f062cc3e5790b75b5604bb4604285af9e0d702b970afcbc60f0
+  data.tar.gz: 3932601afecab862419b98507ce3547bbe526f9f1e6043355552d86cf7c88ac6381bb82b2d3fba2fd8b79de6c6cf80058e6c2312858ca03cad71cf110a263c95

data/lib/cli/base_command.rb

@@ -204,11 +204,22 @@ module Bosh::Cli
       end
 
       def normalize_url(url)
-        had_port = url.to_s =~ /:\d+$/
+        url = url.gsub(/\/$/, '')
         url = "https://#{url}" unless url.match(/^http:?/)
         uri = URI.parse(url)
-        uri.port = DEFAULT_DIRECTOR_PORT unless had_port
-        uri.to_s.strip.gsub(/\/$/, '')
+
+        if port = url.match(/:(\d+)$/)
+          port_number = port.captures[0].to_i
+          if port_number == URI::HTTPS::DEFAULT_PORT
+            uri.to_s + ":#{URI::HTTPS::DEFAULT_PORT}"
+          else
+            uri.port = port_number
+            uri.to_s
+          end
+        else
+          uri.port = DEFAULT_DIRECTOR_PORT
+          uri.to_s
+        end
       end
     end
   end

data/lib/cli/commands/vms.rb

@@ -78,7 +78,7 @@ module Bosh::Cli::Command
               swap = vitals['swap']
               disk = vitals['disk']
 
-              row << vitals['load'].map { |l| "#{l}%" }.join(', ')
+              row << vitals['load'].join(', ')
               row << "#{cpu['user']}%"
               row << "#{cpu['sys']}%"
               row << "#{cpu['wait']}%"

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2682.1.0'
+    VERSION = '1.2685.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2682.1.0
+  version: 1.2685.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-11 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.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: 0.5.4
 description: |-
   BOSH CLI
-  93a782
+  989d8b
 email: support@cloudfoundry.com
 executables:
 - bosh