ubalo 0.0.16 → 0.0.17

data/bin/ubalo

@@ -69,6 +69,9 @@ program_desc 'Command-line access to ubalo.com.'
 desc "Change the connect url"
 flag 'connect-url'
 
+desc "Prints the current version of the Ubalo gem"
+switch 'version'
+
 desc 'Display authentication information'
 command :whoami do |c|
   c.action do |global_options,options,args|
@@ -289,7 +292,7 @@ command :stop do |c|
   end
 end
 
-desc 'Add an ssh key (defaults to ~/.ssh/id_rsa.pub)'
+desc 'Upload your 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|
@@ -300,10 +303,10 @@ command :add_key do |c|
   end
 end
 
-desc 'Clear all ssh keys'
-command :clear_keys do |c|
+desc 'Clear your ssh key'
+command :clear_key do |c|
   c.action do |global_options,options,args|
-    puts ubalo.clear_keys.fetch('message')
+    puts ubalo.clear_key.fetch('message')
   end
 end
 
@@ -385,7 +388,17 @@ desc 'Edit your environment'
 command :edit do |c|
   c.action do |global_options,options,args|
     username = args.first || local_username
-    ubalo.ssh(username)
+    puts "Opening an ssh connection to edit the environment belonging to #{username}."
+    ubalo.ssh(username, 'edit-environment')
+  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(username, 'edit-shared-data')
   end
 end
 
@@ -439,7 +452,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.fetch('pod_url')}."
+    $stderr.puts "Your pod is now available at #{response.fetch('url')}."
   end
 end
 
@@ -456,19 +469,28 @@ command :unpublish do |c|
   end
 end
 
+def unauthorized_command?(command)
+  command && [:login, :help].include?(command.name)
+end
+
 pre do |global,command,options,args|
   config = Ubalo.config
-  connect_url = global['connect-url'] || config['connect-url'] || "https://ubalo.com/api"
+  connect_url = global['connect-url'] || config['connect-url'] || "https://ubalo.com"
+
+  if global[:version]
+    print "Ubalo version #{Ubalo::VERSION}"
+    raise UbaloExit, 0
+  end
 
   # When logging in, don't use the authorization:
-  unless command && command.name == :login
+  unless unauthorized_command?(command)
     if host_config = config[connect_url]
       @local_username = host_config['username']
       authorization = host_config['authorization']
     end
   end
 
-  unless authorization or (command && command.name == :login)
+  unless authorization or unauthorized_command?(command)
     raise UbaloMessage, "No credentials found. Please run 'ubalo login'."
   end
 

data/lib/ubalo.rb

@@ -62,7 +62,7 @@ class Ubalo
       else
         name = pod['name']
       end
-      "  #{name} - #{pod['language']}"
+      "  #{name} - #{pod['language_name']}"
     end
 
     private
@@ -103,22 +103,22 @@ class Ubalo
   end
 
   def get(action, params={})
-    url = "#{base_url}/#{action}"
+    url = "#{base_url}/api/#{action}"
     url_get(url, params)
   end
 
   def url_get url, params={}
-    response = RestClient.get url, add_authorization(:params => params)
+    response = RestClient.get url, add_headers(:params => params, :accept => :json)
     parse(response)
   end
 
   def post(action, params={})
-    url = "#{base_url}/#{action}"
+    url = "#{base_url}/api/#{action}"
     url_post(url, params)
   end
 
   def url_post(url, params={})
-    response = RestClient.post url, params, add_authorization({})
+    response = RestClient.post url, params, add_headers(:accept => :json)
     parse(response)
   end
 
@@ -162,8 +162,8 @@ class Ubalo
     post(:upload_key, :key => key)
   end
 
-  def clear_keys
-    post(:clear_keys)
+  def clear_key
+    post(:clear_key)
   end
 
   def download(name)
@@ -183,10 +183,9 @@ class Ubalo
     get(:pods)
   end
 
-  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)
+  def ssh(username, action)
+    ssh_command = "ssh -o SendEnv='UBALO_OWNER_NAME UBALO_ACTION TERM' -tq #{ssh_path}"
+    Process.spawn({'UBALO_OWNER_NAME' => username, 'UBALO_ACTION' => action}, ssh_command)
     pid, status = Process.wait2
     unless status.success?
       abort "Error running ssh"
@@ -194,8 +193,8 @@ class Ubalo
   end
 
   def scp(username, opts, args)
-    scp_command = "scp -o SendEnv=UBALO_DISTRIBUTION_OWNER #{opts} #{args}"
-    Process.spawn({'UBALO_DISTRIBUTION_OWNER' => username}, scp_command)
+    scp_command = "scp -o SendEnv='UBALO_OWNER_NAME UBALO_ACTION' #{opts} #{args}"
+    Process.spawn({'UBALO_OWNER_NAME' => username, 'UBALO_ACTION' => 'edit-environment'}, scp_command)
     pid, status = Process.wait2
     unless status.success?
       abort "Error running cp"
@@ -265,21 +264,23 @@ class Ubalo
   end
 
   def publish pod_name
-    post(:publish, :pod_name => pod_name)
+    url_post("#{base_url}/pods/#{pod_name}/publish")
   end
 
   def unpublish pod_name
-    post(:unpublish, :pod_name => pod_name)
+    url_post("#{base_url}/pods/#{pod_name}/unpublish")
   end
 
   private
 
-  def add_authorization(headers)
+  def add_headers headers
+    # Add authorization headers.
     if authorization
-      headers.merge(:authorization => authorization)
-    else
-      headers
+      headers.merge!(:authorization => authorization)
     end
+
+    # Add version header.
+    headers.merge!('X-Ubalo-Version' => Ubalo::VERSION)
   end
 
   def parse(result)

data/lib/ubalo/version.rb

@@ -0,0 +1,3 @@
+class Ubalo
+  VERSION = "0.0.17"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70254281845560 !ruby/object:Gem::Requirement
+  requirement: &70162737169520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254281845560
+  version_requirements: *70162737169520
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70254281845120 !ruby/object:Gem::Requirement
+  requirement: &70162737168820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254281845120
+  version_requirements: *70162737168820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70254281844640 !ruby/object:Gem::Requirement
+  requirement: &70162737168140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254281844640
+  version_requirements: *70162737168140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70254281844000 !ruby/object:Gem::Requirement
+  requirement: &70162737167480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70254281844000
+  version_requirements: *70162737167480
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -62,6 +62,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ubalo/version.rb
 - lib/ubalo.rb
 - bin/ubalo
 homepage: http://ubalo.com/