wavefront-cli 2.9.2 → 2.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b1eb89086e67e5ce3e1005b254248f712915ea9ec13c401c618544cba401f9
-  data.tar.gz: b5595a4b8d1eee6f968c6c0c2d428dad2af59102d61d59eeb6cdaeba0f36d5d4
+  metadata.gz: f715afc29d378a6e84b9ce7ad2b7ade17047a85d2ae6e1280605322d87085c0e
+  data.tar.gz: 35ebc020f4201d6890625a62cf346d46aacf3eb7250ddaa7015dce34fb4ef93e
 SHA512:
-  metadata.gz: 1f871775db809ba9258a008dd1a2f618abeb582e0018f54cc90c99c8f00771053591569fde1d3c9e193622f946644f8299dd63942455e53c103a596e1ba417b1
-  data.tar.gz: 0e807a24dddcd83cb3931c83ca3fd0b879170c20e7bad3441c41ae76698b1571fa7409ccc3e23d15b329a77d9f3cacfe6a398b31a8a524a06699f2bb307daa00
+  metadata.gz: 61a94256695771c09205e5a5d26bedf2f45c35fc4e2ba9a6c4d03cec23cbeeed465f12f807d06d5135b63bd6af5f7956a8778ed3c5885fa5e363994d2ae0fbe8
+  data.tar.gz: 6722fd63e13d7178015c7960d5b8d615de73e49d3c54cf98e17d9cbd05d42ba4280e7b1ecc184b3d42e24f37a3db7405f9548ffbc486095971db6bb7dcf65a9b

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.9.3 (03/09/2018)
+* Fix a bug where indefinitely snoozed alerts broke `wf alert
+  snoozed`.
+
 ## 2.9.2 (22/08/2018)
 * Fix regression which broke the `wf` command when it ran without a
   tty.

data/lib/wavefront-cli/alert.rb

@@ -53,12 +53,23 @@ module WavefrontCli
       search = do_search([format('status=%s', status)])
 
       items = search.response.items.map do |i|
-        { name: i.name, id: i.id, startTime: i.event.startTime }
+        { name: i.name, id: i.id, time: state_time(i) }
       end
 
       search.tap { |s| s.response[:items] = items }
     end
 
+    # Snoozed alerts don't have a start time, they have a "snoozed"
+    # time. This is -1 if they are snoozed forever: the formatting
+    # methods know what to do with that.
+    # @return [Integer]
+    #
+    def state_time(item)
+      return item[:event][:startTime] if item.key?(:event)
+      return item[:snoozed] if item.key?(:snoozed)
+      nil
+    end
+
     # Take a previously exported alert, and construct a hash which
     # create() can use to re-create it.
     #

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

@@ -16,13 +16,13 @@ module WavefrontDisplay
     end
 
     def do_firing
-      readable_time_arr(:startTime)
-      multicolumn(:id, :name, :startTime)
+      readable_time_arr(:time)
+      multicolumn(:id, :time, :name)
     end
 
     def do_snoozed
-      readable_time_arr(:startTime)
-      multicolumn(:id, :name, :startTime)
+      readable_time_arr(:time)
+      multicolumn(:id, :time, :name)
     end
 
     def do_describe

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

@@ -267,27 +267,32 @@ module WavefrontDisplay
     #   used for unit tests.
     # return [String] a human-readable timestamp
     #
-    # rubocop:disable Metrics/MethodLength
     def human_time(time, force_utc = false)
       raise ArgumentError unless time.is_a?(Numeric) || time.is_a?(String)
-      str = time.to_s
 
-      if str =~ /^\d{13}$/
-        fmt = '%Q'
-        out_fmt = HUMAN_TIME_FORMAT_MS
-      elsif str =~ /^\d{10}$/
-        fmt = '%s'
-        out_fmt = HUMAN_TIME_FORMAT
-      else
-        raise ArgumentError
-      end
+      return 'FOREVER' if time == -1
 
+      str = time.to_s
+      fmt, out_fmt = time_formats(str)
       # rubocop:disable Style/DateTime
       ret = DateTime.strptime(str, fmt).to_time
       # rubocop:enable Style/DateTime
       ret = ret.utc if force_utc
       ret.strftime(out_fmt)
     end
-    # rubocop:enable Metrics/MethodLength
+
+    # How do we format a timestamp?
+    # @param str [String] an epoch timestamp, as a string
+    # @return [String, String] DateTime formatter, strptime formatter
+    #
+    def time_formats(str)
+      if str =~ /^\d{13}$/
+        ['%Q', HUMAN_TIME_FORMAT_MS]
+      elsif str =~ /^\d{10}$/
+        ['%s', HUMAN_TIME_FORMAT]
+      else
+        raise ArgumentError
+      end
+    end
   end
 end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '2.9.2'.freeze
+WF_CLI_VERSION = '2.9.3'.freeze

data/spec/wavefront-cli/display/base_spec.rb

@@ -157,5 +157,6 @@ class WavefrontDisplayBaseTest < MiniTest::Test
                  wf.human_time(Time.now.to_i))
     assert_equal('2017-07-07 11:23:35.123', wf.human_time(1_499_426_615_123,
                                                           true))
+    assert_equal('FOREVER', wf.human_time(-1))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt