ubalo 0.17 → 0.18

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.full_printable_result
+    puts pod.printable_result
   end
 end
 
@@ -219,7 +219,7 @@ command :task do |c|
       task = pod.latest_task
     end
 
-    puts task.full_printable_result
+    puts task.printable_result
   end
 end
 
@@ -253,7 +253,7 @@ command 'task:stop' do |c|
       task.refresh!
       task.complete?
     end
-    puts task.full_printable_result
+    puts task.printable_result
   end
 end
 

data/lib/ubalo/container_process.rb

@@ -16,56 +16,22 @@ 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(running_message, final_message)
+    def tail(message)
       tailer = Ubalo::Tailer.new(logger)
-      logger.poll do
+      tailer.poll_on(message) do
         yield
-
-        message = "(#{runtime}) #{running_message}..."
-        if completed?
-          message << "#{final_message}. Exit status: #{exit_result}"
-        end
-
-        tailer.update(@output, message)
+        tailer.update(@output)
         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

@@ -105,15 +105,9 @@ module Ubalo
         compilation_process
       end
 
-      logger.puts "Compilation process output:"
-      compilation_process.tail("Compiling #{fullname}", "compiled") do
+      compilation_process.tail("Waiting for #{fullname.inspect} to compile") do
         refresh!
       end
-
-      logger.poll_on("Waiting for container to stop") do
-        refresh!
-        compiled?
-      end
     end
 
     def delete!
@@ -129,13 +123,14 @@ module Ubalo
       s = ""
       s << "  name: #{fullname}\n"
       s << " state: #{state}\n"
-      s
-    end
 
-    def full_printable_result
-      s = printable_result
       if compilation_process
-        s << compilation_process.printable_result
+        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
       end
       s
     end

data/lib/ubalo/tailer.rb

@@ -6,7 +6,16 @@ module Ubalo
       @lines = 0
     end
 
-    def update(output, message)
+    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 " " * Integer(ENV.fetch("COLUMNS", 80))
@@ -21,7 +30,7 @@ module Ubalo
       end
 
       puts ""
-      puts message
+      puts @message
     end
 
     def puts(str)

data/lib/ubalo/task.rb

@@ -32,15 +32,9 @@ module Ubalo
         container_process
       end
 
-      puts "Task process output:"
-      container_process.tail("Running #{label.inspect}", "completed") do
+      container_process.tail("Waiting for task #{label.inspect}") do
         refresh!
       end
-
-      logger.poll_on("Waiting for container to stop") do
-        refresh!
-        complete?
-      end
     end
 
     def stop!
@@ -72,6 +66,15 @@ 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}"
@@ -83,14 +86,6 @@ 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.17"
+    VERSION = "0.18"
   end
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70211396093500 !ruby/object:Gem::Requirement
+  requirement: &70165820405740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211396093500
+  version_requirements: *70165820405740
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70211396071860 !ruby/object:Gem::Requirement
+  requirement: &70165820404300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211396071860
+  version_requirements: *70165820404300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70211396068360 !ruby/object:Gem::Requirement
+  requirement: &70165820403040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211396068360
+  version_requirements: *70165820403040
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70211396067300 !ruby/object:Gem::Requirement
+  requirement: &70165820399420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70211396067300
+  version_requirements: *70165820399420
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70211396066140 !ruby/object:Gem::Requirement
+  requirement: &70165820397840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211396066140
+  version_requirements: *70165820397840
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70211396065480 !ruby/object:Gem::Requirement
+  requirement: &70165820396300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211396065480
+  version_requirements: *70165820396300
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: