bosh_cli 1.2513.0 → 1.2524.0

data/lib/cli.rb

@@ -70,6 +70,8 @@ require 'cli/release_tarball'
 
 require 'cli/blob_manager'
 
+require 'cli/logs_downloader'
+
 require 'common/properties'
 require 'cli/job_property_collection'
 require 'cli/job_property_validator'

data/lib/cli/client/errands_client.rb

@@ -1,19 +1,23 @@
 module Bosh::Cli::Client
   class ErrandsClient
     class ErrandResult
-      attr_reader :exit_code, :stdout, :stderr
+      attr_reader :exit_code, :stdout, :stderr, :logs_blobstore_id
 
-      def initialize(exit_code, stdout, stderr)
+      def initialize(exit_code, stdout, stderr, logs_blobstore_id)
         @exit_code = exit_code
         @stdout = stdout
         @stderr = stderr
+        @logs_blobstore_id = logs_blobstore_id
       end
 
       def ==(other)
         unless other.is_a?(self.class)
           raise ArgumentError, "Must be #{self.class} to compare"
         end
-        [exit_code, stdout, stderr] == [other.exit_code, other.stdout, other.stderr]
+
+        local = [exit_code, stdout, stderr, logs_blobstore_id]
+        other = [other.exit_code, other.stdout, other.stderr, other.logs_blobstore_id]
+        local == other
       end
     end
 
@@ -36,7 +40,10 @@ module Bosh::Cli::Client
 
       if errand_result_output
         task_result = JSON.parse(errand_result_output)
-        errand_result = ErrandResult.new(*task_result.values_at('exit_code', 'stdout', 'stderr'))
+        errand_result = ErrandResult.new(
+          *task_result.values_at('exit_code', 'stdout', 'stderr'),
+          task_result.fetch('logs', {})['blobstore_id'],
+        )
       end
 
       [status, task_id, errand_result]

data/lib/cli/commands/errand.rb

@@ -4,6 +4,8 @@ module Bosh::Cli::Command
   class Errand < Base
     usage 'run errand'
     desc 'Run specified errand'
+    option '--download-logs', 'download logs'
+    option '--logs-dir destination_directory', String, 'logs download directory'
     def run_errand(errand_name)
       auth_required
       deployment_required
@@ -28,6 +30,17 @@ module Bosh::Cli::Command
       say(errand_result.stderr.empty?? 'None' : errand_result.stderr)
       nl
 
+      if options[:download_logs] && errand_result.logs_blobstore_id
+        logs_downloader = Bosh::Cli::LogsDownloader.new(director, self)
+        logs_path = logs_downloader.build_destination_path(errand_name, 0, options[:logs_dir] || Dir.pwd)
+
+        begin
+          logs_downloader.download(errand_result.logs_blobstore_id, logs_path)
+        rescue Bosh::Cli::CliError => e
+          @download_logs_error = e
+        end
+      end
+
       title_prefix = "Errand `#{errand_name}'"
       exit_code_suffix = "(exit code #{errand_result.exit_code})"
 
@@ -38,6 +51,8 @@ module Bosh::Cli::Command
       else
         err("#{title_prefix} completed with error #{exit_code_suffix}")
       end
+
+      raise @download_logs_error if @download_logs_error
     end
   end
 end

data/lib/cli/commands/log_management.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli::Command
   class LogManagement < Base
     # bosh logs
@@ -16,9 +14,11 @@ module Bosh::Cli::Command
       index = valid_index_for(job, index)
       check_arguments(index)
 
+      logs_downloader = Bosh::Cli::LogsDownloader.new(director, self)
+
       resource_id = fetch_log_resource_id(index, job)
-      log_file_path = log_file_destination(index, job)
-      download_logs(log_file_path, resource_id)
+      logs_path = logs_downloader.build_destination_path(job, index, options[:dir] || Dir.pwd)
+      logs_downloader.download(resource_id, logs_path)
     end
 
     def fetch_log_resource_id(index, job)
@@ -38,20 +38,6 @@ module Bosh::Cli::Command
       options[:job]
     end
 
-    def download_logs(log_file_path, resource_id)
-      say("Downloading log bundle (#{resource_id.to_s.make_green})...")
-
-      begin
-        tmp_file = director.download_resource(resource_id)
-        FileUtils.mv(tmp_file, log_file_path)
-        say("Logs saved in `#{log_file_path.make_green}'")
-      rescue Bosh::Cli::DirectorError => e
-        err("Unable to download logs from director: #{e}")
-      ensure
-        FileUtils.rm_rf(tmp_file) if tmp_file && File.exists?(tmp_file)
-      end
-    end
-
     def check_arguments(index)
       auth_required
       no_track_unsupported
@@ -85,15 +71,6 @@ module Bosh::Cli::Command
       filter
     end
 
-    def log_file_destination(index, job)
-      time = Time.now.strftime('%Y-%m-%d@%H-%M-%S')
-      File.join(log_directory, "#{job}.#{index}.#{time}.tgz")
-    end
-
-    def log_directory
-      options[:dir] || Dir.pwd
-    end
-
     def deployment_name
       prepare_deployment_manifest['name']
     end

data/lib/cli/logs_downloader.rb

@@ -0,0 +1,33 @@
+module Bosh::Cli
+  class LogsDownloader
+    def initialize(director, ui)
+      @director = director
+      @ui = ui
+    end
+
+    def build_destination_path(job_name, job_index, directory)
+      time = Time.now.strftime('%Y-%m-%d-%H-%M-%S')
+      File.join(directory, "#{job_name}.#{job_index}.#{time}.tgz")
+    end
+
+    def download(resource_id, logs_destination_path)
+      @ui.say("Downloading log bundle (#{resource_id.to_s.make_green})...")
+      @ui.nl
+
+      begin
+        tmp_file = @director.download_resource(resource_id)
+
+        FileUtils.mv(tmp_file, logs_destination_path)
+
+        @ui.say("Logs saved in `#{logs_destination_path.make_green}'")
+        @ui.nl
+
+      rescue Bosh::Cli::DirectorError => e
+        @ui.err("Unable to download logs from director: #{e}")
+
+      ensure
+        FileUtils.rm_rf(tmp_file) if tmp_file
+      end
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2513.0'
+    VERSION = '1.2524.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2513.0
+  version: 1.2524.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  f90a96'
+  0501e4'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -330,6 +330,7 @@ files:
 - lib/cli/job_property_validator.rb
 - lib/cli/job_state.rb
 - lib/cli/line_wrap.rb
+- lib/cli/logs_downloader.rb
 - lib/cli/manifest_warnings.rb
 - lib/cli/name_version_pair.rb
 - lib/cli/package_builder.rb
@@ -381,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1822677666364164043
+      hash: -281260894014773282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23