wavefront-cli 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 367f4cd2831b3bb22eeae430ab3b3bd9f065d847a68b59f7f6ecafa39c46c156
-  data.tar.gz: 11e4a86ec0ed8134ce921b237a068cc2910e01b600becef4d35f7a49d35e3564
+  metadata.gz: b7e6e0c9d8fddd6df88fbd3f2f3f8410a74f508627b818b95e5eccaeafdcaf06
+  data.tar.gz: ac3fabdf56be3ce5585802ea5459d66a0a37471171460dd7a30bc22cb07d0992
 SHA512:
-  metadata.gz: faa0fecdf792a026db31353defb49e24cd5e72e8ff2d8702aa38846dd31af53abad50f9c79bed30ccb00b323196e9d9ba5da2f53c9318066dfd731898f93cafb
-  data.tar.gz: c6febba432e3dff6aa0a5125fd1b366dbcb59d9f056ca6f2924366b9dd9f01eb64423d4385488fbdc695649010c75f448f59e173d5333f737c6d26809a14ef3c
+  metadata.gz: 5a29eb0de9db686d9a4cd4c32beb3c17379a9385fc5532d398af6553aa33406ad06b4637752f5555cc3482f917022ae3ea08f48bc27ff1f4c361048444be1948
+  data.tar.gz: 49d870efddc368949dc08e14da1c740e6200255cb667379918b50ec6ab90dca6b35c2b4bc69226fe2ed55df9a8322c88bedda58081acd31f4d6408306a970d14

data/HISTORY.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 2.5.0
+## 2.6.0 (27/06/2018)
+
+* Anything which can be imported can be imported from STDIN. The CLI
+  will do its best to work out if the format is YAML or JSON.
+
+## 2.5.0 (25/06/2018)
 
 * Support [derived
   metrics](https://docs.wavefront.com/derived_metrics.html).

data/lib/wavefront-cli/base.rb

@@ -266,7 +266,7 @@ module WavefrontCli
     # Give it a path to a file (as a string) and it will return the
     # contents of that file as a Ruby object. Automatically detects
     # JSON and YAML. Raises an exception if it doesn't look like
-    # either.
+    # either. If path is '-' then it will read STDIN.
     #
     # @param path [String] the file to load
     # @return [Hash] a Ruby object of the loaded file
@@ -274,6 +274,8 @@ module WavefrontCli
     # @raise pass through any error loading or parsing the file
     #
     def load_file(path)
+      return load_from_stdin if path == '-'
+
       file = Pathname.new(path)
       raise 'Import file does not exist.' unless file.exist?
 
@@ -286,6 +288,26 @@ module WavefrontCli
       end
     end
 
+    # Read STDIN and return a Ruby object, assuming that STDIN is
+    # valid JSON or YAML. This is a dumb method, it does no
+    # buffering, so STDIN must be a single block of data. This
+    # appears to be a valid assumption for use-cases of this CLI.
+    #
+    # @return [Object]
+    # @raise 'cannot parse stdin' if it, well you know.
+    #
+    def load_from_stdin
+      raw = STDIN.read
+
+      if raw.start_with?('---')
+        YAML.safe_load(raw)
+      else
+        JSON.parse(raw)
+      end
+    rescue
+      raise 'Cannot parse stdin.'
+    end
+
     # Below here are common methods. Most are used by most classes,
     # but if they don't match a command described in the docopt
     # text, the dispatcher will never call them. So, there's no

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '2.5.0'.freeze
+WF_CLI_VERSION = '2.6.0'.freeze

metadata

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