wavefront-cli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b927f378e45604265322586b41adfc505f6f817
-  data.tar.gz: 04c4a0d7ac7a0c8f09d956a45d130ceee0380fde
+  metadata.gz: d5fe5e6006694e0e3683bcc58dbb55e1ad703ff8
+  data.tar.gz: 96154590a344297b93be93b7e3cad81f42ffbb4d
 SHA512:
-  metadata.gz: 1c761352761708b57c2d1244317324e3ffa2abed5363b28ca76208aef41ad7ce59861e566784ae82d361653b0245a0fd2c27ab672cd5af137594934454dc0ddd
-  data.tar.gz: 22a3fb23be4711fa52b39a6c57708f01c5a9993748b7d0d6849a2697b86897aaf7b3b269c2ba01d94fd2d92957bb4d7ee7a3ba13ed9a2f046c7ed22b9a9837bd
+  metadata.gz: 981838fe6e017bd0bb1d1c14612ef2cec3ff746bcceb90cbac243c9b245aeb02010f76eadb6aac1d75b2c4e3945186c771e49f1a52465948e161dea62c7aa3ab
+  data.tar.gz: b760924a3672f4e1ff8b909940feb2d13cd9003d83a1be7188e2330d71ada5b134af80e9ae4e5abae3817023d40ab37da27bf351e9287592ad04b2c65dff8811

data/README.md

@@ -5,8 +5,20 @@
 This package provides a command-line interface to Wavefront's API. Each API path
 is covered by a different command keyword.
 
+The gem is hosted [on
+Rubygems](https://rubygems.org/gems/wavefront-cli) and can be
+installed with
+
+```
+$ gem install wavefront-cli
+```
+
 It is built on [the Wavefront Ruby
-SDK](https://github.com/snltd/wavefront-sdk) and requires Ruby >= 2.2.
+SDK](https://github.com/snltd/wavefront-sdk) and requires Ruby >=
+2.2. It has no "native extension" dependencies.
+
+I also maintain [a reasonably thorough
+tutorial](http://sysdef.xyz/post/2017-07-26-wavefront-cli).
 
 ```
 $ wf --help

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

@@ -28,8 +28,8 @@ class WavefrontCommandEvent < WavefrontCommandBase
      '-l, --long                list events in detail',
      '-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',
+     '-s, --start=TIME          time at which event begins',
+     '-e, --end=TIME            time at which event ends',
      '-S, --severity=SEVERITY   severity of event',
      '-i, --instant             create an instantaneous event',
      '-T, --type=TYPE           type of event',

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

@@ -18,6 +18,10 @@ class WavefrontCommandWindow < WavefrontCommandBase
   def _commands
     ["list #{CMN} [-l] [-f format] [-o offset] [-L limit]",
      "describe #{CMN} [-f format] <id>",
+     "create #{CMN} -d reason [-s time] [-e time] " \
+     '[-A alert_tag...] [-T host_tag...] [-H host...] <title>',
+     "close #{CMN} <id>",
+     "extend #{CMN} (by|to) <time> <id>",
      "delete #{CMN} <id>",
      "import #{CMN} <file>",
      "update #{CMN} <key=value> <id>",
@@ -29,6 +33,12 @@ class WavefrontCommandWindow < WavefrontCommandBase
      '-l, --long           list maintenance windows in detail',
      '-o, --offset=n       start from nth maintenance window',
      '-L, --limit=COUNT    number of maintenance windows to list',
+     '-d, --desc=STRING    reason for maintenance window',
+     '-s, --start=TIME     time at which window begins',
+     '-e, --end=TIME       time at which window ends',
+     '-A, --atag=STRING    alert tag to which window applies',
+     '-H, --host=STRING    host to which window applies',
+     '-T, --htag=STRING    host tag to which window applies',
      '-f, --format=STRING  output format']
   end
 end

data/lib/wavefront-cli/controller.rb

@@ -6,9 +6,9 @@ require_relative './opt_handler'
 require_relative './exception'
 
 # $LOAD_PATH.<< Pathname.new(__FILE__).dirname.realpath.parent.parent
-              # .parent + 'lib'
+               # .parent + 'lib'
 # $LOAD_PATH.<< Pathname.new(__FILE__).dirname.realpath.parent.parent
-              # .parent + 'wavefront-sdk' + 'lib'
+               # .parent + 'wavefront-sdk' + 'lib'
 
 CMD_DIR = Pathname.new(__FILE__).dirname + 'commands'
 

data/lib/wavefront-cli/maintenancewindow.rb

@@ -1,3 +1,4 @@
+require 'wavefront-sdk/mixins'
 require_relative './base'
 
 module WavefrontCli
@@ -5,6 +6,9 @@ module WavefrontCli
   # CLI coverage for the v2 'maintenancewindow' API.
   #
   class MaintenanceWindow < WavefrontCli::Base
+
+    include Wavefront::Mixins
+
     def validator_method
       :wf_maintenance_window_id?
     end
@@ -12,5 +16,54 @@ module WavefrontCli
     def validator_exception
       Wavefront::Exception::InvalidMaintenanceWindowId
     end
+
+    def do_create
+      body = { title: options[:'<title>'] }
+
+      body[:startTimeInSeconds] = if options[:start]
+                                    parse_time(options[:start])
+                                  else
+                                    Time.now.to_i
+                                  end
+
+      body[:endTimeInSeconds] = if options[:end]
+                                  parse_time(options[:end])
+                                else
+                                  body[:startTimeInSeconds] + 3600
+                                end
+
+      body[:reason] = options[:desc] if options[:desc]
+
+      [%i(CustomerTags atag), %i(HostTags htag),
+       %i(HostNames host)].each do |key, opt|
+        k = ('relevant' + key.to_s).to_sym
+        body[k] = options[opt] unless options[opt].empty?
+      end
+
+      wf.create(body)
+    end
+
+    def do_extend_by
+      begin
+        to_add = options[:'<time>'].to_seconds
+      rescue
+        abort "Could not parse time range '#{options[:'<time>']}'."
+      end
+
+      old_end = wf.describe(options[:'<id>']).response.endTimeInSeconds
+      change_end_time(old_end + to_add)
+    end
+
+    def do_extend_to
+      change_end_time(parse_time(options[:'<time>']))
+    end
+
+    def do_close
+      change_end_time(Time.now.to_i)
+    end
+
+    def change_end_time(ts)
+      wf.update(options[:'<id>'], { endTimeInSeconds: ts })
+    end
   end
 end

data/lib/wavefront-cli/string.rb

@@ -56,4 +56,29 @@ class String
   def scan_line(width)
     scan(/\S.{0,#{width}}\S(?=\s|$)|\S+/)
   end
+
+  def to_seconds
+    begin
+      number, unit = self.match(/^(\d+)([smhdw])$/).captures
+    rescue
+      raise ArgumentError
+    end
+
+    factor = case unit
+             when 's'
+               1
+             when 'm'
+               60
+             when 'h'
+               3600
+             when 'd'
+               86400
+             when 'w'
+               604800
+             else
+               raise ArgumentError
+             end
+
+    number.to_i * factor
+  end
 end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '1.0.1'.freeze
+WF_CLI_VERSION = '1.0.2'.freeze

data/spec/wavefront-cli/maintanancewindow_spec.rb

@@ -17,7 +17,7 @@ describe "#{word} command" do
               { method: :delete, path: "/api/v2/maintenancewindow/#{id}" }, k)
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}"])
   cmd_to_call(word, "search -o 100 id=#{id}",
-              { method: :post, path: "/api/v2/search/maintenancewindow",
+              { method: :post, path: '/api/v2/search/maintenancewindow',
                 body:   { limit: 10,
                           offset: "100",
                           query: [{key: 'id',
@@ -26,4 +26,12 @@ describe "#{word} command" do
                           sort: {field: 'id', ascending: true}},
                 headers: JSON_POST_HEADERS },
                 WavefrontCli::MaintenanceWindow)
+
+  cmd_to_call(word, 'create -d testing -H shark tester',
+              { method: :post, path: '/api/v2/maintenancewindow',
+                body: {
+              },
+                headers: JSON_POST_HEADERS },
+                WavefrontCli::MaintenanceWindow)
+
 end

data/spec/wavefront-cli/string_spec.rb

@@ -34,18 +34,13 @@ class StringTest < MiniTest::Test
     assert_equal(str.opt_fold(100), "  #{str}\n")
   end
 
-  #def test_fold_two_column_one_fold
-    #str = "a reasonably long string which must be folded just once"
-#
-    #assert_equal(str.fold(40), "a reasonably long string which" \
-                 #"\n          must be folded just once")
-#
-    ##assert_equal("  key    a very long string whose very length\n" \
-                 #"         means that the method is going to\n" \
-                 #"         have to fold it twice",
-#
-                 #wf.mk_line('key', 'a very long string whose very length means that the method is going to have to fold it twice', 40))
-#
-#
-  #end
+  def test_to_seconds
+    assert_equal(14, '14s'.to_seconds)
+    assert_equal(300, '5m'.to_seconds)
+    assert_equal(10800, '3h'.to_seconds)
+    assert_equal(1209600, '2w'.to_seconds)
+    assert_raises(ArgumentError) { 'm'.to_seconds }
+    assert_raises(ArgumentError) { '3m5s'.to_seconds }
+  end
 end
+

data/wavefront-cli.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w(lib)
 
   gem.add_dependency 'docopt', '0.6.0'
-  gem.add_dependency 'wavefront-sdk', '>= 1.0.1'
+  gem.add_dependency 'wavefront-sdk', '>= 1.0.2'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement