wavefront-cli 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48f9a11ef858f502c05d4c4d89080a31267f70d96430e88e44deba5b2f929015
-  data.tar.gz: a1bbc741a8379fb2a5783688a858b8c12b5d020a1501d58478042fc303ca43c3
+  metadata.gz: 3c4a1d42c967b17f864ba74a9f8581d04df349c014e27a2729c5d8e5587e436b
+  data.tar.gz: ca290107fdc4488e165ab07713692d446eb13ddd5e430f8ee63aaf33239bf430
 SHA512:
-  metadata.gz: 759172c664ff1b81f2e199afceb052a61f31f4c91b7f72ea69ad5e511dc19d7397d9731d7e03269d75b88bd3baa52bfedc3bc289c166a84b590fb71ea9bc7a11
-  data.tar.gz: 5c7a9545f5ea086dce5bc02588ddf678ebad99321e55c68026a9e12ad0645b5a4a0bffcffac155ca238ad79370cd00cf146bd8033780f83dfabe2d7322b6c378
+  metadata.gz: b28118415ce64ef71ddf2d04417b26079f796884f895a82510c3ccfcb9883c188972e6e07b0961896cbe8e90272198ace216957d035b2715892a1b9c260f2292
+  data.tar.gz: b8e523c837ae979c554476f6aaec258788374b1ade012669ead8c2f3a2b0ba9f88da88fa349761acdbd6f12beea1460bda6cd011fb5bf9b71fa7a0715feaf960

data/HISTORY.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 4.2.0 (01/07/2019)
+* Add `-M` (`--items-only`) option to all commands. For
+  machine-parseable formats, this filters the API response, giving only
+  the `items` array, which should usually be suitable for batch
+  importing. This is a more sophisticated and flexible implementation of
+  4.1.0's `dump` subcommand.
+
 ## 4.1.0 (27/06/2019)
 * Add `dump` subcommand for all importable object types. Produces
   JSON or YAML output.

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

@@ -1,6 +1,6 @@
 require_relative '../stdlib/string'
 
-CMN = '[-DnV] [-c file] [-P profile] [-E endpoint] [-t token] ' \
+CMN = '[-DnVM] [-c file] [-P profile] [-E endpoint] [-t token] ' \
       '[-f format]'.freeze
 
 # A base class which all command classes extend.
@@ -20,6 +20,7 @@ class WavefrontCommandBase
      '-n, --noop           do not perform API calls',
      '-V, --verbose        be verbose',
      '-f, --format=STRING  output format',
+     '-M, --items-only     only show items in machine-parseable formats',
      '-h, --help           show this message']
   end
 

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

@@ -16,8 +16,8 @@ module WavefrontOutput
 
     def initialize(resp = {}, options = {})
       @cmd = options[:class]
-      @resp = resp
       @options = options
+      @resp = filtered_response(resp)
     end
 
     # We used to call #run directly, but now we use this wrapper to
@@ -31,6 +31,24 @@ module WavefrontOutput
       command_class.run
     end
 
+    def filtered_response(resp)
+      return resp unless options[:itemsonly]
+      items_only(resp)
+    end
+
+    def items_only(resp)
+      if allow_items_only?
+        return resp[:items] if resp.key?(:items)
+
+        raise(WavefrontCli::Exception::UnsupportedOutput,
+              'API response does not contain items object.')
+      end
+
+      raise(WavefrontCli::Exception::UnsupportedOutput,
+            format("'%s' format does not support items-only output.",
+                   my_format))
+    end
+
     def my_format
       self.class.name.split('::').last.downcase
     end
@@ -47,5 +65,9 @@ module WavefrontOutput
       require_relative command_file
       Object.const_get(command_class_name).new(resp, options)
     end
+
+    def allow_items_only?
+      false
+    end
   end
 end

data/lib/wavefront-cli/output/json.rb

@@ -8,5 +8,9 @@ module WavefrontOutput
     def _run
       resp.to_json
     end
+
+    def allow_items_only?
+      true
+    end
   end
 end

data/lib/wavefront-cli/output/ruby.rb

@@ -12,5 +12,9 @@ module WavefrontOutput
     def _run
       resp
     end
+
+    def allow_items_only?
+      true
+    end
   end
 end

data/lib/wavefront-cli/output/yaml.rb

@@ -11,5 +11,9 @@ module WavefrontOutput
     def _run
       JSON.parse(resp.to_json).to_yaml
     end
+
+    def allow_items_only?
+      true
+    end
   end
 end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '4.1.0'.freeze
+WF_CLI_VERSION = '4.2.0'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt