protobuf 2.8.0.beta8-java → 2.8.0.beta9-java

data/lib/protobuf/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'protobuf/version'
+require 'protobuf/lifecycle'
 require 'protobuf/logger'
 require 'protobuf/rpc/servers/evented_runner'
 require 'protobuf/rpc/servers/socket_runner'
@@ -87,7 +88,7 @@ module Protobuf
       def configure_logger
         debug_say('Configuring logger')
         ::Protobuf::Logger.configure({ :file => options.log || STDOUT,
-                                       :level => options.debug? ? ::Logger::DEBUG : options.level })
+                                     :level => options.debug? ? ::Logger::DEBUG : options.level })
 
         # Debug output the server options to the log file.
         ::Protobuf::Logger.debug { 'Debugging options:' }
@@ -242,9 +243,10 @@ module Protobuf
           ::Protobuf::Logger.info {
             "pid #{::Process.pid} -- #{@runner_mode} RPC Server listening at #{options.host}:#{options.port}"
           }
+
+          ::Protobuf::Lifecycle.trigger( "after_server_bind" )
         end
       end
     end
   end
 end
-

data/lib/protobuf/lifecycle.rb

@@ -0,0 +1,34 @@
+module Protobuf
+  class Lifecycle
+
+    def self.register( event_name, &blk )
+      raise "Lifecycle register must have a block" unless block_given?
+      event_name = normalized_event_name( event_name )
+
+      lifecycle_events[ event_name ] ||= []
+      lifecycle_events[ event_name ] << blk
+    end
+
+    def self.trigger( event_name )
+      event_name = normalized_event_name( event_name )
+
+      if lifecycle_events.has_key?( event_name )
+        lifecycle_events[ event_name ].each do |block|
+          block.call
+        end
+      end
+    end
+    
+    def self.normalized_event_name( event_name )
+      return "#{event_name}".downcase
+    end
+
+    class << self
+      attr_accessor :lifecycle_events
+
+      alias_method :on, :register
+    end
+
+    @lifecycle_events ||= {}
+  end
+end

data/lib/protobuf/rpc/servers/zmq/server.rb

@@ -167,8 +167,10 @@ module Protobuf
 
           start_broker unless brokerless?
           start_missing_workers
+
+          yield if block_given? # runs on startup
           wait_for_shutdown_signal
-          broadcast_flatline if broadcast_beacons?
+          broadcast_flatline if broadcast_beacons? 
           Thread.pass until reap_dead_workers.empty?
           @broker.join unless brokerless?
         ensure

data/lib/protobuf/rpc/servers/zmq_runner.rb

@@ -20,8 +20,9 @@ module Protobuf
       def run
         @server = ::Protobuf::Rpc::Zmq::Server.new(@options)
         register_signals
-        yield if block_given?
-        @server.run
+        @server.run do 
+          yield if block_given?
+        end
       end
 
       def running?

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.8.0.beta8'
+  VERSION = '2.8.0.beta9'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/cli_spec.rb

@@ -7,9 +7,23 @@ describe ::Protobuf::CLI do
     File.expand_path('../../../support/test_app_file.rb', __FILE__)
   end
 
-  let(:sock_runner) { double "SocketRunner", run: nil, register_signals: nil }
-  let(:zmq_runner) { double "ZmqRunner", run: nil, register_signals: nil }
-  let(:evented_runner) { double "EventedRunner", run: nil, register_signals: nil }
+  let(:sock_runner) { 
+    runner = double("SocketRunner", :register_signals => nil)
+    runner.stub(:run) { ::Protobuf::Lifecycle.trigger( "after_server_bind" ) }
+    runner
+  }
+
+  let(:zmq_runner) { 
+    runner = double "ZmqRunner", register_signals: nil
+    runner.stub(:run) { ::Protobuf::Lifecycle.trigger( "after_server_bind" ) }
+    runner
+  }
+
+  let(:evented_runner) { 
+    runner = double "EventedRunner", register_signals: nil
+    runner.stub(:run) { ::Protobuf::Lifecycle.trigger( "after_server_bind" ) }
+    runner
+  }
 
   before(:each) do
     ::Protobuf::Rpc::SocketRunner.stub(:new) { sock_runner }

data/spec/lib/protobuf/lifecycle_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'protobuf/lifecycle'
+
+describe ::Protobuf::Lifecycle do
+  subject { described_class }
+
+  before(:each) do
+    described_class.lifecycle_events = {}
+  end
+
+  it "registers a string as the event_name" do
+    expect {
+      subject.register("something") do
+        true
+      end
+    }.to change { subject.lifecycle_events.size }.by(1)
+  end
+
+  it "registers a symbol as the event_name" do
+    expect {
+      subject.register("something") do
+        true
+      end
+    }.to change { subject.lifecycle_events.size }.by(1)
+  end
+
+  it "only registers blocks for event callbacks" do
+    expect {
+      subject.register("something")
+    }.to raise_error( /block/ ) 
+  end
+
+  it "calls the registered block when triggered" do
+    this = nil
+    subject.register("this") do
+      this = "not nil"
+    end
+
+    subject.trigger("this")
+    this.should_not be_nil
+    this.should eq("not nil")
+  end
+
+  it "calls multiple registered blocks when triggered" do
+    this = nil
+    that = nil
+
+    subject.register("this") do
+      this = "not nil"
+    end
+
+    subject.register("this") do
+      that = "not nil"
+    end
+
+    subject.trigger("this")
+    this.should_not be_nil
+    this.should eq("not nil")
+    that.should_not be_nil
+    that.should eq("not nil")
+  end
+
+  context "normalized event names" do
+    specify { subject.normalized_event_name(:derp).should eq("derp") }
+    specify { subject.normalized_event_name(:Derp).should eq("derp") }
+    specify { subject.normalized_event_name("DERP").should eq("derp") }
+    specify { subject.normalized_event_name("derp").should eq("derp") }
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 2.8.0.beta8
+  version: 2.8.0.beta9
 platform: java
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -391,6 +391,7 @@ files:
 - lib/protobuf/field/uint32_field.rb
 - lib/protobuf/field/uint64_field.rb
 - lib/protobuf/field/varint_field.rb
+- lib/protobuf/lifecycle.rb
 - lib/protobuf/logger.rb
 - lib/protobuf/message.rb
 - lib/protobuf/message/decoder.rb
@@ -441,6 +442,7 @@ files:
 - spec/lib/protobuf/enum_spec.rb
 - spec/lib/protobuf/enum_value_spec.rb
 - spec/lib/protobuf/field/int32_field_spec.rb
+- spec/lib/protobuf/lifecycle_spec.rb
 - spec/lib/protobuf/logger_spec.rb
 - spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb