wavefront-cli 2.15.1 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7bcdc77460e6ee7549d1eb6dae32e5319f7ea74a47a820f27ab99312f50b963
-  data.tar.gz: bfcac8895c3005bf7f516403391b4eab7aef4905fe3e86e186832e031cf6a88f
+  metadata.gz: d23d72573c71a3c0fdfc1277b6a8f1544fe38536dfa6c72199d47a15833613db
+  data.tar.gz: d212aa09f8bbe2bb3377f00be4a5fa6e4f6f64870e92d4e8130905cf190848b4
 SHA512:
-  metadata.gz: a670d0670679e424cedf12545d4fcc4f5aae9e79d4e89ea644b7f7633de0efda9a7426472c9eb2c0054f090849774af5cdfe4f3acb1cce5ec1459137fa2aa53e
-  data.tar.gz: ec6445ab10a7510ceb30386e9542aedc0d795dadc3cdbc22be93a759d6309bff728c52b9c914d60a98e33594559bfdfe74aca81145a2583453e145987ee766a3
+  metadata.gz: 2df4d1cc0fd0ff924fd4d1f4271e00600b5448d332db1b65213e31944499c4aaece08944c719c0fcc5bd2603f1bdc5ddedeeb02aeb96ff054d33b227f46097ba
+  data.tar.gz: 41f5a4aae62c21c9729b73f8581fcb0a1da3538d83278b55baee5321b2ba5732fbaa9f63ebe68f3bf90821958dabdb75c65a1595e131534cc0ba970b809db295

data/HISTORY.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.15.2 (21/12/2018)
+* Fix bug which caused an unhandled exception if CSV or Wavefront
+  query outputs tried to process an empty data set.
+
+## 2.15.1 (20/12/2018)
+
+* Fix bug where `alert snoozed` and `alert firing` did the same
+  thing.
+
 ## 2.15.0 (18/12/2018)
 * Gracefully handle ctrl-c.
 * Add `install` and `uninstall` subcommands to `wf alert`.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Sysdef Ltd
+Copyright (c) 2017-2018, Sysdef Ltd
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/wavefront-cli/controller.rb

@@ -114,6 +114,8 @@ class WavefrontCliController
     abort 'Unsupported file format.'
   rescue WavefrontCli::Exception::UnparseableInput => e
     abort "Cannot parse input. #{e.message}"
+  rescue WavefrontCli::Exception::UnparseableResponse => e
+    abort "Bad response from Wavefront. #{e.message}"
   rescue WavefrontCli::Exception::FileNotFound
     abort 'File not found.'
   rescue WavefrontCli::Exception::UnparseableInput

data/lib/wavefront-cli/exception.rb

@@ -7,6 +7,7 @@ module WavefrontCli
     class SystemError < RuntimeError; end
     class UnhandledCommand < RuntimeError; end
     class UnparseableInput < RuntimeError; end
+    class UnparseableResponse < RuntimeError; end
     class UnsupportedFileFormat < RuntimeError; end
     class UnsupportedOperation < RuntimeError; end
     class UnsupportedOutput < RuntimeError; end

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

@@ -14,5 +14,14 @@ module WavefrontCsvOutput
     def run
       puts _run
     end
+
+    def check_query_response
+      return true unless resp[:timeseries].nil?
+
+      puts 'No points match query.'
+      exit 0
+    rescue StandardError
+      raise WavefrontCli::Exception::UnparseableResponse
+    end
   end
 end

data/lib/wavefront-cli/output/csv/query.rb

@@ -42,6 +42,8 @@ module WavefrontCsvOutput
     # @return [Array[Hash]] which goes in the @data_map
     #
     def query_output
+      check_query_response
+
       resp[:timeseries].each_with_object([]) do |ts, a|
         ts[:data].each do |point|
           a.<< csv_format(ts[:label],

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

@@ -1,12 +1,12 @@
 require 'wavefront-sdk/stdlib/hash'
-require_relative 'base'
+require_relative '../csv/base'
 
 module WavefrontWavefrontOutput
   #
   # Display query results in Wavefront wire format. We have to
   # handle raw and normal output in different ways.
   #
-  class Query < Base
+  class Query < WavefrontCsvOutput::Base
     def _run
       if options[:raw]
         raw_output
@@ -28,6 +28,8 @@ module WavefrontWavefrontOutput
     end
 
     def query_output
+      check_query_response
+
       resp[:timeseries].each_with_object('') do |ts, a|
         ts[:data].each do |point|
           a.<< wavefront_format(ts[:label],

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '2.15.1'.freeze
+WF_CLI_VERSION = '2.15.2'.freeze

data/spec/wavefront-cli/integration_spec.rb

@@ -35,7 +35,7 @@ describe "#{word} command" do
 
   cmd_to_call(word, 'installed', path: "/api/v2/#{word}/installed")
 
-  cmd_to_call(word, 'manifests', path: "/api/v2/#{word}/manifests")
+  cmd_to_call(word, 'manifests -f json', path: "/api/v2/#{word}/manifests")
 
   invalid_ids(word, ["describe #{bad_id}", "install #{bad_id}",
                      "alert install #{bad_id}",

data/spec/wavefront-cli/write_spec.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require_relative '../spec_helper'
 require_relative '../../lib/wavefront-cli/write'
 
 # Test base writer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.2
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -243,7 +243,6 @@ files:
 - lib/wavefront-cli/output/json.rb
 - lib/wavefront-cli/output/ruby.rb
 - lib/wavefront-cli/output/wavefront.rb
-- lib/wavefront-cli/output/wavefront/base.rb
 - lib/wavefront-cli/output/wavefront/query.rb
 - lib/wavefront-cli/output/yaml.rb
 - lib/wavefront-cli/proxy.rb

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

@@ -1,17 +0,0 @@
-module WavefrontWavefrontOutput
-  #
-  # Standard output template
-  #
-  class Base
-    attr_reader :resp, :options
-
-    def initialize(resp, options)
-      @resp = resp
-      @options = options
-    end
-
-    def run
-      puts _run
-    end
-  end
-end