morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/api/file_copy_request_interface.rb

@@ -48,7 +48,7 @@ class Morpheus::FileCopyRequestInterface < Morpheus::APIClient
     url = "#{@base_url}/api/file-copy-request/download/#{URI.escape(id)}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
-    # execute(opts, false)
+    # execute(opts, {parse_json: false})
     if Dir.exists?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end

data/lib/morpheus/api/group_policies_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::GroupPoliciesInterface < Morpheus::APIClient
   def destroy(group_id, id, params={})
     url = "#{@base_url}/api/groups/#{group_id}/policies/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/groups_interface.rb

@@ -20,7 +20,7 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
     elsif options.is_a?(String)
       headers[:params]['name'] = options
     end
-    opts = {method: :get, url: url, timeout: 30, headers: headers}
+    opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
@@ -28,7 +28,7 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
     url = "#{@base_url}/api/groups"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
-    opts = {method: :post, url: url, timeout: 30, headers: headers, payload: payload.to_json}
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
@@ -43,7 +43,7 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
   def destroy(id)
     url = "#{@base_url}/api/groups/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
@@ -51,7 +51,7 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
     url = "#{@base_url}/api/groups/#{id}/update-zones"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
-    opts = {method: :put, url: url, timeout: 30, headers: headers, payload: payload.to_json}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
   end

data/lib/morpheus/api/image_builder_boot_scripts_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::ImageBuilderBootScriptsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/boot-scripts/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/image_builder_image_builds_interface.rb

@@ -47,14 +47,14 @@ class Morpheus::ImageBuilderImageBuildsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/image-builds/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
   def run(id, params={})
     url = "#{@base_url}/api/image-builds/#{id}/run"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, timeout: 30, headers: headers}
+    opts = {method: :post, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/image_builder_preseed_scripts_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::ImageBuilderPreseedScriptsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/preseed-scripts/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/instances_interface.rb

@@ -8,36 +8,34 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def get(options=nil)
+  def get(params={})
     url = "#{@base_url}/api/instances"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-    if options.is_a?(Hash)
-      headers[:params].merge!(options)
-    elsif options.is_a?(Numeric)
-      url = "#{@base_url}/api/instances/#{options}"
-    elsif options.is_a?(String)
-      headers[:params]['name'] = options
+    if params.is_a?(Hash)
+      headers[:params].merge!(params)
+    elsif params.is_a?(Numeric)
+      url = "#{@base_url}/api/instances/#{params}"
+    elsif params.is_a?(String)
+      headers[:params]['name'] = params
     end
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-  def list(options={})
-    get(options)
+  def list(params={})
+    get(params)
   end
 
-  def get_envs(id, options=nil)
+  def get_envs(id, params={})
     url = "#{@base_url}/api/instances/#{id}/envs"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-  def create_env(id, options)
+  def create_env(id, payload={})
     url = "#{@base_url}/api/instances/#{id}/envs"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
@@ -49,18 +47,16 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def create(options)
+  def create(payload)
     url = "#{@base_url}/api/instances"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def update(id, options)
+  def update(id, payload)
     url = "#{@base_url}/api/instances/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
@@ -180,10 +176,9 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def clone(id, options)
+  def clone(id, payload)
     url = "#{@base_url}/api/instances/#{id}/clone"
     headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
@@ -209,10 +204,9 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def apply_security_groups(id, options)
+  def apply_security_groups(id, payload)
     url = "#{@base_url}/api/instances/#{id}/security-groups"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
@@ -223,7 +217,7 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def service_plans(params)
+  def service_plans(params={})
     url = "#{@base_url}/api/instances/service-plans"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}

data/lib/morpheus/api/logs_interface.rb

@@ -8,25 +8,22 @@ class Morpheus::LogsInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def container_logs(containers=[], options={})
+  def container_logs(containers=[], params={})
     url = "#{@base_url}/api/logs"
-    headers = { params: {'containers' => containers}.merge(options), authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    headers = { params: {'containers' => containers}.merge(params), authorization: "Bearer #{@access_token}" }
+    execute({method: :get, url: url, headers: headers})
   end
 
-  def server_logs(servers=[], options={})
+  def server_logs(servers=[], params={})
     url = "#{@base_url}/api/logs"
-    headers = { params: {'servers' => servers}.merge(options), authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    headers = { params: {'servers' => servers}.merge(params), authorization: "Bearer #{@access_token}" }
+    execute({method: :get, url: url, headers: headers})
   end
 
   def stats()
     url = "#{@base_url}/api/logs/log-stats"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    execute({method: :get, url: url, headers: headers})
   end
 
 

data/lib/morpheus/api/network_domains_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworkDomainsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/networks/domains/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/network_groups_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworkGroupsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/networks/groups/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/network_pool_servers_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworkPoolServersInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/networks/pool-servers/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/network_pools_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworkPoolsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/networks/pools/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/network_proxies_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworkProxiesInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/networks/proxies/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/network_services_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworkServicesInterface < Morpheus::APIClient
   # def destroy(id, params={})
   #   url = "#{@base_url}/api/networks/services/#{id}"
   #   headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-  #   opts = {method: :delete, url: url, timeout: 30, headers: headers}
+  #   opts = {method: :delete, url: url, headers: headers}
   #   execute(opts)
   # end
 

data/lib/morpheus/api/networks_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::NetworksInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/networks/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/old_cypher_interface.rb

@@ -0,0 +1,55 @@
+require 'morpheus/api/api_client'
+require 'uri'
+
+class Morpheus::OldCypherInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/cypher/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/cypher"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/cypher"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/cypher/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id, params={})
+    url = "#{@base_url}/api/cypher/#{id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def decrypt(id, params={})
+    url = "#{@base_url}/api/cypher/#{id}/decrypt"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/api/packages_interface.rb

@@ -84,7 +84,7 @@ class Morpheus::PackagesInterface < Morpheus::APIClient
     url = "#{@base_url}/api/packages/export"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :post, url: url, headers: headers}
-    # execute(opts, false)
+    # execute(opts, {parse_json: false})
     if Dir.exists?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end

data/lib/morpheus/api/policies_interface.rb

@@ -41,7 +41,7 @@ class Morpheus::PoliciesInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/policies/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/setup_interface.rb

@@ -17,7 +17,7 @@ class Morpheus::SetupInterface < Morpheus::APIClient
     url = "#{@base_url}/ping"
     headers = {:params => params }
     opts = {method: :get, url: url, headers: headers, timeout: timeout}
-    execute(opts, false)
+    execute(opts, {parse_json: false})
   end
 
   def check(params={}, timeout=5)

data/lib/morpheus/api/storage_providers_interface.rb

@@ -41,7 +41,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/storage/buckets/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/whoami_interface.rb

@@ -8,7 +8,7 @@ class Morpheus::WhoamiInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def get()
+  def get(params={})
     url = "#{@base_url}/api/whoami"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers, timeout: 5)

data/lib/morpheus/benchmarking.rb

@@ -0,0 +1,277 @@
+require 'securerandom'
+require 'morpheus/logging'
+
+# Provides global Benchmarking functionality
+# This provides a store of benchmarking records which can be looked up by name.
+# There is also a global enabled flag that can be used.
+# There is a mixin HasBenchmarking which provides start_benchmark(), stop_benchmark() and with_benchmark()
+#
+module Morpheus::Benchmarking
+
+  # a global toggle switch for benchmarking
+  @@enabled = false
+
+  def self.enabled?
+    @@enabled  
+  end
+  
+  def self.enabled
+    @@enabled
+  end
+
+  def self.enabled=(val)
+    @@enabled = !!val
+  end
+
+  # internal Array to store benchmark records for recording
+  # todo: garbage cleanup, roll these off to disk probably.
+  @@benchmark_record_list = []
+  def self.benchmark_record_list
+    @@benchmark_record_list
+  end
+
+  # internal Hash to lookup benchmark records by id
+  @@benchmark_id_store = {}
+  def self.benchmark_id_store
+    @@benchmark_id_store
+  end
+  
+  # internal Hash to lookup benchmark records by name
+  @@benchmark_name_store = {}
+  def self.benchmark_name_store
+    @@benchmark_name_store
+  end
+
+  # start a new BenchmarkRecord
+  # @params opts [String or Hash] String as name like like "my routine" or with a Hash like {name: "my routine"}
+  #         Just a String for name is fine because there are no other settings of interest at the moment.
+  #         Optional, a test can be created without a name. A random :id will be available in the response.
+  # Examples:
+  #   Morpheus::Benchmarking.start()
+  #   Morpheus::Benchmarking.start("my routine")
+  # @returns BenchmarkRecord that looks like  {id: ID, name:"my routine",start_time:Time}
+  def self.start(opts={})
+    benchmark_record = BenchmarkRecord.new(opts)
+    benchmark_record_list << benchmark_record
+    # index name and id
+    if benchmark_record.name
+      benchmark_name_store[benchmark_record.name.to_s] = benchmark_record
+    end
+    if benchmark_record.id
+      benchmark_id_store[benchmark_record.id.to_s] = benchmark_record
+    end
+    #benchmark_record.start() # initialize does it 
+    return benchmark_record
+  end
+
+  # stop a BenchmarkRecord identified by name or options
+  # maybe: if opts is nil, the last record is returned
+  # @params opts [String or Hash] String as name like like "my routine" or with a Hash like {name: "my routine"} or {id:ID}
+  # @returns BenchmarkRecord that looks like {id: ID, name:"my routine",start_time:Time}
+  def self.stop(opts, exit_code=0, error=nil)
+    benchmark_record = self.lookup(opts)
+    if benchmark_record
+      benchmark_record.stop(exit_code, error)
+      return benchmark_record
+    else
+      return nil
+    end
+  end
+
+  # lookup a BenchmarkRecord identified by name or options, usually just name.
+  # @params cmd [String or Hash] Name like "my routine" or with a Hash like {id: ID}
+  # @returns BenchmarkRecord that looks like  {id: ID, name:"my routine",start_time:Time}
+  def self.lookup(opts={})
+    benchmark_record = nil
+    if opts.nil? || opts.empty?
+      benchmark_record = nil
+    elsif opts.is_a?(Hash)
+      if opts[:id]
+        benchmark_record = benchmark_name_store[opts[:id].to_s]
+      elsif opts[:name]
+        benchmark_record = benchmark_id_store[opts[:name].to_s]
+      end
+    elsif opts.is_a?(String) || opts.is_a?(Symbol)
+      benchmark_record = benchmark_name_store[opts.to_s] || benchmark_id_store[opts.to_s]
+    else
+      Morpheus::Logging::DarkPrinter.puts "Benchmarking lookup passed a bad lookup argument: #{opts}" if Morpheus::Logging.debug?
+    end
+    # could to slow traversal of benchmark_record_list here..
+    return benchmark_record
+  end
+
+  # get last benchmark started. useful if the name, so `benchmark stop` can work
+  # use a unique name or else your record may be overwritten!
+  def self.last()
+    (@@benchmark_record_list || []).last
+  end
+
+  # Mixin for any class that needs benchmarking
+  module HasBenchmarking
+
+    # true when benchmark is currently running
+    # def benchmarking?
+    #   !!@benchmark_record
+    # end
+
+    # def benchmark_record
+    #   @benchmark_record
+    # end
+
+    def with_benchmark(opts, &block)
+      exit_code, err = 0, nil
+      begin
+        start_benchmark(opts)
+        if block_given?
+          result = block.call()
+          # exit_code, err = Morpheus::Cli::CliCommand.parse_command_result(result)
+          if result.is_a?(Array)
+            exit_code = result[0]
+            err = result[0]
+          elsif result == true || result == nil
+            exit_code = 0
+          elsif result == false
+            exit_code = 1
+          else
+            exit_code = result
+          end
+        end
+      rescue => ex
+        raise ex
+        # exit_code = 1
+        # err = ex.msg
+      ensure
+        stop_benchmark(exit_code, err)
+      end
+      return exit_code, err
+    end
+
+    def start_benchmark(opts)
+      @benchmark_record = BenchmarkRecord.new(opts)
+      return @benchmark_record
+    end
+
+    # finish the current benchmark and optionally print the time taken.
+    def stop_benchmark(exit_code=0, err=nil)
+      if @benchmark_record
+        @benchmark_record.stop(exit_code, err)
+        @last_benchmark_record = @benchmark_record
+        @benchmark_record = nil
+        return @last_benchmark_record
+      else
+        return nil
+      end
+    end
+
+  end
+
+  # An internal class for modeling benchmark info on a single run.
+  # Examples:
+  #   BenchmarkRecord.new()
+  #   BenchmarkRecord.new("my routine")
+  #   BenchmarkRecord.new({name:"my routine"})
+  class BenchmarkRecord
+    
+    attr_reader :id, :name, :command, :start_time, :end_time, :exit_code, :error
+  
+    def initialize(opts={})
+      # no info is fine, anonymous benchmark is cool
+      if opts.nil? || opts.empty?
+        opts = {}
+      end
+      # support String
+      opts = opts.is_a?(Hash) ? opts : {name: opts.to_s}
+      @id = opts[:id] || self.object_id
+      @name = opts[:name]
+      #@command = opts[:command]
+      # store the list of commands would be cool... to record adhoc scripts
+      # @commands = []
+      # @commands << @command if @command
+      start()
+    end
+
+    def start()
+      if !@start_time
+        @start_time = Time.now
+      end
+      return self
+    end
+
+    def stop(exit_code=0, error=nil)
+      if !@end_time
+        @end_time = Time.now
+        @exit_code = exit_code
+        @error = error
+      end
+      return self
+    end
+
+    def duration
+      if @start_time && @end_time
+        return @end_time - @start_time
+      elsif @start_time
+        return Time.now - @start_time
+      else
+        return 0
+      end
+    end
+
+    def msg
+      time_str = ""
+      seconds = self.duration
+      if seconds > 0.002
+        seconds = seconds.round(3)
+      else
+        #seconds = seconds.round(3)
+      end
+      duration_str = duration
+      if @start_time && @end_time
+        time_str = "#{seconds} seconds"
+      elsif @start_time
+        time_str = "#{seconds} seconds (running)"
+      else
+        time_str = "(unstarted)"
+      end
+      command_str = "#{@name}" # or "#{@name || @id}"
+      exit_str = "#{@exit_code}"
+      error_str = "#{@error}" # should inspect and format this
+      out = ""
+      
+      if @end_time
+        out << "#{command_str.ljust(30, ' ')}"
+      else
+        out << "#{command_str.ljust(30, ' ')}"
+      end
+
+      # if @end_time
+      #   out << "finished: #{command_str.ljust(30, ' ')}"
+      # else
+      #   out << "running: #{command_str.ljust(30, ' ')}"
+      # end
+      
+      #out = "benchmark: #{command_str.ljust(22, ' ')}   time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}"
+      # out = "benchmark: #{command_str.ljust(27, ' ')}   time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}"
+      #out = "time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}   exec: #{command_str}"
+      # how about a command you can copy and paste?
+      # out = "time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}   #{command_str}"
+      # out = "time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(4, ' ')}   benchmark exec '#{command_str}'"
+      if @end_time || @exit_code
+        out << "\texit: #{exit_str.ljust(2, ' ')}"
+      end
+      if @end_time && @exit_code != 0 && @error
+        out << "\terror: #{error_str.ljust(12, ' ')}"
+      end
+
+      out << "\t#{time_str.ljust(9, ' ')}"
+      
+
+      return out
+    end
+
+    def to_s
+      msg
+    end
+
+  end
+
+end