ubalo 0.0.5 → 0.0.6

data/bin/ubalo

@@ -44,7 +44,7 @@ def ubalo
 end
 
 program_desc 'Command-line access to ubalo.com.'
-version "0.0.4"
+version "0.0.6"
 
 desc "Change the connect url"
 flag 'connect-url'
@@ -56,39 +56,28 @@ command :whoami do |c|
   end
 end
 
-desc 'Display pods'
-command :pods do |c|
-  c.desc 'show all pods you can snap (default)'
-  c.switch :all
-
-  c.desc 'show only your pods'
-  c.switch :mine
-
-  c.desc 'show only the pods you can edit and snap'
-  c.switch :editable
-
+desc 'Display a list of available pods'
+command :list do |c|
   c.action do |global_options,options,args|
-    unless options.all or options.edit_only
-      # Default to showing just your pods.
-      options.mine = true
-    end
-
-    your_pods, editable_pods, snappable_pods = ubalo.pods
+    response = ubalo.pods
 
-    # Always show your pods.
-    your_pods.each do |pod|
-      puts Ubalo.format_pod(pod)
-    end
-
-    if options.all or options.edit_only
-      editable_pods.each do |pod|
-        puts Ubalo.format_pod(pod)
+    puts "your pods:"
+    your_pods = response['your_pods']
+    if your_pods.empty?
+      puts "  (none)"
+    else
+      response['your_pods'].each do |pod|
+        puts Ubalo.format_pod(pod, false)
       end
     end
 
-    if options.all
-      snappable_pods.each do |pod|
-        puts Ubalo.format_pod(pod)
+    puts "other pods:"
+    other_pods = response['other_pods']
+    if other_pods.empty?
+      puts "  (none)"
+    else
+      other_pods.each do |pod|
+        puts Ubalo.format_pod(pod, true)
       end
     end
   end
@@ -230,15 +219,7 @@ end
 
 desc 'Snap a pod'
 arg_name '<pod name>'
-command :snap do |c|
-  c.desc 'detach, leaving task running in the background; return an id'
-  c.switch [:detach, :d]
-
-  c.desc 'explicitly show the complete result'
-  c.switch [:verbose, :v]
-
-  c.desc 'outputs as json to stdout; stdout > stderr'
-  c.switch [:json, :j]
+command :run do |c|
 
   c.action do |global_options,options,args|
     pod_name = args.shift
@@ -246,15 +227,12 @@ command :snap do |c|
       raise "please specify a pod"
     end
 
-    h = ubalo.submit_task(pod_name, args.join(" "))
-    task_id = h['id']
+    $stderr.print "Running #{pod_name}..."
+    response = ubalo.submit_task(pod_name, args.join(" "))
+    task_id = response['id']
 
-    if options.detach
-      puts task_id
-    else
-      result = ubalo.check_task(task_id, true)
-      ubalo.show_result(result, options.verbose, options.json)
-    end
+    result = ubalo.check_task(task_id, true)
+    ubalo.show_result(result)
   end
 end
 
@@ -281,38 +259,44 @@ command :check do |c|
   end
 end
 
-desc 'Retrieve an API token'
-command :authorize do |c|
+desc 'Sign into Ubalo'
+command :signin do |c|
   c.action do |global_options,options,args|
     puts "Please enter your Ubalo username/email and password to unlock command-line access."
     login    = hl.ask("     login: "){|q| q.echo = true}
     password = hl.ask("  password: "){|q| q.echo = false}
 
     ubalo.token = ubalo.get_api_token(login, password)
-    Ubalo.write_config('token' => ubalo.token)
+    Ubalo.write_config("connect-url" => ubalo.base_url, ubalo.base_url => {'token' => ubalo.token})
     puts "Access details saved to ~/.ubalorc."
     puts ubalo.whoami
   end
 end
 
-desc 'Clear any stored API tokens'
-command :deauthorize do |c|
+desc 'Sign out of Ubalo'
+command :signout do |c|
   c.action do |global_options,options,args|
-    Ubalo.write_config('token' => nil)
+    Ubalo.write_config(ubalo.base_url => nil)
     puts "Access details deleted."
   end
 end
 
 pre do |global,command,options,args|
   config = Ubalo.config
-  token = config['token']
+  connect_url = global['connect-url'] || config['connect-url']
+
+  # When signing in, don't use the token:
+  unless command && command.name == :signin
+    if host_config = config[connect_url]
+      token = host_config['token']
+    end
+  end
 
-  unless token or (command && command.name == :authorize)
-    raise "No credentials found. Please run 'ubalo authorize'."
+  unless token or (command && command.name == :signin)
+    raise "No credentials found. Please run 'ubalo signin'."
   end
 
-  connect_url = global['connect-url'] || config['connect-url']
-  @ubalo ||= Ubalo.authorize(token, connect_url)
+  @ubalo ||= Ubalo.signin(token, connect_url)
 
   true
 end

data/lib/ubalo.rb

@@ -50,15 +50,20 @@ class Ubalo
       "#{task['id'].to_s[0,6]}  #{task['state'].lfit(8)}  #{task['pod_name'].lfit(25)}  #{task['arg'].to_s.lfit(40)}"
     end
 
-    def format_pod pod
-      "#{pod['environ'].lfit(18)}  #{pod['code_lines'].to_s.rjust 3} lines  #{pod['user'].rfit(10)} / #{pod['name']}"
+    def format_pod pod, with_username
+      if with_username
+        name = "#{pod['user']}/#{pod['name']}"
+      else
+        name = pod['name']
+      end
+      "  #{name} - #{pod['environ']}"
     end
   end
 
   attr_reader :base_url
   attr_accessor :token
 
-  def self.authorize token, base_url=nil
+  def self.signin token, base_url=nil
     new(token, base_url)
   end
 
@@ -95,7 +100,6 @@ class Ubalo
   end
 
   def submit_task(pod_name, arg)
-    $stderr.puts "Snapping #{pod_name}"
     parse(post(:submit_task, {:pod_name => pod_name, :arg => arg}))
   end
 
@@ -104,7 +108,7 @@ class Ubalo
       60.times do
         h = check_task_once(id)
         if %w{complete failed}.include?(h['state'])
-          $stderr.puts "done"
+          $stderr.puts " done."
           return h
         end
         $stderr.print '.'
@@ -140,8 +144,7 @@ class Ubalo
   end
 
   def pods
-    h = parse(get(:pods))
-    [h['your_pods'], h['editable_pods'], h['snappable_pods']]
+    parse(get(:pods))
   end
 
   def ssh(pod_name)
@@ -170,36 +173,22 @@ class Ubalo
     if json
       puts outputs
     else
-      if verbose
-        puts "    id: #{result['id']}"
-        puts "  name: #{result['pod_name']}"
-        puts " state: #{result['state']}"
-        puts "status: #{result['status']}"
-        if result['stdout']
-          puts "stdout:"
-          puts result['stdout'].indent
-        end
-        if result['stderr']
-          puts "stderr:"
-          puts result['stderr'].indent
-        end
-      else
-        if result['stdout']
-          print result['stdout']
-        end
-        if result['stderr']
-          $stderr.print result['stderr']
-        end
-
-        exit_code = Integer(result['status'] || 0)
-        unless exit_code.zero?
-          raise UbaloExit, exit_code
-        end
+      puts "    id: #{result['id']}"
+      puts "  name: #{result['pod_name']}"
+      puts "   arg: #{result['arg']}"
+      puts " state: #{result['state']}"
+      puts "status: #{result['status']}" if result['status']
+      if result['stdout']
+        puts "stdout:"
+        puts result['stdout'].indent
+      end
+      if result['stderr']
+        puts "stderr:"
+        puts result['stderr'].indent
       end
-
       if outputs
-        $stderr.puts "outputs:"
-        $stderr.puts outputs.indent
+        puts "outputs:"
+        puts outputs.indent
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000Z
+date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2157151880 !ruby/object:Gem::Requirement
+  requirement: &2153089760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157151880
+  version_requirements: *2153089760
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157151440 !ruby/object:Gem::Requirement
+  requirement: &2153089320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157151440
+  version_requirements: *2153089320
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157150940 !ruby/object:Gem::Requirement
+  requirement: &2153088800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157150940
+  version_requirements: *2153088800
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: