ubalo 0.12 → 0.13

data/bin/ubalo

@@ -174,8 +174,11 @@ command :run do |c|
   c.action do |global_options,options,args|
     logger.puts "Running #{pod.fullname}."
     task = pod.run(args.shift)
-    logger.poll_on("Waiting for task #{task.label.inspect}") do
+
+    tailer = Ubalo::Tailer.new(logger)
+    tailer.poll_on("Waiting for task #{task.label.inspect}") do
       task.refresh!
+      tailer.update(task.process_output)
       task.complete?
     end
     puts task.printable_result

data/lib/ubalo/pod.rb

@@ -90,14 +90,9 @@ module Ubalo
       if compilation_process
         s << "status: #{compilation_process.fetch('exit_result')}\n"
 
-        if stdout = compilation_process.fetch('stdout') and stdout.length > 0
-          s << "stdout:\n"
-          s << Util.indent(stdout)
-        end
-
-        if stderr = compilation_process.fetch('stderr') and stderr.length > 0
-          s << "stderr:\n"
-          s << Util.indent(stderr)
+        if process_output = compilation_process.fetch('output') and process_output.length > 0
+          s << "stdout/stderr:\n"
+          s << Util.indent(process_output)
         end
       end
       s

data/lib/ubalo/tailer.rb

@@ -0,0 +1,41 @@
+module Ubalo
+  class Tailer
+    def initialize(logger)
+      @logger = logger
+      @output_position = 0
+      @lines = 0
+    end
+
+    def poll_on(message)
+      @message = message
+
+      @logger.puts "stdout/stderr: "
+      @logger.poll do
+        yield
+      end
+    end
+
+    def update(output)
+      @lines.times do
+        @logger.print "\e[A"
+        @logger.print " " * ENV.fetch("COLUMNS", 80)
+        @logger.print "\r"
+      end
+
+      @lines = 0
+
+      if output
+        @logger.print output[@output_position..-1]
+        @output_position = output.length
+      end
+
+      puts ""
+      puts @message
+    end
+
+    def puts(str)
+      @lines += 1
+      @logger.puts str
+    end
+  end
+end

data/lib/ubalo/task.rb

@@ -59,16 +59,9 @@ module Ubalo
 
       s << "  time: #{'%.1f' % elapsed_time} s\n"
 
-      if container_process
-        if stdout = container_process.fetch('stdout') and stdout.length > 0
-          s << "stdout:\n"
-          s << Util.indent(stdout)
-        end
-
-        if stderr = container_process.fetch('stderr') and stderr.length > 0
-          s << "stderr:\n"
-          s << Util.indent(stderr)
-        end
+      if process_output
+        s << "stdout/stderr:\n"
+        s << Util.indent(process_output)
       end
 
       if output?
@@ -82,9 +75,18 @@ module Ubalo
       s
     end
 
-    private
+    def process_output
+      if container_process
+        if data = container_process.fetch('output')
+          data
+        end
+      end
+    end
+
     attr_reader :container_process
 
+    private
+
     def update_attributes(attributes)
       @state = attributes['state']
       @arg = attributes['arg']

data/lib/ubalo/util.rb

@@ -38,20 +38,28 @@ module Ubalo
         @incomplete_line = false
       end
 
-      def poll_on(message)
-        self.print message
+      def poll
         600.times do
           if result = yield
-            self.puts " done."
             return result
           end
-          self.print '.'
           sleep 0.5
         end
 
         self.complete_line
         raise Ubalo::Error, "timed-out polling on #{message}"
       end
+
+      def poll_on(message)
+        self.print message
+        result = poll do
+          self.print '.'
+          yield
+        end
+
+        self.puts " done."
+        result
+      end
     end
 
     class << self

data/lib/ubalo/version.rb

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

data/lib/ubalo.rb

@@ -11,6 +11,7 @@ require "ubalo/pod"
 require "ubalo/pod_archive"
 require "ubalo/task"
 require "ubalo/pod_dir"
+require "ubalo/tailer"
 
 module Ubalo
   class BaseError < StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70169058383260 !ruby/object:Gem::Requirement
+  requirement: &70189316806960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169058383260
+  version_requirements: *70189316806960
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70169058382500 !ruby/object:Gem::Requirement
+  requirement: &70189316806180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169058382500
+  version_requirements: *70189316806180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70169058381700 !ruby/object:Gem::Requirement
+  requirement: &70189316805280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169058381700
+  version_requirements: *70189316805280
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70169058379860 !ruby/object:Gem::Requirement
+  requirement: &70189316804040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70169058379860
+  version_requirements: *70189316804040
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70169058376880 !ruby/object:Gem::Requirement
+  requirement: &70189316803080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169058376880
+  version_requirements: *70189316803080
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -77,6 +77,7 @@ files:
 - lib/ubalo/pod.rb
 - lib/ubalo/pod_archive.rb
 - lib/ubalo/pod_dir.rb
+- lib/ubalo/tailer.rb
 - lib/ubalo/task.rb
 - lib/ubalo/util.rb
 - lib/ubalo/version.rb