ubalo 0.22 → 0.23

data/bin/ubalo

@@ -22,7 +22,7 @@ end
 use_openstruct true
 
 def logger
-  @logger ||= Ubalo::Util::Logger.new $stdin.tty?
+  @logger ||= Ubalo::Logger.new $stdin.tty?
 end
 
 def connect_url

data/lib/ubalo.rb

@@ -12,6 +12,7 @@ require "ubalo/pod_archive"
 require "ubalo/container_process"
 require "ubalo/task"
 require "ubalo/pod_dir"
+require "ubalo/logger"
 require "ubalo/tailer"
 
 module Ubalo

data/lib/ubalo/container_process.rb

@@ -16,6 +16,7 @@ module Ubalo
 
     def update_attributes(attributes)
       @state = attributes.fetch('state')
+      @runtime = attributes.fetch('runtime')
       @started_at = parse_datetime(attributes.fetch('started_at'))
       @stopped_at = parse_datetime(attributes.fetch('stopped_at'))
       @exit_type = attributes.fetch('exit_type')
@@ -33,7 +34,7 @@ module Ubalo
     def printable_result
       s = ""
       s << "status: #{exit_result}\n"
-      s << "runtime: #{runtime}\n"
+      s << "runtime: #{pretty_runtime}\n"
 
       if output and output.length > 0
         s << "stdout/stderr:\n"
@@ -42,10 +43,9 @@ module Ubalo
       s
     end
 
-    def runtime
-      if @started_at
-        seconds = ((@stopped_at || DateTime.now) - @started_at) * 86400
-        "%2.1f s" % seconds
+    def pretty_runtime
+      if @runtime
+        "%2.1f s" % @runtime
       end
     end
 

data/lib/ubalo/logger.rb

@@ -0,0 +1,50 @@
+module Ubalo
+  class Logger
+    def initialize tty
+      @incomplete_line = false
+      @tty = tty
+    end
+
+    def tty?
+      @tty
+    end
+
+    def print(str)
+      @incomplete_line = true
+      $stderr.print(str)
+    end
+
+    def puts(str="")
+      @incomplete_line = false
+      $stderr.print(str + "\n")
+    end
+
+    def complete_line
+      $stderr.print("\n") if @incomplete_line
+      @incomplete_line = false
+    end
+
+    def poll
+      600.times do
+        if result = yield
+          return result
+        end
+        sleep 0.5
+      end
+
+      self.complete_line
+      raise Ubalo::Error, "timed-out while waiting"
+    end
+
+    def poll_on(message)
+      self.print message
+      result = poll do
+        self.print '.'
+        yield
+      end
+
+      self.puts " done."
+      result
+    end
+  end
+end

data/lib/ubalo/tailer.rb

@@ -13,7 +13,7 @@ module Ubalo
       # Erase current line.
       if tty?
         @logger.print "\r"
-        @logger.print " " * Integer(ENV.fetch("COLUMNS", 80))
+        @logger.print " " * Integer(Util.columns)
         @logger.print "\r"
       end
 
@@ -23,7 +23,7 @@ module Ubalo
       end
 
       if tty?
-        @logger.print Color.blue(wrap(message))
+        @logger.print Color.green(wrap(message))
       else
         @logger.puts wrap(message)
       end

data/lib/ubalo/util.rb

@@ -18,55 +18,6 @@ module Ubalo
       end
     end
 
-    class Logger
-      def initialize tty
-        @incomplete_line = false
-        @tty = tty
-      end
-
-      def tty?
-        @tty
-      end
-
-      def print(str)
-        @incomplete_line = true
-        $stderr.print(str)
-      end
-
-      def puts(str="")
-        @incomplete_line = false
-        $stderr.print(str + "\n")
-      end
-
-      def complete_line
-        $stderr.print("\n") if @incomplete_line
-        @incomplete_line = false
-      end
-
-      def poll
-        600.times do
-          if result = yield
-            return result
-          end
-          sleep 0.5
-        end
-
-        self.complete_line
-        raise Ubalo::Error, "timed-out while waiting"
-      end
-
-      def poll_on(message)
-        self.print message
-        result = poll do
-          self.print '.'
-          yield
-        end
-
-        self.puts " done."
-        result
-      end
-    end
-
     class << self
       def normalize_pod_name(default_username, pod_name)
         if pod_name.include?("/")
@@ -162,6 +113,12 @@ module Ubalo
       def debug_mode?
         ENV['UBALO_DEBUG'] == 'true'
       end
+
+      def columns
+        @columns ||= Integer(`tput cols`.strip)
+      rescue
+        80
+      end
     end
   end
 

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: '0.22'
+  version: '0.23'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70151076782260 !ruby/object:Gem::Requirement
+  requirement: &70362525730360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151076782260
+  version_requirements: *70362525730360
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70151076781820 !ruby/object:Gem::Requirement
+  requirement: &70362525729940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151076781820
+  version_requirements: *70362525729940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70151076781260 !ruby/object:Gem::Requirement
+  requirement: &70362525729520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151076781260
+  version_requirements: *70362525729520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70151076780740 !ruby/object:Gem::Requirement
+  requirement: &70362525729020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70151076780740
+  version_requirements: *70362525729020
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &70151076780320 !ruby/object:Gem::Requirement
+  requirement: &70362525769540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151076780320
+  version_requirements: *70362525769540
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70151076779840 !ruby/object:Gem::Requirement
+  requirement: &70362525769080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151076779840
+  version_requirements: *70362525769080
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -86,6 +86,7 @@ extra_rdoc_files: []
 files:
 - lib/ubalo/account.rb
 - lib/ubalo/container_process.rb
+- lib/ubalo/logger.rb
 - lib/ubalo/pod.rb
 - lib/ubalo/pod_archive.rb
 - lib/ubalo/pod_dir.rb
@@ -122,3 +123,4 @@ signing_key:
 specification_version: 3
 summary: CLI and API client for Ubalo
 test_files: []
+has_rdoc: