ubalo 0.0.13 → 0.0.14

data/bin/ubalo

@@ -43,6 +43,20 @@ def ubalo
   @ubalo
 end
 
+def local_username
+  @local_username || raise(UbaloMessage, "Please re-login to obtain local username")
+end
+
+def normalize_pod_name(pod_name)
+  if pod_name
+    if pod_name[/\//]
+      pod_name
+    else
+      "#{local_username}/#{pod_name}"
+    end
+  end
+end
+
 def local_config
   unless @local_config
     raise UbaloMessage, "Please run this command from within a local pod directory"
@@ -106,7 +120,7 @@ def process_download response, destination_path=nil
   name = response.fetch('name')
   fullname = response.fetch('fullname')
   url = response.fetch('url')
-  files = response.fetch('files')
+  files = response.fetch('current_version').fetch('files')
   destination_path ||= name
 
   if File.exists?(destination_path)
@@ -133,7 +147,7 @@ desc 'Download a pod to your computer'
 arg_name '<pod name>'
 command :get do |c|
   c.action do |global_options,options,args|
-    pod_name = args.shift
+    pod_name = normalize_pod_name(args.shift)
     destination_path = args.shift
 
     $stderr.print "Fetching code for #{pod_name}..."
@@ -199,7 +213,7 @@ command :run do |c|
   c.switch :json
 
   c.action do |global_options,options,args|
-    pod_name = args.shift
+    pod_name = normalize_pod_name(args.shift)
     if options.json
       args = receive_json_from_stdin
       response = ubalo.submit_task_json(args)
@@ -232,7 +246,7 @@ command :submit do |c|
       args = receive_json_from_stdin
       result = ubalo.submit_task_json(args)
     else
-      pod_name = args.shift
+      pod_name = normalize_pod_name(args.shift)
 
       $stderr.print "Submitting #{pod_name}..."
       result = ubalo.submit_task(pod_name, args.join(" "))
@@ -371,7 +385,7 @@ desc 'Modify a pod'
 arg_name '<pod name>'
 command :edit do |c|
   c.action do |global_options,options,args|
-    pod_name = args.shift
+    pod_name = normalize_pod_name(args.shift)
     ubalo.ssh(pod_name)
   end
 end
@@ -388,7 +402,7 @@ command :cp do |c|
 
     environ = nil
     scp_args = args.join(" ").gsub(/[\w-]+(?=:)/) do |pod_name|
-      ssh_path, environ = ubalo.ssh_path(pod_name)
+      ssh_path, environ = ubalo.ssh_path(normalize_pod_name(pod_name))
       "#{ssh_path}"
     end
 
@@ -407,7 +421,7 @@ command :login do |c|
     ubalo.token = response.fetch('api_token')
     username = response.fetch('username')
 
-    Ubalo.write_config(ubalo.base_url => {'token' => ubalo.token})
+    Ubalo.write_config(ubalo.base_url => {'token' => ubalo.token, 'username' => username})
     puts "Success! Ready to use as #{username}."
   end
 end
@@ -424,7 +438,7 @@ desc 'Publish a pod'
 arg_name '<pod name>'
 command :publish do |c|
   c.action do |global_options,options,args|
-    pod_name = args.shift
+    pod_name = normalize_pod_name(args.shift)
 
     $stderr.print "Publishing #{pod_name}..."
     response = ubalo.publish(pod_name)
@@ -437,7 +451,7 @@ desc 'Unpublish a pod'
 arg_name '<pod name>'
 command :unpublish do |c|
   c.action do |global_options,options,args|
-    pod_name = args.shift
+    pod_name = normalize_pod_name(args.shift)
 
     $stderr.print "Unpublishing #{pod_name}..."
     response = ubalo.unpublish(pod_name)
@@ -453,6 +467,7 @@ pre do |global,command,options,args|
   # When logging in, don't use the token:
   unless command && command.name == :login
     if host_config = config[connect_url]
+      @local_username = host_config['username']
       token = host_config['token']
     end
   end

data/lib/ubalo.rb

@@ -57,11 +57,11 @@ class Ubalo
 
     def format_pod pod, with_username
       if with_username
-        name = "#{pod['user']}/#{pod['name']}"
+        name = pod['fullname']
       else
         name = pod['name']
       end
-      "  #{name} - #{pod['environ']}"
+      "  #{name} - #{pod['language']}"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2156840040 !ruby/object:Gem::Requirement
+  requirement: &70363591242100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156840040
+  version_requirements: *70363591242100
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2156839200 !ruby/object:Gem::Requirement
+  requirement: &70363591241600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156839200
+  version_requirements: *70363591241600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156838140 !ruby/object:Gem::Requirement
+  requirement: &70363591241140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156838140
+  version_requirements: *70363591241140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156837500 !ruby/object:Gem::Requirement
+  requirement: &70363591240620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156837500
+  version_requirements: *70363591240620
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: CLI and API client for Ubalo