ubalo 0.0.28 → 0.0.29

data/bin/ubalo

@@ -85,24 +85,11 @@ end
 desc 'Display a list of available pods'
 command :pods do |c|
   c.action do |global_options,options,args|
-    response = ubalo.pods
-
-    puts "your pods:"
-    your_pods = response.fetch('your_pods')
-    if your_pods.empty?
-      puts "  (none)"
+    pods = ubalo.pods
+    if pods.empty?
+      $stderr.puts "You do not currently have any pods."
     else
-      your_pods.each do |pod|
-        puts Ubalo.format_pod(pod)
-      end
-    end
-
-    puts "other pods:"
-    other_pods = response.fetch('other_pods')
-    if other_pods.empty?
-      puts "  (none)"
-    else
-      other_pods.each do |pod|
+      pods.each do |pod|
         puts Ubalo.format_pod(pod)
       end
     end
@@ -248,6 +235,8 @@ desc 'Push files to Ubalo'
 command :push do |c|
   c.action do |global_options,options,args|
     pod_url = local_config.fetch('pod_url')
+    pod = ubalo.create_or_update(pod_url)
+
     ubalo.push_files(pod_url)
   end
 end
@@ -276,40 +265,6 @@ command :login do |c|
   end
 end
 
-desc 'Remove saved username and password'
-command :logout do |c|
-  c.action do |global_options,options,args|
-    Ubalo.write_config(ubalo.base_url => nil)
-    puts "Access details deleted."
-  end
-end
-
-desc 'Publish a pod'
-arg_name '<pod name>'
-command :publish do |c|
-  c.action do |global_options,options,args|
-    pod_name = normalize_pod_name(args.shift)
-
-    $stderr.print "Publishing #{pod_name}..."
-    response = ubalo.publish(pod_name)
-    $stderr.puts " done."
-    $stderr.puts "Your pod is now available at #{response.fetch('url')}."
-  end
-end
-
-desc 'Unpublish a pod'
-arg_name '<pod name>'
-command :unpublish do |c|
-  c.action do |global_options,options,args|
-    pod_name = normalize_pod_name(args.shift)
-
-    $stderr.print "Unpublishing #{pod_name}..."
-    response = ubalo.unpublish(pod_name)
-    $stderr.puts " done."
-    $stderr.puts "Your pod is now private."
-  end
-end
-
 def unauthorized_command?(command)
   command && [:login, :help].include?(command.name)
 end

data/lib/ubalo.rb

@@ -1,48 +1,20 @@
+require 'fileutils'
 require 'time'
 require 'rest-client'
 require 'json'
-require 'open3'
 require 'pp'
 
 require 'zlib'
 require 'archive/tar/minitar'
 include Archive::Tar
 
-class String
-  def lfit max_length
-    if length - 3 <= max_length
-      ljust(max_length)
-    else
-      "#{self[0,max_length-3]}..."
-    end
-  end
-
-  def rfit max_length
-    if length - 3 <= max_length
-      rjust(max_length)
-    else
-      "#{self[0,max_length-3]}..."
-    end
-  end
-
-  def indent amount=2
-    each_line.map do |l|
+def indent str, amount=2
+  if str
+    str.each_line.map do |l|
       " "*amount + l
     end.join
-  end
-end
-
-class NilClass
-  def lfit max_length
-    "".lfit(max_length)
-  end
-
-  def rfit max_length
-    "".rfit(max_length)
-  end
-
-  def indent amount
-    "".indent(amount)
+  else
+    ""
   end
 end
 
@@ -73,10 +45,6 @@ class Ubalo
   end
 
   class << self
-    def tgz_filename
-      "ubalo-files.tar.gz"
-    end
-
     def make_tgz file_list, tgz_name
       tgz = Zlib::GzipWriter.new(File.open(tgz_name, 'wb'))
       Minitar.pack(file_list, tgz)
@@ -103,16 +71,16 @@ class Ubalo
         end
       else
         puts "#{name}: (#{content_type})"
-        puts data.indent
+        puts indent(data)
       end
     end
 
     def format_task task
-      "#{task['label']} #{"(#{task['state']})".lfit(10)} - #{task['pod_name']} (#{time_ago_in_words task['submitted_at']})"
+      "#{task['label']} (#{task['state']}) - #{task['pod_name']} (#{time_ago_in_words task['submitted_at']})"
     end
 
     def format_pod pod
-      "  #{pod.fetch('fullname')}"
+      "#{pod.fetch('fullname')} (updated #{time_ago_in_words pod.fetch('updated_at')})"
     end
 
     private
@@ -203,23 +171,26 @@ class Ubalo
     post("#{base_url}/pods/#{pod_name}/tasks", params)
   end
 
-  def wait_task(label, silent=false)
+  def poll_on(message)
     600.times do
-      h = check_task(label)
-      if h['state'] == 'exited'
-        unless silent
-          $stderr.puts " done."
-        end
-        return h
-      end
-      unless silent
-        $stderr.print '.'
-        $stderr.flush
+      if result = yield
+        $stderr.puts " done."
+        return result
       end
+      $stderr.print '.'
+      $stderr.flush
       sleep 0.5
     end
+
     $stderr.puts
-    raise "timed-out waiting for task #{label}"
+    raise "timed-out polling on #{message}"
+  end
+
+  def wait_task(label)
+    poll_on("task #{label}") do
+      task = check_task(label)
+      task if task['state'] == 'exited'
+    end
   end
 
   def clone(pod_name)
@@ -246,12 +217,12 @@ class Ubalo
 
       if stdout = container_process['stdout'] and stdout.length > 0
         puts "stdout:"
-        puts stdout.indent
+        puts indent(stdout)
       end
 
       if stderr = container_process['stderr'] and stderr.length > 0
         puts "stderr:"
-        puts stderr.indent
+        puts indent(stderr)
       end
     end
 
@@ -294,7 +265,7 @@ class Ubalo
       ignore_patterns = []
     end
 
-    ignore_patterns += %w{. .. .ubalo ubalo-files.tar.gz}
+    ignore_patterns += %w{. .. .ubalo}
 
     filenames = []
     Dir.glob('{.**,**}').each do |path|
@@ -303,40 +274,39 @@ class Ubalo
       filenames << path
     end
 
-    begin
-      Ubalo.make_tgz(filenames, Ubalo.tgz_filename)
-      upload_tgz(pod_url, Ubalo.tgz_filename)
-    ensure
-      FileUtils.rm_f(Ubalo.tgz_filename)
+    Dir.mktmpdir do |dir|
+      tar_path = File.join(dir, "files.tar.gz")
+      Ubalo.make_tgz(filenames, tar_path)
+      upload_tgz(pod_url, tar_path)
+    end
+
+    print "Waiting on pod compilation.."
+    poll_on("compilation of pod at #{pod_url}") do
+      pod = get(pod_url)
+      pod if pod['state'] == 'compiled'
     end
   end
 
   def retrieve_files(destination_path, files_url)
-    # First retrieve the S3 URL.
-    RestClient.get(files_url) do |response|
-      if response.code == 200
-        File.open(File.join(destination_path, Ubalo.tgz_filename), "wb") do |f|
-          f.write response
+    Dir.mktmpdir do |dir|
+      tar_path = File.join(dir, "files.tar.gz")
+      RestClient.get(files_url) do |response|
+        if response.code == 200
+          File.open(tar_path, "wb") do |f|
+            f.write response
+          end
+          Ubalo.extract_tgz(destination_path, tar_path)
+        else
+          raise UbaloMessage, "failed to download pod files"
         end
-        Ubalo.extract_tgz(destination_path, Ubalo.tgz_filename)
-      else
-        raise UbaloMessage, "failed to download pod files"
       end
     end
   end
 
-  def publish pod_name
-    post("#{base_url}/pods/#{pod_name}/publish")
-  end
-
   def delete_pod pod_name
     delete("#{base_url}/pods/#{pod_name}")
   end
 
-  def unpublish pod_name
-    post("#{base_url}/pods/#{pod_name}/unpublish")
-  end
-
   private
 
   def add_headers headers

data/lib/ubalo/version.rb

@@ -1,5 +1,5 @@
 class Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.0.28"
+    VERSION = "0.0.29"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70105707914620 !ruby/object:Gem::Requirement
+  requirement: &70258354451120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105707914620
+  version_requirements: *70258354451120
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70105707914160 !ruby/object:Gem::Requirement
+  requirement: &70258354448760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105707914160
+  version_requirements: *70258354448760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70105707827700 !ruby/object:Gem::Requirement
+  requirement: &70258354448020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105707827700
+  version_requirements: *70258354448020
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70105707826560 !ruby/object:Gem::Requirement
+  requirement: &70258354445900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70105707826560
+  version_requirements: *70258354445900
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70105707825660 !ruby/object:Gem::Requirement
+  requirement: &70258354443860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70105707825660
+  version_requirements: *70258354443860
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: