ubalo 0.0.8 → 0.0.9

data/bin/ubalo

@@ -51,7 +51,6 @@ def local_config
 end
 
 program_desc 'Command-line access to ubalo.com.'
-version "0.0.7"
 
 desc "Change the connect url"
 flag 'connect-url'
@@ -95,22 +94,12 @@ end
 
 desc 'Display tasks'
 command :tasks do |c|
-  c.desc 'filter by task state (pending, complete, etc)'
-  c.long_desc 'possibilities are waiting,running,pending,complete,failed,all'
-  c.default_value 'all'
-  c.flag 'state'
-
   c.desc 'maximum number of tasks to display'
   c.default_value 20
   c.flag 'max'
 
   c.action do |global_options,options,args|
-    unless options.pending or options.failed
-      # Default to showing just your pods.
-      options.all = true
-    end
-
-    ubalo.tasks(options.state, options.max).each do |task|
+    ubalo.tasks(options.max).reverse.each do |task|
       puts Ubalo.format_task(task)
     end
   end
@@ -148,9 +137,6 @@ arg_name '<pod name>'
 command :get do |c|
   c.action do |global_options,options,args|
     pod_name = args.shift
-    unless pod_name
-      raise "please specify a pod"
-    end
     destination_path = args.shift
 
     $stderr.print "Fetching code for #{pod_name}..."
@@ -214,9 +200,6 @@ arg_name '<pod name>'
 command :run do |c|
   c.action do |global_options,options,args|
     pod_name = args.shift
-    unless pod_name
-      raise "please specify a pod"
-    end
 
     $stderr.print "Running #{pod_name}..."
     response = ubalo.submit_task(pod_name, args.join(" "))
@@ -247,9 +230,6 @@ command :submit do |c|
       result = ubalo.submit_task_json(args)
     else
       pod_name = args.shift
-      unless pod_name
-        raise "please specify a pod"
-      end
 
       $stderr.print "Submitting #{pod_name}..."
       result = ubalo.submit_task(pod_name, args.join(" "))
@@ -271,18 +251,27 @@ command :check do |c|
       result = ubalo.check_task_json(args)
     else
       task_label = args.first
-      unless task_label
-        raise "please specify a task"
-      end
 
       $stderr.print "Checking task #{task_label}..."
       result = ubalo.check_task(task_label)
+      $stderr.puts " found."
     end
 
     ubalo.show_result(result, options.json)
   end
 end
 
+desc 'Stop running a specific task'
+arg_name '<task label>'
+command :stop do |c|
+  c.action do |global_options,options,args|
+    task_label = args.first
+    $stderr.print "Stopping task #{task_label}..."
+    result = ubalo.stop_task(task_label)
+    $stderr.puts " task now #{result['state']}."
+  end
+end
+
 desc 'Add an ssh key (defaults to ~/.ssh/id_rsa.pub)'
 arg_name '<file containing ssh key>'
 command :add_key do |c|
@@ -301,19 +290,6 @@ command :clear_keys do |c|
   end
 end
 
-desc 'Modify a pod'
-arg_name '<pod name>'
-command :edit do |c|
-  c.action do |global_options,options,args|
-    pod_name = args.shift
-    unless pod_name
-      raise "please specify a pod"
-    end
-
-    ubalo.ssh(pod_name)
-  end
-end
-
 desc 'Push code to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
@@ -393,10 +369,6 @@ arg_name '<pod name>'
 command :edit do |c|
   c.action do |global_options,options,args|
     pod_name = args.shift
-    unless pod_name
-      raise "please specify a pod"
-    end
-
     ubalo.ssh(pod_name)
   end
 end
@@ -457,6 +429,9 @@ on_error do |exception|
   when RestClient::BadRequest
     $stderr.puts exception.inspect.sub('400 Bad Request', 'Error')
     false
+  when RestClient::ResourceNotFound
+    $stderr.puts exception.inspect.sub('404 Resource Not Found', 'Error')
+    false
   when UbaloExit
     # Normal exit, preserving the correct exit code.
     exit exception.message

data/lib/ubalo.rb

@@ -48,7 +48,7 @@ end
 class Ubalo
   class << self
     def format_task task
-      "#{task['label']}  #{task['state'].lfit(8)}  #{task['pod_name'].lfit(25)}  #{task['arg'].to_s.lfit(40)}"
+      "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{task['submitted_at_in_words']} ago)"
     end
 
     def format_pod pod, with_username
@@ -101,8 +101,8 @@ class Ubalo
     "You are #{response['username']}, with role #{response['role']}. You have #{response['pod_count']} pods."
   end
 
-  def tasks state, count
-    get(:tasks, :count => count, :state => state)
+  def tasks count
+    get(:tasks, :count => count)
   end
 
   def submit_task(pod_name, arg)
@@ -125,7 +125,7 @@ class Ubalo
       sleep 0.5
     end
     $stderr.puts
-    raise "timed-out waiting for task"
+    raise "timed-out waiting for task #{label}"
   end
 
   def upload_key(key)
@@ -164,6 +164,10 @@ class Ubalo
     end
   end
 
+  def stop_task(label)
+    post(:stop_task, {:label => label})
+  end
+
   def show_result(result, json=false)
     if json
       puts JSON.dump(result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2157148100 !ruby/object:Gem::Requirement
+  requirement: &2169287420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157148100
+  version_requirements: *2169287420
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157147660 !ruby/object:Gem::Requirement
+  requirement: &2169286980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157147660
+  version_requirements: *2169286980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157147160 !ruby/object:Gem::Requirement
+  requirement: &2169286480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157147160
+  version_requirements: *2169286480
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: