wavefront-cli 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88361573bacb11ad77961b36c20cbd1fee3a0275
-  data.tar.gz: 759b6a5b0c5f3287d7658d676fc27ba68d2bcdc6
+  metadata.gz: abded61ee10732bf7af826637d39e1a736db92bc
+  data.tar.gz: bf039ef6b77cde28bcd7f6c3c1d2e8f141e86f9c
 SHA512:
-  metadata.gz: 266b8c096a7b57896158b1f54bee0615108024984279a9ebfba714725ddb48eac9648ba8da2e96fbcfc2769614166b6e4c074dd163d55d5df0c0e767bc731a19
-  data.tar.gz: 77f79a1bf985a89dd1f4fa71151efa85ba53289e640456a4997d2c7f6285d12b3c6fb2259aadae20ac4efc8ff0e3bcf58faaf95ff45061bb98f800799eeb2e63
+  metadata.gz: e99d3375a2f2693e3b18974a8cd6099d642d3e78bbe88a752fef943d21fbc93432028ff59e5d345074aa1c93990de9b1bfd1a6da9e3f3f8e49eed647ab32554a
+  data.tar.gz: b5a9e93eef9dda6708651c49736aa7d69008553c633494d955153fc1440afb80cfdc0a296ecdfc30b18cb5b2c3d87254463ba8cffae44277d32b23aa7f7b738a

data/.travis.yml

@@ -8,9 +8,10 @@ before_install: gem install bundler --no-rdoc --no-ri
 deploy:
   provider: rubygems
   api_key:
-    secure: dfmL5JwBn+u3cUmyAaDsApDa7ljGajGNz3GDcKd2J8FOt7+a758/lmL8EQ34sDT1ZFotrxn/y1RbgXlaDxAE1XDfrZbjckmx7a6wa2sqR3kBraJ2tx7CiXodbw3Z8XZf9WLb0kYGmlLtI73GNcuunMt/9f1cobqWISRLHw6b7amlO7GW2ZBZgzRS+N8TSS2dicIvKMo5HoMYU+uWLM4zDFBPnGNcMiWxh8ysLzJoKqA9kbBUyCVEZ03MlV7G71ObvWCLasKnZ3W5U+K1NbgU7mgMYfl9KIcA4y9hQ9hUCijk40SmT7ffy3P2gq8zblC/4x5Eefpau9X/bdLwXoRCIzqk05t4f45wstj2auHGK0HJwOYRtx8apdaLSgyJ5lQpGcbCRu40WR9mDkaM8m9n3u2o6GJmftCg3AN1QtsourmQB84x67LEbHzValMaokrbCol4XeWqlC+dCNLPixemQRBvcNfI3V9C6RqVGfjpoGlSTI+RkQqwm01PcxpeqIVfdMd1wnfUuAOywUO6UpvtK9TZaxg0NnVElXpPseQbtzulLwZ7R5Y3A4Ss8Z7w43c1KHxTkg54FWUOp065ItjAc4lmyORXq/2+F7sMvRN6dtCLaXTUlkYuU3cjFLIPlLGFYgqq4T4xQa+e5NEK1XW7nghv+IRfKfyVeZsB0WpY+uc=
+    secure: dpVC480pAmGQrkEeugPowxhYzM8Er9UDhY02u2P5ytrCXC9J05uGKvN8uZ6H8SJr1ZKUb7OGxCq+EVKrA/q1s6Cv07Xl9u1HiOR0cB4ZUW3wBl6TGdl7c/rcor5AQxjELTcWnhCJvTzB+i46a1s4AcWjGBIVEY7/b1iloj/Sm0U43UZPcWPaIl5xfnANBk6v9F5eEfQy5IXlQUQKtRLXzgyqwyJi7DQcNcnEXA0O33KKwka7QDQsycYE7axEiJGOBt0PbYiRUXRZBxKWnsrtq9Sk9QukYsZSQqZgkykV6ImvMYzWI/vUwDRl+dJWmyAG6K2mz4kqMjhiMkB4ctbj5sxDG1BzsBlNTTEb0P8PGBEYgcf4VBd7XDlEt0Sythp6ztn9EVtw35M22n5Q7sdgalf6TFrzQpp9sec3o4AqO3IXUIqRN4VD4vPRQVBJHcwFOuZ3EUO0VekUzCUO3R/mG4oHUIQ9VgRzrUuyYpCwuwWyoVKVA/AukHHW6Y7El2g+JlpP+ijf0ABpqusHENELVWnuCRcv36sxbyM6Rbt2JrT9FrG1oSAELz4yMS86Qhq104II89d6apGJT3thUH8n9m2KA16DmxQYXkNamfygCn3D5ogC2gcIgVicQnJma+405Pv43/a+PaKy/oKr3/H7IJJmoqHfiMyG9DtkFTWQrfA=
   gem: wavefront-cli
   on:
     tags: true
     repo: snltd/wavefront-cli
     ruby: 2.3.4
+

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'                                                                                                  
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -1,5 +1,5 @@
 # Wavefront CLI
-[![Build Status](https://travis-ci.org/snltd/wavefront-cli.svg?branch=master)](https://travis-ci.org/snltd/wavefront-cli) [![Code Climate](https://codeclimate.com/github/snltd/wavefront-cli/badges/gpa.svg)](https://codeclimate.com/github/snltd/wavefront-cli) [![Issue Count](https://codeclimate.com/github/snltd/wavefront-cli/badges/issue_count.svg)](https://codeclimate.com/github/snltd/wavefront-cli) [![Known Vulnerabilities](https://snyk.io/test/github/snltd/wavefront-cli/badge.svg)](https://snyk.io/test/github/snltd/wavefront-cli) [![Gem Version](https://badge.fury.io/rb/wavefront-cli.svg)](https://badge.fury.io/rb/wavefront-cli) ![](http://ruby-gem-downloads-badge.herokuapp.com/wavefront-cli?type=total)
+[![Build Status](https://travis-ci.org/snltd/wavefront-cli.svg?branch=master)](https://travis-ci.org/snltd/wavefront-cli) [![Code Climate](https://codeclimate.com/github/snltd/wavefront-cli/badges/gpa.svg)](https://codeclimate.com/github/snltd/wavefront-cli) [![Issue Count](https://codeclimate.com/github/snltd/wavefront-cli/badges/issue_count.svg)](https://codeclimate.com/github/snltd/wavefront-cli) [![Dependency Status](https://gemnasium.com/badges/github.com/snltd/wavefront-cli.svg)](https://gemnasium.com/github.com/snltd/wavefront-cli) [![Gem Version](https://badge.fury.io/rb/wavefront-cli.svg)](https://badge.fury.io/rb/wavefront-cli) ![](http://ruby-gem-downloads-badge.herokuapp.com/wavefront-cli?type=total)
 
 
 This package provides a command-line interface to Wavefront's API. Each API path
@@ -9,13 +9,13 @@ It is built on [the Wavefront Ruby
 SDK](https://github.com/snltd/wavefront-sdk) and requires Ruby >= 2.2.
 
 ```
-$ wavefront --help
+$ wf --help
 Wavefront CLI
 
 Usage:
-  wavefront [options] command [options]
-  wavefront --version
-  wavefront --help
+  wf [options] command [options]
+  wf --version
+  wf --help
 
 Commands:
   alert         view and manage alerts
@@ -34,7 +34,7 @@ Commands:
   webhook       view and manage webhooks
   write         send data points to a Wavefront proxy
 
-Use 'wavefront <command> --help' for further information.
+Use 'wf <command> --help' for further information.
 ```
 
 ## General Rules
@@ -71,7 +71,7 @@ Most commands have a `list` subcommand, which will produce brief
 column.
 
 ```
-$ wavefront proxy list
+$ wf proxy list
 457d6cf3-5171-45e0-8d31-5c980be889ea  test agent
 917102d1-a10e-997b-ba63-95058f98d4fb  Agent on wavefront-2017-03-13-02
 926dfb4c-23c6-4fb9-8c8d-833625ab8f6f  Agent on shark-wavefront
@@ -85,7 +85,7 @@ Most commands have a `describe` subcommand which will tell you more about the
 object.
 
 ```
-$ wavefront proxy describe 917102d1-a10e-497b-ba63-95058f98d4fb
+$ wf proxy describe 917102d1-a10e-497b-ba63-95058f98d4fb
 name                     Agent on wavefront-2017-03-13-02
 id                       917102d1-a10e-497b-ba63-95058f98d4fb
 version                  4.7
@@ -121,22 +121,22 @@ If you `describe` an object like a dashboard, user, webhook etc as `json` or
 `yaml`, and send the output to a file, you can re-import that data. The format of the file to be imported is automatically detected.
 
 ```
-$ wavefront user list
+$ wf user list
 slackboy@gmail.com
 sysdef.limited@gmail.com
-$ wavefront user describe -f json sysdef.limited@gmail.com > user.json
+$ wf user describe -f json sysdef.limited@gmail.com > user.json
 $ cat user.json
 {"identifier":"sysdef.limited@gmail.com","customer":"sysdef","groups":["agent_management"]}
-$ wavefront user delete sysdef.limited@gmail.com
+$ wf user delete sysdef.limited@gmail.com
 Deleted user 'sysdef.limited@gmail.com'.
-$ wavefront user list
+$ wf user list
 slackboy@gmail.com
-$ wavefront user import user.json
+$ wf user import user.json
 Imported user.
 identifier  sysdef.limited@gmail.com
 customer    sysdef
 groups      agent_management
-$ wavefront user list
+$ wf user list
 slackboy@gmail.com
 sysdef.limited@gmail.com
 ```
@@ -154,7 +154,7 @@ method](https://ruby-doc.org/stdlib-2.3.1/libdoc/date/rdoc/DateTime.html#method-
 method can parse unaided. For instance:
 
 ```
-$ wavefront --start 12:15 --end 12:20 ...
+$ wf command --start 12:15 --end 12:20 ...
 ```
 
 will define a window between 12:15 and 12:20pm today. If you ran
@@ -162,7 +162,7 @@ that in the morning, the time would be invalid, and you would get a
 400 error from Wavefront, so something of the form
 `2016-04-17T12:25:00` would remove all ambiguity.
 
-There is no need to include a timezone in your time: the `wavefront`
+There is no need to include a timezone in your time: the `wf`
 CLI will automatically use your local timezone when it parses the
 string.
 
@@ -185,20 +185,20 @@ fail. This output can be very verbose.
 Writing a single point is simple:
 
 ```
-$ wavefront write point cli.example 10
+$ wf write point cli.example 10
 ```
 
 and you can add point tags, if you like.
 
 ```
-$ wavefront write point cli.example 9.4 -E wavefront -T proxy=wavefront \
+$ wf write point cli.example 9.4 -E wavefront -T proxy=wavefront \
   -T from=README
 ```
 
 or force a timestamp:
 
 ```
-$ wavefront write point -t 16:53:14 cli.example 8
+$ wf write point -t 16:53:14 cli.example 8
 ```
 
 More usefully, you can write from a file. Your file must contain multiple
@@ -212,11 +212,11 @@ $ cat datafile
 1496767813 dev.cli.test 12.1
 1496767813 dev.cli.test 10.0
 1496767813 dev.cli.test 14.5
-$ wavefront write file -F tmv datafile
+$ wf write file -F tmv datafile
 ```
 
 If you set the file to `-`, you can read from standard in:
 
 ```
-$ while true; do echo $RANDOM; sleep 1; done | wavefront write file -m cli.demo -Fv -
+$ while true; do echo $RANDOM; sleep 1; done | wf write file -m cli.demo -Fv -
 ```

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubocop/rake_task'
 task default: :test
 
 Rake::TestTask.new do |t|
-  t.pattern = 'spec/wavefront-cli/*_spec.rb'
+  t.pattern = 'spec/wavefront-cli/**/*_spec.rb'
   t.warning = false
 end
 
@@ -14,5 +14,5 @@ RuboCop::RakeTask.new(:rubocop) do |t|
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.files = ['lib/wavefront-cli/*rb']
+  t.files = ['lib/wavefront-cli/**/*.rb']
 end

data/bin/{wavefront → wf}

@@ -5,10 +5,14 @@ require 'io/console'
 require_relative '../lib/wavefront-cli/controller'
 
 begin
-  TW = IO.console.winsize.last
+  tw = IO.console.winsize.last
 rescue
-  TW = 80
+  tw = 80
 end
 
+tw = 80 if tw < 60
+
+TW = tw
+
 CMD = Pathname.new(__FILE__).basename
 WavefrontCliController.new(ARGV)

data/lib/wavefront-cli/alert.rb

@@ -18,13 +18,13 @@ module WavefrontCli
     end
 
     def do_delete
-      print (if wf.describe(options[:'<id>']).status.code == 200
-              'Soft'
-            else
-              'Permanently'
-            end)
+      word = if wf.describe(options[:'<id>']).status.code == 200
+               'Soft'
+             else
+               'Permanently'
+             end
 
-      puts " deleting alert '#{options[:'<id>']}'."
+      puts "#{word} deleting alert '#{options[:'<id>']}'."
       wf.delete(options[:'<id>'])
     end
 
@@ -41,6 +41,7 @@ module WavefrontCli
     #
     # @param raw [Hash] Ruby hash of imported data
     #
+    # rubocop:disable Metrics/MethodLength
     def import_to_create(raw)
       ret = %w(name condition minutes target severity displayExpression
                additionalInformation).each_with_object({}) do |k, aggr|

data/lib/wavefront-cli/base.rb

@@ -1,8 +1,6 @@
-
 require 'yaml'
 require 'json'
 require 'wavefront-sdk/validators'
-# require_relative './constants'
 require_relative './exception'
 
 module WavefrontCli
@@ -89,7 +87,10 @@ module WavefrontCli
     # @return [Hash] containing `token` and `endpoint`.
     #
     def mk_creds
-      { token: options[:token], endpoint: options[:endpoint] }
+      { token:    options[:token],
+        endpoint: options[:endpoint],
+        agent:    "wavefront-cli-#{WF_CLI_VERSION}"
+      }
     end
 
     # Make a common wavefront-sdk options object from standard CLI
@@ -98,12 +99,14 @@ module WavefrontCli
     # @return [Hash] containing `debug`, `verbose`, and `noop`.
     #
     def mk_opts
-      { debug: options[:debug], verbose: options[:verbose],
-        noop: options[:noop] }
+      { debug:   options[:debug],
+        verbose: options[:verbose],
+        noop:    options[:noop],
+      }
     end
 
     # To allow a user to default to different output formats for
-    # different object, we define a format for each class. For
+    # different object, we are able to define a format for each class.
     # instance, `alertformat` or `agentformat`. This method returns
     # such a string appropriate for the inheriting class.
     #
@@ -166,6 +169,8 @@ module WavefrontCli
     #   this output. Used to find a suitable humanize method.
     #
     def display(data, method)
+      exit if options[:noop]
+
       [:status, :response].each do |b|
         abort "no #{b} block in API response" unless data.respond_to?(b)
       end
@@ -290,6 +295,22 @@ module WavefrontCli
       wf.update(options[:'<id>'], k => v)
     end
 
+    def do_search
+      require 'wavefront-sdk/search'
+      wfs = Wavefront::Search.new(mk_creds, mk_opts)
+
+      query = options[:'<condition>'].each_with_object([]) do |c, aggr|
+        key, value = c.split(/\W/, 2)
+        q = { key: key, value: value }
+        q[:matchingMethod] = 'EXACT' if c.start_with?("#{key}=")
+        q[:matchingMethod] = 'STARTSWITH' if c.start_with?("#{key}^")
+        aggr.<< q
+      end
+
+      wfs.search(klass_word, query, { limit: options[:limit],
+                                      offset: options[:offset] || options[:cursor]})
+    end
+
     def do_tags
       wf.tags(options[:'<id>'])
     end

data/lib/wavefront-cli/commands/alert.rb

@@ -17,6 +17,7 @@ class WavefrontCommandAlert < WavefrontCommandBase
      "snooze #{CMN} [-T time] <id>",
      "update #{CMN} <key=value> <id>",
      "unsnooze #{CMN} <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>...",
      "tags #{CMN} [-f format] <id>",
      "tag set #{CMN} <id> <tag>...",
      "tag clear #{CMN} <id>",
@@ -28,11 +29,11 @@ class WavefrontCommandAlert < WavefrontCommandBase
   def _options
     [common_options,
      '-l, --long               list alerts in detail',
+     '-a, --all                list all alerts',
      '-v, --version=INTEGER    describe only this version of alert',
      '-o, --offset=n           start from nth alert',
      '-L, --limit=COUNT        number of alerts to list',
      '-T, --time=SECONDS       how long to snooze (default 3600)',
-     '-a, --all                list all alerts',
      '-f, --format=STRING      output format']
   end
 end

data/lib/wavefront-cli/commands/base.rb

@@ -1,9 +1,12 @@
+require_relative '../string'
+
 CMN = '[-DnV] [-c file] [-P profile] [-E endpoint] [-t token]'.freeze
 
 # A base class which all command classes extend.
 #
 class WavefrontCommandBase
   # All commands have these options
+  # @return [Array]
   #
   def global_options
     ['-c, --config=FILE    path to configuration file',
@@ -15,13 +18,22 @@ class WavefrontCommandBase
   end
 
   # Many commands have these options
+  # @return [Array]
   #
   def common_options
     ['-E, --endpoint=URI       cluster endpoint',
      '-t, --token=TOKEN        Wavefront authentication token']
   end
 
+  # Inheriting classes must override this method
+  # @return [Array]
+  #
+  def _options
+    []
+  end
+
   # Anything which takes tags provides the same interface
+  # @return [Array]
   #
   def tag_commands
     ["tags #{CMN} [-f format] <id>",
@@ -31,75 +43,88 @@ class WavefrontCommandBase
      "tag delete #{CMN} <id> <tag>"]
   end
 
-  # The command keyword
+  # Inheriting classes must override this method
+  # @return [Array]
+  #
+  def _commands
+    []
+  end
+
+  # @return [String] the command keyword
   #
   def word
     self.class.name.sub(/WavefrontCommand/, '').downcase
   end
 
-  # Returns the name of the SDK class which does the work for this
-  # command.
+  # @return [String] the name of the SDK class which does the work
+  #   for this command.
   #
   def sdk_class
     word.capitalize
   end
 
+  # @return [String] the name of the SDK file which does the work
+  #   for this command.
+  #
   def sdk_file
     word
   end
 
-  # Returns a string describing the subcommands the command offers.
+  # @param term_width [Integer] force a terminal width. Makes
+  #   testing far simpler.
+  # @return [String] the subcommands the command offers.
   #
-  def commands
+  #
+  def commands(term_width = TW)
     _commands.flatten.each_with_object("Usage:\n") do |cmd, ret|
-      ret.<< '  ' + "#{CMD} #{word} #{cmd}\n".cmd_fold + "\n"
+      ret.<< '  ' + "#{CMD} #{word} #{cmd}\n".cmd_fold(term_width) + "\n"
     end + "  #{CMD} #{word} --help"
   end
 
-  # Returns a string describing the options the command understands.
+  # @param term_width [Integer] force a terminal width. Makes
+  #   testing far simpler.
+  # @return [String] the options the command understands.
+  #
   #
-  def options
-    width = column_widths
+  def options(term_width = TW)
+    width = option_column_width
     ret = "Global options:\n"
-    global_options.each { |o| ret.<< opt_row(o, width) }
+    global_options.each { |o| ret.<< opt_row(o, width, term_width) }
     ret.<< "\nOptions:\n"
-    _options.flatten.each { |o| ret.<< opt_row(o, width) }
+    _options.flatten.each { |o| ret.<< opt_row(o, width, term_width) }
     ret
   end
 
-  def opt_row(opt, width)
+  # Formats an option string.
+  #
+  # @param opt [String] the option string
+  # @param width [Integer] the width of the short + long options
+  #   columns. This is used to indent following lines
+  # @param term_width [Integer] the width of the user's terminal
+  #
+  def opt_row(opt, width, term_width = TW)
     format("  %s %-#{width}s %s\n", *opt.split(/\s+/, 3))
+      .opt_fold(term_width, width + 5)
   end
 
-  def column_widths
+  # @return [Integer] the width of the column containing short and
+  #   long options
+  #
+  def option_column_width
     (global_options + _options).flatten.map do |o|
       o.split(/\s+/, 3)[0..1].join(' ').size
     end.max
   end
 
-  # Returns a string which will be printed underneath the options.
+  # @return [String] which will be printed underneath the options.
   #
   def postscript
     ''
   end
 
-  # Returns a full options string which docopt understands
+  # @return [String] a full options string which docopt understands
   #
   def docopt
     commands + "\n\n" + options + "\n" + postscript
   end
 end
-
-# Extensions to the String class to help with formatting.
-#
-class String
-
-  # Fold long command lines. We can't break on a space inside
-  # [square brackets] or it confuses docopt.
-  #
-  def cmd_fold(width = TW, indent = 10)
-    gsub(/\s(?=\w+\])/, '^').
-    scan(/\S.{0,#{width - 8}}\S(?=\s|$)|\S+/).join("\n" + ' ' * indent).
-    gsub('^', ' ')
-  end
-end

data/lib/wavefront-cli/commands/dashboard.rb

@@ -15,6 +15,7 @@ class WavefrontCommandDashboard < WavefrontCommandBase
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",
      "history #{CMN} [-b] [-f format] [-o offset] [-L limit] <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>...",
      tag_commands]
   end
 

data/lib/wavefront-cli/commands/event.rb

@@ -9,13 +9,16 @@ class WavefrontCommandEvent < WavefrontCommandBase
 
   def _commands
     ["list #{CMN} [-l] [-f format] [-s start] [-e end] [-L limit] " \
-      '[-o offset]',
+      '[-o cursor]',
      "describe #{CMN} [-f format] <id>",
      "create #{CMN} [-d description] [-s time] [-i | -e time] " \
      '[-S severity] [-T type] [-H host...] [-N] <event>',
      "close #{CMN} [<id>]",
      "delete #{CMN} <id>",
      "update #{CMN} <key=value> <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>...",
+     "wrap #{CMN} [-C command] [-d description] [-S severity] [-T type] " \
+     '[-H host...] <event>',
      tag_commands,
      'show [-D]']
   end
@@ -23,7 +26,7 @@ class WavefrontCommandEvent < WavefrontCommandBase
   def _options
     [common_options,
      '-l, --long                list events in detail',
-     '-o, --offset=n            start list from nth event',
+     '-o, --cursor=EVENT        start listing from given event',
      '-L, --limit=COUNT         number of events to list',
      '-s, --start=TIME          time at which event/window begins',
      '-e, --end=TIME            time at which even/window  ends',
@@ -34,7 +37,8 @@ class WavefrontCommandEvent < WavefrontCommandBase
      '-H, --host=STRING         source to which event applies',
      '-N, --nostate             do not create a local file recording ' \
      'the event',
-     '-f, --format=STRING        output format']
+     '-C, --command=COMMAND     command to run',
+     '-f, --format=STRING       output format']
   end
 
   def postscript

data/lib/wavefront-cli/commands/integration.rb

@@ -20,7 +20,8 @@ class WavefrontCommandIntegration < WavefrontCommandBase
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",
-     "import #{CMN} <file>"]
+     "import #{CMN} <file>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>..."]
   end
 
   def _options

data/lib/wavefront-cli/commands/link.rb

@@ -20,8 +20,8 @@ class WavefrontCommandLink < WavefrontCommandBase
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
      "import #{CMN} <file>",
-     "update #{CMN} <key=value> <id>"
-    ]
+     "update #{CMN} <key=value> <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>..."]
   end
 
   def _options

data/lib/wavefront-cli/commands/proxy.rb

@@ -12,7 +12,8 @@ class WavefrontCommandProxy < WavefrontCommandBase
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",
-     "rename #{CMN} <id> <name>"]
+     "rename #{CMN} <id> <name>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>..."]
   end
 
   def _options

data/lib/wavefront-cli/commands/savedsearch.rb

@@ -19,7 +19,8 @@ class WavefrontCommandSavedsearch < WavefrontCommandBase
     ["list #{CMN} [-l] [-f format] [-o offset] [-L limit]",
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
-     "import #{CMN} <file>"]
+     "import #{CMN} <file>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>..."]
   end
 
   def _options

data/lib/wavefront-cli/commands/source.rb

@@ -8,18 +8,19 @@ class WavefrontCommandSource < WavefrontCommandBase
   end
 
   def _commands
-    ["list #{CMN} [-l] [-f format] [-o offset] [-L limit] [-a]",
+    ["list #{CMN} [-l] [-f format] [-o cursor] [-L limit] [-a]",
      "describe #{CMN} [-f format] <id>",
      "description set  #{CMN} <id> <description>",
      "description clear  #{CMN} <id>",
      "clear  #{CMN} <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>...",
      tag_commands]
   end
 
   def _options
     [common_options,
      '-l, --long                 list sources in detail',
-     '-o, --offset=n             start list from nth source',
+     '-o, --cursor=SOURCE        start list given source',
      '-L, --limit=COUNT          number of sources to list',
      '-a, --all                  list all sources, including cluster',
      '-f, --format=STRING        output format']

data/lib/wavefront-cli/commands/webhook.rb

@@ -12,7 +12,8 @@ class WavefrontCommandWebhook < WavefrontCommandBase
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
      "import #{CMN} <file>",
-     "update #{CMN} <key=value> <id>"]
+     "update #{CMN} <key=value> <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>..."]
   end
 
   def _options

data/lib/wavefront-cli/commands/window.rb

@@ -20,7 +20,8 @@ class WavefrontCommandWindow < WavefrontCommandBase
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
      "import #{CMN} <file>",
-     "update #{CMN} <key=value> <id>"]
+     "update #{CMN} <key=value> <id>",
+     "search #{CMN} [-f format] [-o offset] [-L limit] [-l] <condition>..."]
   end
 
   def _options

data/lib/wavefront-cli/commands/write.rb

@@ -9,9 +9,10 @@ class WavefrontCommandWrite < WavefrontCommandBase
 
   def _commands
     ['point [-DnV] [-c file] [-P profile] [-E proxy] [-t time] ' \
-      '[-p port] [-H host] [-n] [-T tag...] <metric> <value>',
+     '[-p port] [-H host] [-n] [-T tag...] <metric> <value>',
      'file [-DnV] [-c file] [-P profile] [-E proxy] [-H host] ' \
-     '[-p port] [-n] [-F format] [-m metric] [-T tag...] <file>']
+     '[-p port] [-n] [-F format] [-m metric] [-T tag...] ' \
+     '[-r rate] <file>']
   end
 
   def _options
@@ -24,12 +25,15 @@ class WavefrontCommandWrite < WavefrontCommandBase
      '-F, --infileformat=STRING  format of input file or stdin',
      '-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']
+     'the two will be dot-concatenated, with this value first',
+     '-r, --rate=INTEGER         throttle point sending to this many ' \
+     'points per second']
   end
 
   def postscript
-    %(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.)
+    'Files are whitespace separated, and fields can be defined ' \
+    "with the '-F' option.  Use 't' for timestamp; 'm' for metric " \
+    "name; 'v' for value, 's' for source, and 'T' for tags. Put 'T' " \
+    'last.'.cmd_fold(TW, 0)
   end
 end

data/lib/wavefront-cli/constants.rb

@@ -11,7 +11,7 @@ module WavefrontCli
     #
     DEFAULT_OPTS = {
       endpoint: 'metrics.wavefront.com',
-      format:   :human,
+      format:   :human
     }.freeze
   end
 end