ubalo 0.19 → 0.20

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/container_process.rb

@@ -16,22 +16,56 @@ module Ubalo
 
     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(message)
+    def tail(running_message, final_message)
       tailer = Ubalo::Tailer.new(logger)
-      tailer.poll_on(message) do
+      logger.poll do
         yield
-        tailer.update(@output)
+
+        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

@@ -66,7 +66,7 @@ module Ubalo
     end
 
     def latest_task
-      if task_json = request(:get, "/tasks").first
+      if task_json = request(:get, "/tasks/latest")
         @account.task_from_json(task_json)
       else
         raise Ubalo::Error, "Could not find latest task for #{fullname.inspect}"
@@ -105,7 +105,8 @@ module Ubalo
         compilation_process
       end
 
-      compilation_process.tail("Waiting for #{fullname.inspect} to compile") do
+      logger.puts "Compilation process output:"
+      compilation_process.tail("Compiling #{fullname}", "compiled") do
         refresh!
       end
 
@@ -128,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.exit_result}\n"
-
-        if compilation_process.output and compilation_process.output.length > 0
-          s << "stdout/stderr:\n"
-          s << Util.indent(compilation_process.output)
-        end
+        s << compilation_process.printable_result
       end
       s
     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

@@ -32,7 +32,8 @@ module Ubalo
         container_process
       end
 
-      container_process.tail("Waiting for task #{label.inspect}") do
+      puts "Task process output:"
+      container_process.tail("Running #{label.inspect}", "completed") do
         refresh!
       end
 
@@ -71,15 +72,6 @@ module Ubalo
       s << " state: #{state}\n"
       s << "  time: #{'%.1f' % elapsed_time} s\n"
 
-      if container_process
-        s << "status: #{container_process.exit_result}\n"
-
-        if container_process.output and container_process.output.length > 0
-          s << "stdout/stderr:\n"
-          s << Util.indent(container_process.output)
-        end
-      end
-
       if output?
         if @output_error
           s << "! Parse error in output: #{@output_error.message}"
@@ -91,6 +83,14 @@ module Ubalo
       s
     end
 
+    def full_printable_result
+      s = printable_result
+      if container_process
+        s << container_process.printable_result
+      end
+      s
+    end
+
     def pretty_argv
       Shellwords.join(argv)
     end

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.20'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70178184528280 !ruby/object:Gem::Requirement
+  requirement: &70273345221500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178184528280
+  version_requirements: *70273345221500
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70178184527840 !ruby/object:Gem::Requirement
+  requirement: &70273345220120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178184527840
+  version_requirements: *70273345220120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70178184527360 !ruby/object:Gem::Requirement
+  requirement: &70273345218440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178184527360
+  version_requirements: *70273345218440
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70178184526780 !ruby/object:Gem::Requirement
+  requirement: &70273345216520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70178184526780
+  version_requirements: *70273345216520
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70178184526180 !ruby/object:Gem::Requirement
+  requirement: &70273345213160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178184526180
+  version_requirements: *70273345213160
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70178184525320 !ruby/object:Gem::Requirement
+  requirement: &70273345211620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178184525320
+  version_requirements: *70273345211620
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: