ubalo 0.0.17 → 0.0.19

data/bin/ubalo

@@ -90,7 +90,7 @@ command :pods do |c|
       puts "  (none)"
     else
       your_pods.each do |pod|
-        puts Ubalo.format_pod(pod, false)
+        puts Ubalo.format_pod(pod)
       end
     end
 
@@ -100,7 +100,7 @@ command :pods do |c|
       puts "  (none)"
     else
       other_pods.each do |pod|
-        puts Ubalo.format_pod(pod, true)
+        puts Ubalo.format_pod(pod)
       end
     end
   end
@@ -123,7 +123,7 @@ def process_download response, destination_path=nil
   name = response.fetch('name')
   fullname = response.fetch('fullname')
   url = response.fetch('url')
-  files = response.fetch('current_version').fetch('files')
+  files = response.fetch('files')
   destination_path ||= name
 
   if File.exists?(destination_path)
@@ -168,8 +168,8 @@ command :create do |c|
 
   c.desc "Pod name"
   c.flag :name
-  c.desc "Pod type"
-  c.flag :type
+  c.desc "Pod template"
+  c.flag :template
 
   c.action do |global_options,options,args|
     if options.name
@@ -187,20 +187,22 @@ command :create do |c|
     end
 
     templates = ubalo.available_templates
-    if options['type']
-      pod_type = options['type']
-      unless templates.include? pod_type
-        raise UbaloMessage, "Invalid pod type"
+    template_names = templates.map{|t| t['name']}
+
+    if options['template']
+      template_name = options['template']
+      unless template_names.include? template_name
+        raise UbaloMessage, "Invalid template name"
       end
     else
-      pod_type = hl.choose do |menu|
-        menu.prompt = "New pod type: "
-        menu.choices(*templates.keys)
+      template_name = hl.choose do |menu|
+        menu.prompt = "Template for your new pod: "
+        menu.choices(*template_names)
       end
     end
 
-    $stderr.print "Creating a new #{pod_type} pod called #{pod_name}..."
-    response = ubalo.create_pod(pod_name, templates.fetch(pod_type))
+    $stderr.print "Creating a new #{template_name} pod called #{pod_name}..."
+    response = ubalo.create_pod(pod_name, template_name)
 
     fullname, destination_path = process_download(response)
 
@@ -209,6 +211,26 @@ command :create do |c|
   end
 end
 
+desc 'Delete a pod'
+arg_name '<pod name>'
+command :delete do |c|
+  c.action do |global_options,options,args|
+    pod_name = normalize_pod_name(args.shift)
+
+    hl.choose do |menu|
+      menu.prompt = "Are you sure you want to delete #{pod_name}? "
+      menu.choice :yes do
+        $stderr.print "Deleting #{pod_name}..."
+        response = ubalo.delete_pod(pod_name)
+        $stderr.puts " done."
+      end
+      menu.choice :no do
+        raise UbaloMessage, "Cancelled! No changes made to #{pod_name}."
+      end
+    end
+  end
+end
+
 desc 'Run a pod'
 arg_name '<pod name>'
 command :run do |c|
@@ -292,21 +314,23 @@ command :stop do |c|
   end
 end
 
-desc 'Upload your ssh key (defaults to ~/.ssh/id_rsa.pub)'
+desc 'Add an 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|
     public_key_file = args.shift
-    public_key_file ||= File.expand_path('~/.ssh/id_rsa.pub')
+    public_key_file ||= '~/.ssh/id_rsa.pub'
 
-    puts ubalo.upload_key(File.read(public_key_file)).fetch('message')
+    response = ubalo.upload_key(File.read(File.expand_path(public_key_file)))
+    puts "Success! Key uploaded."
   end
 end
 
 desc 'Clear your ssh key'
 command :clear_key do |c|
   c.action do |global_options,options,args|
-    puts ubalo.clear_key.fetch('message')
+    ubalo.clear_key
+    puts "Success! Key cleared."
   end
 end
 
@@ -324,7 +348,7 @@ command :push do |c|
 
     print "Uploading changes to #{filenames.first}... "
     result = ubalo.push(local_config.fetch('pod_url'), contents)
-    puts result.fetch('message')
+    puts "Code changes saved."
   end
 end
 
@@ -365,25 +389,6 @@ command :pull do |c|
   end
 end
 
-desc 'Add an 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|
-    public_key_file = args.shift
-    public_key_file ||= File.expand_path('~/.ssh/id_rsa.pub')
-
-    response = ubalo.upload_key(File.read(public_key_file))
-    puts response.fetch('message')
-  end
-end
-
-desc 'Clear all ssh keys'
-command :clear_keys do |c|
-  c.action do |global_options,options,args|
-    puts ubalo.clear_keys.fetch('message')
-  end
-end
-
 desc 'Edit your environment'
 command :edit do |c|
   c.action do |global_options,options,args|
@@ -421,10 +426,18 @@ end
 
 desc 'Enter username and password for access'
 command :login do |c|
+  c.desc "Username"
+  c.flag :username
+  c.desc "Password"
+  c.flag :password
+
   c.action do |global_options,options,args|
-    puts "Please enter your Ubalo details for command-line access."
-    login    = hl.ask("     login: "){|q| q.echo = true}
-    password = hl.ask("  password: "){|q| q.echo = false}
+    unless options[:username] and options[:password]
+      puts "Please enter your Ubalo details for command-line access."
+    end
+
+    login = options[:username] || hl.ask("     login: "){|q| q.echo = true}
+    password = options[:password] || hl.ask("  password: "){|q| q.echo = false}
 
     response = ubalo.get_authorization(login, password)
     ubalo.authorization = response.fetch('authorization')

data/lib/ubalo.rb

@@ -56,13 +56,8 @@ class Ubalo
       "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{time_ago_in_words task['submitted_at']})"
     end
 
-    def format_pod pod, with_username
-      if with_username
-        name = pod['fullname']
-      else
-        name = pod['name']
-      end
-      "  #{name} - #{pod['language_name']}"
+    def format_pod pod
+      "  #{pod.fetch('fullname')} - #{pod.fetch('language_name')}"
     end
 
     private
@@ -102,33 +97,44 @@ class Ubalo
     @base_url = base_url
   end
 
-  def get(action, params={})
-    url = "#{base_url}/api/#{action}"
-    url_get(url, params)
+  def request(method, url, params)
+    if method == :get
+      response = RestClient.get url, add_headers(:params => params, :accept => :json)
+    elsif method == :post
+      response = RestClient.post url, params, add_headers(:accept => :json)
+    elsif method == :put
+      response = RestClient.put url, params, add_headers(:accept => :json)
+    elsif method == :delete
+      response = RestClient.delete url, add_headers(:accept => :json)
+    else
+      raise "don't understand request method #{method.inspect}"
+    end
+    parse(response)
   end
 
-  def url_get url, params={}
-    response = RestClient.get url, add_headers(:params => params, :accept => :json)
-    parse(response)
+  def post(url, params={})
+    request(:post, url, params)
   end
 
-  def post(action, params={})
-    url = "#{base_url}/api/#{action}"
-    url_post(url, params)
+  def get(url, params={})
+    request(:get, url, params)
   end
 
-  def url_post(url, params={})
-    response = RestClient.post url, params, add_headers(:accept => :json)
-    parse(response)
+  def put(url, params={})
+    request(:put, url, params)
+  end
+
+  def delete(url)
+    request(:delete, url, {})
   end
 
   def whoami
-    response = get(:whoami)
-    "You are #{response['username']}, with role #{response['role']}. You have #{response['pod_count']} pods."
+    response = get("#{base_url}/user")
+    "You are #{response['username']}, with role #{response['role']}."
   end
 
   def tasks count
-    get(:tasks, :count => count)
+    get("#{base_url}/api/tasks", :count => count)
   end
 
   def submit_task(pod_name, arg)
@@ -136,7 +142,7 @@ class Ubalo
   end
 
   def submit_task_json hash
-    post(:submit_task, hash)
+    post("#{base_url}/api/submit_task", hash)
   end
 
   def wait_task(label, silent=false)
@@ -159,28 +165,28 @@ class Ubalo
   end
 
   def upload_key(key)
-    post(:upload_key, :key => key)
+    put("#{base_url}/user", :user => {:ssh_key => key})
   end
 
   def clear_key
-    post(:clear_key)
+    put("#{base_url}/user", :user => {:ssh_key => nil})
   end
 
-  def download(name)
-    get(:download, :pod_name => name)
+  def download(pod_name)
+    get("#{base_url}/pods/#{pod_name}/files")
   end
 
   def upload_code(name, code)
-    post(:upload_code, {:pod_name => name, :code => code})
+    post("#{base_url}/api/upload_code", {:pod_name => name, :code => code})
   end
 
   def ssh_path
-    h = get(:ssh_path)
+    h = get("#{base_url}/api/ssh_path")
     h.fetch('ssh_path')
   end
 
   def pods
-    get(:pods)
+    get("#{base_url}/pods")
   end
 
   def ssh(username, action)
@@ -202,7 +208,7 @@ class Ubalo
   end
 
   def stop_task(label)
-    post(:stop_task, {:label => label})
+    post("#{base_url}/api/stop_task", {:label => label})
   end
 
   def show_result(result, json=false)
@@ -236,23 +242,23 @@ class Ubalo
   end
 
   def get_authorization login, password
-    post(:get_authorization, :user => {:login => login, :password => password})
+    post("#{base_url}/user/authorization", :user => {:login => login, :password => password})
   end
 
   def available_templates
-    get(:available_templates)['templates']
+    get("#{base_url}/templates")
   end
 
-  def create_pod name, pod_type
-    post(:create_pod, :template => pod_type, :pod_name => name)
+  def create_pod name, template
+    post("#{base_url}/templates/#{template}/pods", :pod => {:name => name})
   end
 
   def push pod_url, contents
-    url_post("#{pod_url}/api/push", :contents => contents)
+    post("#{pod_url}/files", :contents => contents)
   end
 
   def pull pod_url
-    url_get("#{pod_url}/api/pull")['contents']
+    get("#{pod_url}/files")['files']
   end
 
   def check_task label
@@ -260,15 +266,19 @@ class Ubalo
   end
 
   def check_task_json hash
-    get(:check_task, hash)
+    get("#{base_url}/api/check_task", hash)
   end
 
   def publish pod_name
-    url_post("#{base_url}/pods/#{pod_name}/publish")
+    post("#{base_url}/pods/#{pod_name}/publish")
+  end
+
+  def delete_pod pod_name
+    delete("#{base_url}/pods/#{pod_name}")
   end
 
   def unpublish pod_name
-    url_post("#{base_url}/pods/#{pod_name}/unpublish")
+    post("#{base_url}/pods/#{pod_name}/unpublish")
   end
 
   private

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70162737169520 !ruby/object:Gem::Requirement
+  requirement: &70217556672060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162737169520
+  version_requirements: *70217556672060
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70162737168820 !ruby/object:Gem::Requirement
+  requirement: &70217556671440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162737168820
+  version_requirements: *70217556671440
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70162737168140 !ruby/object:Gem::Requirement
+  requirement: &70217556670920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162737168140
+  version_requirements: *70217556670920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70162737167480 !ruby/object:Gem::Requirement
+  requirement: &70217556670260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70162737167480
+  version_requirements: *70217556670260
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: