ubalo 0.0.10 → 0.0.11

data/bin/ubalo

@@ -55,9 +55,6 @@ program_desc 'Command-line access to ubalo.com.'
 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|
@@ -66,22 +63,22 @@ command :whoami do |c|
 end
 
 desc 'Display a list of available pods'
-command :list do |c|
+command :pods do |c|
   c.action do |global_options,options,args|
     response = ubalo.pods
 
     puts "your pods:"
-    your_pods = response['your_pods']
+    your_pods = response.fetch('your_pods')
     if your_pods.empty?
       puts "  (none)"
     else
-      response['your_pods'].each do |pod|
+      your_pods.each do |pod|
         puts Ubalo.format_pod(pod, false)
       end
     end
 
     puts "other pods:"
-    other_pods = response['other_pods']
+    other_pods = response.fetch('other_pods')
     if other_pods.empty?
       puts "  (none)"
     else
@@ -112,7 +109,7 @@ def process_download response, destination_path=nil
   files = response.fetch('files')
   destination_path ||= name
 
-  if Dir.exist?(destination_path)
+  if File.exists?(destination_path)
     raise "directory #{destination_path.inspect} already exists"
   end
 
@@ -168,13 +165,13 @@ command :create do |c|
     end
     destination_path = pod_name
 
-    if Dir.exist?(pod_name)
+    if File.exists?(pod_name)
       raise "directory #{destination_path} already exists, giving up."
     end
 
     templates = ubalo.available_templates
-    if options.type
-      pod_type = options.type
+    if options['type']
+      pod_type = options['type']
       unless templates.include? pod_type
         raise "Invalid pod type"
       end
@@ -186,7 +183,7 @@ command :create do |c|
     end
 
     $stderr.print "Creating a new #{pod_type} pod called #{pod_name}..."
-    response = ubalo.create_pod(pod_name, templates[pod_type])
+    response = ubalo.create_pod(pod_name, templates.fetch(pod_type))
 
     fullname, destination_path = process_download(response)
 
@@ -203,7 +200,7 @@ command :run do |c|
 
     $stderr.print "Running #{pod_name}..."
     response = ubalo.submit_task(pod_name, args.join(" "))
-    task_label = response['label']
+    task_label = response.fetch('label')
 
     result = ubalo.wait_task(task_label)
     ubalo.show_result(result)
@@ -268,7 +265,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['state']}."
+    $stderr.puts " task now #{result.fetch('state')}."
   end
 end
 
@@ -279,7 +276,7 @@ command :add_key do |c|
     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"]
+    puts ubalo.upload_key(File.read(public_key_file)).fetch('message')
   end
 end
 
@@ -293,7 +290,7 @@ end
 desc 'Push code to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
-    filenames = local_config['filenames']
+    filenames = local_config.fetch('filenames')
     contents = {}
     filenames.each do |filename|
       contents[filename] = File.read(filename)
@@ -303,8 +300,8 @@ command :push do |c|
     fail unless filenames.length == 1
 
     print "Uploading changes to #{filenames.first}... "
-    result = ubalo.push(local_config['pod_url'], contents)
-    puts result['message']
+    result = ubalo.push(local_config.fetch('pod_url'), contents)
+    puts result.fetch('message')
   end
 end
 
@@ -312,27 +309,26 @@ desc 'Pull code from Ubalo'
 command :pull do |c|
   c.action do |global_options,options,args|
     print "Pulling changes from Ubalo..."
-    contents = ubalo.pull(local_config['pod_url'])
+    contents = ubalo.pull(local_config.fetch('pod_url'))
     puts " received."
 
-    filenames = local_config['filenames']
+    filenames = local_config.fetch('filenames')
 
     filenames.each do |filename|
-
       if File.exists?(filename)
         existing_contents = File.read(filename)
       else
         existing_contents = nil
       end
 
-      if contents[filename] == existing_contents
+      if contents.fetch(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]
+              f.puts contents.fetch(filename)
             end
             puts "Changes saved to #{filename}."
           end
@@ -353,7 +349,8 @@ command :add_key do |c|
     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"]
+    response = ubalo.upload_key(File.read(public_key_file))
+    puts response.fetch('message')
   end
 end
 
@@ -373,6 +370,26 @@ command :edit do |c|
   end
 end
 
+desc 'Copy files to or from 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
+
+    ubalo.scp(environ, opts, scp_args)
+  end
+end
+
 desc 'Enter username and password for access'
 command :login do |c|
   c.action do |global_options,options,args|
@@ -381,8 +398,8 @@ command :login do |c|
     password = hl.ask("  password: "){|q| q.echo = false}
 
     response = ubalo.get_api_token(login, password)
-    ubalo.token = response['api_token']
-    username = response['username']
+    ubalo.token = response.fetch('api_token')
+    username = response.fetch('username')
 
     Ubalo.write_config(ubalo.base_url => {'token' => ubalo.token})
     puts "Success! Ready to use as #{username}."
@@ -406,7 +423,7 @@ command :publish do |c|
     $stderr.print "Publishing #{pod_name}..."
     response = ubalo.publish(pod_name)
     $stderr.puts " done."
-    $stderr.puts "Your pod is now available at #{response['pod_url']}."
+    $stderr.puts "Your pod is now available at #{response.fetch('pod_url')}."
   end
 end
 
@@ -435,16 +452,17 @@ pre do |global,command,options,args|
   end
 
   unless token or (command && command.name == :login)
-    raise "No credentials found. Please run 'ubalo login'."
+    $stderr.puts "No credentials found. Please run 'ubalo login'."
+    raise UbaloExit, 1
   end
 
   local_config_filename = ".ubalo/config"
   if File.exists?(local_config_filename)
-    @local_config = YAML.load_file(local_config_filename)
+    full_path = File.expand_path(local_config_filename)
+    @local_config = YAML.load_file(full_path)
   end
 
   @ubalo ||= Ubalo.login(token, connect_url)
-  @debug = global.debug
 
   true
 end
@@ -454,16 +472,21 @@ on_error do |exception|
   case exception
   when RestClient::BadRequest
     $stderr.puts exception.inspect.sub('400 Bad Request', 'Error')
-    false
+    false  # no additional raise required.
   when RestClient::ResourceNotFound
     $stderr.puts exception.inspect.sub('404 Resource Not Found', 'Error')
-    false
+    false  # no additional raise required.
+  when RestClient::Unauthorized
+    $stderr.puts "Invalid credentials. Please use ubalo login to reset them."
+    true  # fall back to GLI's handling
+  when GLI::BadCommandLine
+    true  # fall back to GLI's handling
   when UbaloExit
     # Normal exit, preserving the correct exit code.
     exit exception.message
   else
-    raise if @debug
-    true
+    $stderr.puts "Error! Unfortunately something went wrong. Please contact us: errors@ubalo.com."
+    raise  # and go on to raise
   end
 end
 

data/lib/ubalo.rb

@@ -164,6 +164,15 @@ class Ubalo
     end
   end
 
+  def scp(environ, opts, args)
+    scp_command =  "scp -o SendEnv=UBALO_ENVIRON #{opts} #{args}"
+    Process.spawn({'UBALO_ENVIRON' => environ}, scp_command)
+    pid, status = Process.wait2
+    unless status.success?
+      abort "Error running cp"
+    end
+  end
+
   def stop_task(label)
     post(:stop_task, {:label => label})
   end
@@ -200,12 +209,12 @@ class Ubalo
     get(:available_templates)['templates']
   end
 
-  def create_pod name, type
-    post(:create_pod, template: type, pod_name: name)
+  def create_pod name, pod_type
+    post(:create_pod, :template => pod_type, :pod_name => name)
   end
 
   def push pod_url, contents
-    url_post("#{pod_url}/api/push", contents: contents)
+    url_post("#{pod_url}/api/push", :contents => contents)
   end
   
   def pull pod_url
@@ -213,7 +222,7 @@ class Ubalo
   end
 
   def check_task label
-    check_task_json({label: label})
+    check_task_json({:label => label})
   end
 
   def check_task_json hash
@@ -221,11 +230,11 @@ class Ubalo
   end
 
   def publish pod_name
-    post(:publish, pod_name: pod_name)
+    post(:publish, :pod_name => pod_name)
   end
 
   def unpublish pod_name
-    post(:unpublish, pod_name: pod_name)
+    post(:unpublish, :pod_name => pod_name)
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2152383460 !ruby/object:Gem::Requirement
+  requirement: &2164902800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152383460
+  version_requirements: *2164902800
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2152382720 !ruby/object:Gem::Requirement
+  requirement: &2164902220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152382720
+  version_requirements: *2164902220
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2152381580 !ruby/object:Gem::Requirement
+  requirement: &2164901580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152381580
+  version_requirements: *2164901580
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: