bosh_cli 1.2311.0 → 1.2334.0

data/lib/cli/client/director.rb

@@ -598,22 +598,26 @@ module Bosh
           @director_name ||= get_status['name']
         end
 
-        def request(method, uri, content_type = nil, payload = nil,
-          headers = {}, options = {})
-          headers  = headers.dup
-          tmp_file = nil
-
+        def request(method, uri, content_type = nil, payload = nil, headers = {}, options = {})
+          headers = headers.dup
           headers['Content-Type'] = content_type if content_type
 
+          tmp_file = nil
+          response_reader = nil
           if options[:file]
             tmp_file = File.open(File.join(Dir.mktmpdir, 'streamed-response'), 'w')
-
             response_reader = lambda { |part| tmp_file.write(part) }
-          else
-            response_reader = nil
           end
 
-          response = try_to_perform_http_request(method, "#{@scheme}://#{@director_ip}:#{@port}#{uri}", payload, headers, num_retries, retry_wait_interval, &response_reader)
+          response = try_to_perform_http_request(
+            method,
+            "#{@scheme}://#{@director_ip}:#{@port}#{uri}",
+            payload,
+            headers,
+            num_retries,
+            retry_wait_interval,
+            &response_reader
+          )
 
           if options[:file]
             tmp_file.close
@@ -640,7 +644,6 @@ module Bosh
 
           [response.code, body, headers]
 
-
         rescue SystemCallError => e
           raise DirectorError, "System call error while talking to director: #{e}"
         end
@@ -659,6 +662,19 @@ module Bosh
           end
         end
 
+        def try_to_perform_http_request(method, uri, payload, headers, num_retries, retry_wait_interval, &response_reader)
+          num_retries.downto(1) do |n|
+            begin
+              return perform_http_request(method, uri, payload, headers, &response_reader)
+
+            rescue DirectorInaccessible
+              warning("cannot access director, trying #{n-1} more times...") if n != 1
+              raise if n == 1
+              sleep(retry_wait_interval)
+            end
+          end
+        end
+
         def perform_http_request(method, uri, payload = nil, headers = {}, &block)
           http_client = HTTPClient.new
 
@@ -676,31 +692,23 @@ module Bosh
               Base64.encode64("#{@user}:#{@password}").strip
           end
 
-          http_client.request(method, uri, :body => payload,
-                              :header            => headers, &block)
+          http_client.request(method, uri, {
+            :body => payload,
+            :header => headers,
+          }, &block)
+
+        rescue URI::Error, SocketError, Errno::ECONNREFUSED, Timeout::Error, HTTPClient::TimeoutError => e
+          raise DirectorInaccessible, "cannot access director (#{e.message})"
 
         rescue HTTPClient::BadResponseError => e
           err("Received bad HTTP response from director: #{e}")
-        rescue URI::Error, SocketError, SystemCallError
-          raise # We handle these upstream
-        rescue => e
-          # httpclient (sadly) doesn't have a generic exception
+
+        # HTTPClient doesn't have a root exception but instead subclasses RuntimeError
+        rescue RuntimeError => e
           puts "Perform request #{method}, #{uri}, #{headers.inspect}, #{payload.inspect}"
           err("REST API call exception: #{e}")
         end
 
-        def try_to_perform_http_request(method, uri, payload, headers, num_retries, retry_wait_interval, &response_reader)
-          num_retries.downto(1) do |n|
-            begin
-              return perform_http_request(method, uri, payload, headers, &response_reader)
-            rescue URI::Error, SocketError, Errno::ECONNREFUSED => e
-              warning("cannot access director, trying #{n-1} more times...") if n != 1
-              raise DirectorInaccessible, "cannot access director (#{e.message})" if n == 1
-              sleep retry_wait_interval
-            end
-          end
-        end
-
         def get_json(url)
           status, body = get_json_with_status(url)
           raise AuthError if status == 401

data/lib/cli/task_tracking/event_log_renderer.rb

@@ -64,8 +64,10 @@ module Bosh::Cli::TaskTracking
     end
 
     def add_event(event)
-      @total_duration.started_at = event['time']
-      @total_duration.finished_at = event['time']
+      unless event['time'] == 0
+        @total_duration.started_at = event['time']
+        @total_duration.finished_at = event['time']
+      end
 
       if event['type'] == 'deprecation'
         show_deprecation(event)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2311.0'
+    VERSION = '1.2334.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2311.0
+  version: 1.2334.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  7df356'
+  839055'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -380,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -598426764694286403
+      hash: 4124968515230087242
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23