wavefront-client 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beeb02e2fa86d2049cf941fe782f4a57aff4320a
-  data.tar.gz: 1a7fc2bdf6fd1f8015856519daee209889199377
+  metadata.gz: 5c289e188276ac63035e6acd3ea84ab59721e63b
+  data.tar.gz: eb9d96bae403aa21ed775bf37bb5ad85d8c078c3
 SHA512:
-  metadata.gz: 0f3b60f1c518d9dae1cce42fe8b246c2f60d561008ef6ce941029db9d1ad029f61994e1fd102da4583729f574e2687b7fd22f9ef01affab80b6de1866cf9a25b
-  data.tar.gz: a3a604a315860308f795c813abfe45a3cd0cf9c9d50d8c85529429a5f854a0c2742b58f81bef024d2f9025c70096a10c62a968c46f3716f65cf6d7cf209c808d
+  metadata.gz: 18b87b4ff437336b124a353fb982bdea69c0a34ed32314a0fad69db6f636cb33c0b529cad6dffa95137ef18a952b1ad0d1066959e01fa25e652bceb04e78b5e8
+  data.tar.gz: c926ec0a4245bba66b92f64daa28cbb300c8abad127d3a2f302b6c05b14e234e0109b6986678bb220c6651886125a716e96a154e75ac5c7ee81fc9a25d0564e1

data/.travis.yml

@@ -4,8 +4,10 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.10
-- 2.2.5
-- 2.3.1
+- 2.2.6
+- 2.3.3
+- 2.4.0
+before_install: gem install bundler --no-rdoc --no-ri
 deploy:
   provider: rubygems
   api_key:

data/README-cli.md

@@ -12,11 +12,18 @@ The following options are valid in almost all contexts.
 ```
 -c, --config=FILE    path to configuration file [default: ~/.wavefront]
 -P, --profile=NAME   profile in configuration file [default: default]
--t, --token=TOKEN    Wavefront authentication token
 -D, --debug          enable debug mode
+-V, --verbose        enable verbose mode
 -h, --help           show help for command
 ```
 
+Debug mode will show you combined options, and debug output from
+`rest-client`. It also shows the full stack trace should a command
+fail.
+
+In the following usage examples, the global options have been omitted
+to save space.
+
 ## `ts` Mode: Retrieving Timeseries Data
 
 The `ts` command is used to submit a standard timeseries query to
@@ -26,13 +33,13 @@ query.
 
 ```
 Usage:
-  wavefront ts [-c file] [-P profile] [-E endpoint] [-t token] [-OD]
+  wavefront ts [-c file] [-P profile] [-E endpoint] [-t token] [-ODV]
             [-S | -m | -H | -d] [-s time] [-e time] [-f format] [-p num]
             [-X bool] <query>
 
 Options:
-  -E, --endpoint=URI            cluster endpoint [default:
-                                metrics.wavefront.com]
+  -E, --endpoint=URI            cluster endpoint [metrics.wavefront.com]
+  -t, --token=TOKEN             Wavefront authentication token
   -S, --seconds                 query granularity of seconds
   -m, --minutes                 query granularity of minutes
   -H, --hours                   query granularity of hours
@@ -41,13 +48,12 @@ Options:
                                 strptime parseable format
   -e, --end=TIME                end of query window in epoch seconds or
                                 strptime parseable format
-  -f, --format=STRING           output format (raw, ruby, graphite,
-                                highcharts, human)
-                                [default: raw]
+  -f, --format=STRING           output format (raw, ruby, graphite, highcharts, human)
+                                [raw]
   -p, --prefixlength=NUM        number of path elements to treat as prefix
-                                in schema manipulation. [default: 1]
+                                in schema manipulation. [1]
   -X, --strict=BOOL             Do not return points outside the query
-                                window. [default: true]
+                                window. [true]
   -O, --includeObsoleteMetrics  include metrics unreported for > 4 weeks
 ```
 
@@ -106,17 +112,18 @@ formatters.
 
 ```
 Usage:
-  wavefront alerts [-c file] [-P profile] [-E endpoint] [-t token]
+  wavefront alerts [-D] [-c file] [-P profile] [-E endpoint] [-t token] [-V]
             [-f format] [-p tag] [ -s tag] <state>
 
 Options:
-  -E, --endpoint=URI   cluster endpoint [default: metrics.wavefront.com]
-  -f, --format=STRING  output format (ruby, json, human)
-                       [default: human]
-  -p, --private=TAG    retrieve only alerts with named private tags,
-                       comma delimited.
-  -s, --shared=TAG     retrieve only alerts with named shared tags, comma
-                       delimited.
+  -E, --endpoint=URI       cluster endpoint [metrics.wavefront.com]
+  -t, --token=TOKEN        Wavefront authentication token
+  -f, --alertformat=STRING output format (ruby, json, human)
+                           []
+  -p, --private=TAG        retrieve only alerts with named private tags,
+                           comma delimited.
+  -s, --shared=TAG         retrieve only alerts with named shared tags,
+                           comma delimited.
 ```
 
 ### Examples
@@ -160,26 +167,29 @@ The `event` command is used to open and close Wavefront events.
 
 ```
 Usage:
-  wavefront event create [-V] [-c file] [-P profile] [-E endpoint] [-t token]
-           [-d description] [-s time] [-i | -e time] [-l level] [-t type]
+  wavefront event create [-DV] [-c file] [-P profile] [-E endpoint] [-t token]
+           [-d description] [-s time] [-i | -e time] [-l level] [-T type]
            [-H host] [-n] <event>
-  wavefront event close [-V] [-c file] [-P profile] [-E endpoint] [-t token]
+  wavefront event close [-DV] [-c file] [-P profile] [-E endpoint] [-t token]
            [<event>] [<timestamp>]
-  wavefront event delete [-V] <timestamp> <event>
+  wavefront event delete [-DV] [-c file] [-P profile] [-E endpoint] [-t token]
+           <timestamp> <event>
   wavefront event show
   wavefront event --help
 
 Options:
-  -E, --endpoint=URI   cluster endpoint [default: metrics.wavefront.com]
+  -E, --endpoint=URI   cluster endpoint [metrics.wavefront.com]
+  -t, --token=TOKEN    Wavefront authentication token
   -i, --instant        create an instantaneous event
-  -V, --verbose        be verbose
   -s, --start=TIME     time at which event begins
   -e, --end=TIME       time at which event ends
   -l, --level=LEVEL    level of event (info, smoke, warn, severe)
   -T, --type=TYPE      type of event
   -d, --desc=STRING    description of event
-  -H, --host=STRING    list of hosts to tag with even (comma separated)
+  -H, --host=STRING    list of hosts to tag with event (comma separated)
   -n, --nostate        do not create a local file recording the event
+
+View events in detail using the 'ts' command with the 'events()' function.
 ```
 
 To close an event in the Wavefront API it must be identified by its
@@ -266,19 +276,31 @@ Usage:
            [-p port] [-H host] [-n] [-T tag...] <metric> <value>
   wavefront write file [-DV] [-c file] [-P profile] [-E proxy] [-H host]
            [-p port] [-n] [-F format] [-m metric] [-T tag...] <file>
+  wavefront write --help
 
-Options:
-  -E, --proxy=URI      proxy endpoint [default: wavefront]
-  -t, --time=TIME      time of data point (omit to use current time)
-  -H, --host=STRING    source host [default: box]
-  -p, --port=INT       Wavefront proxy port [default: 2878]
-  -T, --tag=TAG        point tag in key=value form
-  -F, --format=STRING  format of input file or stdin [default: tmv]
-  -n, --noop           show the metric without sending it
-  -m, --metric=STRING  the metric path to which contents of a file will be
-                       assigned. If the file contains a metric name, the two
-                       will be concatenated
+Global options:
+  -c, --config=FILE    path to configuration file [/home/rob/.wavefront]
+  -P, --profile=NAME   profile in configuration file [default]
+  -D, --debug          enable debug mode
   -V, --verbose        be verbose
+  -h, --help           show this message
+
+Options:
+  -E, --proxy=URI            proxy endpoint [wavefront]
+  -t, --time=TIME            time of data point (omit to use current time)
+  -H, --host=STRING          source host [box]
+  -p, --port=INT             Wavefront proxy port [2878]
+  -T, --tag=TAG              point tag in key=value form
+  -F, --infileformat=STRING  format of input file or stdin [tmv]
+  -n, --noop                 show the metric without sending it
+  -m, --metric=STRING        the metric path to which contents of a
+                             file will be assigned. If the file
+                             contains a metric name, the two will be
+                             concatenated
+
+Files are whitespace separated, and fields can be defined with the -F
+option.  Use 't' for timestamp; 'm' for metric name; 'v' for value
+and 'T' for tags. Put 'T' last.
 ```
 
 `write` has two sub-commands: `write point` and `write file`. Both
@@ -364,37 +386,34 @@ sources. Note that source tags are not the same as point tags.
 
 ```
 Usage:
-  wavefront source list [-c file] [-P profile] [-E endpoint] [-t token]
-           [-f format] [-T tag ...] [-at] [-s source] [-l limit] <pattern>
-  wavefront source show [-c file] [-P profile] [-E endpoint] [-t token]
+  wavefront source list [-c file] [-P profile] [-E endpoint] [-t token] [-DV]
+           [-f format] [-T tag ...] [-ag] [-s source] [-l limit] <pattern>
+  wavefront source show [-c file] [-P profile] [-E endpoint] [-t token] [-DV]
            [-f format] <host> ...
   wavefront source describe [-c file] [-P profile] [-E endpoint] [-t token]
-           [-H host ... ] <description>
+           [-DV] [-H host ... ] <description>
   wavefront source undescribe [-c file] [-P profile] [-E endpoint] [-t token]
-           [<host>] ...
+           [-DV] [<host>] ...
   wavefront source tag add [-c file] [-P profile] [-E endpoint] [-t token]
-           [-H host ... ] <tag> ...
+           [-DV] [-H host ... ] <tag> ...
   wavefront source tag delete [-c file] [-P profile] [-E endpoint] [-t token]
-           [-H host ... ] <tag> ...
-  wavefront source untag [-c file] [-P profile] [-E endpoint] [-t token]
+           [-DV] [-H host ... ] <tag> ...
+  wavefront source untag [-c file] [-P profile] [-E endpoint] [-t token] [-DV]
            [<host>] ...
   wavefront source --help
 
-Global options:
-  -c, --config=FILE    path to configuration file [default: /home/rob/.wavefront]
-  -P, --profile=NAME   profile in configuration file [default: default]
-  -D, --debug          enable debug mode
-  -h, --help           show this message
-
 Options:
-  -a, --all            including hidden sources in 'human' output
-  -t, --tags           show tag counts in 'human' output
-  -T, --tagged=STRING  only list sources with this tag in 'human' output
-  -s, --start=STRING   start the list after the named source
-  -l, --limit=NUMBER   only list NUMBER sources
-  -H, --host=STRING    source to manipulate
-  -f, --format=STRING  output format (ruby, json, human)
-                       [default: human]
+  -E, --endpoint=URI        cluster endpoint [metrics.wavefront.com]
+  -t, --token=TOKEN         Wavefront authentication token
+  -a, --all                 including hidden sources in 'human' output
+  -g, --tags                show tag counts in 'human' output
+  -T, --tagged=STRING       only list sources with this tag when using
+                            'human' output
+  -s, --start=STRING        start the list after the named source
+  -l, --limit=NUMBER        only list NUMBER sources
+  -H, --host=STRING         source to manipulate
+  -f, --sourceformat=STRING output format (ruby, json, human)
+                            [human]
 ```
 
 Tags and descriptions can be applied to multiple sources by repeated
@@ -480,7 +499,9 @@ string.
 Passing tokens and endpoints into the `wavefront` command can become
 tiresome, so you can put such data into an `ini`-style configuration
 file. By default this file should be located at `${HOME}/.wavefront`,
-though you can override the location with the `-c` flag.
+though you can override the location with the `-c` flag. You can
+also put a system-wide file at `/etc/wavefront/client.conf`, though
+the user-specific file will take precedentce.
 
 You can switch between Wavefront accounts using profile stanzas,
 selected with the `-P` option.  If `-P` is not supplied, the
@@ -493,16 +514,19 @@ A configuration file looks like this:
 [default]
 token = abcdefab-1234-abcd-1234-abcdefabcdef
 endpoint = companya.wavefront.com
-format = human
+format = json
+alertformat = human
 
 [companyb]
 token = 12345678-abcd-0123-abcd-123456789abc
 endpoint = metrics.wavefront.com
+proxy = wavefront.local
+sourceformat = json
 ```
 
 The key for each key-value pair can match any long option show in the
 command `help`, so you can set, for instance, a default output
-format, as shown above.
+format for timeseries, alerts and source commands, as shown above.
 
 If an option is defined by a command-line switch, and in the
 configuration file, the config file will win.

data/bin/wavefront

@@ -15,17 +15,19 @@
 #
 
 require 'pathname'
+
+# uncomment for development
+$LOAD_PATH.<< Pathname.new(__FILE__).dirname.realpath.parent + 'lib'
+
 require 'wavefront/client'
 require 'wavefront/client/version'
 require 'wavefront/cli'
+require 'wavefront/opt_handler'
 require 'docopt'
-require 'socket'
 include Wavefront::Constants
 
 def sanitize_keys(hash)
-  hash.each_with_object({}) do |(k, v), aggr|
-    aggr[k.delete('-').to_sym] = v
-  end
+  hash.each_with_object({}) { |(k, v), aggr| aggr[k.delete('-').to_sym] = v }
 end
 
 ME = Pathname.new(__FILE__).basename
@@ -33,19 +35,20 @@ ME = Pathname.new(__FILE__).basename
 # If we are a normal user, look for wavefront config in our home
 # directory; if not, look in /etc
 #
-DEF_CF = if ENV['HOME']
-           Pathname.new(ENV['HOME']) + '.wavefront'
-         else
-           Pathname.new('/etc/wavefront/client.conf')
-         end
+conf_file = if ENV['HOME']
+              Pathname.new(ENV['HOME']) + '.wavefront'
+            else
+              Pathname.new('/etc/wavefront/client.conf')
+            end
 
 # The global_opts are available in every command.
 #
 global_opts = %(
 Global options:
-  -c, --config=FILE    path to configuration file [default: #{DEF_CF}]
-  -P, --profile=NAME   profile in configuration file [default: default]
+  -c, --config=FILE    path to configuration file [#{conf_file}]
+  -P, --profile=NAME   profile in configuration file [#{DEFAULT_OPTS[:profile]}]
   -D, --debug          enable debug mode
+  -n, --noop           don't perform API calls
   -V, --verbose        be verbose
   -h, --help           show this message
 )
@@ -56,12 +59,12 @@ Global options:
 usage = {
 ts: %(
 Usage:
-  #{ME} ts [-c file] [-P profile] [-E endpoint] [-t token] [-ODV]
+  #{ME} ts [-c file] [-P profile] [-E endpoint] [-t token] [-ODnV]
             [-S | -m | -H | -d] [-s time] [-e time] [-f format] [-p num]
             [-X bool] <query>
 #{global_opts}
 Options:
-  -E, --endpoint=URI            cluster endpoint [default: #{DEFAULT_HOST}]
+  -E, --endpoint=URI            cluster endpoint [#{DEFAULT_OPTS[:endpoint]}]
   -t, --token=TOKEN             Wavefront authentication token
   -S, --seconds                 query granularity of seconds
   -m, --minutes                 query granularity of minutes
@@ -72,73 +75,76 @@ Options:
   -e, --end=TIME                end of query window in epoch seconds or
                                 strptime parseable format
   -f, --format=STRING           output format (#{FORMATS.join(', ')})
-                                [default: #{DEFAULT_FORMAT}]
+                                [#{DEFAULT_OPTS[:format]}]
   -p, --prefixlength=NUM        number of path elements to treat as prefix
-                                in schema manipulation. [default: #{DEFAULT_PREFIX_LENGTH}]
+                                in schema manipulation. [#{DEFAULT_OPTS[:prefixlength]}]
   -X, --strict=BOOL             Do not return points outside the query
-                                window. [default: #{DEFAULT_STRICT}]
+                                window. [#{DEFAULT_OPTS[:strict]}]
   -O, --includeObsoleteMetrics  include metrics unreported for > 4 weeks
 ),
 
 alerts: %(
 Usage:
-  #{ME} alerts [-c file] [-P profile] [-E endpoint] [-t token] [-V]
+  #{ME} alerts [-DnV] [-c file] [-P profile] [-E endpoint] [-t token]
             [-f format] [-p tag] [ -s tag] <state>
 #{global_opts}
 Options:
-  -E, --endpoint=URI   cluster endpoint [default: #{DEFAULT_HOST}]
-  -t, --token=TOKEN    Wavefront authentication token
-  -f, --format=STRING  output format (#{ALERT_FORMATS.join(', ')})
-                       [default: #{DEFAULT_ALERT_FORMAT}]
-  -p, --private=TAG    retrieve only alerts with named private tags,
-                       comma delimited.
-  -s, --shared=TAG     retrieve only alerts with named shared tags, comma
-                       delimited.
+  -E, --endpoint=URI       cluster endpoint [#{DEFAULT_OPTS[:endpoint]}]
+  -t, --token=TOKEN        Wavefront authentication token
+  -f, --alertformat=STRING output format (#{ALERT_FORMATS.join(', ')})
+                           [#{DEFAULT_OPTS[:aformat]}]
+  -p, --private=TAG        retrieve only alerts with named private tags,
+                           comma delimited.
+  -s, --shared=TAG         retrieve only alerts with named shared tags,
+                           comma delimited.
 ),
 
 event: %(
 Usage:
-  #{ME} event create [-V] [-c file] [-P profile] [-E endpoint] [-t token]
+  #{ME} event create [-DnV] [-c file] [-P profile] [-E endpoint] [-t token]
            [-d description] [-s time] [-i | -e time] [-l level] [-T type]
-           [-H host] [-n] <event>
-  #{ME} event close [-V] [-c file] [-P profile] [-E endpoint] [-t token]
+           [-H host] [-N] <event>
+  #{ME} event close [-DnV] [-c file] [-P profile] [-E endpoint] [-t token]
            [<event>] [<timestamp>]
-  #{ME} event delete [-V] <timestamp> <event>
+  #{ME} event delete [-DnV] [-c file] [-P profile] [-E endpoint] [-t token]
+           <timestamp> <event>
   #{ME} event show
   #{ME} event --help
 #{global_opts}
 Options:
+  -E, --endpoint=URI   cluster endpoint [#{DEFAULT_OPTS[:endpoint]}]
+  -t, --token=TOKEN    Wavefront authentication token
   -i, --instant        create an instantaneous event
   -s, --start=TIME     time at which event begins
   -e, --end=TIME       time at which event ends
   -l, --level=LEVEL    level of event (#{EVENT_LEVELS.join(', ')})
   -T, --type=TYPE      type of event
   -d, --desc=STRING    description of event
-  -H, --host=STRING    list of hosts to tag with even (comma separated)
-  -n, --nostate        do not create a local file recording the event
+  -H, --host=STRING    list of sources to which event applies (comma separated)
+  -N, --nostate        do not create a local file recording the event
 
 View events in detail using the 'ts' command with the 'events()' function.
 ),
 
 write: %(
 Usage:
-  #{ME} write point [-DV] [-c file] [-P profile] [-E proxy] [-t time]
+  #{ME} write point [-DnV] [-c file] [-P profile] [-E proxy] [-t time]
            [-p port] [-H host] [-n] [-T tag...] <metric> <value>
-  #{ME} write file [-DV] [-c file] [-P profile] [-E proxy] [-H host]
+  #{ME} write file [-DnV] [-c file] [-P profile] [-E proxy] [-H host]
            [-p port] [-n] [-F format] [-m metric] [-T tag...] <file>
   #{ME} write --help
 #{global_opts}
 Options:
-  -E, --proxy=URI      proxy endpoint [default: #{DEFAULT_PROXY}]
-  -t, --time=TIME      time of data point (omit to use current time)
-  -H, --host=STRING    source host [default: #{Socket.gethostname}]
-  -p, --port=INT       Wavefront proxy port [default: #{DEFAULT_PROXY_PORT}]
-  -T, --tag=TAG        point tag in key=value form
-  -F, --format=STRING  format of input file or stdin [default: #{DEFAULT_INFILE_FORMAT}]
-  -n, --noop           show the metric without sending it
-  -m, --metric=STRING  the metric path to which contents of a file will be
-                       assigned. If the file contains a metric name, the two
-                       will be concatenated
+  -E, --proxy=URI            proxy endpoint [#{DEFAULT_OPTS[:proxy]}]
+  -t, --time=TIME            time of data point (omit to use current time)
+  -H, --host=STRING          source host [#{DEFAULT_OPTS[:host]}]
+  -p, --port=INT             Wavefront proxy port [#{DEFAULT_OPTS[:port]}]
+  -T, --tag=TAG              point tag in key=value form
+  -F, --infileformat=STRING  format of input file or stdin [#{DEFAULT_OPTS[:infileformat]}]
+  -m, --metric=STRING        the metric path to which contents of a
+                             file will be assigned. If the file
+                             contains a metric name, the two will be
+                             concatenated
 
 Files are whitespace separated, and fields can be defined with the -F
 option.  Use 't' for timestamp; 'm' for metric name; 'v' for value
@@ -146,31 +152,33 @@ and 'T' for tags. Put 'T' last.
 ),
 source: %(
 Usage:
-  #{ME} source list [-c file] [-P profile] [-E endpoint] [-t token] [-V]
-           [-f format] [-T tag ...] [-at] [-s source] [-l limit] <pattern>
-  #{ME} source show [-c file] [-P profile] [-E endpoint] [-t token] [-V]
+  #{ME} source list [-c file] [-P profile] [-E endpoint] [-t token] [-DnV]
+           [-f format] [-T tag ...] [-ag] [-s source] [-l limit] <pattern>
+  #{ME} source show [-c file] [-P profile] [-E endpoint] [-t token] [-DnV]
            [-f format] <host> ...
   #{ME} source describe [-c file] [-P profile] [-E endpoint] [-t token]
-           [-V] [-H host ... ] <description>
+           [-DnV] [-H host ... ] <description>
   #{ME} source undescribe [-c file] [-P profile] [-E endpoint] [-t token]
-           [-V] [<host>] ...
+           [-DnV] [<host>] ...
   #{ME} source tag add [-c file] [-P profile] [-E endpoint] [-t token]
-           [-V] [-H host ... ] <tag> ...
+           [-DnV] [-H host ... ] <tag> ...
   #{ME} source tag delete [-c file] [-P profile] [-E endpoint] [-t token]
-           [-V] [-H host ... ] <tag> ...
-  #{ME} source untag [-c file] [-P profile] [-E endpoint] [-t token] [-V]
+           [-DnV] [-H host ... ] <tag> ...
+  #{ME} source untag [-c file] [-P profile] [-E endpoint] [-t token] [-DnV]
            [<host>] ...
   #{ME} source --help
 #{global_opts}
 Options:
-  -a, --all            including hidden sources in 'human' output
-  -t, --tags           show tag counts in 'human' output
-  -T, --tagged=STRING  only list sources with this tag in 'human' output
-  -s, --start=STRING   start the list after the named source
-  -l, --limit=NUMBER   only list NUMBER sources
-  -H, --host=STRING    source to manipulate
-  -f, --format=STRING  output format (#{ALERT_FORMATS.join(', ')})
-                       [default: #{DEFAULT_ALERT_FORMAT}]
+  -E, --endpoint=URI         cluster endpoint [#{DEFAULT_OPTS[:endpoint]}]
+  -t, --token=TOKEN          Wavefront authentication token
+  -a, --all                  including hidden sources in 'human' output
+  -g, --tags                 show tag counts in 'human' output
+  -T, --tagged=STRING        only list sources with this tag when using
+                             'human' output
+  -s, --start=STRING         start the list after the named source
+  -l, --limit=NUMBER         only list NUMBER sources
+  -H, --host=STRING          source to manipulate
+  -f, --sourceformat=STRING  output format (#{SOURCE_FORMATS.join(', ')}) [#{DEFAULT_OPTS[:sourceformat]}]
 ),
 default: %(
 Wavefront CLI
@@ -190,29 +198,33 @@ Commands:
 Use '#{ME} <command> --help' for further information.)
 }
 
-# Parse the input. We have to do this twice because of the nested
-# help/option parser generation.
+# Parse the input. The first Docopt.docopt handles the default
+# options, the second works on the command.
 #
 begin
   opts = Docopt.docopt(usage[:default], version: Wavefront::Client::VERSION)
 rescue Docopt::Exit => e
-  cmd = ARGV.length > 0 ? ARGV.first.to_sym : nil
+
+  cmd = ARGV.empty? ? nil : ARGV.first.to_sym
 
   if usage.keys.include?(cmd)
     begin
       opts = sanitize_keys(Docopt.docopt(usage[cmd]))
     rescue Docopt::Exit => e
-      abort e.message
+      abort e.message # command help
     end
   else
-    abort e.message
+    abort e.message # default help
   end
 end
 
-# Load the config file. Values in there take priority, otherwise
-# default (unset) options will win.
-#
-opts.merge!(Wavefront::Cli.new(opts, nil).load_profile || {})
+opts = Wavefront::OptHandler.new(conf_file, opts).opts
+
+if opts[:debug]
+  require 'pp'
+  puts 'Combined options:'
+  pp opts
+end
 
 case cmd
 when :ts
@@ -238,7 +250,10 @@ when :write
 end
 
 begin
+  cli.validate_opts
   cli.run
 rescue => e
-  abort "#{cmd} query failed. #{e}"
+  STDERR.puts "#{cmd} query failed. #{e}"
+  STDERR.puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}" if opts[:debug]
+  exit 1
 end