tremolo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7dfce98c352baef3925e7d7fd7852819a14dbb9
-  data.tar.gz: b45fc0011cc43ede092f8c490c82636a3d8a55f8
+  metadata.gz: 32a54e2c56f4c0dc08262bed5ff4b8bf74ad037d
+  data.tar.gz: 5781e18979cf200095c21a4a6abca08473055917
 SHA512:
-  metadata.gz: eb56f8c4590bb28e8225ca6374dcf44b403cc0c03d91d96bc4973678dbedf17b18ede5b9ac2361691fc8f603c60af6c08c0e44a34ac40f7b602559db741fb5c3
-  data.tar.gz: a8631daa572cc518bb8d37fad625f3097048e1946bb82e8e2810ab2e731658db431e90b3b762a4a085f3513b80602e3ff0f8e7619435f61db1a1aeb457c1205a
+  metadata.gz: 59cd090fc5980557f1dec2608bac50d2f9bafae025e811dbee903fb7ab944ef3f9c9375e378023ea98df9bee9799cff0581a1c932ebc95a128478a756bd3a9f5
+  data.tar.gz: d3936ce56375039d9a769fd6cd1b1bf440a2b49eba236a4140c763d000a9d08a47649e68b8b49c7ce8c282ddaf2cf5745292752a4e5fe3ad0bd9c23130978bec

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Tremolo 0.0.4 ##
+
+*   Make Tremolo::Tracker a Celluloid actor so that it can be supervised if desired
+*   Trap a dying Sender in Tracker and set to nil to let it reload
+*   Create Sender on the fly in the Tracker using `new_link`
+*   Add Tremolo.supervised_tracker
+
+    *Tony Pitale*
+
 ## Tremolo 0.0.3 ##
 
 *   Bump celluloid-io requirement to support `UDPSocket.connect`

data/README.md

@@ -16,17 +16,28 @@ Or install it yourself as:
 
     $ gem install tremolo
 
+## Is it any good?
+
+It's getting there, but some of the nuance of the method API and Celluloid's behavior are still being worked out. I'll let you know when it's settled down a bit more.
+
 ## Usage
 
 ```ruby
-# Get a tracker
+# Get an unsupervised tracker
 tracker = Tremolo.tracker('0.0.0.0', 4444)
 
 # options that can be set on the tracker:
 # namespace, a string prefix for all series names on this tracker, joined with '.' (default="")
-
 tracker = Tremolo.tracker('0.0.0.0', 4444, namespace: 'appname')
 
+# tracker is a Celluloid Actor, it will not be GC'd like you would expect so I'd advise against doing it this way.
+
+# Because we're using celluloid, we probably want to create a supervised tracker
+Tremolo.supervised_tracker(:tracker, '0.0.0.0', 4444, namespace: 'appname')
+
+# whenever you want to use this supervised tracker, you can always ask Celluloid
+tracker = Celluloid::Actor[:tracker]
+
 # Write a point to 'series-name' series
 tracker.write_point('series-name', {:value => 121, :otherdata => 998142})
 

data/lib/tremolo/sender.rb

@@ -1,6 +1,5 @@
 module Tremolo
   class Sender
-    # include Celluloid::Logger
     include Celluloid::IO
 
     def initialize(host, port)
@@ -11,8 +10,7 @@ module Tremolo
     def write_points(series_name, data)
       begin
         @socket.send(prepare(series_name, data), 0)
-      rescue Errno::ECONNREFUSED => e
-        # debug "Connection refused. Ignoring."
+      rescue Errno::ECONNREFUSED
         nil
       end
     end

data/lib/tremolo/series.rb

@@ -1,5 +1,7 @@
 module Tremolo
   class Series
+    include Celluloid
+
     attr_reader :tracker, :series_name
 
     def initialize(tracker, series_name)

data/lib/tremolo/tracker.rb

@@ -1,9 +1,13 @@
 module Tremolo
   class Tracker
+    include Celluloid
+
+    trap_exit :sender_died
+
     attr_reader :namespace
 
     def initialize(host, port, options={})
-      @sender = Sender.new(host, port)
+      @host, @port = host, port
 
       @namespace = options[:namespace]
     end
@@ -37,7 +41,16 @@ module Tremolo
     end
 
     def write_points(series_name, data)
-      @sender.write_points([namespace, series_name].compact.join('.'), data)
+      sender.async.write_points([namespace, series_name].compact.join('.'), data)
+    end
+
+    private
+    def sender
+      @sender ||= Sender.new_link(@host, @port)
+    end
+
+    def sender_died(actor, reason=nil)
+      @sender = nil
     end
   end
 end

data/lib/tremolo/version.rb

@@ -1,3 +1,3 @@
 module Tremolo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tremolo.rb

@@ -11,7 +11,18 @@ module Tremolo
       Tracker.new(host, port, options)
     end
   end
+
+  def supervised_tracker(as, host, port, options={})
+    if host.nil? || port.nil?
+      NoopTracker.new(host, port, options)
+    else
+      Tracker.supervise_as as.to_sym, host, port, options
+      Celluloid::Actor[as.to_sym]
+    end
+  end
+
   module_function :tracker
+  module_function :supervised_tracker
 end
 
 require 'tremolo/data_point'

data/spec/lib/tremolo/noop_tracker_spec.rb

@@ -40,4 +40,8 @@ describe Tremolo::NoopTracker do
     expect(returned).to eq('returning a thing')
     expect(socket).to have_received(:send).never
   end
+
+  it 'makes a series for itself', :celluloid => true do
+    expect(tracker.series('timing.accounts')).to be_kind_of(Tremolo::Series)
+  end
 end

data/spec/lib/tremolo/series_spec.rb

@@ -1,49 +1,55 @@
 require 'spec_helper'
 
-describe Tremolo::Tracker do
+describe Tremolo::Series do
   let(:socket) {stub(:connect => true, :send => true)}
-  let(:tracker) {Tremolo.tracker('0.0.0.0', 4444)}
+  let(:tracker) {
+    Tremolo.supervised_tracker(:tracker, '0.0.0.0', 4444)
+  }
   let(:series) {tracker.series('accounts.created')}
 
   before(:each) do
     Celluloid::IO::UDPSocket.stubs(:new).returns(socket)
   end
 
-  it 'sends point data formatted for InfluxDB' do
+  it 'sends point data formatted for InfluxDB', :celluloid => true do
     series.write_point({value: 111, associated_id: 81102})
 
     json = '[{"name":"accounts.created","columns":["associated_id","value"],"points":[[81102,111]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'sends single point with value 1' do
+  it 'sends single point with value 1', :celluloid => true do
     series.increment
 
     json = '[{"name":"accounts.created","columns":["value"],"points":[[1]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'sends single point with value -1' do
+  it 'sends single point with value -1', :celluloid => true do
     series.decrement
 
     json = '[{"name":"accounts.created","columns":["value"],"points":[[-1]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'tracks timing value for ms' do
+  it 'tracks timing value for ms', :celluloid => true do
     series.timing(89)
 
     json = '[{"name":"accounts.created","columns":["value"],"points":[[89]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'tracks block timing value for ms' do
+  it 'tracks block timing value for ms', :celluloid => true do
     # PREVENT Timers in Celluloid from calling Time.now all the time
-    Timers.any_instance.stubs(:wait_interval).returns(nil)
+    Timers.stubs(:wait_interval).returns(nil)
 
     start_at = Time.now
     end_at = start_at + 1.05 # 1013.5 ms, rounds to 1014
@@ -56,6 +62,7 @@ describe Tremolo::Tracker do
 
     json = '[{"name":"accounts.created","columns":["value"],"points":[[1050]]}]'
 
+    sleep 0.1
     expect(returned).to eq('returning another thing')
     expect(socket).to have_received(:send).with(json, 0)
   end

data/spec/lib/tremolo/tracker_spec.rb

@@ -2,47 +2,54 @@ require 'spec_helper'
 
 describe Tremolo::Tracker do
   let(:socket) {stub(:connect => true, :send => true)}
-  let(:tracker) {Tremolo.tracker('0.0.0.0', 4444)}
+  let(:tracker) {
+    Tremolo.supervised_tracker(:tracker, '0.0.0.0', 4444)
+  }
 
   before(:each) do
     Celluloid::IO::UDPSocket.stubs(:new).returns(socket)
   end
 
-  it 'sends point data formatted for InfluxDB' do
+  it 'sends point data formatted for InfluxDB', :celluloid => true do
     tracker.write_point('accounts.created', {value: 111, associated_id: 81102})
 
     json = '[{"name":"accounts.created","columns":["associated_id","value"],"points":[[81102,111]]}]'
 
+
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'sends single point with value 1' do
+  it 'sends single point with value 1', :celluloid => true do
     tracker.increment('accounts.created')
 
     json = '[{"name":"accounts.created","columns":["value"],"points":[[1]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'sends single point with value -1' do
+  it 'sends single point with value -1', :celluloid => true do
     tracker.decrement('accounts.created')
 
     json = '[{"name":"accounts.created","columns":["value"],"points":[[-1]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'tracks timing value for ms' do
+  it 'tracks timing value for ms', :celluloid => true do
     tracker.timing('timing.accounts.created', 89)
 
     json = '[{"name":"timing.accounts.created","columns":["value"],"points":[[89]]}]'
 
+    sleep 0.1
     expect(socket).to have_received(:send).with(json, 0)
   end
 
-  it 'tracks block timing value for ms' do
+  it 'tracks block timing value for ms', :celluloid => true do
     # PREVENT Timers in Celluloid from calling Time.now all the time
-    Timers.any_instance.stubs(:wait_interval).returns(nil)
+    Timers.stubs(:wait_interval).returns(nil)
 
     start_at = Time.now
     end_at = start_at + 1.0135 # 1013.5 ms, rounds to 1014
@@ -55,6 +62,7 @@ describe Tremolo::Tracker do
 
     json = '[{"name":"timing.accounts.created","columns":["value"],"points":[[1014]]}]'
 
+    sleep 0.1
     expect(returned).to eq('returning a thing')
     expect(socket).to have_received(:send).with(json, 0)
   end
@@ -62,11 +70,12 @@ describe Tremolo::Tracker do
   context "with a namespace" do
     let(:tracker) {Tremolo.tracker('0.0.0.0', 4444, namespace: 'alf')}
 
-    it 'tracks timing value for ms' do
+    it 'tracks timing value for ms', :celluloid => true do
       tracker.timing('timing.accounts.created', 14)
 
       json = '[{"name":"alf.timing.accounts.created","columns":["value"],"points":[[14]]}]'
 
+      sleep 0.1
       expect(socket).to have_received(:send).with(json, 0)
     end
   end

data/spec/spec_helper.rb

@@ -6,10 +6,20 @@ require 'bundler/setup'
 require 'rspec'
 require 'mocha/api'
 require 'bourne'
+require 'celluloid/test'
+
+$CELLULOID_DEBUG = false
 
 require File.expand_path('../../lib/tremolo', __FILE__)
 
 RSpec.configure do |config|
   config.mock_with :mocha
   config.order = 'random'
+
+  config.around :celluloid => true do |e|
+    Celluloid.boot
+    e.run
+    Celluloid.shutdown
+    Celluloid::Actor.clear_registry
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tremolo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io