librato-metrics 1.2.0 → 1.3.0

data.tar.gz.sig

@@ -1 +1,4 @@
-�ԇ��d�I�T.���`<���3��e����U�Q����6��f�M;AC�@yCf���V��H�$.��B҄&܈��LʔSOS�����$ƒ5�Ak�]�g�M����
�ru��D��ؖC1f>��z���ɠ�`�ɥ/U[�aYJ���������I�+~w��sn��*�ď��:Sb�
ލ�9�u �>�z����0 V��ο.�Y:0͟�=ʍL��7c�/�N]=�9��^[]3z/���풏'B���[*
+k6A��IM�7�1�Q-�pE�
+'�d�Je�$x�B�6�u��^]�S-2dw�
+r��L�v}�L$��@3r{�Z�Rt��y�R�\�)���X����?M/� ��"k�b��7����x�¡+Y�Z��*�LI)5�����(�����p�9��tĬS:�Vpε.��U
+�פ���{��q���D�;��k��&���a�g���M��2�)\Aq%EV�.X�ղ��ʾ嬓:	����;��=���n

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### Version 1.3.0
+* Add support for working with sources as a first-class entity
+
 ### Version 1.2.0
 * Give metric-facing methods more explicit names & deprecate priors
 * Documentation improvements

data/LICENSE

@@ -8,8 +8,8 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of Librato, Inc. nor the names of project contributors 
-      may be used to endorse or promote products derived from this software 
+    * Neither the name of Librato, Inc. nor the names of project contributors
+      may be used to endorse or promote products derived from this software
       without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

data/lib/librato/metrics.rb

@@ -79,6 +79,7 @@ module Librato
                    :get_metric, :get_measurements, :metrics,
                    :delete_metrics, :update_metric, :update_metrics,
                    :submit,
+                   :sources, :get_source, :update_source,
                    # Deprecated metrics methods
                    :fetch, :list, :delete, :update
 

data/lib/librato/metrics/client.rb

@@ -340,6 +340,53 @@ module Librato
         end
       end
 
+      # Update one or more metrics. Note that attributes are specified in
+      # their own hash for updating a single metric but are included inline
+      # when updating multiple metrics.
+      #
+      # @deprecated Use #update_metric instead
+      alias update update_metric
+
+      # List sources, optionally limited by a name. See http://dev.librato.com/v1/sources
+      # and http://dev.librato.com/v1/get/sources
+      #
+      # @example Get sources matching "production"
+      #   Librato::Metrics.sources name: "production"
+      #
+      # @param [Hash] filter
+      def sources(filter = {})
+        query = filter[:name] if filter.has_key?(:name)
+        path = "sources"
+        Collection.paginated_collection("sources", connection, path, query)
+      end
+
+      # Retrieve a single source by name. See http://dev.librato.com/v1/get/sources/:name
+      #
+      # @example Get the source for a particular EC2 instance from Cloudwatch
+      #   Librato::Metrics.source "us-east-1b.i-f1bc8c9c"
+      #
+      # @param String name
+      def get_source(name)
+        url = connection.build_url("sources/#{name}")
+        response = connection.get(url)
+        parsed = SmartJSON.read(response.body)
+      end
+
+      # Update a source by name. See http://dev.librato.com/v1/get/sources/:name
+      #
+      # @example Update the source display name for a particular EC2 instance from Cloudwatch
+      #   Librato::Metrics.source "us-east-1b.i-f1bc8c9c", display_name: "Production Web 1"
+      #
+      # @param String name
+      # @param Hash options
+      def update_source(name, options = {})
+        url = "sources/#{name}"
+        connection.put do |request|
+          request.url connection.build_url(url)
+          request.body = SmartJSON.write(options)
+        end
+      end
+
     private
 
       def default_faraday_adapter

data/lib/librato/metrics/collection.rb

@@ -14,12 +14,16 @@ module Librato
       # @param [String] path API uri
       # @param [Hash] query Query options
       def self.paginated_metrics(connection, path, query)
+        paginated_collection("metrics", connection, path, query)
+      end
+
+      def self.paginated_collection(name, connection, path, query)
         results = []
         # expects 200
         url = connection.build_url(path, query)
         response = connection.get(url)
         parsed = SmartJSON.read(response.body)
-        results = parsed["metrics"]
+        results = parsed[name]
         return results if parsed["query"]["found"] <= MAX_RESULTS
         query[:offset] = MAX_RESULTS
         begin
@@ -27,10 +31,11 @@ module Librato
           url = connection.build_url(path, query)
           response = connection.get(url)
           parsed = SmartJSON.read(response.body)
-          results.push(*parsed["metrics"])
+          results.push(*parsed[name])
           query[:offset] += MAX_RESULTS
         end while query[:offset] < parsed["query"]["found"]
         results
+
       end
 
     end

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/librato-metrics.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
 
   s.name        = 'librato-metrics'
   s.version     = Librato::Metrics::VERSION
+  s.license     = 'BSD 3-clause'
 
   s.summary     = "Ruby wrapper for Librato's Metrics API"
   s.description = "An easy to use ruby wrapper for Librato's Metrics API"

data/spec/integration/metrics_spec.rb

@@ -310,5 +310,50 @@ module Librato
       end
     end
 
+    describe "Sources API" do
+      before do
+        Metrics.update_source("sources_api_test", display_name: "Sources Api Test")
+      end
+
+      describe "#sources" do
+        it "should work" do
+          sources = Metrics.sources
+          sources.should be_an(Array)
+          test_source = sources.detect { |s| s["name"] == "sources_api_test" }
+          test_source["display_name"].should == "Sources Api Test"
+        end
+      end
+
+      describe "#get_source" do
+        it "should work" do
+          test_source = Metrics.get_source("sources_api_test")
+          test_source["display_name"].should == "Sources Api Test"
+        end
+      end
+
+      describe "#update_source" do
+        it "should update an existing source" do
+          Metrics.update_source("sources_api_test", display_name: "Updated Source Name")
+
+          test_source = Metrics.get_source("sources_api_test")
+          test_source["display_name"].should == "Updated Source Name"
+        end
+
+        it "should create new sources" do
+          source_name = "sources_api_test_#{Time.now.to_f}"
+          lambda {
+            no_source = Metrics.get_source(source_name)
+          }.should raise_error(Librato::Metrics::NotFound)
+
+          Metrics.update_source(source_name, display_name: "New Source")
+
+          test_source = Metrics.get_source(source_name)
+          test_source.should_not be_nil
+          test_source["display_name"].should == "New Source"
+        end
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   bktaNmhlblFBRjFDSDk2WmNxY0pIMTc5UzJ0SWlLRE04a2VlUklVT1BDM1dU
   MGZhb2svMgpnQTJvemRyODUxYy9uQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -236,7 +236,8 @@ files:
 - spec/unit/metrics/queue_spec.rb
 - spec/unit/metrics_spec.rb
 homepage: https://github.com/librato/librato-metrics
-licenses: []
+licenses:
+- BSD 3-clause
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -250,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3545928183344149228
+      hash: 694362489325963939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: