wavefront-cli 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2433758d7cf885eb814ce50935fca5325d6a5ae01060eb407cb17e74e36da6c7
-  data.tar.gz: 6fd760d2439cd0c81f125f8d6df72e5eff5702f1d574d73b899eef6b4f646952
+  metadata.gz: 873187a820bc7cb2248cc10eb22ce76c12d95925651baa3c53972d5f7440a892
+  data.tar.gz: e0ab5dd4af22d88eb3f5d412dcaa08fb2e58906bf4044178c074dacde734159e
 SHA512:
-  metadata.gz: 96c2a9221dbb07add7e115bdfd5e3499739022055875d9fdde0381965f87a49e7deb7806c98f1dd0e30b983d58ec29c8457b850841a998d20c9253f821368e38
-  data.tar.gz: aa66e5930f5319c9b8597510457e4037ecfe936118392c2a388ca566b9d4d2c9b83eab70bfda862b810decd34680cb1ec4d4697415d9675d40cff640e3563d09
+  metadata.gz: 4432d6d046bc4c55530f10d8e765e5528f04432a9cfbdc4ab4e9a0899beae778885b70035c4cc570c669c3865ce0aa91c537320c6e2d62e0167e0b0123ea44e7
+  data.tar.gz: 2e9bb61ac0e004f412e3e00420f3e93d4795961ec3f63dc58ff6077efd1d502da4de880126ae562e5f992bc78196ee4ba61b151f14db43e62917bfbbe743be92

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.4.2 (2019-10-31)
+* Bugfix: `dashboard import --update` didn't work when reading from stdin.
+* Better handling of tag values in brief listings.
+
 ## 4.4.1 (2019-10-31)
 * Elegantly handle requests to print non-existent fields.
 

data/lib/wavefront-cli/base.rb

@@ -363,11 +363,11 @@ module WavefrontCli
     end
 
     def load_json(file)
-      JSON.parse(IO.read(file), symbolize_names: true)
+      read_json(IO.read(file))
     end
 
     def load_yaml(file)
-      YAML.safe_load(IO.read(file), symbolize_names: true)
+      read_yaml(IO.read(file))
     end
 
     # Read STDIN and return a Ruby object, assuming that STDIN is
@@ -383,9 +383,9 @@ module WavefrontCli
       raw = STDIN.read
 
       if raw.start_with?('---')
-        YAML.safe_load(raw)
+        read_yaml(raw)
       else
-        JSON.parse(raw)
+        read_json(raw)
       end
     rescue RuntimeError
       raise Wavefront::Exception::UnparseableInput
@@ -642,5 +642,15 @@ module WavefrontCli
       aggr
     end
     # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def read_json(io)
+      JSON.parse(io, symbolize_names: true)
+    end
+
+    def read_yaml(io)
+      YAML.safe_load(io, symbolize_names: true)
+    end
   end
 end

data/lib/wavefront-cli/display/printer/terse.rb

@@ -8,7 +8,7 @@ module WavefrontDisplayPrinter
   # Print values which are per-row. The terse listings, primarily
   #
   class Terse
-    attr_reader :data, :fmt
+    attr_reader :data
 
     # @param data [Hash] data to display, from a response object
     # @param keys [Array[Symbol]] keys to display, in order
@@ -18,32 +18,48 @@ module WavefrontDisplayPrinter
       @fmt  = format_string(data, keys)
     end
 
+    # @return [String] used to format output
+    #
     def format_string(data, keys)
       keys.map { |k| "%-#{data.longest_value_of(k)}<#{k}>s" }.join('  ')
     end
 
+    # Flatten nested data.
+    # @param data [Map,Hash] data to flatten
+    # @param keys [Array[Symbol]] keys of interest. We don't bother working on
+    #   things we'll only throw away
+    #
     def stringify(data, keys)
-      data.map { |e| e.tap { keys.each { |k| e[k] = to_string(e[k]) } } }
+      data.map { |e| e.tap { keys.each { |k| e[k] = value_as_string(e[k]) } } }
     end
 
-    def to_string(value)
-      if value.is_a?(Array)
-        value.join(', ')
-      elsif value.is_a?(Map)
-        map_to_string(value)
-      else
-        value
-      end
+    # Turn a (potentially) more complicated structure into a string
+    # @param value [Object]
+    # @return [String]
+    #
+    def value_as_string(value)
+      return value.join(', ') if value.is_a?(Array)
+
+      return map_to_string(value) if value.is_a?(Map)
+
+      value
     end
 
+    # If we get a hash as a value (tags, for instance) we squash it down to a
+    # "key1=val1;key2=val2" kind of string. Note that this doesn't handle
+    # nested hashes. It shouldn't have to.
+    #
+    # @param value [Map,Hash] { k1: 'v1', k2: 'v2' }
+    # @return [String] 'k1=v1;k2=v2'
+    #
     def map_to_string(value)
-      format('%<key>s=%<value>s',
-             key: value.keys[0],
-             value: value.values.join(','))
+      value.map { |k, v| "#{k}=#{v}" }.join(';')
     end
 
+    # Format every element according to the format string @fmt
+    #
     def to_s
-      data.map { |e| format(fmt, e).rstrip }.join("\n")
+      data.map { |e| format(@fmt, e).rstrip }.join("\n")
     rescue KeyError
       raise WavefrontCli::Exception::UserError, 'field not found'
     end

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '4.4.1'
+WF_CLI_VERSION = '4.4.2'

data/spec/wavefront-cli/display/printer/terse_spec.rb

@@ -17,7 +17,7 @@ class WavefrontDisplayPrinterTerse < MiniTest::Test
     @wf = WavefrontDisplayPrinter::Terse.new(TERSE_DATA, %i[id name])
   end
 
-  def test_fmt
+  def test_format_string
     assert_equal('%-3<id>s', wf.format_string(TERSE_DATA, [:id]))
     assert_equal('%-3<id>s  %-5<name>s',
                  wf.format_string(TERSE_DATA, %i[id name]))
@@ -45,12 +45,19 @@ class WavefrontDisplayPrinterTerse < MiniTest::Test
                               [:things]))
   end
 
-  def test_to_string
-    assert_equal('a, b, c', wf.to_string(%w[a b c]))
-    assert_equal('abc', wf.to_string('abc'))
+  def test_map_to_string
+    assert_equal('key1=value1;key2=value2;key3=value3',
+                 wf.map_to_string(key1: 'value1',
+                                  key2: 'value2',
+                                  key3: 'value3'))
   end
 
-  def test_end_to_end
+  def test_value_as_string
+    assert_equal('a, b, c', wf.value_as_string(%w[a b c]))
+    assert_equal('abc', wf.value_as_string('abc'))
+  end
+
+  def test_end_to_end_1
     input, expected = OutputTester.new.in_and_out('alerts-input.json',
                                                   'alerts-human-terse')
     out = WavefrontDisplayPrinter::Terse.new(input, %i[id status name]).to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Robert Fisher