ubalo 0.9 → 0.10

data/bin/ubalo

@@ -30,7 +30,7 @@ end
 
 def account
   unless @account.authorized?
-    raise Ubalo::Error, "Could not find your credentials. Please run ubalo login."
+    raise Ubalo::Error, "Could not find your credentials. #{Ubalo::Util.login_suggestion}"
   end
   @account
 end
@@ -104,8 +104,17 @@ end
 
 desc 'Display tasks'
 command :tasks do |c|
+  c.desc 'show all tasks, not just those for the current pod'
+  c.switch :all
+
   c.action do |global_options,options,args|
-    account.tasks.each do |task|
+    if options.all
+      tasks = account.tasks
+    else
+      tasks = pod.tasks
+    end
+
+    tasks.each do |task|
       puts "#{task.label} (#{task.state})  #{task.pod_name}  #{Ubalo::Util.time_ago_in_words task.submitted_at}"
     end
   end

data/lib/ubalo/account.rb

@@ -29,7 +29,7 @@ module Ubalo
     def refresh!
       update_attributes(request(:get, "/users/#{username}"))
     rescue RestClient::ResourceNotFound
-      raise Ubalo::Error, "Your credentials for #{username} are invalid"
+      raise Ubalo::Error, "Your credentials for #{username} are invalid. #{Util.login_suggestion}"
     end
 
     def pod_from_json(pod_json)

data/lib/ubalo/task.rb

@@ -1,6 +1,6 @@
 module Ubalo
   class Task
-    attr_reader :label, :state, :pod_name, :arg, :output, :submitted_at, :elapsed_time
+    attr_reader :label, :state, :pod_name, :arg_error, :output_error, :submitted_at, :elapsed_time
 
     def self.create_with_json(account, json)
       new(account, json.fetch('label'), json)
@@ -43,9 +43,13 @@ module Ubalo
       s = ""
       s << " label: #{label}\n"
       s << "   pod: #{pod_name}\n"
-      if arg
-        s << "   arg:\n"
-        s << Util.indent(arg.pretty_inspect)
+      if arg?
+        if @arg_error
+          s << "! Parse error in arg: #{@arg_error.message}"
+        else
+          s << "   arg:\n"
+          s << Util.indent(arg.pretty_inspect)
+        end
       end
       s << " state: #{state}\n"
 
@@ -67,9 +71,13 @@ module Ubalo
         end
       end
 
-      if output
-        s << "output:\n"
-        s << Util.indent(output.pretty_inspect)
+      if output?
+        if @output_error
+          s << "! Parse error in output: #{@output_error.message}"
+        else
+          s << "output:\n"
+          s << Util.indent(output.pretty_inspect)
+        end
       end
       s
     end
@@ -85,11 +93,42 @@ module Ubalo
       @submitted_at = attributes['submitted_at']
       @elapsed_time = attributes['elapsed_time']
 
-      @arg = Util.decode_content(attributes['arg']) if attributes['arg']
-      @output = Util.decode_content(attributes['outputs']) if attributes['outputs']
+      parse_arg(attributes['arg']) if attributes['arg']
+      parse_output(attributes['outputs']) if attributes['outputs']
       self
     end
 
+    def parse_arg(raw)
+      @arg = Util.decode_content(raw)
+    rescue
+      @arg_error = $!
+    end
+
+    def arg
+      raise "Error with arg: #{@arg_error}" if @arg_error
+      @arg
+    end
+
+    def arg?
+      @arg || @arg_error
+    end
+
+    def parse_output(raw)
+      @output = Util.decode_content(raw)
+    rescue
+      @output_error = $!
+    end
+
+    def output
+      raise "Error with output: #{@output_error}" if @output_error
+      @output
+    end
+
+    def output?
+      @output || @output_error
+    end
+
+
     def request method, path = nil, options = {}
       @account.request(method, "/tasks/#{label}#{path}", options)
     end

data/lib/ubalo/util.rb

@@ -83,10 +83,19 @@ module Ubalo
         end
       end
 
+      def ubalo_headers
+        {
+          'X-Ubalo-Version' => Ubalo.version,
+          'User-Agent' => "ubalo-cli/#{Ubalo.version}",
+          'X-Ruby-Version' => RUBY_VERSION,
+          'X-Ruby-Platform' => RUBY_PLATFORM,
+        }
+      end
+
       def http_request(method, url, options)
         params = options.delete(:params) || {}
 
-        headers = {:accept => :json, 'X-Ubalo-Version' => Ubalo.version}
+        headers = ubalo_headers.merge({:accept => :json})
 
         if authorization = options.delete(:authorization)
           headers.merge!(:authorization => authorization)
@@ -117,6 +126,8 @@ module Ubalo
         else
           JSON.load(response)
         end
+      rescue RestClient::Request::Unauthorized
+        raise Ubalo::Error, "Your credentials are invalid. #{login_suggestion}"
       rescue RestClient::BadRequest => e
         if message = JSON.load(e.response.to_s)["upgrade_message"]
           raise Ubalo::Error, message
@@ -125,6 +136,10 @@ module Ubalo
         end
       end
 
+      def login_suggestion
+        "Please run ubalo login."
+      end
+
       def pluralize count, word
         if count == 1
           "#{count} #{word}"
@@ -149,9 +164,9 @@ module Ubalo
 
       def indent str, amount=2
         if str
-          str.each_line.map do |l|
+          str.chomp.each_line.map do |l|
             " "*amount + l
-          end.join
+          end.join + "\n"
         else
           ""
         end

data/lib/ubalo/version.rb

@@ -1,6 +1,6 @@
 module Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.9"
+    VERSION = "0.10"
   end
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70214700595780 !ruby/object:Gem::Requirement
+  requirement: &70350445320100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214700595780
+  version_requirements: *70350445320100
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70214700594160 !ruby/object:Gem::Requirement
+  requirement: &70350445319680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214700594160
+  version_requirements: *70350445319680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70214700592680 !ruby/object:Gem::Requirement
+  requirement: &70350445319260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214700592680
+  version_requirements: *70350445319260
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70214700591800 !ruby/object:Gem::Requirement
+  requirement: &70350445318660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70214700591800
+  version_requirements: *70350445318660
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70214700591020 !ruby/object:Gem::Requirement
+  requirement: &70350445317500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214700591020
+  version_requirements: *70350445317500
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -93,24 +93,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2863097484302400668
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2863097484302400668
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: CLI and API client for Ubalo