ubalo 0.16 → 0.17

data/bin/ubalo

@@ -187,7 +187,7 @@ desc 'Show information about a pod'
 command :pod do |c|
   c.action do |global_options,options,args|
     pod.refresh!
-    puts pod.printable_result
+    puts pod.full_printable_result
   end
 end
 
@@ -219,7 +219,7 @@ command :task do |c|
       task = pod.latest_task
     end
 
-    puts task.printable_result
+    puts task.full_printable_result
   end
 end
 
@@ -253,7 +253,7 @@ command 'task:stop' do |c|
       task.refresh!
       task.complete?
     end
-    puts task.printable_result
+    puts task.full_printable_result
   end
 end
 

data/lib/ubalo.rb

@@ -9,6 +9,7 @@ require "ubalo/util"
 require "ubalo/account"
 require "ubalo/pod"
 require "ubalo/pod_archive"
+require "ubalo/container_process"
 require "ubalo/task"
 require "ubalo/pod_dir"
 require "ubalo/tailer"

data/lib/ubalo/account.rb

@@ -88,6 +88,10 @@ module Ubalo
       PodArchive.create_with_json(self, archive_json)
     end
 
+    def container_process_from_json(container_process_json)
+      ContainerProcess.create_with_json(self, container_process_json)
+    end
+
     def pods
       request(:get, "/pods").map do |pod_json|
         pod_from_json(pod_json)

data/lib/ubalo/container_process.rb

@@ -0,0 +1,71 @@
+module Ubalo
+  class ContainerProcess
+    include Ubalo::Util
+
+    def self.create_with_json(account, json)
+      container_process = new(account)
+      container_process.update_attributes(json)
+      container_process
+    end
+
+    attr_reader :state, :exit_type, :exit_result, :output
+
+    def initialize(account)
+      @account = account
+    end
+
+    def update_attributes(attributes)
+      @state = attributes.fetch('state')
+      @started_at = parse_datetime(attributes.fetch('started_at'))
+      @stopped_at = parse_datetime(attributes.fetch('stopped_at'))
+      @exit_type = attributes.fetch('exit_type')
+      @exit_result = attributes.fetch('exit_result')
+      @output = attributes.fetch('output')
+    end
+
+    def tail(running_message, final_message)
+      tailer = Ubalo::Tailer.new(logger)
+      logger.poll do
+        yield
+
+        message = "(#{runtime}) #{running_message}..."
+        if completed?
+          message << "#{final_message}. Exit status: #{exit_result}"
+        end
+
+        tailer.update(@output, message)
+        completed?
+      end
+    end
+
+    def printable_result
+      s = ""
+      s << "status: #{exit_result}\n"
+      s << "runtime: #{runtime}\n"
+
+      if output and output.length > 0
+        s << "stdout/stderr:\n"
+        s << Util.indent(output)
+      end
+      s
+    end
+
+    def completed?
+      @state == 'complete'
+    end
+
+    def runtime
+      if @started_at
+        days = ((@stopped_at || DateTime.now) - @started_at)
+        minutes, seconds = (days * 86400).divmod(60)
+        "%d:%02d s" % [minutes, seconds]
+      end
+    end
+
+    def parse_datetime(string)
+      if string
+        DateTime.parse(string)
+      end
+    end
+  end
+end

data/lib/ubalo/pod.rb

@@ -100,10 +100,18 @@ module Ubalo
     end
 
     def tail_process
-      tailer = Ubalo::Tailer.new(logger)
-      tailer.poll_on("Waiting for #{fullname.inspect} to compile") do
+      logger.poll_on("Waiting for process to start") do
+        refresh!
+        compilation_process
+      end
+
+      logger.puts "Compilation process output:"
+      compilation_process.tail("Compiling #{fullname}", "compiled") do
+        refresh!
+      end
+
+      logger.poll_on("Waiting for container to stop") do
         refresh!
-        tailer.update(process_output)
         compiled?
       end
     end
@@ -121,14 +129,13 @@ module Ubalo
       s = ""
       s << "  name: #{fullname}\n"
       s << " state: #{state}\n"
+      s
+    end
 
+    def full_printable_result
+      s = printable_result
       if compilation_process
-        s << "status: #{compilation_process.fetch('exit_result')}\n"
-
-        if process_output = compilation_process.fetch('output') and process_output.length > 0
-          s << "stdout/stderr:\n"
-          s << Util.indent(process_output)
-        end
+        s << compilation_process.printable_result
       end
       s
     end
@@ -141,16 +148,6 @@ module Ubalo
       fullname == other.fullname
     end
 
-    attr_reader :compilation_process
-
-    def process_output
-      if compilation_process
-        if data = compilation_process.fetch('output')
-          data
-        end
-      end
-    end
-
     def url
       @account.url_for(path_prefix)
     end
@@ -158,7 +155,17 @@ module Ubalo
     private
     def update_attributes(attributes)
       @state = attributes['state']
-      @compilation_process = attributes['compilation_process']
+
+      if compilation_process_attr = attributes['compilation_process']
+        if @compilation_process
+          @compilation_process.update_attributes(compilation_process_attr)
+        else
+          @compilation_process = @account.container_process_from_json(compilation_process_attr)
+        end
+      else
+        @compilation_process = nil
+      end
+
       if archive_attr = attributes['archive']
         @archive = @account.archive_from_json(archive_attr)
       end

data/lib/ubalo/tailer.rb

@@ -6,16 +6,7 @@ module Ubalo
       @lines = 0
     end
 
-    def poll_on(message)
-      @message = message
-
-      @logger.puts "stdout/stderr: "
-      @logger.poll do
-        yield
-      end
-    end
-
-    def update(output)
+    def update(output, message)
       @lines.times do
         @logger.print "\e[A"
         @logger.print " " * Integer(ENV.fetch("COLUMNS", 80))
@@ -30,7 +21,7 @@ module Ubalo
       end
 
       puts ""
-      puts @message
+      puts message
     end
 
     def puts(str)

data/lib/ubalo/task.rb

@@ -27,10 +27,18 @@ module Ubalo
     end
 
     def tail_process
-      tailer = Ubalo::Tailer.new(logger)
-      tailer.poll_on("Waiting for task #{label.inspect}") do
+      logger.poll_on("Waiting for process to start") do
+        refresh!
+        container_process
+      end
+
+      puts "Task process output:"
+      container_process.tail("Running #{label.inspect}", "completed") do
+        refresh!
+      end
+
+      logger.poll_on("Waiting for container to stop") do
         refresh!
-        tailer.update(process_output)
         complete?
       end
     end
@@ -62,18 +70,8 @@ module Ubalo
         end
       end
       s << " state: #{state}\n"
-
-      if container_process
-        s << "status: #{container_process.fetch('exit_result')}\n"
-      end
-
       s << "  time: #{'%.1f' % elapsed_time} s\n"
 
-      if process_output
-        s << "stdout/stderr:\n"
-        s << Util.indent(process_output)
-      end
-
       if output?
         if @output_error
           s << "! Parse error in output: #{@output_error.message}"
@@ -85,12 +83,12 @@ module Ubalo
       s
     end
 
-    def process_output
+    def full_printable_result
+      s = printable_result
       if container_process
-        if data = container_process.fetch('output')
-          data
-        end
+        s << container_process.printable_result
       end
+      s
     end
 
     def pretty_argv
@@ -108,9 +106,18 @@ module Ubalo
     def update_attributes(attributes)
       @state = attributes['state']
       @argv = attributes['argv']
-      @arg = attributes['arg']
       @pod_name = attributes['pod_name']
-      @container_process = attributes['container_process']
+
+      if container_process_attr = attributes['container_process']
+        if @container_process
+          @container_process.update_attributes(container_process_attr)
+        else
+          @container_process = @account.container_process_from_json(container_process_attr)
+        end
+      else
+        @container_process = nil
+      end
+
       @submitted_at = attributes['submitted_at']
       @elapsed_time = attributes['elapsed_time']
 
@@ -131,7 +138,7 @@ module Ubalo
     end
 
     def arg?
-      @arg || @arg_error
+      defined?(@arg) || defined?(@arg_error)
     end
 
     def parse_output(raw)
@@ -146,7 +153,7 @@ module Ubalo
     end
 
     def output?
-      @output || @output_error
+      defined?(@output) || defined?(@output_error)
     end
 
     def request method, path = nil, options = {}

data/lib/ubalo/version.rb

@@ -1,6 +1,6 @@
 module Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.16"
+    VERSION = "0.17"
   end
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70197562743800 !ruby/object:Gem::Requirement
+  requirement: &70211396093500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197562743800
+  version_requirements: *70211396093500
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70197562711140 !ruby/object:Gem::Requirement
+  requirement: &70211396071860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197562711140
+  version_requirements: *70211396071860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70197562707560 !ruby/object:Gem::Requirement
+  requirement: &70211396068360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197562707560
+  version_requirements: *70211396068360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70197562706240 !ruby/object:Gem::Requirement
+  requirement: &70211396067300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70197562706240
+  version_requirements: *70211396067300
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70197562705480 !ruby/object:Gem::Requirement
+  requirement: &70211396066140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197562705480
+  version_requirements: *70211396066140
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70197562704740 !ruby/object:Gem::Requirement
+  requirement: &70211396065480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197562704740
+  version_requirements: *70211396065480
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -85,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ubalo/account.rb
+- lib/ubalo/container_process.rb
 - lib/ubalo/pod.rb
 - lib/ubalo/pod_archive.rb
 - lib/ubalo/pod_dir.rb