librato-metrics 1.6.2 → 2.0.0.beta

data/lib/librato/metrics/annotator.rb

@@ -14,15 +14,15 @@ module Librato::Metrics
     #   annotator.add :deployments, 'deployed v45'
     #
     # @example Annotation with start and end times
-    #   annotator.add :deployments, 'deployed v56', :start_time => start,
-    #                 :end_time => end_time
+    #   annotator.add :deployments, 'deployed v56', start_time: start,
+    #                 end_time: end_time
     #
     # @example Annotation with a specific source
-    #   annotator.add :deployments, 'deployed v60', :source => 'app12'
+    #   annotator.add :deployments, 'deployed v60', source: 'app12'
     #
     # @example Annotation with a description
     #   annotator.add :deployments, 'deployed v61',
-    #                 :description => '9b562b2: shipped new feature foo!'
+    #                 description: '9b562b2: shipped new feature foo!'
     #
     # @example Annotate with automatic start and end times
     #   annotator.add(:deployments, 'deployed v62') do
@@ -41,7 +41,7 @@ module Librato::Metrics
       event = SmartJSON.read(response.body)
       if block_given?
         yield
-        update_event stream, event['id'], :end_time => Time.now.to_i
+        update_event stream, event['id'], end_time: Time.now.to_i
         # need to get updated representation
         event = fetch_event stream, event['id']
       end
@@ -85,12 +85,12 @@ 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_time
+    #   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_time
+    #   annotator.fetch :deployments, sources: ['foo','bar','baz'],
+    #                   start_time: start, end_time: end_time
     #
     def fetch(stream, options={})
       response = connection.get("annotations/#{stream}", options)
@@ -113,7 +113,7 @@ module Librato::Metrics
     #   streams = annotator.list
     #
     # @example List annotator streams with 'deploy' in the name
-    #   deploy_streams = annotator.list :name => 'deploy'
+    #   deploy_streams = annotator.list name: 'deploy'
     #
     def list(options={})
       response = connection.get("annotations", options)
@@ -123,7 +123,7 @@ module Librato::Metrics
     # Update an event's properties
     #
     # @example Set an end time for a previously submitted event
-    #   annotator.update_event 'deploys', 'v24', :end_time => end_time
+    #   annotator.update_event 'deploys', 'v24', end_time: end_time
     #
     def update_event(stream, id, options={})
       url = "annotations/#{stream}/#{id}"

data/lib/librato/metrics/client.rb

@@ -31,7 +31,7 @@ module Librato
       end
 
       def annotator
-        @annotator ||= Annotator.new(:client => self)
+        @annotator ||= Annotator.new(client: self)
       end
 
       # API endpoint to use for queries and direct
@@ -65,8 +65,8 @@ module Librato
       def connection
         # prevent successful creation if no credentials set
         raise CredentialsMissing unless (self.email and self.api_key)
-        @connection ||= Connection.new(:client => self, :api_endpoint => api_endpoint,
-                                       :adapter => faraday_adapter, :proxy => self.proxy)
+        @connection ||= Connection.new(client: self, api_endpoint: api_endpoint,
+                                       adapter: faraday_adapter, proxy: self.proxy)
       end
 
       # Overrride user agent for this client's connections. If you
@@ -92,14 +92,14 @@ module Librato
       #   Librato::Metrics.delete_metrics :foo, :bar
       #
       # @example Delete metrics that start with 'foo' except 'foobar'
-      #   Librato::Metrics.delete_metrics :names => 'foo*', :exclude => ['foobar']
+      #   Librato::Metrics.delete_metrics names: 'foo*', exclude: ['foobar']
       #
       def delete_metrics(*metric_names)
         raise(NoMetricsProvided, 'Metric name missing.') if metric_names.empty?
         if metric_names[0].respond_to?(:keys) # hash form
           params = metric_names[0]
         else
-          params = { :names => metric_names.map(&:to_s) }
+          params = { names: metric_names.map(&:to_s) }
         end
         connection.delete do |request|
           request.url connection.build_url("metrics")
@@ -109,12 +109,6 @@ module Librato
         true
       end
 
-      # Completely delete metrics with the given names. Be
-      # careful with this, this is instant and permanent.
-      #
-      # @deprecated Use {#delete_metrics} instead
-      def delete(*metric_names); delete_metrics(*metric_names); end
-
       # Return current adapter this client will use.
       # Defaults to Metrics.faraday_adapter if set, otherwise
       # Faraday.default_adapter
@@ -127,42 +121,6 @@ module Librato
         @faraday_adapter = adapter
       end
 
-      # Query metric data
-      #
-      # @deprecated Use {#get_metric} or {#get_measurements} instead.
-      #
-      # @example Get attributes for a metric
-      #   attrs = Librato::Metrics.fetch :temperature
-      #
-      # @example Get 20 most recent data points for metric
-      #   data = Librato::Metrics.fetch :temperature, :count => 20
-      #
-      # @example Get 20 most recent data points for a specific source
-      #   data = Librato::Metrics.fetch :temperature, :count => 20,
-      #                                 :source => 'app1'
-      #
-      # @example Get the 20 most recent 15 minute data point rollups
-      #   data = Librato::Metrics.fetch :temperature, :count => 20,
-      #                                 :resolution => 900
-      #
-      # @example Get data points for the last hour
-      #   data = Librato::Metrics.fetch :start_time => Time.now-3600
-      #
-      # @example Get 15 min data points from two hours to an hour ago
-      #   data = Librato::Metrics.fetch :start_time => Time.now-7200,
-      #                                 :end_time => Time.now-3600,
-      #                                 :resolution => 900
-      #
-      # A full list of query parameters can be found in the API
-      # documentation: {http://dev.librato.com/v1/get/metrics/:name}
-      #
-      # @param [Symbol|String] metric Metric name
-      # @param [Hash] options Query options
-      def fetch(metric, options={})
-        metric = get_metric(metric, options)
-        options.empty? ? metric : metric["measurements"]
-      end
-
       # Retrieve measurements for a given composite metric definition.
       # :start_time and :resolution are required options, :end_time is
       # optional.
@@ -170,7 +128,7 @@ module Librato
       # @example Get 5m moving average of 'foo'
       #   measurements = Librato::Metrics.get_composite
       #     'moving_average(mean(series("foo", "*"), {size: "5"}))',
-      #     :start_time => Time.now.to_i - 60*60, :resolution => 300
+      #     start_time: Time.now.to_i - 60*60, resolution: 300
       #
       # @param [String] definition Composite definition
       # @param [hash] options Query options
@@ -193,7 +151,7 @@ module Librato
       #   metric = Librato::Metrics.get_metric :temperature
       #
       # @example Get a metric and its 20 most recent data points
-      #   metric = Librato::Metrics.get_metric :temperature, :count => 20
+      #   metric = Librato::Metrics.get_metric :temperature, count: 20
       #   metric['measurements'] # => {...}
       #
       # A full list of query parameters can be found in the API
@@ -223,23 +181,23 @@ module Librato
       # Retrieve data points for a specific metric
       #
       # @example Get 20 most recent data points for metric
-      #   data = Librato::Metrics.get_measurements :temperature, :count => 20
+      #   data = Librato::Metrics.get_measurements :temperature, count: 20
       #
       # @example Get 20 most recent data points for a specific source
-      #   data = Librato::Metrics.get_measurements :temperature, :count => 20,
-      #                                            :source => 'app1'
+      #   data = Librato::Metrics.get_measurements :temperature, count: 20,
+      #                                            source: 'app1'
       #
       # @example Get the 20 most recent 15 minute data point rollups
-      #   data = Librato::Metrics.get_measurements :temperature, :count => 20,
-      #                                            :resolution => 900
+      #   data = Librato::Metrics.get_measurements :temperature, count: 20,
+      #                                            resolution: 900
       #
       # @example Get data points for the last hour
-      #   data = Librato::Metrics.get_measurements :start_time => Time.now-3600
+      #   data = Librato::Metrics.get_measurements start_time: Time.now-3600
       #
       # @example Get 15 min data points from two hours to an hour ago
-      #   data = Librato::Metrics.get_measurements :start_time => Time.now-7200,
-      #                                            :end_time => Time.now-3600,
-      #                                            :resolution => 900
+      #   data = Librato::Metrics.get_measurements start_time: Time.now-7200,
+      #                                            end_time: Time.now-3600,
+      #                                            resolution: 900
       #
       # A full list of query parameters can be found in the API
       # documentation: {http://dev.librato.com/v1/get/metrics/:name}
@@ -265,7 +223,7 @@ module Librato
       #   Librato::Metrics.metrics
       #
       # @example List metrics with 'foo' in the name
-      #   Librato::Metrics.metrics :name => 'foo'
+      #   Librato::Metrics.metrics name: 'foo'
       #
       # @param [Hash] options
       def metrics(options={})
@@ -276,11 +234,6 @@ module Librato
         Collection.paginated_metrics(connection, path, query)
       end
 
-      # List currently existing metrics
-      #
-      # @deprecated Use {#metrics} instead
-      def list(options={}); metrics(options); end
-
       # Create a new queue which uses this client.
       #
       # @return [Queue]
@@ -312,9 +265,9 @@ module Librato
       # Submit all queued metrics.
       #
       def submit(args)
-        @queue ||= Queue.new(:client => self,
-                             :skip_measurement_times => true,
-                             :clear_failures => true)
+        @queue ||= Queue.new(client: self,
+                             skip_measurement_times: true,
+                             clear_failures: true)
         @queue.add args
         @queue.submit
       end
@@ -322,10 +275,10 @@ module Librato
       # Update a single metric with new attributes.
       #
       # @example Update metric 'temperature'
-      #   Librato::Metrics.update_metric :temperature, :period => 15, :attributes => { :color => 'F00' }
+      #   Librato::Metrics.update_metric :temperature, period: 15, attributes: { color: 'F00' }
       #
       # @example Update metric 'humidity', creating it if it doesn't exist
-      #   Librato::Metrics.update_metric 'humidity', :type => :gauge, :period => 60, :display_name => 'Humidity'
+      #   Librato::Metrics.update_metric 'humidity', type: :gauge, period: 60, display_name: 'Humidity'
       #
       def update_metric(metric, options = {})
         url = "metrics/#{metric}"
@@ -338,10 +291,10 @@ module Librato
       # Update multiple metrics.
       #
       # @example Update multiple metrics by name
-      #   Librato::Metrics.update_metrics :names => ["foo", "bar"], :period => 60
+      #   Librato::Metrics.update_metrics names: ["foo", "bar"], period: 60
       #
       # @example Update all metrics that start with 'foo' that aren't 'foobar'
-      #   Librato::Metrics.update_metrics :names => 'foo*', :exclude => ['foobar'], :display_min => 0
+      #   Librato::Metrics.update_metrics names: 'foo*', exclude: ['foobar'], display_min: 0
       #
       def update_metrics(metrics)
         url = "metrics" # update multiple metrics
@@ -351,26 +304,6 @@ 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} or {#update_metrics} instead
-      def update(metric, options={})
-        if metric.respond_to?(:each)
-          update_metrics(metric)
-        else
-          update_metric(metric, options)
-        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
       #

data/lib/librato/metrics/connection.rb

@@ -31,8 +31,8 @@ module Librato
       def transport
         raise(NoClientProvided, "No client provided.") unless @client
         @transport ||= Faraday::Connection.new(
-          :url => api_endpoint + "/v1/",
-          :request => {:open_timeout => 20, :timeout => 30}) do |f|
+          url: api_endpoint + "/v1/",
+          request: {open_timeout: 20, timeout: 30}) do |f|
 
           f.use Librato::Metrics::Middleware::RequestBody
           f.use Librato::Metrics::Middleware::Retry

data/lib/librato/metrics/middleware/retry.rb

@@ -16,7 +16,7 @@ module Librato
             env[:body] = request_body # after failure is set to response body
             @app.call(env)
           rescue Librato::Metrics::ServerError, Timeout::Error,
-                 Faraday::ConnectionFailed
+                 Faraday::Error::ConnectionFailed
             if retries > 0
               retries -= 1 and retry
             end

data/lib/librato/metrics/processor.rb

@@ -30,7 +30,7 @@ module Librato
       # @return Boolean
       def submit
         return true if self.queued.empty?
-        options = {:per_request => @per_request}
+        options = {per_request: @per_request}
         if persister.persist(self.client, self.queued, options)
           @last_submit_time = Time.now
           clear and return true
@@ -54,7 +54,7 @@ module Librato
       #   end
       #
       # @example Queue API request response time w/ source
-      #   queue.time :api_request_time, :source => 'app1' do
+      #   queue.time :api_request_time, source: 'app1' do
       #     # API request..
       #   end
       #
@@ -64,7 +64,7 @@ module Librato
         start = Time.now
         yield.tap do
           duration = (Time.now - start) * 1000.0 # milliseconds
-          metric = {name => options.merge({:value => duration})}
+          metric = {name => options.merge({value: duration})}
           add metric
         end
       end

data/lib/librato/metrics/queue.rb

@@ -33,7 +33,7 @@ module Librato
             metric[:name] = key.to_s
             type = metric.delete(:type) || metric.delete('type') || 'gauge'
           else
-            metric = {:name => key.to_s, :value => value}
+            metric = {name: key.to_s, value: value}
             type = :gauge
           end
           if @prefix

data/lib/librato/metrics/smart_json.rb

@@ -1,25 +1,36 @@
-require 'multi_json'
-
 module Librato
   module Metrics
     class SmartJSON
-      JSON_HANDLER = MultiJson
       extend SingleForwardable
-      
-      # wrap MultiJSON's implementation so we can use any version
-      # prefer modern syntax if available; def once at startup
-      if JSON_HANDLER.respond_to?(:load)
-        def_delegator JSON_HANDLER, :load, :read
-      else
-        def_delegator JSON_HANDLER, :decode, :read
-      end
-      
-      if JSON_HANDLER.respond_to?(:dump)
-        def_delegator JSON_HANDLER, :dump, :write
+
+      if defined?(::MultiJson)
+        # MultiJSON >= 1.3.0
+        if MultiJson.respond_to?(:load)
+          def_delegator MultiJson, :load, :read
+        else
+          def_delegator MultiJson, :decode, :read
+        end
+
+        # MultiJSON <= 1.2.0
+        if MultiJson.respond_to?(:dump)
+          def_delegator MultiJson, :dump, :write
+        else
+          def_delegator MultiJson, :encode, :write
+        end
+
+        def self.handler
+          :multi_json
+        end
       else
-        def_delegator JSON_HANDLER, :encode, :write
-      end
+        require "json"
 
+        def_delegator JSON, :parse, :read
+        def_delegator JSON, :generate, :write
+
+        def self.handler
+          :json
+        end
+      end
     end
   end
 end

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "1.6.2"
+    VERSION = "2.0.0.beta"
   end
 end

data/librato-metrics.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '1.3.5'
+  s.required_ruby_version = '>= 1.9'
 
   s.name        = 'librato-metrics'
   s.version     = Librato::Metrics::VERSION
@@ -25,8 +26,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[LICENSE]
 
   ## runtime dependencies
-  s.add_dependency 'faraday', ['>= 0.7', '< 2.0']
-  s.add_dependency 'multi_json'
+  s.add_dependency 'faraday'
   s.add_dependency 'aggregate', '~> 0.2.2'
 
   # omitting for now because jruby-19mode can't handle

data/spec/integration/metrics/annotator_spec.rb

@@ -8,135 +8,135 @@ module Librato
       before(:each) { delete_all_annotations }
 
       describe "#add" do
-        it "should create new annotation" do
+        it "creates new annotation" do
           subject.add :deployment, "deployed v68"
-          annos = subject.fetch(:deployment, :start_time => Time.now.to_i-60)
-          annos["events"]["unassigned"].length.should == 1
-          annos["events"]["unassigned"][0]["title"].should == 'deployed v68'
-        end
-        it "should support sources" do
-          subject.add :deployment, 'deployed v69', :source => 'box1'
-          annos = subject.fetch(:deployment, :start_time => Time.now.to_i-60)
-          annos["events"]["box1"].length.should == 1
+          annos = subject.fetch(:deployment, start_time: Time.now.to_i-60)
+          expect(annos["events"]["unassigned"].length).to eq(1)
+          expect(annos["events"]["unassigned"][0]["title"]).to eq('deployed v68')
+        end
+        it "supports sources" do
+          subject.add :deployment, 'deployed v69', source: 'box1'
+          annos = subject.fetch(:deployment, start_time: Time.now.to_i-60)
+          expect(annos["events"]["box1"].length).to eq(1)
           first = annos["events"]["box1"][0]
-          first['title'].should == 'deployed v69'
+          expect(first['title']).to eq('deployed v69')
         end
-        it "should support start and end times" do
+        it "supports start and end times" do
           start_time = Time.now.to_i-120
           end_time = Time.now.to_i-30
-          subject.add :deployment, 'deployed v70', :start_time => start_time,
-                      :end_time => end_time
-          annos = subject.fetch(:deployment, :start_time => Time.now.to_i-180)
-          annos["events"]["unassigned"].length.should == 1
+          subject.add :deployment, 'deployed v70', start_time: start_time,
+                      end_time: end_time
+          annos = subject.fetch(:deployment, start_time: Time.now.to_i-180)
+          expect(annos["events"]["unassigned"].length).to eq(1)
           first = annos["events"]["unassigned"][0]
-          first['title'].should == 'deployed v70'
-          first['start_time'].should == start_time
-          first['end_time'].should == end_time
-        end
-        it "should support description" do
-          subject.add :deployment, 'deployed v71', :description => 'deployed foobar!'
-          annos = subject.fetch(:deployment, :start_time => Time.now.to_i-180)
-          annos["events"]["unassigned"].length.should == 1
+          expect(first['title']).to eq('deployed v70')
+          expect(first['start_time']).to eq(start_time)
+          expect(first['end_time']).to eq(end_time)
+        end
+        it "supports description" do
+          subject.add :deployment, 'deployed v71', description: 'deployed foobar!'
+          annos = subject.fetch(:deployment, start_time: Time.now.to_i-180)
+          expect(annos["events"]["unassigned"].length).to eq(1)
           first = annos["events"]["unassigned"][0]
-          first['title'].should == 'deployed v71'
-          first['description'].should == 'deployed foobar!'
+          expect(first['title']).to eq('deployed v71')
+          expect(first['description']).to eq('deployed foobar!')
         end
-        it "should have an id for further use" do
+        it "has an id for further use" do
           annotation = subject.add :deployment, "deployed v23"
-          annotation['id'].should_not be_nil
+          expect(annotation['id']).not_to be_nil
         end
 
         context "with a block" do
-          it "should set both start and end times" do
+          it "sets 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
+            expect(data['start_time']).not_to be_nil
+            expect(data['end_time']).not_to be_nil
           end
         end
       end
 
       describe "#delete" do
-        it "should remove annotation streams" do
+        it "removes annotation streams" do
           subject.add :deployment, "deployed v45"
           subject.fetch :deployment # should exist
           subject.delete :deployment
-          lambda {
+          expect {
             subject.fetch(:deployment)
-          }.should raise_error(Metrics::NotFound)
+          }.to raise_error(Metrics::NotFound)
         end
       end
 
       describe "#delete_event" do
-        it "should remove an annotation event" do
+        it "removes an annotation event" do
           subject.add :deployment, 'deployed v46'
           subject.add :deployment, 'deployed v47'
-          events = subject.fetch(:deployment, :start_time => Time.now.to_i-60)
+          events = subject.fetch(:deployment, start_time: Time.now.to_i-60)
           events = events['events']['unassigned']
           ids = events.reduce({}) do |hash, event|
             hash[event['title']] = event['id']
             hash
           end
           subject.delete_event :deployment, ids['deployed v47']
-          events = subject.fetch(:deployment, :start_time => Time.now.to_i-60)
+          events = subject.fetch(:deployment, start_time: Time.now.to_i-60)
           events = events['events']['unassigned']
-          events.length.should == 1
-          events[0]['title'].should == 'deployed v46'
+          expect(events.length).to eq(1)
+          expect(events[0]['title']).to eq('deployed v46')
         end
       end
 
       describe "#fetch" do
         context "without a time frame" do
-          it "should return stream properties" do
+          it "returns stream properties" do
             subject.add :backups, "backup 21"
             properties = subject.fetch :backups
-            properties['name'].should == 'backups'
+            expect(properties['name']).to eq('backups')
           end
         end
 
         context "with a time frame" do
-          it "should return set of annotations" do
+          it "returns set of annotations" do
             subject.add :backups, "backup 22"
             subject.add :backups, "backup 23"
-            annos = subject.fetch :backups, :start_time => Time.now.to_i-60
+            annos = subject.fetch :backups, start_time: Time.now.to_i-60
             events = annos['events']['unassigned']
-            events[0]['title'].should == 'backup 22'
-            events[1]['title'].should == 'backup 23'
+            expect(events[0]['title']).to eq('backup 22')
+            expect(events[1]['title']).to eq('backup 23')
           end
-          it "should respect source limits" do
-            subject.add :backups, "backup 24", :source => 'server_1'
-            subject.add :backups, "backup 25", :source => 'server_2'
-            subject.add :backups, "backup 26", :source => 'server_3'
-            annos = subject.fetch :backups, :start_time => Time.now.to_i-60,
-                                  :sources => %w{server_1 server_3}
-            annos['events']['server_1'].should_not be_nil
-            annos['events']['server_2'].should be_nil
-            annos['events']['server_3'].should_not be_nil
+          it "respects source limits" do
+            subject.add :backups, "backup 24", source: 'server_1'
+            subject.add :backups, "backup 25", source: 'server_2'
+            subject.add :backups, "backup 26", source: 'server_3'
+            annos = subject.fetch :backups, start_time: Time.now.to_i-60,
+                                  sources: %w{server_1 server_3}
+            expect(annos['events']['server_1']).not_to be_nil
+            expect(annos['events']['server_2']).to be_nil
+            expect(annos['events']['server_3']).not_to be_nil
           end
         end
 
-        it "should return exception if annotation is missing" do
-          lambda {
+        it "returns exception if annotation is missing" do
+          expect {
             subject.fetch :backups
-          }.should raise_error(Metrics::NotFound)
+          }.to raise_error(Metrics::NotFound)
         end
       end
 
       describe "#fetch_event" do
         context "with existing event" do
-          it "should return event properties" do
+          it "returns event properties" do
             annotation = subject.add 'deploys', 'v69'
             data = subject.fetch_event 'deploys', annotation['id']
-            data['title'].should == 'v69'
+            expect(data['title']).to eq('v69')
           end
         end
         context "when event doesn't exist" do
-          it "should raise NotFound" do
-            lambda {
+          it "raises NotFound" do
+            expect {
               data = subject.fetch_event 'deploys', 324
-            }.should raise_error(Metrics::NotFound)
+            }.to raise_error(Metrics::NotFound)
           end
         end
       end
@@ -148,35 +148,35 @@ module Librato
         end
 
         context "without arguments" do
-          it "should list annotation streams" do
+          it "lists annotation streams" do
             streams = subject.list
-            streams['annotations'].length.should == 2
+            expect(streams['annotations'].length).to eq(2)
             streams = streams['annotations'].map{|i| i['name']}
-            streams.should include('backups')
-            streams.should include('deployment')
+            expect(streams).to include('backups')
+            expect(streams).to include('deployment')
           end
         end
         context "with an argument" do
-          it "should list annotation streams which match" do
-            streams = subject.list :name => 'back'
-            streams['annotations'].length.should == 1
+          it "lists annotation streams which match" do
+            streams = subject.list name: 'back'
+            expect(streams['annotations'].length).to eq(1)
             streams = streams['annotations'].map{|i| i['name']}
-            streams.should include('backups')
+            expect(streams).to include('backups')
           end
         end
       end
 
       describe "#update_event" do
         context "when event exists" do
-          it "should update event" do
+          it "updates 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'
+              end_time: end_time, title: 'v28'
             data = subject.fetch_event 'deploys', annotation['id']
 
-            data['title'].should == 'v28'
-            data['end_time'].should == end_time
+            expect(data['title']).to eq('v28')
+            expect(data['end_time']).to eq(end_time)
           end
         end
         context "when event does not exist" do