ubalo 0.0.6 → 0.0.7

data/bin/ubalo

@@ -2,9 +2,9 @@
 
 require 'gli'
 require 'yaml'
+require 'fileutils'
 
 require 'highline'
-require 'highline/import'
 hl = HighLine.new
 
 require 'ubalo'
@@ -44,11 +44,14 @@ def ubalo
 end
 
 program_desc 'Command-line access to ubalo.com.'
-version "0.0.6"
+version "0.0.7"
 
 desc "Change the connect url"
 flag 'connect-url'
 
+desc "Enable debug mode"
+switch :debug
+
 desc 'Display authentication information'
 command :whoami do |c|
   c.action do |global_options,options,args|
@@ -106,120 +109,120 @@ command :tasks do |c|
   end
 end
 
-desc 'Add an ssh key (defaults to ~/.ssh/id_rsa.pub)'
-arg_name '<file containing ssh key>'
-command :add_key do |c|
-  c.action do |global_options,options,args|
+def process_download response, destination_path=nil
+  name = response.fetch('name')
+  fullname = response.fetch('fullname')
+  files = response.fetch('files')
+  destination_path ||= name
 
-    public_key_file, = *args
+  if Dir.exist?(destination_path)
+    raise "directory #{destination_path.inspect} already exists"
+  end
 
-    public_key_file ||= '~/.ssh/id_rsa.pub'
-    public_key_file = File.expand_path(public_key_file)
+  FileUtils.mkdir(destination_path)
+  FileUtils.mkdir(File.join(destination_path, ".ubalo"))
 
-    puts ubalo.upload_key(File.read(public_key_file))
+  File.open(File.join(destination_path, ".ubalo", "name"), "w") do |f|
+    f.puts name
   end
-end
 
-desc 'Clear all ssh keys'
-command :clear_keys do |c|
-  c.action do |global_options,options,args|
-    puts ubalo.clear_keys
+  files.each do |filename,content|
+    File.open(File.join(destination_path, filename), "w") do |f|
+      f.puts content
+    end
   end
+
+  [fullname, destination_path]
 end
 
-desc 'Modify a pod'
+desc 'Download a pod to your computer'
 arg_name '<pod name>'
-command :edit do |c|
+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
 
-    ubalo.ssh(pod_name)
+    $stderr.print "Fetching code for #{pod_name}..."
+    response = ubalo.download(pod_name)
+
+    fullname, destination_path = process_download(response)
+    $stderr.puts " done."
+    $stderr.puts "Retrieved #{fullname} into #{destination_path}/."
   end
 end
 
-desc 'Show the code in a pod'
+desc 'Create a new pod'
 arg_name '<pod name>'
-command :cat do |c|
-  c.action do |global_options,options,args|
-    pod_name = args.shift
-    unless pod_name
-      raise "please specify a pod"
-    end
+command :create do |c|
 
-    puts ubalo.cat_code(pod_name)
-  end
-end
+  c.desc "Pod name"
+  c.flag :name
+  c.desc "Pod type"
+  c.flag :type
 
-desc 'Set the code in a pod'
-arg_name '<pod_name> <code_file>'
-command :code do |c|
   c.action do |global_options,options,args|
-    pod_name = args.first
-    unless pod_name
-      raise "please specify a pod"
+    if options.name
+      pod_name = options.name
+    else
+      pod_name = hl.ask("New pod name: ")
+      if pod_name.empty?
+        raise "No pod name given"
+      end
     end
+    destination_path = pod_name
 
-    file_name = args.last
-    if file_name
-      code = File.read(file_name)
-    elsif $stdin.tty?
-      raise "please give the new code as a filename or on stdin"
+    if Dir.exist?(pod_name)
+      raise "directory #{destination_path} already exists, giving up."
+    end
+
+    templates = ubalo.available_templates
+    if options.type
+      pod_type = options.type
+      unless templates.include? pod_type
+        raise "Invalid pod type"
+      end
     else
-      code = $stdin.read
+      pod_type = hl.choose do |menu|
+        menu.prompt = "New pod type: "
+        menu.choices(*templates.keys)
+      end
     end
 
-    puts ubalo.upload_code(pod_name, code)
+    $stderr.print "Creating a new #{pod_type} pod called #{pod_name}..."
+    response = ubalo.create_pod(pod_name, templates[pod_type])
+
+    fullname, destination_path = process_download(response)
+
+    $stderr.puts " done."
+    $stderr.puts "Created #{fullname} and placed in #{destination_path}/."
   end
 end
 
-desc 'Show the files in a pod environ'
+desc 'Run a pod'
 arg_name '<pod name>'
-command :ls do |c|
-  c.desc 'list in long format'
-  c.switch :l
-
-  c.desc 'list in human-readable form'
-  c.switch :h
+command :run do |c|
 
   c.action do |global_options,options,args|
-    opts = ""
-    opts << " -l" if options.l
-    opts << " -h" if options.h
-
-    pod_name = args.last
+    pod_name = args.shift
     unless pod_name
       raise "please specify a pod"
     end
-    puts ubalo.ls(pod_name, opts)
-  end
-end
 
-desc 'Copy files into and out of a pod environ'
-arg_name '<pod name>'
-command :cp do |c|
-  c.desc 'copy recursively'
-  c.switch :r
-
-  c.action do |global_options,options,args|
-    opts = ""
-    opts << " -r" if options.r
-
-    environ = nil
-    scp_args = args.join(" ").gsub(/[\w-]+(?=:)/) do |pod_name|
-      ssh_path, environ = ubalo.ssh_path(pod_name)
-      "#{ssh_path}"
-    end
+    $stderr.print "Running #{pod_name}..."
+    response = ubalo.submit_task(pod_name, args.join(" "))
+    task_label = response['label']
 
-    ubalo.scp(environ, opts, scp_args)
+    result = ubalo.check_task(task_label, true)
+    ubalo.show_result(result)
   end
 end
 
-desc 'Snap a pod'
+desc 'Submit a pod for running in the background'
 arg_name '<pod name>'
-command :run do |c|
+command :submit do |c|
 
   c.action do |global_options,options,args|
     pod_name = args.shift
@@ -227,54 +230,49 @@ command :run do |c|
       raise "please specify a pod"
     end
 
-    $stderr.print "Running #{pod_name}..."
-    response = ubalo.submit_task(pod_name, args.join(" "))
-    task_id = response['id']
+    $stderr.print "Submitting #{pod_name}..."
+    result = ubalo.submit_task(pod_name, args.join(" "))
+    $stderr.puts " submitted."
 
-    result = ubalo.check_task(task_id, true)
     ubalo.show_result(result)
+
   end
 end
 
 desc 'Check or get the result of a task'
-arg_name '<task id>'
+arg_name '<task label>'
 command :check do |c|
-  c.desc 'explicitly show the complete result'
-  c.switch [:verbose, :v]
-
-  c.desc 'wait for the result if the task is pending'
-  c.switch [:wait, :w]
-
-  c.desc 'outputs as json to stdout; stdout > stderr'
-  c.switch [:json, :j]
-
   c.action do |global_options,options,args|
-    task_id = args.first
-    unless task_id
+    task_label = args.first
+    unless task_label
       raise "please specify a task"
     end
 
-    result = ubalo.check_task(task_id, true)
+    $stderr.print "Checking task #{task_label}..."
+
+    result = ubalo.check_task(task_label, true)
     ubalo.show_result(result, options.verbose, options.json)
   end
 end
 
-desc 'Sign into Ubalo'
-command :signin do |c|
+desc 'Enter username and password for access'
+command :login do |c|
   c.action do |global_options,options,args|
-    puts "Please enter your Ubalo username/email and password to unlock command-line access."
+    puts "Please enter your Ubalo details for 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)
+    response = ubalo.get_api_token(login, password)
+    ubalo.token = response['api_token']
+    username = response['username']
+
     Ubalo.write_config("connect-url" => ubalo.base_url, ubalo.base_url => {'token' => ubalo.token})
-    puts "Access details saved to ~/.ubalorc."
-    puts ubalo.whoami
+    puts "Success! Ready to use as #{username}."
   end
 end
 
-desc 'Sign out of Ubalo'
-command :signout do |c|
+desc 'Remove saved username and password'
+command :logout do |c|
   c.action do |global_options,options,args|
     Ubalo.write_config(ubalo.base_url => nil)
     puts "Access details deleted."
@@ -285,23 +283,26 @@ pre do |global,command,options,args|
   config = Ubalo.config
   connect_url = global['connect-url'] || config['connect-url']
 
-  # When signing in, don't use the token:
-  unless command && command.name == :signin
+  # When logging in, don't use the token:
+  unless command && command.name == :login
     if host_config = config[connect_url]
       token = host_config['token']
     end
   end
 
-  unless token or (command && command.name == :signin)
-    raise "No credentials found. Please run 'ubalo signin'."
+  unless token or (command && command.name == :login)
+    raise "No credentials found. Please run 'ubalo login'."
   end
 
-  @ubalo ||= Ubalo.signin(token, connect_url)
+  @ubalo ||= Ubalo.login(token, connect_url)
+
+  @debug = global.debug
 
   true
 end
 
 on_error do |exception|
+  puts
   case exception
   when RestClient::BadRequest
     $stderr.puts exception.inspect.sub('400 Bad Request', 'Error')
@@ -310,6 +311,7 @@ on_error do |exception|
     # Normal exit, preserving the correct exit code.
     exit exception.message
   else
+    raise if @debug
     true
   end
 end

data/lib/ubalo.rb

@@ -47,7 +47,7 @@ end
 class Ubalo
   class << self
     def format_task task
-      "#{task['id'].to_s[0,6]}  #{task['state'].lfit(8)}  #{task['pod_name'].lfit(25)}  #{task['arg'].to_s.lfit(40)}"
+      "#{task['label']}  #{task['state'].lfit(8)}  #{task['pod_name'].lfit(25)}  #{task['arg'].to_s.lfit(40)}"
     end
 
     def format_pod pod, with_username
@@ -63,7 +63,7 @@ class Ubalo
   attr_reader :base_url
   attr_accessor :token
 
-  def self.signin token, base_url=nil
+  def self.login token, base_url=nil
     new(token, base_url)
   end
 
@@ -78,35 +78,32 @@ class Ubalo
       params.merge!({:auth_token => token})
     end
     response = RestClient.get url, :params => params
-    response
+    parse(response)
   end
 
   def post(action, params={})
     url = "#{base_url}/#{action}"
-    RestClient.post url, {:auth_token => token}.merge(params)
-  end
-
-  def username
-    username, role = whoami
-    username
+    response = RestClient.post url, {:auth_token => token}.merge(params)
+    parse(response)
   end
 
   def whoami
-    get(:whoami)
+    response = get(:whoami)
+    "You are #{response['username']}, with role #{response['role']}. You have #{response['pod_count']} pods."
   end
 
   def tasks state, count
-    parse(get(:tasks, :count => count, :state => state))
+    get(:tasks, :count => count, :state => state)
   end
 
   def submit_task(pod_name, arg)
-    parse(post(:submit_task, {:pod_name => pod_name, :arg => arg}))
+    post(:submit_task, {:pod_name => pod_name, :arg => arg})
   end
 
-  def check_task(id, blocking=false)
+  def check_task(label, blocking=false)
     if blocking
       60.times do
-        h = check_task_once(id)
+        h = check_task_once(label)
         if %w{complete failed}.include?(h['state'])
           $stderr.puts " done."
           return h
@@ -118,7 +115,7 @@ class Ubalo
       $stderr.puts
       raise "timed-out waiting for task"
     else
-      check_task_once(id)
+      check_task_once(label)
     end
   end
 
@@ -130,8 +127,8 @@ class Ubalo
     post(:clear_keys)
   end
 
-  def cat_code(name)
-    get(:cat_code, :pod_name => name)
+  def download(name)
+    get(:download, :pod_name => name)
   end
 
   def upload_code(name, code)
@@ -139,12 +136,12 @@ class Ubalo
   end
 
   def ssh_path(name)
-    h = parse(get(:ssh_path, :pod_name => name))
+    h = get(:ssh_path, :pod_name => name)
     [h['ssh_path'], h['environ'], h['environ_fullname']]
   end
 
   def pods
-    parse(get(:pods))
+    get(:pods)
   end
 
   def ssh(pod_name)
@@ -173,8 +170,8 @@ class Ubalo
     if json
       puts outputs
     else
-      puts "    id: #{result['id']}"
-      puts "  name: #{result['pod_name']}"
+      puts " label: #{result['label']}"
+      puts "   pod: #{result['pod_name']}"
       puts "   arg: #{result['arg']}"
       puts " state: #{result['state']}"
       puts "status: #{result['status']}" if result['status']
@@ -187,19 +184,27 @@ class Ubalo
         puts result['stderr'].indent
       end
       if outputs
-        puts "outputs:"
+        puts "output:"
         puts outputs.indent
       end
     end
   end
 
   def get_api_token login, password
-    parse(post(:get_api_token, :user => {:login => login, :password => password}))['api_token']
+    post(:get_api_token, :user => {:login => login, :password => password})
+  end
+
+  def available_templates
+    get(:available_templates)['templates']
+  end
+
+  def create_pod name, type
+    post(:create_pod, template: type, pod_name: name)
   end
 
   private
-  def check_task_once id
-    parse(get(:check_task, :id => id))
+  def check_task_once label
+    get(:check_task, :label => label)
   end
 
   def parse(result)

metadata

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