ubalo 0.0.11 → 0.0.12

data/bin/ubalo

@@ -195,21 +195,27 @@ end
 desc 'Run a pod'
 arg_name '<pod name>'
 command :run do |c|
+  c.desc 'Use JSON for input and output'
+  c.switch :json
+
   c.action do |global_options,options,args|
     pod_name = args.shift
-
-    $stderr.print "Running #{pod_name}..."
-    response = ubalo.submit_task(pod_name, args.join(" "))
+    if options.json
+      args = receive_json_from_stdin
+      response = ubalo.submit_task_json(args)
+    else
+      $stderr.print "Running #{pod_name}..."
+      response = ubalo.submit_task(pod_name, args.join(" "))
+    end
     task_label = response.fetch('label')
-
-    result = ubalo.wait_task(task_label)
-    ubalo.show_result(result)
+    result = ubalo.wait_task(task_label, options.json)
+    ubalo.show_result(result, options.json)
   end
 end
 
 def receive_json_from_stdin
   if $stdin.tty?
-    raise "please pipe to stdin when using --json"
+    raise UbaloMessage, "please pipe to stdin when using --json"
   else
     JSON.parse($stdin.read)
   end
@@ -484,6 +490,9 @@ on_error do |exception|
   when UbaloExit
     # Normal exit, preserving the correct exit code.
     exit exception.message
+  when UbaloMessage
+    $stderr.puts "Error: #{exception.message}"
+    exit 1
   else
     $stderr.puts "Error! Unfortunately something went wrong. Please contact us: errors@ubalo.com."
     raise  # and go on to raise

data/lib/ubalo.rb

@@ -45,6 +45,10 @@ class UbaloExit < StandardError
 
 end
 
+class UbaloMessage < StandardError
+
+end
+
 class Ubalo
   class << self
     def format_task task
@@ -113,15 +117,19 @@ class Ubalo
     post(:submit_task, hash)
   end
 
-  def wait_task(label)
+  def wait_task(label, silent=false)
     60.times do
       h = check_task(label)
       if %w{complete failed}.include?(h['state'])
-        $stderr.puts " done."
+        unless silent
+          $stderr.puts " done."
+        end
         return h
       end
-      $stderr.print '.'
-      $stderr.flush
+      unless silent
+        $stderr.print '.'
+        $stderr.flush
+      end
       sleep 0.5
     end
     $stderr.puts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2164902800 !ruby/object:Gem::Requirement
+  requirement: &2156840200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164902800
+  version_requirements: *2156840200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2164902220 !ruby/object:Gem::Requirement
+  requirement: &2156839340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164902220
+  version_requirements: *2156839340
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2164901580 !ruby/object:Gem::Requirement
+  requirement: &2156838200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164901580
+  version_requirements: *2156838200
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: