ubalo 0.0.3 → 0.0.4

data/bin/ubalo

@@ -44,7 +44,7 @@ def ubalo
 end
 
 program_desc 'Command-line access to ubalo.com.'
-version "0.0.3"
+version "0.0.4"
 
 desc "Change the connect url"
 flag 'connect-url'
@@ -168,12 +168,12 @@ 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.shift
+    pod_name = args.first
     unless pod_name
       raise "please specify a pod"
     end
 
-    file_name = args.shift
+    file_name = args.last
     if file_name
       code = File.read(file_name)
     elsif $stdin.tty?
@@ -200,7 +200,7 @@ command :ls do |c|
     opts << " -l" if options.l
     opts << " -h" if options.h
 
-    pod_name = args.shift
+    pod_name = args.last
     unless pod_name
       raise "please specify a pod"
     end
@@ -218,12 +218,13 @@ command :cp do |c|
     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}:#{environ}"
+      "#{ssh_path}"
     end
 
-    ubalo.scp(opts, scp_args)
+    ubalo.scp(environ, opts, scp_args)
   end
 end
 
@@ -270,7 +271,7 @@ command :check do |c|
   c.switch [:json, :j]
 
   c.action do |global_options,options,args|
-    task_id = args.shift
+    task_id = args.first
     unless task_id
       raise "please specify a task"
     end

data/lib/ubalo.rb

@@ -146,18 +146,19 @@ class Ubalo
   def ssh(pod_name)
     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 -tq #{ssh_path} #{environ}"
-    Process.exec({'TERM' => 'xterm'}, ssh_command)
+    ssh_command = "ssh -o SendEnv='UBALO_ENVIRON TERM' -tq #{ssh_path}"
+    Process.exec({'UBALO_ENVIRON' => environ}, ssh_command)
   end
 
-  def scp(opts, args)
-    Process.exec("scp#{opts} #{args}")
+  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 -tq #{ssh_path} #{environ}"
-    `#{ssh_command} ls#{options}`
+    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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000Z
+date: 2011-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70217783652080 !ruby/object:Gem::Requirement
+  requirement: &2153165080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217783652080
+  version_requirements: *2153165080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70217783651640 !ruby/object:Gem::Requirement
+  requirement: &2153164620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217783651640
+  version_requirements: *2153164620
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70217783651120 !ruby/object:Gem::Requirement
+  requirement: &2153164060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70217783651120
+  version_requirements: *2153164060
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -73,7 +73,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