wavefront-client 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb93397040acca02ee9271182b09bf0d1e34a57e
-  data.tar.gz: 324e62b59979579b09b750398d53257142cab2a0
+  metadata.gz: 9396cafd5d5f3e458c9147b3e381fc11f3dee48d
+  data.tar.gz: 936de304d4419dd50a5c23dc0f6003e8f9e50841
 SHA512:
-  metadata.gz: b6093581d6aa9403fe3de7cbf683bc2698460093ba623651a3b2e75d243d5ea8745cdd13b8c87d73ee073cd07704f46eaee33f95417d65a1fc13a5f55eea023a
-  data.tar.gz: 03fad5a006ac5a881ef03db7dd859a54afa3eb57a25933c2c0ce3a18eb4ff862930ab8a032f6aa50dd93cecdb1647b699fc70dc4618c3f4948bc641d84f08124
+  metadata.gz: 93c35116bd36d60d178289c31126c4743f6ff69e690782e0826ef25a3a0682d123762f6791acbd85e3415ad899fb854baa53a64dc79cbaa0262e65a10cecbe4d
+  data.tar.gz: 478854bc64520703ea2cf5694b918c3f43fa2788a5699462407e9fe028c04496ebe77d9bc8f22eab1a82371489122f7e466bb3413e63048cfc2cf5e816bfc62a

data/lib/wavefront/cli/sources.rb

@@ -54,7 +54,7 @@ class Wavefront::Cli::Sources < Wavefront::Cli
 
     q[:lastEntityId] = start if start
 
-    display_data(JSON.parse(wf.show_sources(q)), 'list_source')
+    display_data(wf.show_sources(q), 'list_source')
   end
 
   def describe_handler(hosts, desc)
@@ -113,7 +113,7 @@ class Wavefront::Cli::Sources < Wavefront::Cli
   def show_source_handler(sources)
     sources.each do |s|
       begin
-        result = JSON.parse(wf.show_source(s))
+        result = wf.show_source(s)
       rescue RestClient::ResourceNotFound
         puts "Source '#{s}' not found."
         next

data/lib/wavefront/client/version.rb

@@ -16,6 +16,6 @@ See the License for the specific language governing permissions and
 
 module Wavefront
   class Client
-    VERSION = "3.5.1"
+    VERSION = "3.5.2"
   end
 end

data/lib/wavefront/metadata.rb

@@ -18,6 +18,7 @@ require "wavefront/client/version"
 require "wavefront/constants"
 require "wavefront/exception"
 require 'wavefront/validators'
+require 'wavefront/mixins'
 require 'rest_client'
 require 'uri'
 require 'logger'
@@ -119,10 +120,13 @@ module Wavefront
 
     def show_sources(params = {})
       #
-      # return a list of sources. Maps to
+      # Return a list of sources as a Ruby object. Maps to
       # GET /api/manage/source
       # call it with a hash as described in the Wavefront API docs.
       #
+      # See the Wavefront API docs for the format of the returned
+      # object.
+      #
       # At the time of writing, supported paramaters are:
       #   lastEntityId (string)
       #   desc         (bool)
@@ -152,16 +156,18 @@ module Wavefront
         end
       end
 
-      call_get(build_uri(nil, query: hash_to_qs(params)))
+      JSON.parse(call_get(build_uri(nil, query: hash_to_qs(params))))
     end
 
     def show_source(source)
       #
-      # return information about a single source. Maps to
-      # GET /api/manage/source/{source}
+      # return information about a single source as a Ruby object. Maps to
+      # GET /api/manage/source/{source}.
+      #
+      # See the Wavefront API docs for the structure of the object.
       #
       fail Wavefront::Exception::InvalidSource unless valid_source?(source)
-      call_get(build_uri(source))
+      JSON.parse(call_get(build_uri(source)))
     end
 
     def set_description(source, desc)

data/spec/wavefront/metadata_spec.rb

@@ -90,6 +90,7 @@ describe Wavefront::Metadata do
       expect(RestClient).to receive(:get).with(
         concat_url(host, path, '?'), wf.headers
       )
+      expect(JSON).to receive(:parse)
       wf.show_sources
     end
 
@@ -97,6 +98,7 @@ describe Wavefront::Metadata do
       expect(RestClient).to receive(:get).with(
         concat_url(host, path, '?limit=100&pattern=test-*'), wf.headers
       )
+      expect(JSON).to receive(:parse)
       wf.show_sources({ limit: 100, pattern: 'test-*' })
     end
 
@@ -132,6 +134,7 @@ describe Wavefront::Metadata do
       expect(RestClient).to receive(:get).with(
         concat_url(host, path, 'mysource'), wf.headers
       )
+      expect(JSON).to receive(:parse)
       wf.show_source('mysource')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-client
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Sam Pointer
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler