ubalo 0.4 → 0.5

data/bin/ubalo

@@ -13,7 +13,7 @@ hl = HighLine.new
 
 module Ubalo
   def self.config_filename
-    File.expand_path("~/.ubaloconfig")
+    File.expand_path("~/.ubalorc")
   end
 end
 
@@ -45,9 +45,6 @@ end
 
 program_desc 'Command-line access to ubalo.com.'
 
-desc "Change the connect url"
-flag 'connect-url'
-
 desc "Override the active pod"
 flag 'pod'
 
@@ -84,7 +81,10 @@ command :login do |c|
     password = options[:password] || hl.ask("  password: "){|q| q.echo = false}
 
     @account.authorize(login, password)
-    Ubalo::Util.append_config(Ubalo.config_filename, account.base_url, account.as_hash)
+    Ubalo::Util.append_config(
+      Ubalo.config_filename, account.base_url,
+      {'authorization' => account.authorization, 'username' => account.username}
+    )
     logger.puts "Success! Ready to use as #{account.username}."
   end
 end
@@ -163,7 +163,7 @@ desc 'Run a pod'
 command :run do |c|
   c.action do |global_options,options,args|
     logger.puts "Running #{pod.fullname}."
-    task = pod.run(nil)
+    task = pod.run(args.shift)
     logger.poll_on("Waiting for task #{task.label.inspect}") do
       task.refresh!
       task.complete?
@@ -176,7 +176,7 @@ desc 'Run a pod in the background'
 command :submit do |c|
   c.action do |global_options,options,args|
     logger.print "Submitting #{pod.fullname}..."
-    task = pod.run(nil)
+    task = pod.run(args.shift)
     logger.puts " done."
     puts task.printable_result
   end
@@ -214,8 +214,10 @@ pre do |global,command,options,args|
   @connect_url = ENV['UBALO_CONNECT_URL'] || "https://ubalo.com"
 
   config = Ubalo::Util.read_config(Ubalo.config_filename)
-  if account_config = config[connect_url]
-    @account = Ubalo::Account.from_hash(account_config)
+  if account_config = config[@connect_url]
+    @account = Ubalo::Account.new(@connect_url)
+    @account.username = account_config.fetch('username')
+    @account.authorization = account_config.fetch('authorization')
   else
     @account = Ubalo::Account.new(connect_url)
   end

data/lib/ubalo/account.rb

@@ -1,12 +1,5 @@
 module Ubalo
   class Account
-    def self.from_hash(h)
-      account = new h.fetch(:base_url)
-      account.username = h.fetch(:username)
-      account.authorization = h.fetch(:authorization)
-      account
-    end
-
     attr_accessor :username, :authorization
     attr_reader :base_url
 
@@ -74,14 +67,6 @@ module Ubalo
       end
     end
 
-    def as_hash
-      {
-        :base_url => @base_url,
-        :username => username,
-        :authorization => authorization
-      }
-    end
-
     def inspect
       "#<Account #{username} #{base_url} #{'authorized' if authorization}>"
     end

data/lib/ubalo/task.rb

@@ -60,7 +60,7 @@ module Ubalo
 
       if output
         s << "output:\n"
-        s << printable_task_content('output', output)
+        s << Util.indent(output.pretty_inspect)
       end
       s
     end

data/lib/ubalo/util.rb

@@ -50,7 +50,7 @@ module Ubalo
         end
 
         self.puts
-        raise UbaloError, "timed-out polling on #{message}"
+        raise Ubalo::Error, "timed-out polling on #{message}"
       end
     end
 
@@ -67,7 +67,7 @@ module Ubalo
         response = RestClient.put(url, File.open(archive_name, 'rb'), :content_type => 'application/x-tar', :content_encoding => 'x-gzip')
 
         unless response.code == 200
-          raise UbaloError, "could not upload pod files"
+          raise Ubalo::Error, "could not upload pod files"
         end
       end
 
@@ -78,7 +78,7 @@ module Ubalo
               f.write response
             end
           else
-            raise UbaloError, "failed to download pod files"
+            raise Ubalo::Error, "failed to download pod files"
           end
         end
       end
@@ -155,7 +155,7 @@ module Ubalo
         if content_type == UbaloJSON.content_type
           s = UbaloJSON.load(data)
         else
-          raise UbaloError, "cannot understand content of this type"
+          raise Ubalo::Error, "cannot understand content of this type"
         end
       end
 

data/lib/ubalo/version.rb

@@ -1,5 +1,5 @@
 module Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.4"
+    VERSION = "0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70122817467440 !ruby/object:Gem::Requirement
+  requirement: &70233084564080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122817467440
+  version_requirements: *70233084564080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70122817466520 !ruby/object:Gem::Requirement
+  requirement: &70233084571080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122817466520
+  version_requirements: *70233084571080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70122817465120 !ruby/object:Gem::Requirement
+  requirement: &70233075286720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122817465120
+  version_requirements: *70233075286720
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70122817464380 !ruby/object:Gem::Requirement
+  requirement: &70233075285840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70122817464380
+  version_requirements: *70233075285840
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70122817463540 !ruby/object:Gem::Requirement
+  requirement: &70233075285220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122817463540
+  version_requirements: *70233075285220
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2500511595485587265
+      hash: -1754747755012050403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2500511595485587265
+      hash: -1754747755012050403
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11