observed-gauge 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWE3MTcxMTExMDI3YmFhZTc5MjMyOTQzZDBjMmM0ZDdhOGJmMDIwZA==
-  data.tar.gz: !binary |-
-    OWIxMTJhOTBhMTgyNGQzYmVkMzdkM2M1Y2RhNzU0ZTk4MmZhOWM0MA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWYyNDJmNjFmOGFiY2NiZWM2YmE4NWM1YWM2Mjg4Yzg2MjFjZTlhNmQzN2My
-    MDIwYzIwYmYzZDI3N2U5NjNiYzczNGM5ZjkzNjg0NDdjYWM2NTAzNmEwODMx
-    OWVhZWNkNTI1NGY0MDYxNWMxYWU3ZGUyMzRjODBkNmNkNGQzZjg=
-  data.tar.gz: !binary |-
-    MGM5MzYxYjg5NDYzYWEyOGVjNzExYjA1OGE2N2RjNmNhNzcyYmE2YWMwMDEx
-    MDNjNGM2NDhjNDU4OGY4MDM2YzBkYjg2OWRhY2E3ZTA2M2FmODQxNGMzMDY3
-    NDVkNzUzNjI5YTczNGY0OTZkZGRmOThjN2RkY2VkZWY1ZWQ2ODE=
+SHA1:
+  metadata.gz: 9d6e48aeff83af1c9c8db48ca47ad0bd004a66f1
+  data.tar.gz: 1fd5740b7b989613086e7bceef0193dc02f810fb
+SHA512:
+  metadata.gz: 70f6c417546a34c6241d6ee0e0172e655024b8b9b35bd5b9bbc00300ab1e2773fa7fce7fae1afc5fa916325f100c1409db44951694908c224dc6ba0df104e923
+  data.tar.gz: 8f0a517c62804f6c6e360a3f6c76cf40173e195d4771679643d924ad3d3d3bf962bb03a8b002403bd1908a3a1b892267f2c8863ce9556807b2cd32749c8040d0

data/README.md

@@ -16,6 +16,11 @@ Or install it yourself as:
 
     $ gem install observed-gauge
 
+You might also need to install rrdtool:
+
+    (CentOS or Ubuntu)
+    $ sudo apt-get install librrd-dev
+
 ## Usage
 
 TODO: Write usage instructions here

data/lib/observed/gauge.rb

@@ -1,4 +1,5 @@
-require 'observed/reporter'
+require 'observed/logging'
+require 'observed/translator'
 require 'observed/reporter/regexp_matching'
 require 'observed/gauge/version'
 require 'logger'
@@ -6,39 +7,40 @@ require 'rrd'
 
 module Observed
   module Plugins
-    class Gauge < Observed::Reporter
+    class Gauge < Observed::Translator
 
       plugin_name 'gauge'
 
+      include Observed::Logging
       include Observed::Reporter::RegexpMatching
 
-      attribute :tag
       attribute :key_path
       attribute :coerce, default: ->(data){ data }
       attribute :rrd
       attribute :step
       attribute :period
 
-      def report(tag, time, data)
+      def translate(data, options)
+        time = options[:time] || Time.now
         rewrote = update_value_for_key_path(data, key_path) do |v|
           sample = coerce.call(v)
           average = get_cdp_updated_with(time, sample)
           average
         end
         unless fetch_value_for_key_path(rewrote, key_path).nan?
-          system.report(self.tag, rewrote)
+          rewrote
         end
       end
 
       def prepare_rrd(args)
         start = args[:start]
-        logger.debug "Creating a rrd file named '#{args[:rrd]}' with options {:start => #{start}}"
+        log_debug "Creating a rrd file named '#{args[:rrd]}' with options {:start => #{start}}"
         result = RRD::Builder.new(args[:rrd], start: start, step: step.seconds).tap do |builder|
           builder.datasource data_source, :type => :gauge, :heartbeat => period.seconds, :min => 0, :max => :unlimited
           builder.archive :average, :every => period.seconds, :during => period.seconds
           builder.save
         end
-        logger.debug "Builder#save returned: #{result.inspect}"
+        log_debug "Builder#save returned: #{result.inspect}"
       end
 
       private
@@ -101,17 +103,13 @@ module Observed
           prepare_rrd(rrd: rrd_path, start: t)
         end
 
-        logger.debug "Updating the data source '#{data_source}' with the value #{value} with timestamp #{t}"
+        log_debug "Updating the data source '#{data_source}' with the value #{value} with timestamp #{t}"
         rrd.update t, value
 
-        logger.debug rrd.fetch!(:average)[-2..-1]
+        log_debug rrd.fetch!(:average)[-2..-1]
 
         rrd.fetch(:average)[-2..-1].first.last
       end
-
-      def logger
-        @logger ||= Logger.new(STDOUT)
-      end
     end
   end
 end

data/lib/observed/gauge/version.rb

@@ -1,5 +1,5 @@
 module Observed
   module Gauge
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/observed-gauge.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'observed', '~> 0.1.0'
+  spec.add_dependency 'observed', '~> 0.2'
   spec.add_dependency 'rrd-ffi', '~> 0.2.14'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/spec/gauge_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 require 'observed/gauge'
+require 'observed/system'
 
 shared_examples_for 'the observed-gauge plugin' do
 
@@ -20,14 +21,13 @@ shared_examples_for 'the observed-gauge plugin' do
 
   it 'reports data with averaged values' do
     subject.prepare_rrd(start: t - 120, rrd: rrd)
-    system.expects(:report).with(tag, expected_data.freeze).once
-    expect { subject.report('test.foo', t - 120, data) }.to_not raise_error
-    expect { subject.report('test.foo', t - 60, data) }.to_not raise_error
-    expect { subject.report('test.foo', t, data) }.to_not raise_error
+    expect(subject.translate(data, {tag: 'test.foo', time: t - 120})).to be_nil
+    expect(subject.translate(data, {tag: 'test.foo', time: t - 60})).to be_nil
+    expect(subject.translate(data, {tag: 'test.foo', time: t})).to eq(expected_data)
   end
 
   it 'creates rrd files automatically on first report' do
-    expect { subject.report('test.foo', t, data) }.to_not raise_error
+    expect { subject.translate(data, {tag: 'test.foo', time: t}) }.to_not raise_error
 
     expect { File.exist? rrd }.to be_true
   end
@@ -64,7 +64,7 @@ describe Observed::Plugins::Gauge do
     }
 
     let(:system) {
-      sys = mock('system')
+      sys = Observed::System.new
 
       sys.stubs(:now).returns(t)
 
@@ -117,7 +117,7 @@ describe Observed::Plugins::Gauge do
       }
 
       it 'raise an error' do
-        expect { subject.report('test.foo', t, data) }.to raise_error(/Unexpected type of key_path met/)
+        expect { subject.translate(data, {tag: 'test.foo', time: t}) }.to raise_error(/Unexpected type of key_path met/)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: observed-gauge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - KUOKA Yusuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: observed
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rrd-ffi
   requirement: !ruby/object:Gem::Requirement
@@ -56,70 +56,70 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Gauge plugin for Observed
@@ -149,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A plugin to consolidate outputs from other Observed output plugins by averaging