bosh_cli 1.2978.0 → 1.2980.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be935dcc92dc6f7536c085b586e9929f18a7de60
-  data.tar.gz: fcc3762539fb1f738a42843e4576bdc678461af6
+  metadata.gz: b746e2346f147c8bcb5ab4e32ffd42ee2068ba5e
+  data.tar.gz: e272f8007bfb9d325d11cbcc055ca082c9288a6b
 SHA512:
-  metadata.gz: e5effdc8644bd914e6948c0ad1a8d6b3824742831cf1f0a6e18877c984f2baddd71b68b63435384ae6196146940b7453e655620fa8ef3a78a4706e7e66d042ec
-  data.tar.gz: f88d999391a3ce02d4537a8f369b235a615ddfc93ad4e87ef6cd939066e740ac3350ac8d5723538117874fbec7983c76c1b3c34bc32fdbd3294efd7fce74a460
+  metadata.gz: 9ceffbe0e4a7eae7b9cecd7db1a1813fd41c72506f38f459628d7b63782472e9e42ca30145fbc70093a3652320e9856e92c3e34802867aa7fef9558d18ca2a76
+  data.tar.gz: 4d2aeedcdaa87c14c0d48ea9422e184dda6872b506c4348e8f6eb8176fc241d838bd5fbf08344b52a337d9cc990890add37c5d3511fb3eff2e0430ef2a514c0b

data/lib/cli/client/director.rb

@@ -723,7 +723,8 @@ module Bosh
                Timeout::Error,
                HTTPClient::TimeoutError,
                HTTPClient::KeepAliveDisconnected,
-               OpenSSL::SSL::SSLError => e
+               OpenSSL::SSL::SSLError,
+               OpenSSL::X509::StoreError => e
           raise DirectorInaccessible, "cannot access director (#{e.message})"
 
         rescue HTTPClient::BadResponseError => e

data/lib/cli/client/uaa.rb

@@ -24,13 +24,13 @@ module Bosh
             @token_issuer.prompts
           rescue CF::UAA::SSLException => e
             raise e unless @ssl_ca_file.nil?
-            err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate') #FIXME: the uaa client shouldn't know about 'err'
+            err('Invalid SSL Cert. Use --ca-cert to specify SSL certificate')
           end
 
           def login(credentials)
             @token_issuer.access_info(credentials)
           rescue CF::UAA::TargetError => e
-            err("Failed to log in: #{e.info['error_description']}") #FIXME: the uaa client shouldn't know about 'err'
+            err("Failed to log in: #{e.info['error_description']}")
           rescue CF::UAA::BadResponse
             nil
           end

data/lib/cli/client/uaa/client_token_issuer.rb

@@ -17,7 +17,9 @@ module Bosh
             decoded = @token_decoder.decode(token)
 
             username = decoded['client_id'] if decoded
-            AccessInfo.new(username, nil)
+
+            access_token = "#{token.info['token_type']} #{token.info['access_token']}"
+            AccessInfo.new(username, access_token)
           end
         end
       end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2978.0'
+    VERSION = '1.2980.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2978.0
+  version: 1.2980.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-02 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.2978.0
+        version: 1.2980.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2978.0
+        version: 1.2980.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2978.0
+        version: 1.2980.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2978.0
+        version: 1.2980.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.2978.0
+        version: 1.2980.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2978.0
+        version: 1.2980.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  6e538e
+  cb6c5e
 email: support@cloudfoundry.com
 executables:
 - bosh