ubalo 0.0.21 → 0.0.22

data/bin/ubalo

@@ -173,6 +173,11 @@ command :create do |c|
   c.flag :template
 
   c.action do |global_options,options,args|
+    # Request available templates first to provoke 403 if not logged-in
+    # properly.
+    templates = ubalo.available_templates
+    template_names = templates.map{|t| t['name']}.sort
+
     if options.name
       pod_name = options.name
     else
@@ -187,9 +192,6 @@ command :create do |c|
       raise UbaloMessage, "directory #{destination_path} already exists, giving up."
     end
 
-    templates = ubalo.available_templates
-    template_names = templates.map{|t| t['name']}
-
     if options['template']
       template_name = options['template']
       unless template_names.include? template_name
@@ -237,7 +239,6 @@ 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)
@@ -248,14 +249,10 @@ command :run do |c|
       $stderr.print "Running #{pod_name}..."
     end
 
-    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
+    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
 
@@ -321,26 +318,6 @@ command :stop 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|
-    public_key_file = args.shift
-    public_key_file ||= '~/.ssh/id_rsa.pub'
-
-    response = ubalo.upload_key(File.read(File.expand_path(public_key_file)))
-    puts "Success! Key uploaded."
-  end
-end
-
-desc 'Clear your ssh key'
-command :clear_key do |c|
-  c.action do |global_options,options,args|
-    ubalo.clear_key
-    puts "Success! Key cleared."
-  end
-end
-
 desc 'Push files to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
@@ -393,41 +370,6 @@ command :pull do |c|
   end
 end
 
-desc 'Edit your environment'
-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('edit environment', username)
-  end
-end
-
-desc 'Edit your shared data'
-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('edit shared data', username)
-  end
-end
-
-desc 'Copy files to or from your environment'
-command :cp do |c|
-  c.desc 'copy recursively'
-  c.switch :r
-
-  c.action do |global_options,options,args|
-    opts = ""
-    opts << " -r" if options.r
-
-    scp_args = args.join(" ").gsub(/ubalo(?=:)/) do
-      ubalo.ssh_path
-    end
-
-    ubalo.scp(opts, scp_args, local_username)
-  end
-end
-
 desc 'Enter username and password for access'
 command :login do |c|
   c.desc "Username"
@@ -486,6 +428,19 @@ command :unpublish do |c|
   end
 end
 
+
+# XXX testing
+command :upload do |c|
+  c.action do |global_options,options,args|
+    while filename = args.shift
+      $stderr.print "Uploading #{filename.inspect}..."
+      response = ubalo.s3_put filename
+      $stderr.puts " done."
+      puts "Saved as #{response.inspect}."
+    end
+  end
+end
+
 def unauthorized_command?(command)
   command && [:login, :help].include?(command.name)
 end
@@ -531,8 +486,8 @@ on_error do |exception|
   when RestClient::ResourceNotFound
     $stderr.puts exception.inspect.sub('404 Resource Not Found', 'Error')
     false  # no additional raise required.
-  when RestClient::Unauthorized
-    $stderr.puts "Invalid credentials. Please use ubalo login to reset them."
+  when RestClient::Unauthorized, RestClient::Forbidden
+    $stderr.puts "Invalid credentials. Please run ubalo login."
     true  # fall back to GLI's handling
   when GLI::BadCommandLine
     true  # fall back to GLI's handling

data/lib/ubalo.rb

@@ -51,6 +51,11 @@ class UbaloMessage < StandardError
 end
 
 class Ubalo
+  class PodError < StandardError
+  end
+  class S3Error < PodError
+  end
+
   class << self
     def format_task task
       "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{time_ago_in_words task['submitted_at']})"
@@ -137,13 +142,8 @@ class Ubalo
     get("#{base_url}/tasks", :count => count)
   end
 
-  def run_task(pod_name, arg)
-    puts "Running #{pod_name} interactively..."
-    ssh('run task', pod_name, arg)
-  end
-
   def submit_task pod_name, arg
-    post("#{base_url}/pods/#{pod_name}/tasks", :arg => arg)
+    post("#{base_url}/pods/#{pod_name}/tasks", :arg => JSON.dump(:data => arg))
   end
 
   def wait_task(label, silent=false)
@@ -165,49 +165,14 @@ class Ubalo
     raise "timed-out waiting for task #{label}"
   end
 
-  def upload_key(key)
-    put("#{base_url}/user", :user => {:ssh_key => key})
-  end
-
-  def clear_key
-    put("#{base_url}/user", :user => {:ssh_key => nil})
-  end
-
   def download(pod_name)
     get("#{base_url}/pods/#{pod_name}/files")
   end
 
-  def upload_code(name, code)
-    post("#{base_url}/api/upload_code", {:pod_name => name, :code => code})
-  end
-
-  def ssh_path
-    h = get("#{base_url}/api/ssh_path")
-    h.fetch('ssh_path')
-  end
-
   def pods
     get("#{base_url}/pods")
   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 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 command"
-    end
-  end
-
   def stop_task(label)
     post("#{base_url}/tasks/#{label}/stop")
   end
@@ -282,7 +247,39 @@ class Ubalo
     post("#{base_url}/pods/#{pod_name}/unpublish")
   end
 
+  def s3_put filename
+    username = write_s3cfg_and_get_user
+
+    key = "#{username}/uploads/#{filename}"
+    pid = Process.spawn("s3cmd", "put", filename, "#{root_s3_path}/#{key}", {err: "/dev/null", out: "/dev/null"})
+    _, status = Process.wait2(pid)
+
+    unless status.success?
+      raise Ubalo::S3Error, "could not write file #{filename.inspect} from key #{key.inspect}"
+    end
+    key
+  end
+
   private
+  def root_s3_path
+    "s3://ubalo/users"
+  end
+
+  def write_s3cfg_and_get_user
+    return @s3cfg_user if @s3cfg_user
+
+    response = put("#{base_url}/user")
+    conf = <<EOS
+[default]
+access_key = #{response['amazon_access_key_id']}
+secret_key = #{response['amazon_secret_access_key']}
+EOS
+    open(File.expand_path("~/.s3cfg"), "w") do |f|
+      f.write conf
+    end
+    @s3cfg_user = response['username']
+  end
+
 
   def add_headers headers
     # Add authorization headers.

data/lib/ubalo/version.rb

@@ -1,3 +1,3 @@
 class Ubalo
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2153859700 !ruby/object:Gem::Requirement
+  requirement: &70246690489020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153859700
+  version_requirements: *70246690489020
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153859280 !ruby/object:Gem::Requirement
+  requirement: &70246690487940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153859280
+  version_requirements: *70246690487940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153858860 !ruby/object:Gem::Requirement
+  requirement: &70246690486780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153858860
+  version_requirements: *70246690486780
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153858360 !ruby/object:Gem::Requirement
+  requirement: &70246690485440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153858360
+  version_requirements: *70246690485440
 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.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: CLI and API client for Ubalo