bosh_cli 1.2063.0 → 1.2068.0

data/lib/cli/client/compiled_packages_client.rb

@@ -24,6 +24,5 @@ module Bosh::Cli::Client
 
       @director.upload_and_track(:post, path, exported_tar_path, {content_type: 'application/x-compressed'})
     end
-
   end
 end

data/lib/cli/client/errands_client.rb

@@ -0,0 +1,40 @@
+module Bosh::Cli::Client
+  class ErrandsClient
+    class ErrandResult
+      attr_reader :exit_code, :stdout, :stderr
+
+      def initialize(exit_code, stdout, stderr)
+        @exit_code = exit_code
+        @stdout = stdout
+        @stderr = stderr
+      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]
+      end
+    end
+
+    def initialize(director)
+      @director = director
+    end
+
+    def run_errand(deployment_name, errand_name)
+      url = "/deployments/#{deployment_name}/errands/#{errand_name}/runs"
+      options = { content_type: 'application/json', payload: '{}' }
+
+      status, task_id = @director.request_and_track(:post, url, options)
+
+      if status != :done
+        return [status, task_id, nil]
+      end
+
+      task_result = JSON.parse(@director.get_task_result_log(task_id))
+      errand_result = ErrandResult.new(*task_result.values_at('exit_code', 'stdout', 'stderr'))
+
+      [status, task_id, errand_result]
+    end
+  end
+end

data/lib/cli/commands/errand.rb

@@ -0,0 +1,41 @@
+require 'cli/client/errands_client'
+
+module Bosh::Cli::Command
+  class Errand < Base
+    usage 'run errand'
+    desc 'Run specified errand'
+    def run_errand(errand_name)
+      auth_required
+      deployment_required
+
+      deployment_name = prepare_deployment_manifest['name']
+
+      errands_client = Bosh::Cli::Client::ErrandsClient.new(director)
+      status, task_id, errand_result = errands_client.run_errand(deployment_name, errand_name)
+
+      unless errand_result
+        task_report(status, task_id, nil, "Errand `#{errand_name}' did not complete")
+        return
+      end
+
+      nl
+
+      say('[stdout]')
+      say(errand_result.stdout.empty?? 'None' : errand_result.stdout)
+      nl
+
+      say('[stderr]')
+      say(errand_result.stderr.empty?? 'None' : errand_result.stderr)
+      nl
+
+      title_prefix = "Errand `#{errand_name}' completed"
+      exit_code_suffix = "(exit code #{errand_result.exit_code})"
+
+      if errand_result.exit_code == 0
+        say("#{title_prefix} successfully #{exit_code_suffix}".make_green)
+      else
+        err("#{title_prefix} with error #{exit_code_suffix}")
+      end
+    end
+  end
+end

data/lib/cli/commands/import_compiled_packages.rb

@@ -4,13 +4,13 @@ module Bosh::Cli::Command
   class ImportCompiledPackages < Base
     usage 'import compiled_packages'
     desc 'Import compiled packages for a specific release and stemcell combination'
-
     def perform(exported_tar_path)
       auth_required
 
       unless File.exist?(exported_tar_path)
         raise Bosh::Cli::CliError, 'Archive does not exist'
       end
+
       client = Bosh::Cli::Client::CompiledPackagesClient.new(director)
       status, task_id = client.import(exported_tar_path)
       task_report(status, task_id)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2063.0'
+    VERSION = '1.2068.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2063.0
+  version: 1.2068.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-26 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.2063.0
+        version: 1.2068.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2063.0
+        version: 1.2068.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.2063.0
+        version: 1.2068.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2063.0
+        version: 1.2068.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  941741'
+  5f63a5'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -284,6 +284,7 @@ files:
 - lib/cli/changeset_helper.rb
 - lib/cli/client/compiled_packages_client.rb
 - lib/cli/client/director.rb
+- lib/cli/client/errands_client.rb
 - lib/cli/command_discovery.rb
 - lib/cli/command_handler.rb
 - lib/cli/commands/backup.rb
@@ -292,6 +293,7 @@ files:
 - lib/cli/commands/cloudcheck.rb
 - lib/cli/commands/complete.rb
 - lib/cli/commands/deployment.rb
+- lib/cli/commands/errand.rb
 - lib/cli/commands/export_compiled_packages.rb
 - lib/cli/commands/help.rb
 - lib/cli/commands/import_compiled_packages.rb
@@ -376,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4174074309811955679
+      hash: -2465170715055136714
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23