travis-metrics 2.0.0.rc3 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3380d5ee57e2427a63b514dd6b4571fae800217
-  data.tar.gz: 5f27c608e00aa5a891c4bdb174905d874c60854c
+  metadata.gz: 58b038816eaddc65ee765d986391e931b9c9fc4f
+  data.tar.gz: 9ac884a2d7cb52418d754521336a747ecb1c4797
 SHA512:
-  metadata.gz: dbbd4ca2a88f1b72440561ea114514201006480711c24f1e976ded7483b7817d78db6692bf0364acc1b0f2f6dae9bbf2e151aaa60ea1a1f9ee32f2078ffa783a
-  data.tar.gz: 3356bff220359009b532ee3e97f0b97be7be9d143d7e85ace25d2cc1c2fa6403f83ef61eb73416cbe0cc3e123683a5cb99c3e107479863c385fadcd994dfbb60
+  metadata.gz: fa36355535b333cc97fa636e69d128c2ab614d2de33cc8ae38ee5582121980fcb7c9fc037e940f2ea95e6932f728f26838e8cd4be283a1d77063aea4ccc22b3b
+  data.tar.gz: 4a34aa214f2c9640c9eac2526518d330704e4d3bd3d35a010235f834c32cf543b161c0ec8be4a3165cff903de8113b548a9a6b062a4ca7a22d293cfc64f9bfe6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-metrics (2.0.0.rc2)
+    travis-metrics (2.0.0.rc3)
       metriks-librato_metrics (~> 1.0)
 
 GEM

data/lib/travis/metrics/reporter/graphite.rb

@@ -9,12 +9,13 @@ module Travis
           error: 'Graphite error: %s (%s)'
         }
 
+        attr_reader :reporter
+
         def setup
           return unless host
           logger.info MSGS[:setup] % [host, port]
-          reporter = Metriks::Reporter::Graphite.new(host, port, interval: interval, on_error: method(:on_error))
+          @reporter = Metriks::Reporter::Graphite.new(host, port, interval: interval, on_error: method(:on_error))
           reporter.start
-          reporter
         end
 
         private

data/lib/travis/metrics/reporter/librato.rb

@@ -9,12 +9,13 @@ module Travis
           error: 'Librato error: %s (%s)'
         }
 
+        attr_reader :reporter
+
         def setup
           return unless email && token
           logger.info MSGS[:setup] % [source, email]
-          reporter = Metriks::LibratoMetricsReporter.new(email, token, source: source, on_error: method(:on_error))
+          @reporter = Metriks::LibratoMetricsReporter.new(email, token, source: source, on_error: method(:on_error))
           reporter.start
-          reporter
         end
 
         private

data/lib/travis/metrics/version.rb

@@ -1,5 +1,5 @@
 module Travis
   class Metrics
-    VERSION = "2.0.0.rc3"
+    VERSION = "2.0.0.rc4"
   end
 end

data/spec/travis/metrics/reporter/graphite_spec.rb

@@ -15,8 +15,11 @@ describe Travis::Metrics::Reporter::Graphite do
       it { expect(subject).to be_nil }
     end
 
-    describe 'returns a graphite reporter' do
-      it { expect(subject).to be_kind_of(Metriks::Reporter::Graphite) }
+    describe 'starts a graphite reporter' do
+      let(:metriks) { double('metriks', start: nil) }
+      before { allow(Metriks::Reporter::Graphite).to receive(:new).and_return(metriks) }
+      before { reporter.setup }
+      it { expect(metriks).to have_received(:start) }
       it { expect(log).to include "Using Graphite metrics reporter (host: #{host}, port: 1234)" }
     end
 
@@ -26,9 +29,10 @@ describe Travis::Metrics::Reporter::Graphite do
       before { allow_any_instance_of(Metriks::Reporter::Graphite).to receive(:write).and_raise(error) }
 
       before do
-        subject.start
+        reporter.setup
+        reporter.reporter.start
         sleep 0.1 # ugh.
-        subject.stop
+        reporter.reporter.stop
       end
 
       it { expect(stdout.string).to include 'Graphite error: message (body)' }

data/spec/travis/metrics/reporter/librato_spec.rb

@@ -5,11 +5,6 @@ describe Travis::Metrics::Reporter::Librato do
   let(:reporter) { described_class.new(config, logger) }
   subject        { reporter.setup }
 
-  def log
-    reporter.setup
-    super
-  end
-
   describe 'setup' do
     describe 'returns nil if email is missing' do
       let(:email) { nil }
@@ -21,8 +16,11 @@ describe Travis::Metrics::Reporter::Librato do
       it { expect(subject).to be_nil }
     end
 
-    describe 'returns a librato reporter' do
-      it { expect(subject).to be_kind_of(Metriks::LibratoMetricsReporter) }
+    describe 'starts a librato reporter' do
+      let(:metriks) { double('metriks', start: nil) }
+      before { allow(Metriks::LibratoMetricsReporter).to receive(:new).and_return(metriks) }
+      before { reporter.setup }
+      it { expect(metriks).to have_received(:start) }
       it { expect(log).to include 'Using Librato metrics reporter (source: source, account: anja@travis-ci.org)' }
     end
 
@@ -30,7 +28,8 @@ describe Travis::Metrics::Reporter::Librato do
       let(:error) { StandardError.new('message') }
       before { allow(error).to receive(:response).and_return(double(body: 'body')) }
       before { allow_any_instance_of(Metriks::LibratoMetricsReporter).to receive(:write).and_raise(error) }
-      before { subject.flush }
+      before { reporter.setup }
+      before { reporter.reporter.flush }
       it { expect(stdout.string).to include 'Librato error: message (body)' }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-metrics
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Travis CI