librato-metrics 1.0.4 → 1.1.0

data.tar.gz.sig

@@ -0,0 +1,3 @@
+����B�Wg��]�D���a��X.��#��y���M��������<��E���/��?��hK���z5y�ܢWS>��C�J������3ժ2��_�������ZA��
+ʉ��rS_`��޴����!@�Ӄ���3Hkv��8�zI�l���ƤL��Çr.�Aܴ	�E*�S�=��&�O��!�rU�QS�a5�&��|
+ �55�����ς��7�֚V^L���|6���'�:���ڤ�2gCgg

data/.gitignore

@@ -1,4 +1,6 @@
-.rvmrc
+.ruby-gemset
+.ruby-version
+
 .bundle
 .DS_Store
 Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### Version 1.1.0
+* Add ability to update annotation events
+* Add ability to fetch annotation events
+* Add block form of annotation
+* Add metric batch update support
+* Add support for pattern-based metric deletes
+* Add set of code examples
+* Sign gem when building
+* Documentation improvements
+
 ### Version 1.0.4
 * Ensure sane default timeouts for all requests
 

data/README.md

@@ -1,10 +1,12 @@
 Librato Metrics
 =======
 
-[![Build Status](https://secure.travis-ci.org/librato/librato-metrics.png?branch=master)](http://travis-ci.org/librato/librato-metrics)
+[![Gem Version](https://badge.fury.io/rb/librato-metrics.png)](http://badge.fury.io/rb/librato-metrics) [![Build Status](https://secure.travis-ci.org/librato/librato-metrics.png?branch=master)](http://travis-ci.org/librato/librato-metrics) [![Code Climate](https://codeclimate.com/github/librato/librato-metrics.png)](https://codeclimate.com/github/librato/librato-metrics)
 
 A convenient Ruby wrapper for the Librato Metrics API.
 
+This gem provides granular control for scripting interactions with the Metrics core API. It is well suited for integrations, scripts, workers & background jobs. If you want to submit from a web app, take at look at [librato-rails](https://github.com/librato/librato-rails) and/or [librato-rack](https://github.com/librato/librato-rack).
+
 ## Installation
 
 In your shell:
@@ -130,7 +132,7 @@ If you need extra attributes for a `Queue` timing measurement, simply add them o
 
 Annotation streams are a great way to track events like deploys, backups or anything else that might affect your system. They can be overlaid on any other metric stream so you can easily see the impact of changes.
 
-At a minimum each annotation needs to be assigned to a stream and to have a title. Let's add an annotation for deploying v45 of our app to the `deployments` stream:
+At a minimum each annotation needs to be assigned to a stream and to have a title. Let's add an annotation for deploying `v45` of our app to the `deployments` stream:
 
     Librato::Metrics.annotate :deployments, 'deployed v45'
 
@@ -140,6 +142,12 @@ There are a number of optional fields which can make annotations even more power
         :start_time => 1354662596, :end_time => 1354662608,
         :description => 'Deployed 6f3bc6e67682: fix lotsa bugs…'
 
+You can also automatically annotate the start and end time of an action by using `annotate`'s block form:
+
+    Librato::Metrics.annotate :deployments, 'deployed v46' do
+      # do work..
+    end
+
 More fine-grained control of annotations is available via the `Annotator` object:
 
     annotator = Librato::Metrics::Annotator.new
@@ -202,15 +210,29 @@ Get the 20 most recent 15 minute data point rollups for `temperature`:
 
     data = Librato::Metrics.fetch :temperature, :count => 20, :resolution => 900
 
-There are many more options supported for querying, take a look at the [REST API docs](http://dev.librato.com/v1/get/gauges/:name) or the [fetch documentation](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics.fetch)  for more details.
+There are many more options supported for querying, take a look at the [REST API docs](http://dev.librato.com/v1/get/gauges/:name) or the [fetch documentation](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#fetch-instance_method)  for more details.
+
+## Setting Metric Properties
+
+Setting custom [properties](http://dev.librato.com/v1/metrics#metric_properties) on your metrics is easy:
+
+    # assign a period and default color
+    Librato::Metrics.update :temperature, :period => 15, :attributes => { :color => 'F00' }
+
+It is also possible to update properties for multiple metrics at once, see the [#update method documentation](http://rubydoc.info/github/librato/librato-metrics/master/Librato/Metrics/Client#update-instance_method) for more information.
 
 ## Deleting Metrics
 
 If you ever need to remove a metric and all of its measurements, doing so is easy:
 
-	# Delete the metrics 'temperature' and 'humidity'
+	# delete the metrics 'temperature' and 'humidity'
 	Librato::Metrics.delete :temperature, :humidity
 
+You can also delete using wildcards:
+
+    # delete metrics that start with cpu. except for cpu.free
+    Librato::Metrics.delete :names => 'cpu.*', :exclude => ['cpu.free']
+
 Note that deleted metrics and their measurements are unrecoverable, so use with care.
 
 ## Using Multiple Accounts Simultaneously
@@ -244,7 +266,13 @@ Once the queue is associated you can use it normally:
 
 ## Thread Safety
 
-The `librato-metrics` gem currently does not do internal locking for thread safety. When used in multi-threaded applications, please add your own mutexes for sensitive operations.
+The `librato-metrics` gem currently does not do internal locking for thread safety. When used in multi-threaded applications, please add your own [mutexes](http://www.ruby-doc.org/core-2.0/Mutex.html) for sensitive operations.
+
+## More Information
+
+`librato-metrics` is sufficiently complex that not everything can be documented in the README. Additional options are documented regularly in the codebase. You are encouraged to take a quick look through the [docs](http://rubydoc.info/github/librato/librato-metrics/frames) and [source](https://github.com/librato/librato-metrics) for more.
+
+We also maintain a set of [examples of common uses](https://github.com/librato/librato-metrics/tree/master/examples) and appreciate contributions if you have them.
 
 ## Contribution
 

data/Rakefile

@@ -38,6 +38,10 @@ YARD::Rake::YardocTask.new
 # IRB
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/librato/metrics.rb"
+  if !`which pry`.empty?
+    sh "pry -r ./lib/librato/metrics.rb"
+  else
+    sh "irb -rubygems -r ./lib/librato/metrics.rb"
+  end
 end
 

data/certs/librato-public.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMREwDwYDVQQDDAhydWJ5
+Z2VtczEXMBUGCgmSJomT8ixkARkWB2xpYnJhdG8xEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMTMwODA4MjIxOTQ2WhcNMTQwODA4MjIxOTQ2WjBBMREwDwYDVQQDDAhy
+dWJ5Z2VtczEXMBUGCgmSJomT8ixkARkWB2xpYnJhdG8xEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/X7kdKwZ/oi/A
+Bjs/caxkyDIZgLS/kgmuloThfPBBR6MuN4GXe/hsdzSH8XhtBYoYpK/F2rRBsrS+
+jLrZbKJAGUIrqHiSfdLzx2k2sGUYlKzf6a4xWi587ndC8Bvh5ldc85W1llHDeASS
+R5Wjper4KU1NWG1FAVvQCXhSKdmki+wX7Jnd7CQ+oz7kkKYPM8G/ZTdb+qn7wRLV
+KaR+zzGDmwTQ2WzMitSXmf/ku4MUmRzsyepDXXERLynSp8ITk67g2HMCyvOPsf8K
+cYvl/wbb8By/r6HOjy7SM7Yo354uIfhniu8AKymIKxsb4Ig71S0cU7Hm3+WBTi28
+AIg8TUaXAgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFDbyQQqO4xJmaKBE
+neQ4y+RWCvOXMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAKAzXbA47
+9U59SsEfqR+DLdv1VAcdmxawqC+ZmG4FpxZhuHhaoUui35AoQjzSiHEUNDTIu3u7
+TcsYwXMPzuyzZJJKXvBKmSb9mWJ99DOH81oUmOzX7jClQXZHrnFtHdARcLQsPmga
+4Dh+fWXWxPJ6fkvg826vJ4pDml7Oo9sCXTpC2ki/5VekTXkpFrUsQRXjlXPkmT3/
+xa858BGRjvU59WPE13QGiba7YIeHtREvNx42JIfoJMV74ofrKIuTw9CMto2gz9Xx
+Kx1ncn07A+bJnKZ6henQAF1CH96ZcqcJH179S2tIiKDM8keeRIUOPC3WT0faok/2
+gA2ozdr851c/nA==
+-----END CERTIFICATE-----

data/examples/simple.rb

@@ -0,0 +1,24 @@
+require 'librato/metrics'
+
+Librato::Metrics.authenticate 'my email', 'my api key'
+
+# send a measurement of 12 for 'foo'
+Librato::Metrics.submit :cpu => 54
+
+# submit multiple metrics at once
+Librato::Metrics.submit :cpu => 63, :memory => 213
+
+# submit a metric with a custom source
+Librato::Metrics.submit :cpu => {:source => 'myapp', :value => 75}
+
+# if you are sending many metrics it is much more performant
+# to submit them in sets rather than individually:
+
+queue = Librato::Metrics::Queue.new
+
+queue.add 'disk.free' => 1223121
+queue.add :memory => 2321
+queue.add :cpu => {:source => 'myapp', :value => 52}
+#...
+
+queue.submit

data/examples/submit_every.rb

@@ -0,0 +1,27 @@
+# send a set of metrics every 60 seconds
+
+require 'librato/metrics'
+
+Librato::Metrics.authenticate 'my email', 'my api key'
+queue = Librato::Metrics::Queue.new
+
+def sleep_until(time)
+  secs = time - Time.now
+  puts "sleeping for #{secs}"
+  sleep secs
+end
+
+loop do
+  start = Time.now
+
+  queue.add 'my.metric' => 1234
+  # do work, add more metrics..
+
+  begin
+    queue.submit
+  rescue Exception => e
+    $stderr.puts e
+  end
+
+  sleep_until(start+60)
+end

data/lib/librato/metrics/aggregator.rb

@@ -11,9 +11,15 @@ module Librato
 
       attr_reader :source
 
-      def initialize(options={})
+      # @option opts [Integer] :autosubmit_interval If set the aggregator will auto-submit if the given number of seconds has passed when a new metric is added.
+      # @option opts [Boolean] :clear_failures Should the aggregator remove all stored data if it runs into problems with a request? (default: false)
+      # @option opts [Client] :client The client object to use to connect to Metrics. (default: Librato::Metrics.client)
+      # @option opts [Time|Integer] :measure_time A default measure_time to use for measurements added.
+      # @option opts [String] :prefix If set will apply the given prefix to all metric names of measurements added.
+      # @option opts [String] :source The default source to use for measurements added.
+      def initialize(opts={})
         @aggregated = {}
-        setup_common_options(options)
+        setup_common_options(opts)
       end
 
       # Add a metric entry to the metric set:
@@ -43,7 +49,7 @@ module Librato
 
       # Returns true if aggregate contains no measurements
       #
-      # @return Boolean
+      # @return [Boolean]
       def empty?
         @aggregated.empty?
       end
@@ -55,6 +61,8 @@ module Librato
       end
       alias :flush :clear
 
+      # Returns currently queued data
+      #
       def queued
         gauges = []
 

data/lib/librato/metrics/annotator.rb

@@ -1,9 +1,9 @@
 module Librato::Metrics
 
-  # manages writing and reading annotation streams for a
-  # given client connection
+  # Read & write annotation streams for a given client connection.
   class Annotator
 
+    # @option options [Client] :client Client instance used to connect to Metrics
     def initialize(options={})
       @client = options[:client] || Librato::Metrics.client
     end
@@ -15,7 +15,7 @@ module Librato::Metrics
     #
     # @example Annotation with start and end times
     #   annotator.add :deployments, 'deployed v56', :start_time => start,
-    #                 :end_time => end
+    #                 :end_time => end_time
     #
     # @example Annotation with a specific source
     #   annotator.add :deployments, 'deployed v60', :source => 'app12'
@@ -24,6 +24,11 @@ module Librato::Metrics
     #   annotator.add :deployments, 'deployed v61',
     #                 :description => '9b562b2: shipped new feature foo!'
     #
+    # @example Annotate with automatic start and end times
+    #   annotator.add(:deployments, 'deployed v62') do
+    #     # do work..
+    #   end
+    #
     def add(stream, title, options={})
       options[:title] = title
       if options[:start_time]
@@ -33,21 +38,26 @@ module Librato::Metrics
         options[:end_time] = options[:end_time].to_i
       end
       payload = SmartJSON.write(options)
-      # expects 200
-      connection.post("annotations/#{stream}", payload)
+      response = connection.post("annotations/#{stream}", payload)
+      # will raise exception if not 200 OK
+      event = SmartJSON.read(response.body)
+      if block_given?
+        yield
+        update_event stream, event['id'], :end_time => Time.now.to_i
+        # need to get updated representation
+        event = fetch_event stream, event['id']
+      end
+      event
     end
 
+    # client instance used by this object
     def client
       @client
     end
 
-    def connection
-      client.connection
-    end
-
-    # Delete an annotation streams
+    # Delete an annotation stream
     #
-    # @example Delete 'deployment' annotation stream
+    # @example Delete the 'deployment' annotation stream
     #  annotator.delete :deployment
     #
     def delete(stream)
@@ -77,17 +87,28 @@ module Librato::Metrics
     #   annotator.fetch :deployments
     #
     # @example Get events on 'deployments' between start and end times
-    #   annotator.fetch :deployments, :start_time => start, :end_time => end
+    #   annotator.fetch :deployments, :start_time => start,
+    #                   :end_time => end_time
     #
     # @example Source-limited listing
     #   annotator.fetch :deployments, :sources => ['foo','bar','baz'],
-    #                   :start_time => start, :end_time => end
+    #                   :start_time => start, :end_time => end_time
     #
     def fetch(stream, options={})
       response = connection.get("annotations/#{stream}", options)
       SmartJSON.read(response.body)
     end
 
+    # Get properties for a given annotation stream event
+    #
+    # @example Get event
+    #   annotator.fetch :deployments, 23
+    #
+    def fetch_event(stream, id)
+      response = connection.get("annotations/#{stream}/#{id}")
+      SmartJSON.read(response.body)
+    end
+
     # List currently existing annotation streams
     #
     # @example List all annotation streams
@@ -101,6 +122,26 @@ module Librato::Metrics
       SmartJSON.read(response.body)
     end
 
+    # Update an event's properties
+    #
+    # @example Set an end time for a previously submitted event
+    #   annotator.update_event 'deploys', 'v24', :end_time => end_time
+    #
+    def update_event(stream, id, options={})
+      url = "annotations/#{stream}/#{id}"
+      connection.put do |request|
+        request.url connection.build_url(url)
+        request.body = SmartJSON.write(options)
+      end
+      # expects 204 will raise exception otherwise
+    end
+
+    private
+
+    def connection
+      client.connection
+    end
+
   end
 
 end

data/lib/librato/metrics/client.rb

@@ -90,16 +90,22 @@ module Librato
       #
       # @example Delete metrics 'foo' and 'bar'
       #   Librato::Metrics.delete :foo, :bar
+      #
+      # @example Delete metrics that start with 'foo' except 'foobar'
+      #   Librato::Metrics.delete :names => 'foo*', :exclude => ['foobar']
+      #
       def delete(*metric_names)
         raise(NoMetricsProvided, 'Metric name missing.') if metric_names.empty?
-        metric_names.map!{|i| i.to_s}
-        params = {:names => metric_names }
+        if metric_names[0].respond_to?(:keys) # hash form
+          params = metric_names[0]
+        else
+          params = { :names => metric_names.map(&:to_s) }
+        end
         connection.delete do |request|
           request.url connection.build_url("metrics")
           request.body = SmartJSON.write(params)
         end
-        # expects 204, middleware will raise exception
-        # otherwise.
+        # expects 204, middleware will raise exception otherwise.
         true
       end
 
@@ -226,7 +232,9 @@ module Librato
         @queue.submit
       end
 
-      # Update metric with the given name.
+      # 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.
       #
       # @example Update metric 'temperature'
       #   Librato::Metrics.update :temperature, :period => 15, :attributes => { :color => 'F00' }
@@ -234,9 +242,21 @@ module Librato
       # @example Update metric 'humidity', creating it if it doesn't exist
       #   Librato::Metrics.update 'humidity', :type => :gauge, :period => 60, :display_name => 'Humidity'
       #
+      # @example Update multiple metrics by name
+      #   Librato::Metrics.update :names => ["foo", "bar"], :period => 60
+      #
+      # @example Update all metrics that start with 'foo' that aren't 'foobar'
+      #   Librato::Metrics.update :names => 'foo*', :exclude => ['foobar'], :display_min => 0
+      #
       def update(metric, options = {})
+        if metric.respond_to?(:each)
+          url = "metrics" # update multiple metrics
+          options = metric
+        else
+          url = "metrics/#{metric}" # update single
+        end
         connection.put do |request|
-          request.url connection.build_url("metrics/#{metric}")
+          request.url connection.build_url(url)
           request.body = SmartJSON.write(options)
         end
       end

data/lib/librato/metrics/queue.rb

@@ -7,11 +7,19 @@ module Librato
 
       attr_accessor :skip_measurement_times
 
-      def initialize(options={})
+      # @option opts [Integer] :autosubmit_count If set the queue will auto-submit any time it hits this number of measurements.
+      # @option opts [Integer] :autosubmit_interval If set the queue will auto-submit if the given number of seconds has passed when a new metric is added.
+      # @option opts [Boolean] :clear_failures Should the queue remove any queued measurements from its queue if it runs into problems with a request? (default: false)
+      # @option opts [Client] :client The client object to use to connect to Metrics. (default: Librato::Metrics.client)
+      # @option opts [Time|Integer] :measure_time A default measure_time to use for measurements added.
+      # @option opts [String] :prefix If set will apply the given prefix to all metric names of measurements added.
+      # @option opts [Boolean] :skip_measurement_times If true will not assign measurement_time to each measure as they are added.
+      # @option opts [String] :source The default source to use for measurements added.
+      def initialize(opts={})
         @queued = {}
-        @autosubmit_count = options[:autosubmit_count]
-        @skip_measurement_times = options[:skip_measurement_times]
-        setup_common_options(options)
+        @autosubmit_count = opts[:autosubmit_count]
+        @skip_measurement_times = opts[:skip_measurement_times]
+        setup_common_options(opts)
       end
 
       # Add a metric entry to the metric set:

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.0.4"
+    VERSION = "1.1.0"
   end
 end

data/librato-metrics.gemspec

@@ -41,4 +41,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+
+  s.signing_key = File.expand_path("~/.gem/librato-private_key.pem")
+  s.cert_chain = ["certs/librato-public.pem"]
 end

data/spec/integration/metrics/annotator_spec.rb

@@ -41,6 +41,21 @@ module Librato
           first['title'].should == 'deployed v71'
           first['description'].should == 'deployed foobar!'
         end
+        it "should have an id for further use" do
+          annotation = subject.add :deployment, "deployed v23"
+          annotation['id'].should_not be_nil
+        end
+
+        context "with a block" do
+          it "should set both start and end times" do
+            annotation = subject.add 'deploys', 'v345' do
+              sleep 1.0
+            end
+            data = subject.fetch_event 'deploys', annotation['id']
+            data['start_time'].should_not be_nil
+            data['end_time'].should_not be_nil
+          end
+        end
       end
 
       describe "#delete" do
@@ -109,6 +124,23 @@ module Librato
         end
       end
 
+      describe "#fetch_event" do
+        context "with existing event" do
+          it "should return event properties" do
+            annotation = subject.add 'deploys', 'v69'
+            data = subject.fetch_event 'deploys', annotation['id']
+            data['title'].should == 'v69'
+          end
+        end
+        context "when event doesn't exist" do
+          it "should raise NotFound" do
+            lambda {
+              data = subject.fetch_event 'deploys', 324
+            }.should raise_error(Metrics::NotFound)
+          end
+        end
+      end
+
       describe "#list" do
         before(:each) do
           subject.add :backups, 'backup 1'
@@ -134,6 +166,24 @@ module Librato
         end
       end
 
+      describe "#update_event" do
+        context "when event exists" do
+          it "should update event" do
+            end_time = (Time.now + 60).to_i
+            annotation = subject.add 'deploys', 'v24'
+            subject.update_event 'deploys', annotation['id'],
+              :end_time => end_time, :title => 'v28'
+            data = subject.fetch_event 'deploys', annotation['id']
+
+            data['title'].should == 'v28'
+            data['end_time'].should == end_time
+          end
+        end
+        context "when event does not exist" do
+
+        end
+      end
+
     end
 
   end

data/spec/integration/metrics_spec.rb

@@ -46,38 +46,59 @@ module Librato
     describe "#delete" do
       before(:each) { delete_all_metrics }
 
-      context "with a single argument" do
-        it "should delete named metric" do
-          Metrics.submit :foo => 123
-          Metrics.list(:name => :foo).should_not be_empty
-          Metrics.delete :foo
-          Metrics.list(:name => :foo).should be_empty
+      context 'by names' do
+
+        context "with a single argument" do
+          it "should delete named metric" do
+            Metrics.submit :foo => 123
+            Metrics.list(:name => :foo).should_not be_empty
+            Metrics.delete :foo
+            Metrics.list(:name => :foo).should be_empty
+          end
         end
-      end
 
-      context "with multiple arguments" do
-        it "should delete named metrics" do
-          Metrics.submit :foo => 123, :bar => 345, :baz => 567
-          Metrics.delete :foo, :bar
-          Metrics.list(:name => :foo).should be_empty
-          Metrics.list(:name => :bar).should be_empty
-          Metrics.list(:name => :baz).should_not be_empty
+        context "with multiple arguments" do
+          it "should delete named metrics" do
+            Metrics.submit :foo => 123, :bar => 345, :baz => 567
+            Metrics.delete :foo, :bar
+            Metrics.list(:name => :foo).should be_empty
+            Metrics.list(:name => :bar).should be_empty
+            Metrics.list(:name => :baz).should_not be_empty
+          end
+        end
+
+        context "with missing metric" do
+          it "should run cleanly" do
+            # the API currently returns success even if
+            # the metric has already been deleted or is absent.
+            Metrics.delete :missing
+          end
         end
-      end
 
-      context "with missing metric" do
-        it "should run cleanly" do
-          # the API currently returns success even if
-          # the metric has already been deleted or is absent.
-          Metrics.delete :missing
+        context "with no arguments" do
+          it "should not make request" do
+            lambda {
+              Metrics.delete
+            }.should raise_error(Metrics::NoMetricsProvided)
+          end
         end
+
       end
 
-      context "with no arguments" do
-        it "should not make request" do
-          lambda {
-            Metrics.delete
-          }.should raise_error(Metrics::NoMetricsProvided)
+      context 'by pattern' do
+        it "should filter properly" do
+          Metrics.submit :foo => 1, :foobar => 2, :foobaz => 3, :bar => 4
+          Metrics.delete :names => 'fo*', :exclude => ['foobar']
+
+          %w{foo foobaz}.each do |name|
+            lambda {
+              Metrics.fetch name
+            }.should raise_error(Librato::Metrics::NotFound)
+          end
+
+          %w{foobar bar}.each do |name|
+            Metrics.fetch name # stil exist
+          end
         end
       end
     end
@@ -104,7 +125,8 @@ module Librato
 
       context "with a start_time" do
         it "should return entries since that time" do
-          data = Metrics.fetch :my_counter, :start_time => Time.now-3600 # 1 hr ago
+          # 1 hr ago
+          data = Metrics.fetch :my_counter, :start_time => Time.now-3600
           data['unassigned'].length.should == 3
           data['baz'].length.should == 2
         end
@@ -205,52 +227,84 @@ module Librato
 
     describe "#update" do
 
-      context "with existing metric" do
-        before do
-          delete_all_metrics
-          Metrics.submit :foo => 123
-        end
-
-        it "should update the metric" do
-          Metrics.update :foo, :display_name => "Foo Metric",
-                               :period => 15,
-                               :attributes => {
-                                 :display_max => 1000
-                               }
-          foo = Metrics.fetch :foo
-          foo['display_name'].should == 'Foo Metric'
-          foo['period'].should == 15
-          foo['attributes']['display_max'].should == 1000
-        end
-      end
+      context 'with a single metric' do
+        context "with an existing metric" do
+          before do
+            delete_all_metrics
+            Metrics.submit :foo => 123
+          end
 
-      context "without an existing metric" do
-        it "should create the metric if type specified" do
-          delete_all_metrics
-          Metrics.update :foo, :display_name => "Foo Metric",
-                               :type => 'gauge',
-                               :period => 15,
-                               :attributes => {
-                                 :display_max => 1000
-                               }
-          foo = Metrics.fetch :foo
-          foo['display_name'].should == 'Foo Metric'
-          foo['period'].should == 15
-          foo['attributes']['display_max'].should == 1000
+          it "should update the metric" do
+            Metrics.update :foo, :display_name => "Foo Metric",
+                                 :period => 15,
+                                 :attributes => {
+                                   :display_max => 1000
+                                 }
+            foo = Metrics.fetch :foo
+            foo['display_name'].should == 'Foo Metric'
+            foo['period'].should == 15
+            foo['attributes']['display_max'].should == 1000
+          end
         end
 
-        it "should raise error if no type specified" do
-          delete_all_metrics
-          lambda {
+        context "without an existing metric" do
+          it "should create the metric if type specified" do
+            delete_all_metrics
             Metrics.update :foo, :display_name => "Foo Metric",
+                                 :type => 'gauge',
                                  :period => 15,
                                  :attributes => {
                                    :display_max => 1000
                                  }
-          }.should raise_error
+            foo = Metrics.fetch :foo
+            foo['display_name'].should == 'Foo Metric'
+            foo['period'].should == 15
+            foo['attributes']['display_max'].should == 1000
+          end
+
+          it "should raise error if no type specified" do
+            delete_all_metrics
+            lambda {
+              Metrics.update :foo, :display_name => "Foo Metric",
+                                   :period => 15,
+                                   :attributes => {
+                                     :display_max => 1000
+                                   }
+            }.should raise_error
+          end
         end
+
       end
 
+      context 'with multiple metrics' do
+        before do
+          delete_all_metrics
+          Metrics.submit 'my.1' => 1, 'my.2' => 2, 'my.3' => 3, 'my.4' => 4
+        end
+
+        it "should support named list" do
+          names = ['my.1', 'my.3']
+          Metrics.update :names => names, :period => 60
+
+          names.each do |name|
+             metric = Metrics.fetch name
+             metric['period'].should == 60
+           end
+        end
+
+        it "should support patterns" do
+          Metrics.update :names => 'my.*', :exclude => ['my.3'],
+            :display_max => 100
+
+          %w{my.1 my.2 my.4}.each do |name|
+            metric = Metrics.fetch name
+            metric['attributes']['display_max'].should == 100
+          end
+
+          excluded = Metrics.fetch 'my.3'
+          excluded['attributes']['display_max'].should_not == 100
+        end
+      end
     end
 
   end

data/spec/unit/metrics/queue_spec.rb

@@ -6,7 +6,7 @@ module Librato
     describe Queue do
 
       before(:each) do
-        @time = 1354720160 #Time.now.to_i
+        @time = (Time.now.to_i - 1*60)
         Queue.any_instance.stub(:epoch_time).and_return(@time)
       end
 
@@ -120,13 +120,13 @@ module Librato
           end
 
           it "should accept integers" do
-            time = 1336574713
+            time = @time.to_i
             subject.add :foo => {:measure_time => time, :value => 123}
             subject.queued[:gauges][0][:measure_time].should == time
           end
 
           it "should accept strings" do
-            time = '1336574713'
+            time = @time.to_s
             subject.add :foo => {:measure_time => time, :value => 123}
             subject.queued[:gauges][0][:measure_time].should == time.to_i
           end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVJFd0R3WURWUVFEREFoeWRX
+  SjUKWjJWdGN6RVhNQlVHQ2dtU0pvbVQ4aXhrQVJrV0IyeHBZbkpoZEc4eEV6
+  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOagpiMjB3SGhjTk1UTXdPREE0TWpJeE9U
+  UTJXaGNOTVRRd09EQTRNakl4T1RRMldqQkJNUkV3RHdZRFZRUUREQWh5CmRX
+  SjVaMlZ0Y3pFWE1CVUdDZ21TSm9tVDhpeGtBUmtXQjJ4cFluSmhkRzh4RXpB
+  UkJnb0praWFKay9Jc1pBRVoKRmdOamIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFF
+  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDL1g3a2RLd1ovb2kvQQpCanMvY2F4
+  a3lESVpnTFMva2dtdWxvVGhmUEJCUjZNdU40R1hlL2hzZHpTSDhYaHRCWW9Z
+  cEsvRjJyUkJzclMrCmpMclpiS0pBR1VJcnFIaVNmZEx6eDJrMnNHVVlsS3pm
+  NmE0eFdpNTg3bmRDOEJ2aDVsZGM4NVcxbGxIRGVBU1MKUjVXanBlcjRLVTFO
+  V0cxRkFWdlFDWGhTS2Rta2krd1g3Sm5kN0NRK296N2trS1lQTThHL1pUZGIr
+  cW43d1JMVgpLYVIrenpHRG13VFEyV3pNaXRTWG1mL2t1NE1VbVJ6c3llcERY
+  WEVSTHluU3A4SVRrNjdnMkhNQ3l2T1BzZjhLCmNZdmwvd2JiOEJ5L3I2SE9q
+  eTdTTTdZbzM1NHVJZmhuaXU4QUt5bUlLeHNiNElnNzFTMGNVN0htMytXQlRp
+  MjgKQUlnOFRVYVhBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
+  ME9CQllFRkRieVFRcU80eEptYUtCRQpuZVE0eStSV0N2T1hNQXNHQTFVZER3
+  UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQUtBelhiQTQ3CjlV
+  NTlTc0VmcVIrRExkdjFWQWNkbXhhd3FDK1ptRzRGcHhaaHVIaGFvVXVpMzVB
+  b1FqelNpSEVVTkRUSXUzdTcKVGNzWXdYTVB6dXl6WkpKS1h2QkttU2I5bVdK
+  OTlET0g4MW9VbU96WDdqQ2xRWFpIcm5GdEhkQVJjTFFzUG1nYQo0RGgrZldY
+  V3hQSjZma3ZnODI2dko0cERtbDdPbzlzQ1hUcEMya2kvNVZla1RYa3BGclVz
+  UVJYamxYUGttVDMvCnhhODU4QkdSanZVNTlXUEUxM1FHaWJhN1lJZUh0UkV2
+  Tng0MkpJZm9KTVY3NG9mcktJdVR3OUNNdG8yZ3o5WHgKS3gxbmNuMDdBK2JK
+  bktaNmhlblFBRjFDSDk2WmNxY0pIMTc5UzJ0SWlLRE04a2VlUklVT1BDM1dU
+  MGZhb2svMgpnQTJvemRyODUxYy9uQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
+  LS0tLS0K
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -171,6 +199,9 @@ files:
 - README.md
 - Rakefile
 - benchmarks/array_vs_set.rb
+- certs/librato-public.pem
+- examples/simple.rb
+- examples/submit_every.rb
 - lib/librato/metrics.rb
 - lib/librato/metrics/aggregator.rb
 - lib/librato/metrics/annotator.rb
@@ -216,9 +247,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 236501250346713379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Ruby wrapper for Librato's Metrics API

metadata.gz.sig

@@ -0,0 +1,2 @@
+fO>��t=�
9��(�\(��^�#ao�@��*h��-�
+�ѳ��ăD9	p�c����tU"F	8��o�wWF~%�