lib/td/command/common.rb in td-0.10.4 vs lib/td/command/common.rb in td-0.10.5

- old
+ new

@@ -9,12 +9,12 @@ autoload :Job, 'td/client' module Command private - def get_option(name) - List.get_option(name) + def initialize + @render_indent = '' end def get_client apikey = Config.apikey unless apikey @@ -26,22 +26,48 @@ def cmd_render_table(rows, *opts) require 'hirb' Hirb::Helpers::Table.render(rows, *opts) end - def cmd_render_tree(nodes, *opts) - require 'hirb' - Hirb::Helpers::Tree.render(nodes, *opts) - end + #def cmd_render_tree(nodes, *opts) + # require 'hirb' + # Hirb::Helpers::Tree.render(nodes, *opts) + #end def cmd_debug_error(ex) if $verbose $stderr.puts "error: #{$!.class}: #{$!.to_s}" $!.backtrace.each {|b| $stderr.puts " #{b}" } $stderr.puts "" end + end + + def cmd_format_elapsed(start, finish) + if start + if !finish + finish = Time.now.utc + end + e = finish.to_i - start.to_i + elapsed = '' + if e >= 3600 + elapsed << "#{e/3600}h " + e %= 3600 + elapsed << "% 2dm " % (e/60) + e %= 60 + elapsed << "% 2dsec" % e + elsif e >= 60 + elapsed << "% 2dm " % (e/60) + e %= 60 + elapsed << "% 2dsec" % e + else + elapsed << "% 2dsec" % e + end + else + elapsed = '' + end + elapsed = "% 10s" % elapsed # right aligned end def get_database(client, db_name) begin return client.database(db_name)