ubalo 0.0.15 → 0.0.16

data/bin/ubalo

@@ -381,17 +381,15 @@ command :clear_keys do |c|
   end
 end
 
-desc 'Modify a pod'
-arg_name '<pod name>'
+desc 'Edit your environment'
 command :edit do |c|
   c.action do |global_options,options,args|
-    pod_name = normalize_pod_name(args.shift)
-    ubalo.ssh(pod_name)
+    username = args.first || local_username
+    ubalo.ssh(username)
   end
 end
 
-desc 'Copy files to or from a pod environ'
-arg_name '<pod name>'
+desc 'Copy files to or from your environment'
 command :cp do |c|
   c.desc 'copy recursively'
   c.switch :r
@@ -400,13 +398,11 @@ 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(normalize_pod_name(pod_name))
-      "#{ssh_path}"
+    scp_args = args.join(" ").gsub(/ubalo(?=:)/) do
+      ubalo.ssh_path
     end
 
-    ubalo.scp(environ, opts, scp_args)
+    ubalo.scp(local_username, opts, scp_args)
   end
 end
 

data/lib/ubalo.rb

@@ -1,3 +1,4 @@
+require 'time'
 require 'rest-client'
 require 'json'
 require 'open3'
@@ -52,7 +53,7 @@ end
 class Ubalo
   class << self
     def format_task task
-      "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{task['submitted_at_in_words']} ago)"
+      "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{time_ago_in_words task['submitted_at']})"
     end
 
     def format_pod pod, with_username
@@ -63,6 +64,30 @@ class Ubalo
       end
       "  #{name} - #{pod['language']}"
     end
+
+    private
+    def pluralize count, word
+      if count == 1
+        "#{count} #{word}"
+      else
+        "#{count} #{word}s"
+      end
+    end
+
+    def time_ago_in_words time
+      seconds = Time.now - Time.parse(time)
+      case
+      when seconds < 60
+        "#{pluralize seconds.floor, "second"} ago"
+      when seconds/60 < 60
+        "#{pluralize (seconds/60).floor, "minute"} ago"
+      when seconds/60/60 < 24
+        "#{pluralize (seconds/60/60).floor, "hour"} ago"
+      else
+        "#{pluralize (seconds/60/60/24).floor, "day"} ago"
+      end
+    end
+
   end
 
   attr_reader :base_url
@@ -149,29 +174,28 @@ class Ubalo
     post(:upload_code, {:pod_name => name, :code => code})
   end
 
-  def ssh_path(name)
-    h = get(:ssh_path, :pod_name => name)
-    [h['ssh_path'], h['environ_fullname']]
+  def ssh_path
+    h = get(:ssh_path)
+    h.fetch('ssh_path')
   end
 
   def pods
     get(:pods)
   end
 
-  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 -o SendEnv='UBALO_ENVIRON TERM' -tq #{ssh_path}"
-    Process.spawn({'UBALO_ENVIRON' => environ}, ssh_command)
+  def ssh(username)
+    puts "Opening an ssh connection to edit the environment belonging to #{username}."
+    ssh_command = "ssh -o SendEnv='UBALO_DISTRIBUTION_OWNER TERM' -tq #{ssh_path}"
+    Process.spawn({'UBALO_DISTRIBUTION_OWNER' => username}, ssh_command)
     pid, status = Process.wait2
     unless status.success?
       abort "Error running ssh"
     end
   end
 
-  def scp(environ, opts, args)
-    scp_command =  "scp -o SendEnv=UBALO_ENVIRON #{opts} #{args}"
-    Process.spawn({'UBALO_ENVIRON' => environ}, scp_command)
+  def scp(username, opts, args)
+    scp_command = "scp -o SendEnv=UBALO_DISTRIBUTION_OWNER #{opts} #{args}"
+    Process.spawn({'UBALO_DISTRIBUTION_OWNER' => username}, scp_command)
     pid, status = Process.wait2
     unless status.success?
       abort "Error running cp"
@@ -190,7 +214,13 @@ class Ubalo
       puts "   pod: #{result['pod_name']}"
       puts "   arg: #{result['arg']}"
       puts " state: #{result['state']}"
-      puts "status: #{result['status']}" if result['status']
+      case result['exit_type']
+      when 'exited'
+        puts "status: #{result['exit_result']}"
+      when 'terminated'
+        puts "terminated with signal: #{result['exit_result']}"
+      end
+
       if result['stdout']
         puts "stdout:"
         puts result['stdout'].indent
@@ -221,7 +251,7 @@ class Ubalo
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2012-01-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70291514610660 !ruby/object:Gem::Requirement
+  requirement: &70254281845560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70291514610660
+  version_requirements: *70254281845560
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70291514610200 !ruby/object:Gem::Requirement
+  requirement: &70254281845120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70291514610200
+  version_requirements: *70254281845120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70291514609780 !ruby/object:Gem::Requirement
+  requirement: &70254281844640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70291514609780
+  version_requirements: *70254281844640
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70291514609280 !ruby/object:Gem::Requirement
+  requirement: &70254281844000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70291514609280
+  version_requirements: *70254281844000
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: