ubalo 0.0.19 → 0.0.20

data/bin/ubalo

@@ -153,7 +153,7 @@ command :get do |c|
     pod_name = normalize_pod_name(args.shift)
     destination_path = args.shift
 
-    $stderr.print "Fetching code for #{pod_name}..."
+    $stderr.print "Fetching files for #{pod_name}..."
     response = ubalo.download(pod_name)
 
     fullname, destination_path = process_download(response)
@@ -236,19 +236,25 @@ arg_name '<pod name>'
 command :run do |c|
   c.desc 'Use JSON for input and output'
   c.switch :json
+  c.switch :ssh
 
   c.action do |global_options,options,args|
     pod_name = normalize_pod_name(args.shift)
     if options.json
-      args = receive_json_from_stdin
-      response = ubalo.submit_task_json(args)
+      arg = receive_json_from_stdin
     else
+      arg = args.join(" ")
       $stderr.print "Running #{pod_name}..."
-      response = ubalo.submit_task(pod_name, args.join(" "))
     end
-    task_label = response.fetch('label')
-    result = ubalo.wait_task(task_label, options.json)
-    ubalo.show_result(result, options.json)
+
+    if options.ssh
+      result = ubalo.run_task(pod_name, arg)
+    else
+      response = ubalo.submit_task(pod_name, arg)
+      task_label = response.fetch('label')
+      result = ubalo.wait_task(task_label, options.json)
+      ubalo.show_result(result, options.json)
+    end
   end
 end
 
@@ -310,7 +316,7 @@ command :stop do |c|
     task_label = args.first
     $stderr.print "Stopping task #{task_label}..."
     result = ubalo.stop_task(task_label)
-    $stderr.puts " task now #{result.fetch('state')}."
+    $stderr.puts " stopped."
   end
 end
 
@@ -334,48 +340,45 @@ command :clear_key do |c|
   end
 end
 
-desc 'Push code to Ubalo'
+desc 'Push files to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
     filenames = local_config.fetch('filenames')
-    contents = {}
+    files = {}
     filenames.each do |filename|
-      contents[filename] = File.read(filename)
+      files[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.fetch('pod_url'), contents)
+    print "Uploading changes... "
+    result = ubalo.push(local_config.fetch('pod_url'), files)
     puts "Code changes saved."
   end
 end
 
-desc 'Pull code from Ubalo'
+desc 'Pull files from Ubalo'
 command :pull do |c|
   c.action do |global_options,options,args|
     print "Pulling changes from Ubalo..."
-    contents = ubalo.pull(local_config.fetch('pod_url'))
+    files = ubalo.pull(local_config.fetch('pod_url'))
     puts " received."
 
     filenames = local_config.fetch('filenames')
 
     filenames.each do |filename|
       if File.exists?(filename)
-        existing_contents = File.read(filename)
+        existing_content = File.read(filename)
       else
-        existing_contents = nil
+        existing_content = nil
       end
 
-      if contents.fetch(filename) == existing_contents
+      if files.fetch(filename) == existing_content
         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.fetch(filename)
+              f.puts files.fetch(filename)
             end
             puts "Changes saved to #{filename}."
           end
@@ -394,7 +397,7 @@ command :edit do |c|
   c.action do |global_options,options,args|
     username = args.first || local_username
     puts "Opening an ssh connection to edit the environment belonging to #{username}."
-    ubalo.ssh(username, 'edit-environment')
+    ubalo.ssh('edit environment', username)
   end
 end
 
@@ -403,7 +406,7 @@ command "shared:edit" do |c|
   c.action do |global_options,options,args|
     username = args.first || local_username
     puts "Opening an ssh connection to edit the shared data belonging to #{username}."
-    ubalo.ssh(username, 'edit-shared-data')
+    ubalo.ssh('edit shared data', username)
   end
 end
 
@@ -420,7 +423,7 @@ command :cp do |c|
       ubalo.ssh_path
     end
 
-    ubalo.scp(local_username, opts, scp_args)
+    ubalo.scp(opts, scp_args, local_username)
   end
 end
 

data/lib/ubalo.rb

@@ -134,15 +134,16 @@ class Ubalo
   end
 
   def tasks count
-    get("#{base_url}/api/tasks", :count => count)
+    get("#{base_url}/tasks", :count => count)
   end
 
-  def submit_task(pod_name, arg)
-    submit_task_json({:pod_name => pod_name, :arg => arg})
+  def run_task(pod_name, arg)
+    puts "Running #{pod_name} interactively..."
+    ssh('run task', pod_name, arg)
   end
 
-  def submit_task_json hash
-    post("#{base_url}/api/submit_task", hash)
+  def submit_task pod_name, arg
+    post("#{base_url}/pods/#{pod_name}/tasks", :arg => arg)
   end
 
   def wait_task(label, silent=false)
@@ -189,26 +190,26 @@ class Ubalo
     get("#{base_url}/pods")
   end
 
-  def ssh(username, action)
-    ssh_command = "ssh -o SendEnv='UBALO_OWNER_NAME UBALO_ACTION TERM' -tq #{ssh_path}"
-    Process.spawn({'UBALO_OWNER_NAME' => username, 'UBALO_ACTION' => action}, ssh_command)
-    pid, status = Process.wait2
-    unless status.success?
-      abort "Error running ssh"
-    end
+  def ssh(action, *args)
+    ssh_command = "ssh -o SendEnv='UBALO_ARGS UBALO_ACTION TERM' -tq #{ssh_path}"
+    execute(action, args, ssh_command)
+  end
+
+  def scp(opts, command, *args)
+    scp_command = "scp -o SendEnv='UBALO_ARGS UBALO_ACTION' #{opts} #{command}"
+    execute('edit environment', args, scp_command)
   end
 
-  def scp(username, opts, args)
-    scp_command = "scp -o SendEnv='UBALO_OWNER_NAME UBALO_ACTION' #{opts} #{args}"
-    Process.spawn({'UBALO_OWNER_NAME' => username, 'UBALO_ACTION' => 'edit-environment'}, scp_command)
+  def execute(action, args, command)
+    Process.spawn({'UBALO_ACTION' => action, 'UBALO_ARGS' => JSON.dump(args)}, command)
     pid, status = Process.wait2
     unless status.success?
-      abort "Error running cp"
+      abort "Error running command"
     end
   end
 
   def stop_task(label)
-    post("#{base_url}/api/stop_task", {:label => label})
+    post("#{base_url}/tasks/#{label}/stop")
   end
 
   def show_result(result, json=false)
@@ -253,8 +254,8 @@ class Ubalo
     post("#{base_url}/templates/#{template}/pods", :pod => {:name => name})
   end
 
-  def push pod_url, contents
-    post("#{pod_url}/files", :contents => contents)
+  def push pod_url, files
+    post("#{pod_url}/files", :files => files)
   end
 
   def pull pod_url
@@ -262,11 +263,11 @@ class Ubalo
   end
 
   def check_task label
-    check_task_json({:label => label})
+    get("#{base_url}/tasks/#{label}")
   end
 
   def check_task_json hash
-    get("#{base_url}/api/check_task", hash)
+    check_task(hash[:label])
   end
 
   def publish pod_name

data/lib/ubalo/version.rb

@@ -1,3 +1,3 @@
 class Ubalo
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70217556672060 !ruby/object:Gem::Requirement
+  requirement: &2154176360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217556672060
+  version_requirements: *2154176360
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70217556671440 !ruby/object:Gem::Requirement
+  requirement: &2154175940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217556671440
+  version_requirements: *2154175940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70217556670920 !ruby/object:Gem::Requirement
+  requirement: &2154175520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217556670920
+  version_requirements: *2154175520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70217556670260 !ruby/object:Gem::Requirement
+  requirement: &2154175020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70217556670260
+  version_requirements: *2154175020
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: CLI and API client for Ubalo