bosh_cli 1.2732.0 → 1.2739.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369b59362e32cfaa7b06ce996e80a658b58426d0
-  data.tar.gz: 14298cab8827d311d3a70e6f382816cb6c7566e5
+  metadata.gz: 657ec2e7e308f2278574ceab525e704466c37a01
+  data.tar.gz: bb8691cb23bd51c7b6428073c4d942811ff53262
 SHA512:
-  metadata.gz: 6673ea9f3977df6a6ecee1c0ff9e3a842a5b3045704868035f2e2c39480d6340a5da12a0aaeb2e3b1e179ac13c07a2962e1b8bf94f62d9b8ff30e6baa966e6f1
-  data.tar.gz: cd653bb276dc1fa26341ca258185124265ec185421f1424059dd5df6348a44702e0c61717b6d8244cff7cfe0dc5592b1f9d20ef1c356afb72927d40987e83588
+  metadata.gz: af5a16d77c2c37c78ed7588145549e7b9a02ab83aeee6405bfc15d669609c117a2222169bbef84fd874543f0477eeb337c0ecce9d64cccff88b43f199e4d031b
+  data.tar.gz: ec8cabb614df4814320a353466663bd9e4768c89160a8dc4304b1deae6a3e246dacb3565d2c47df55549a39e6ddcf0f7f765b2af31f793f1c43f0184b5c4645d

data/lib/cli/client/director.rb

@@ -121,6 +121,10 @@ module Bosh
           get_json('/deployments')
         end
 
+        def list_errands(deployment_name)
+          get_json("/deployments/#{deployment_name}/errands")
+        end
+
         def list_running_tasks(verbose = 1)
           get_json("/tasks?state=processing,cancelling,queued&verbose=#{verbose}")
         end

data/lib/cli/commands/errand.rb

@@ -2,14 +2,41 @@ require 'cli/client/errands_client'
 
 module Bosh::Cli::Command
   class Errand < Base
+    usage 'errands'
+    desc 'List available errands'
+    def errands
+      deployment_required
+      errands = list_errands
+
+      if errands.size > 0
+        errands_table = table do |t|
+          t.headings = ['Name']
+          errands.each { |errand| t << [errand['name']] }
+        end
+        nl
+        say(errands_table)
+      else
+        err("Deployment has no available errands")
+      end
+    end
+
     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)
+    def run_errand(errand_name=nil)
       auth_required
       deployment_required
 
+      unless errand_name
+        errand = prompt_for_errand_name
+        errand_name = errand['name']
+      end
+      perform_run_errand(errand_name)
+    end
+
+    private
+    def perform_run_errand(errand_name)
       deployment_name = prepare_deployment_manifest['name']
 
       errands_client = Bosh::Cli::Client::ErrandsClient.new(director)

data/lib/cli/deployment_helper.rb

@@ -264,6 +264,21 @@ module Bosh::Cli
       end
     end
 
+    # return a job/errand selected by user by name
+    def prompt_for_errand_name
+      errands = list_errands
+
+      err("Deployment has no available errands") if errands.size == 0
+      return errands.first if errands.size == 1
+
+      choose do |menu|
+        menu.prompt = 'Choose an errand: '
+        errands.each do |errand, index|
+          menu.choice("#{errand['name']}") { errand }
+        end
+      end
+    end
+
     def jobs_and_indexes
       jobs = prepare_deployment_manifest.fetch('jobs')
 
@@ -287,6 +302,11 @@ module Bosh::Cli
       jobs.find { |job| job.fetch('name') == job_name }
     end
 
+    def list_errands
+      deployment_name = prepare_deployment_manifest.fetch('name')
+      director.list_errands(deployment_name)
+    end
+
     def find_deployment(name)
       if File.exists?(name)
         File.expand_path(name)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2732.0'
+    VERSION = '1.2739.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2732.0
+  version: 1.2739.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-09 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.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.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.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.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
-  f6dedd
+  0d77bd
 email: support@cloudfoundry.com
 executables:
 - bosh