weatherman 0.0.2 → 0.0.3

data/lib/weatherman/report.rb

@@ -23,10 +23,7 @@ module Weatherman
 
     def run
       @thread ||= Thread.new do
-        while true
-          report
-          sleep @period
-        end
+        broadcast sample_metric while sleep @period
       end
     end
 
@@ -39,16 +36,20 @@ module Weatherman
       !@thread.nil?
     end
 
-    def report
-      value = @collector.call
-
-      cloud_watch.put_metric_data @namespace, [{
-        'MetricName' => @name,
-        'Value'      => value,
-        'Dimensions' => @dimensions.map { |k, v| { k.to_s => v } }
-      }]
+    def sample_metric
+      @collector.call
+    end
 
-      value
+    def broadcast(value)
+      begin
+        cloud_watch.put_metric_data @namespace, [{
+          'MetricName' => @name,
+          'Value'      => value,
+          'Dimensions' => @dimensions.map { |k, v| { k.to_s => v } }
+        }]
+      rescue
+        #TODO: Add loggging here, and throughout the gem
+      end
     end
 
   end

data/lib/weatherman/version.rb

@@ -1,3 +1,3 @@
 module Weatherman
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/report_spec.rb

@@ -39,7 +39,7 @@ module Weatherman
 
         report.run
 
-        sleep 2
+        sleep 3
         calls.length.should >= 2
       end
 
@@ -91,36 +91,44 @@ module Weatherman
       end
     end
 
-    describe 'report' do
+    describe 'sample_metric' do
       it 'should collect the metric' do
-        @report.report.should == @metric_value
+        called = false
+        report = Report.new @metric_name do
+          called = true
+          @metric_value
+        end
+
+        result = report.sample_metric
+
+        result.should == @metric_value
+        called.should == true
       end
+    end
 
-      it 'should report the metric' do
+    describe 'broadcast' do
+      it 'should send the metric to CloudWatch' do
         @report.cloud_watch.should_receive(:put_metric_data) do |namespace, metrics|
           namespace.should == @namespace
 
           metrics.length.should == 1
           metric = metrics.first
 
+          metric['Value'].should == @metric_value
           metric['MetricName'].should == @metric_name
         end
 
-        @report.report
+        @report.broadcast @metric_value
       end
 
       it 'should include the instance ID as a default dimension' do
         @report.cloud_watch.should_receive(:put_metric_data) do |namespace, metrics|
-          metrics.length.should == 1
-
-          metric = metrics.first
-          dimensions = metric['Dimensions']
-
+          dimensions = metrics.first['Dimensions']
           dimensions.length.should == 1
           dimensions.first['InstanceId'].should == @instance_id
         end
 
-        @report.report
+        @report.broadcast @metric_value
       end
 
       it 'should include user-defined dimensions plus the instance ID' do
@@ -133,11 +141,7 @@ module Weatherman
         end
 
         report.cloud_watch.should_receive(:put_metric_data) do |namespace, metrics|
-          metrics.length.should == 1
-
-          metric = metrics.first
-          dimensions = metric['Dimensions']
-
+          dimensions = metrics.first['Dimensions']
           dimensions.length.should == 3
 
           user_dimensions['InstanceId'] = @instance_id
@@ -149,7 +153,21 @@ module Weatherman
           end
         end
 
-        report.report
+        report.broadcast @metric_value
+      end
+
+      it "should not kill a running report's thread if there is an error" do
+        report = Report.new @metric_name, :period => 1 do
+          @metric_value
+        end
+
+        report.cloud_watch.should_receive(:put_metric_data).and_raise('some error')
+
+        report.run
+        thread_count = Thread.list.length
+
+        sleep 1.1
+        Thread.list.length.should == thread_count
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: weatherman
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mike Marion