metriks 0.9.0 → 0.9.1

data/lib/metriks.rb

@@ -1,6 +1,6 @@
 
 module Metriks
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 
   def self.get(name)
     Metriks::Registry.default.get(name)
@@ -24,4 +24,4 @@ module Metriks
 end
 
 require 'metriks/registry'
-require 'metriks/reporter/proc_title'
+require 'metriks/reporter/proc_title'

data/lib/metriks/reporter/graphite.rb

@@ -2,9 +2,11 @@
 module Metriks::Reporter
   class Graphite
     def initialize(host, port, options = {})
-      @host      = host
-      @port      = port
-      @prefix    = options[:prefix]
+      @host = host
+      @port = port
+
+      @prefix = options[:prefix]
+
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
       @on_errror = options[:on_error] || proc { |ex| }
@@ -36,6 +38,11 @@ module Metriks::Reporter
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     def write
       @registry.each do |name, metric|
         case metric

data/lib/metriks/reporter/librato_metrics.rb

@@ -19,13 +19,15 @@ module Metriks::Reporter
 
 
     def initialize(email, token, options = {})
-      @email     = email
-      @token     = token
-      @prefix    = options[:prefix]
+      @email = email
+      @token = token
+
+      @prefix = options[:prefix]
+      @source = options[:source]
+
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
       @on_errror = options[:on_error] || proc { |ex| }
-      @source    = options[:source]
     end
 
     def start
@@ -49,6 +51,11 @@ module Metriks::Reporter
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     def write
       gauges = []
       @registry.each do |name, metric|

data/lib/metriks/reporter/logger.rb

@@ -3,12 +3,13 @@ require 'logger'
 module Metriks::Reporter
   class Logger
     def initialize(options = {})
-      @registry  = options[:registry]  || Metriks::Registry.default
       @logger    = options[:logger]    || ::Logger.new(STDOUT)
       @log_level = options[:log_level] || ::Logger::INFO
       @prefix    = options[:prefix]    || 'metriks:'
-      @interval  = options[:interval]  || 60
-      @on_errror = options[:on_error]  || proc { |ex| }
+
+      @registry  = options[:registry] || Metriks::Registry.default
+      @interval  = options[:interval] || 60
+      @on_errror = options[:on_error] || proc { |ex| }
     end
 
     def start
@@ -32,7 +33,20 @@ module Metriks::Reporter
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
+    def flush
+      if !@last_write || @last_write.min != Time.now.min
+        write
+      end
+    end
+
     def write
+      @last_write = Time.now
+
       @registry.each do |name, metric|
         case metric
         when Metriks::Meter

data/lib/metriks/reporter/proc_title.rb

@@ -1,11 +1,12 @@
 module Metriks::Reporter
   class ProcTitle
     def initialize(options = {})
+      @rounding = options[:rounding] || 1
+      @prefix   = options[:prefix]   || $0.dup
+
       @interval  = options[:interval] || 5
-      @rounding  = options[:rounding] || 1
       @on_errror = options[:on_error] || proc { |ex| }
 
-      @prefix   = $0.dup
       @metrics  = []
     end
 
@@ -40,6 +41,11 @@ module Metriks::Reporter
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     protected
     def generate_title
       @metrics.collect do |name, suffix, block|

data/metriks.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks'
-  s.version           = '0.9.0'
-  s.date              = '2012-03-03'
+  s.version           = '0.9.1'
+  s.date              = '2012-03-06'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/test/logger_reporter_test.rb

@@ -10,6 +10,11 @@ class LoggerReporterTest < Test::Unit::TestCase
     @registry = Metriks::Registry.new
 
     @reporter = Metriks::Reporter::Logger.new(:registry => @registry, :logger => @logger)
+
+    @registry.meter('meter.testing').mark
+    @registry.counter('counter.testing').increment
+    @registry.timer('timer.testing').update(1.5)
+    @registry.utilization_timer('utilization_timer.testing').update(1.5)
   end
 
   def teardown
@@ -18,14 +23,16 @@ class LoggerReporterTest < Test::Unit::TestCase
   end
 
   def test_write
-    @registry.meter('meter.testing').mark
-    @registry.counter('counter.testing').increment
-    @registry.timer('timer.testing').update(1.5)
-    @registry.utilization_timer('utilization_timer.testing').update(1.5)
-
     @reporter.write
 
     assert_match /time=\d/, @stringio.string
     assert_match /median=\d/, @stringio.string
   end
+
+  def test_flush
+    @reporter.flush
+
+    assert_match /time=\d/, @stringio.string
+    assert_match /median=\d/, @stringio.string
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-03 00:00:00 -08:00
+date: 2012-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency