ubalo 0.0.7 → 0.0.8

data/bin/ubalo

@@ -43,6 +43,13 @@ def ubalo
   @ubalo
 end
 
+def local_config
+  unless @local_config
+    raise "Please run this command from within a local pod directory"
+  end
+  @local_config
+end
+
 program_desc 'Command-line access to ubalo.com.'
 version "0.0.7"
 
@@ -112,6 +119,7 @@ end
 def process_download response, destination_path=nil
   name = response.fetch('name')
   fullname = response.fetch('fullname')
+  url = response.fetch('url')
   files = response.fetch('files')
   destination_path ||= name
 
@@ -122,8 +130,8 @@ def process_download response, destination_path=nil
   FileUtils.mkdir(destination_path)
   FileUtils.mkdir(File.join(destination_path, ".ubalo"))
 
-  File.open(File.join(destination_path, ".ubalo", "name"), "w") do |f|
-    f.puts name
+  File.open(File.join(destination_path, ".ubalo", "config"), "w") do |f|
+    f.puts(YAML.dump("pod_url" => url, "filenames" => files.keys))
   end
 
   files.each do |filename,content|
@@ -150,7 +158,7 @@ command :get do |c|
 
     fullname, destination_path = process_download(response)
     $stderr.puts " done."
-    $stderr.puts "Retrieved #{fullname} into #{destination_path}/."
+    $stderr.puts "Retrieved #{fullname} into #{destination_path}."
   end
 end
 
@@ -204,7 +212,6 @@ end
 desc 'Run a pod'
 arg_name '<pod name>'
 command :run do |c|
-
   c.action do |global_options,options,args|
     pod_name = args.shift
     unless pod_name
@@ -215,43 +222,182 @@ command :run do |c|
     response = ubalo.submit_task(pod_name, args.join(" "))
     task_label = response['label']
 
-    result = ubalo.check_task(task_label, true)
+    result = ubalo.wait_task(task_label)
     ubalo.show_result(result)
   end
 end
 
+def receive_json_from_stdin
+  if $stdin.tty?
+    raise "please pipe to stdin when using --json"
+  else
+    JSON.parse($stdin.read)
+  end
+end
+
 desc 'Submit a pod for running in the background'
 arg_name '<pod name>'
 command :submit do |c|
+  c.desc 'Receive JSON from stdin'
+  c.switch :json
+
+  c.action do |global_options,options,args|
+    if options.json
+      args = receive_json_from_stdin
+      result = ubalo.submit_task_json(args)
+    else
+      pod_name = args.shift
+      unless pod_name
+        raise "please specify a pod"
+      end
+
+      $stderr.print "Submitting #{pod_name}..."
+      result = ubalo.submit_task(pod_name, args.join(" "))
+      $stderr.puts " submitted."
+    end
+    ubalo.show_result(result, options.json)
+  end
+end
+
+desc 'Check or get the result of a task'
+arg_name '<task label>'
+command :check do |c|
+  c.desc 'Get details and give output as JSON'
+  c.switch :json
+
+  c.action do |global_options,options,args|
+    if options.json
+      args = receive_json_from_stdin
+      result = ubalo.check_task_json(args)
+    else
+      task_label = args.first
+      unless task_label
+        raise "please specify a task"
+      end
+
+      $stderr.print "Checking task #{task_label}..."
+      result = ubalo.check_task(task_label)
+    end
+
+    ubalo.show_result(result, options.json)
+  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|
+    public_key_file = args.shift
+    public_key_file ||= File.expand_path('~/.ssh/id_rsa.pub')
+
+    puts ubalo.upload_key(File.read(public_key_file))["message"]
+  end
+end
+
+desc 'Clear all ssh keys'
+command :clear_keys do |c|
+  c.action do |global_options,options,args|
+    puts ubalo.clear_keys.fetch('message')
+  end
+end
 
+desc 'Modify a pod'
+arg_name '<pod name>'
+command :edit do |c|
   c.action do |global_options,options,args|
     pod_name = args.shift
     unless pod_name
       raise "please specify a pod"
     end
 
-    $stderr.print "Submitting #{pod_name}..."
-    result = ubalo.submit_task(pod_name, args.join(" "))
-    $stderr.puts " submitted."
+    ubalo.ssh(pod_name)
+  end
+end
 
-    ubalo.show_result(result)
+desc 'Push code to Ubalo'
+command :push do |c|
+  c.action do |global_options,options,args|
+    filenames = local_config['filenames']
+    contents = {}
+    filenames.each do |filename|
+      contents[filename] = File.read(filename)
+    end
+
+    # Don't bother formatting for multiple files just yet.
+    fail unless filenames.length == 1
 
+    print "Uploading changes to #{filenames.first}... "
+    result = ubalo.push(local_config['pod_url'], contents)
+    puts result['message']
   end
 end
 
-desc 'Check or get the result of a task'
-arg_name '<task label>'
-command :check do |c|
+desc 'Pull code from Ubalo'
+command :pull do |c|
   c.action do |global_options,options,args|
-    task_label = args.first
-    unless task_label
-      raise "please specify a task"
+    print "Pulling changes from Ubalo..."
+    contents = ubalo.pull(local_config['pod_url'])
+    puts " received."
+
+    filenames = local_config['filenames']
+
+    filenames.each do |filename|
+
+      if File.exists?(filename)
+        existing_contents = File.read(filename)
+      else
+        existing_contents = nil
+      end
+
+      if contents[filename] == existing_contents
+        puts "Checking #{filename}... no changes."
+      else
+        hl.choose do |menu|
+          menu.prompt = "Changes made to #{filename}. Overwrite your copy? "
+          menu.choice :yes do
+            open(filename, 'w') do |f|
+              f.puts contents[filename]
+            end
+            puts "Changes saved to #{filename}."
+          end
+
+          menu.choice :no do
+            puts "Cancelled! No changes made to #{filename}."
+          end
+        end
+      end
     end
+  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|
+    public_key_file = args.shift
+    public_key_file ||= File.expand_path('~/.ssh/id_rsa.pub')
 
-    $stderr.print "Checking task #{task_label}..."
+    puts ubalo.upload_key(File.read(public_key_file))["message"]
+  end
+end
 
-    result = ubalo.check_task(task_label, true)
-    ubalo.show_result(result, options.verbose, options.json)
+desc 'Clear all ssh keys'
+command :clear_keys do |c|
+  c.action do |global_options,options,args|
+    puts ubalo.clear_keys.fetch('message')
+  end
+end
+
+desc 'Modify a pod'
+arg_name '<pod name>'
+command :edit do |c|
+  c.action do |global_options,options,args|
+    pod_name = args.shift
+    unless pod_name
+      raise "please specify a pod"
+    end
+
+    ubalo.ssh(pod_name)
   end
 end
 
@@ -294,8 +440,12 @@ pre do |global,command,options,args|
     raise "No credentials found. Please run 'ubalo login'."
   end
 
-  @ubalo ||= Ubalo.login(token, connect_url)
+  local_config_filename = ".ubalo/config"
+  if File.exists?(local_config_filename)
+    @local_config = YAML.load_file(local_config_filename)
+  end
 
+  @ubalo ||= Ubalo.login(token, connect_url)
   @debug = global.debug
 
   true

data/lib/ubalo.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'json'
 require 'open3'
+require 'pp'
 
 class String
   def lfit max_length
@@ -74,6 +75,10 @@ class Ubalo
 
   def get(action, params={})
     url = "#{base_url}/#{action}"
+    url_get(url, params)
+  end
+
+  def url_get url, params={}
     if token
       params.merge!({:auth_token => token})
     end
@@ -83,6 +88,10 @@ class Ubalo
 
   def post(action, params={})
     url = "#{base_url}/#{action}"
+    url_post(url, params)
+  end
+
+  def url_post(url, params={})
     response = RestClient.post url, {:auth_token => token}.merge(params)
     parse(response)
   end
@@ -97,26 +106,26 @@ class Ubalo
   end
 
   def submit_task(pod_name, arg)
-    post(:submit_task, {:pod_name => pod_name, :arg => arg})
-  end
-
-  def check_task(label, blocking=false)
-    if blocking
-      60.times do
-        h = check_task_once(label)
-        if %w{complete failed}.include?(h['state'])
-          $stderr.puts " done."
-          return h
-        end
-        $stderr.print '.'
-        $stderr.flush
-        sleep 0.5
+    submit_task_json({:pod_name => pod_name, :arg => arg})
+  end
+
+  def submit_task_json hash
+    post(:submit_task, hash)
+  end
+
+  def wait_task(label)
+    60.times do
+      h = check_task(label)
+      if %w{complete failed}.include?(h['state'])
+        $stderr.puts " done."
+        return h
       end
-      $stderr.puts
-      raise "timed-out waiting for task"
-    else
-      check_task_once(label)
+      $stderr.print '.'
+      $stderr.flush
+      sleep 0.5
     end
+    $stderr.puts
+    raise "timed-out waiting for task"
   end
 
   def upload_key(key)
@@ -137,7 +146,7 @@ class Ubalo
 
   def ssh_path(name)
     h = get(:ssh_path, :pod_name => name)
-    [h['ssh_path'], h['environ'], h['environ_fullname']]
+    [h['ssh_path'], h['environ_fullname']]
   end
 
   def pods
@@ -148,27 +157,16 @@ class Ubalo
     ssh_path, environ = ssh_path(pod_name)
     puts "Opening an ssh connection to edit the '#{environ}' environment for the '#{pod_name}' pod."
     ssh_command = "ssh -o SendEnv='UBALO_ENVIRON TERM' -tq #{ssh_path}"
-    Process.exec({'UBALO_ENVIRON' => environ}, ssh_command)
-  end
-
-  def scp(environ, opts, args)
-    Process.exec({'UBALO_ENVIRON' => environ}, "scp -o SendEnv=UBALO_ENVIRON #{opts} #{args}")
-  end
-
-  def ls(pod_name, options)
-    ssh_path, environ = ssh_path(pod_name)
-    ssh_command = "ssh -o SendEnv=UBALO_ENVIRON -q #{ssh_path}"
-    out_and_err, status = Open3.capture2e({'UBALO_ENVIRON' => environ}, "#{ssh_command} ls#{options}")
-    out_and_err
-  end
-
-  def show_result(result, verbose=false, json=false)
-    if result['outputs']
-      outputs = JSON.dump(result['outputs'])
+    Process.spawn({'UBALO_ENVIRON' => environ}, ssh_command)
+    pid, status = Process.wait2
+    unless status.success?
+      abort "Error running ssh"
     end
+  end
 
+  def show_result(result, json=false)
     if json
-      puts outputs
+      puts JSON.dump(result)
     else
       puts " label: #{result['label']}"
       puts "   pod: #{result['pod_name']}"
@@ -183,9 +181,9 @@ class Ubalo
         puts "stderr:"
         puts result['stderr'].indent
       end
-      if outputs
+      if result['outputs']
         puts "output:"
-        puts outputs.indent
+        puts result['outputs'].pretty_inspect.indent
       end
     end
   end
@@ -202,11 +200,23 @@ class Ubalo
     post(:create_pod, template: type, pod_name: name)
   end
 
-  private
-  def check_task_once label
-    get(:check_task, :label => label)
+  def push pod_url, contents
+    url_post("#{pod_url}/api/push", contents: contents)
+  end
+  
+  def pull pod_url
+    url_get("#{pod_url}/api/pull")['contents']
+  end
+
+  def check_task label
+    check_task_json({label: label})
   end
 
+  def check_task_json hash
+    get(:check_task, hash)
+  end
+
+  private
   def parse(result)
     JSON.load(result)
   end

metadata

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