ubalo 0.21 → 0.22

data/bin/ubalo

@@ -21,9 +21,8 @@ end
 
 use_openstruct true
 
-
 def logger
-  @logger ||= Ubalo::Util::Logger.new
+  @logger ||= Ubalo::Util::Logger.new $stdin.tty?
 end
 
 def connect_url
@@ -180,7 +179,6 @@ command :run do |c|
   c.action do |global_options,options,args|
     task = pod.run(options.v2 || pod_dir.v2?, args, options.arg)
     task.tail_process
-    puts task.printable_result
   end
 end
 
@@ -205,7 +203,6 @@ command :submit do |c|
 
   c.action do |global_options,options,args|
     task = pod.run(pod_dir.v2?, args, options.arg)
-    logger.puts " done."
     puts task.printable_result
   end
 end
@@ -249,8 +246,6 @@ command 'task:stop' do |c|
     end
 
     task.stop!
-    task.tail_process
-    puts task.printable_result
   end
 end
 
@@ -259,11 +254,7 @@ command :push do |c|
   c.switch :detached
 
   c.action do |global_options,options,args|
-    pod.push_from(pod_dir)
-    unless options.detached
-      pod.tail_process
-    end
-    puts pod.printable_result
+    pod.push_from(pod_dir, options.detached)
   end
 end
 
@@ -274,21 +265,15 @@ command 'push-run' do |c|
 
   c.action do |global_options,options,args|
     pod.push_from(pod_dir)
-    pod.tail_process
-    puts pod.printable_result
-
     task = pod.run(options.v2 || pod_dir.v2?, args, options.arg)
     task.tail_process
-    puts task.printable_result
   end
 end
 
-desc 'Cancel a pod compilation'
-command 'push:cancel' do |c|
+desc 'Stop a pod compilation'
+command 'push:stop' do |c|
   c.action do |global_options,options,args|
-    pod.cancel_push!
-    pod.tail_process
-    puts pod.printable_result
+    pod.stop!
   end
 end
 

data/lib/ubalo/container_process.rb

@@ -23,18 +23,10 @@ module Ubalo
       @output = attributes.fetch('output')
     end
 
-    def tail(running_message, final_message)
-      tailer = Ubalo::Tailer.new(logger)
+    def tail(tailer, message)
       logger.poll do
+        tailer.update(message, @output)
         yield
-
-        message = "(#{runtime}) #{running_message}..."
-        if completed?
-          message << "#{final_message}. Exit status: #{exit_result}"
-        end
-
-        tailer.update(@output, message)
-        completed?
       end
     end
 
@@ -50,10 +42,6 @@ module Ubalo
       s
     end
 
-    def completed?
-      @state == 'complete'
-    end
-
     def runtime
       if @started_at
         seconds = ((@stopped_at || DateTime.now) - @started_at) * 86400

data/lib/ubalo/pod.rb

@@ -47,8 +47,6 @@ module Ubalo
         argv = ["sh", "run.sh"]
       end
 
-      logger.print "Running #{Shellwords.join(argv)} inside #{fullname}..."
-
       params = {
         :arg_content_type => UbaloJSON.content_type,
         :arg => UbaloJSON.dump(arg),
@@ -56,8 +54,6 @@ module Ubalo
       }
       task = @account.task_from_json(request(:post, "/tasks", :params => params))
 
-      logger.puts " done."
-
       task
     rescue RestClient::Conflict
       raise Ubalo::Error, "Cannot run pod while compiling"
@@ -73,20 +69,44 @@ module Ubalo
       end
     end
 
-    def push_from(pod_dir)
-      logger.print "Pushing files to #{fullname.inspect}..."
+    def push_from(pod_dir, detached=false)
+      tailer = Ubalo::TimedTailer.new(logger)
+      tailer.update("Pushing files to #{fullname}...")
 
       pod_dir.assert_not_empty!
+
       update!
       new_archive.activate_from(pod_dir)
-      refresh!
 
-      logger.puts " done."
+
+      logger.poll do
+        tailer.update("Pushed files. Waiting to build #{fullname}...")
+        refresh!
+        return if detached
+        compilation_process
+      end
+
+      compilation_process.tail(tailer, "Pushed files. Building #{fullname}...") do
+        refresh!
+        compiled?
+      end
+
+      tailer.update("Pushed #{fullname}. Exit code: #{compilation_process.exit_result}.\n")
     end
 
-    def cancel_push!
+    def stop!
+      tailer = Ubalo::TimedTailer.new(logger)
+
+      tailer.update("Stopping #{fullname}...")
       request(:put, "/stop")
-      refresh!
+
+      logger.poll do
+        tailer.update("Stopping #{fullname}...")
+        refresh!
+        compiled?
+      end
+
+      tailer.update("Stopped #{fullname}. Compilation exit code: #{compilation_process.exit_result}.\n")
     end
 
     def clone_to(pod_dir)
@@ -99,23 +119,6 @@ module Ubalo
       state == 'compiled'
     end
 
-    def tail_process
-      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!
-        compiled?
-      end
-    end
-
     def delete!
       request(:delete, nil, :parse => false)
       @deleted = true

data/lib/ubalo/tailer.rb

@@ -3,30 +3,48 @@ module Ubalo
     def initialize(logger)
       @logger = logger
       @output_position = 0
-      @lines = 0
     end
 
-    def update(output, message)
-      @lines.times do
-        @logger.print "\e[A"
+    def tty?
+      @logger.tty?
+    end
+
+    def update(message, output=nil)
+      # Erase current line.
+      if tty?
+        @logger.print "\r"
         @logger.print " " * Integer(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
+      if tty?
+        @logger.print Color.blue(wrap(message))
+      else
+        @logger.puts wrap(message)
+      end
+    end
+
+    private
+    def wrap(message)
+      message
+    end
+  end
+
+  class TimedTailer < Tailer
+    def initialize(logger)
+      @start_time = Time.now
+      super
     end
 
-    def puts(str)
-      @lines += 1
-      @logger.puts str
+    private
+    def wrap(message)
+      seconds = Time.now - @start_time
+      "(%.1f s) #{message}" % seconds
     end
   end
 end

data/lib/ubalo/task.rb

@@ -27,25 +27,35 @@ module Ubalo
     end
 
     def tail_process
-      logger.poll_on("Waiting for process to start") do
-        refresh!
-        container_process
-      end
+      tailer = Ubalo::TimedTailer.new(logger)
 
-      puts "Task process output:"
-      container_process.tail("Running #{label.inspect}", "completed") do
+      logger.poll do
+        tailer.update("Starting...")
         refresh!
+        container_process
       end
 
-      logger.poll_on("Waiting for container to stop") do
+      container_process.tail(tailer, "Running #{label}...") do
         refresh!
         complete?
       end
+
+      tailer.update("Completed #{label}. Exit code: #{container_process.exit_result}.\n")
     end
 
     def stop!
+      tailer = Ubalo::TimedTailer.new(logger)
+
+      tailer.update("Stopping #{label}...")
       request(:put, "/stop")
-      refresh!
+
+      logger.poll do
+        tailer.update("Stopping #{label}...")
+        refresh!
+        complete?
+      end
+
+      tailer.update("Stopped #{label}. Exit code: #{container_process.exit_result}.\n")
     end
 
     def inspect

data/lib/ubalo/util.rb

@@ -19,8 +19,13 @@ module Ubalo
     end
 
     class Logger
-      def initialize
+      def initialize tty
         @incomplete_line = false
+        @tty = tty
+      end
+
+      def tty?
+        @tty
       end
 
       def print(str)
@@ -28,7 +33,7 @@ module Ubalo
         $stderr.print(str)
       end
 
-      def puts(str)
+      def puts(str="")
         @incomplete_line = false
         $stderr.print(str + "\n")
       end
@@ -72,11 +77,7 @@ module Ubalo
       end
 
       def put_targz(url, archive_name)
-        response = RestClient.put(url, File.open(archive_name, 'rb'), :content_type => 'application/x-tar', :content_encoding => 'x-gzip')
-
-        unless response.code == 200
-          raise Ubalo::Error, "could not upload pod files"
-        end
+        RestClient.put(url, File.open(archive_name, 'rb'), :content_type => 'application/x-tar', :content_encoding => 'x-gzip')
       end
 
       def get_targz(url, archive_name)
@@ -86,7 +87,7 @@ module Ubalo
               f.write response
             end
           else
-            raise Ubalo::Error, "failed to download pod files"
+            raise Ubalo::Error, "failed to download pod files: error #{response.code.inspect}"
           end
         end
       end
@@ -163,4 +164,19 @@ module Ubalo
       end
     end
   end
+
+  module Color
+    COLORS = {clear: 0, red: 31, green: 32, yellow: 33, blue: 34, gray: 30, grey: 30}
+    def self.method_missing(color_name, *args)
+      if args.first.is_a? String
+        color(color_name) + args.first + color(:clear)
+      else
+        color(color_name) + args.first.inspect + color(:clear)
+      end
+    end
+
+    def self.color(color)
+      "\e[#{COLORS[color.to_sym]}m"
+    end
+  end
 end

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: '0.22'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70247164806420 !ruby/object:Gem::Requirement
+  requirement: &70151076782260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247164806420
+  version_requirements: *70151076782260
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70247164806000 !ruby/object:Gem::Requirement
+  requirement: &70151076781820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247164806000
+  version_requirements: *70151076781820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70247164805520 !ruby/object:Gem::Requirement
+  requirement: &70151076781260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247164805520
+  version_requirements: *70151076781260
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70247164804960 !ruby/object:Gem::Requirement
+  requirement: &70151076780740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70247164804960
+  version_requirements: *70151076780740
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70247164804200 !ruby/object:Gem::Requirement
+  requirement: &70151076780320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247164804200
+  version_requirements: *70151076780320
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70247164803160 !ruby/object:Gem::Requirement
+  requirement: &70151076779840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247164803160
+  version_requirements: *70151076779840
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: