zk 1.0.0 → 1.1.0

data/spec/zk/client_spec.rb

@@ -1,11 +1,23 @@
 require 'spec_helper'
 
 describe ZK::Client::Threaded do
-  include_context 'threaded client connection'
-  it_should_behave_like 'client'
+  context do
+    include_context 'threaded client connection'
+    it_should_behave_like 'client'
+  end
 
   describe :close! do
     describe 'from a threadpool thread' do
+      include_context 'connection opts'
+
+      before do
+        @zk = ZK::Client::Threaded.new(*connection_args).tap { |z| wait_until { z.connected? } }
+      end
+
+      after do
+        @zk.close! unless @zk.closed?
+      end
+
       it %[should do the right thing and not fail] do
         # this is an extra special case where the user obviously hates us
 
@@ -15,7 +27,7 @@ describe ZK::Client::Threaded do
           @zk.close!
         end
 
-        wait_until { @zk.closed? }.should be_true 
+        wait_until(5) { @zk.closed? }.should be_true 
       end
     end
   end

data/spec/zk/election_spec.rb

@@ -1,14 +1,16 @@
 require 'spec_helper'
 
 describe ZK::Election do
+  include_context 'connection opts'
+
   before do
-    ZK.open('localhost:2181') do |cnx| 
+    ZK.open(connection_host) do |cnx| 
       ZK.logger.debug { "REMOVING /_zkelection" }
       cnx.rm_rf('/_zkelection')
     end
 
-    @zk = ZK.new('localhost:2181')
-    @zk2 = ZK.new('localhost:2181')
+    @zk = ZK.new(*connection_args)
+    @zk2 = ZK.new(*connection_args)
     @election_name = '2012'
     @data1 = 'obama'
     @data2 = 'palin'
@@ -18,7 +20,7 @@ describe ZK::Election do
     @zk.close!
     @zk2.close!
 
-    ZK.open('localhost:2181') { |cnx| cnx.rm_rf('/_zkelection') }
+    ZK.open(connection_host) { |cnx| cnx.rm_rf('/_zkelection') }
   end
 
   describe 'Candidate', 'following next_node' do
@@ -146,6 +148,8 @@ describe ZK::Election do
           end
 
           it %[should take over as leader when the current leader goes away] do
+            pending_187("1.8.7's AWESOEM thread scheduler makes this test deadlock")
+
             @obama.zk.close!
             wait_until { @palin_won }
 
@@ -159,10 +163,11 @@ describe ZK::Election do
           end
 
           it %[should remain leader if the original leader comes back] do
+            pending_187("1.8.7's AWESOEM thread scheduler makes this test deadlock")
             @obama.zk.close!
             wait_until { @palin_won }
 
-            ZK.open('localhost:2181') do |zk|
+            ZK.open(*connection_args) do |zk|
               newbama = ZK::Election::Candidate.new(zk, @election_name, :data => @data1)
 
               win_again = false
@@ -186,7 +191,7 @@ describe ZK::Election do
 
   describe :Observer do
     before do
-      @zk3 = ZK.new('localhost:2181')
+      @zk3 = ZK.new(*connection_args)
 
       @zk3.exists?('/_zkelection/2012/leader_ack').should be_false
 
@@ -260,16 +265,9 @@ describe ZK::Election do
         end
       end
 
-      def pending_192(msg)
-        if RUBY_VERSION == '1.9.2' and not defined?(::JRUBY_VERSION)
-          pending(msg) { yield }
-        else
-          yield
-        end
-      end
-
       describe 'leadership transition' do
         before do
+          pending_187("1.8.7's AWESOEM thread scheduler makes this test deadlock")
           @obama.vote!
           wait_until { @obama.leader? }
 

data/spec/zk/locker_spec.rb

@@ -4,11 +4,12 @@ require 'spec_helper'
 # from ZK::Client#locker
 #
 describe 'ZK::Client#locker' do
+  include_context 'connection opts'
 
   before(:each) do
-    @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
-    @zk2 = ZK.new("localhost:#{ZK_TEST_PORT}")
-    @zk3 = ZK.new("localhost:#{ZK_TEST_PORT}")
+    @zk = ZK.new("localhost:#{ZK.test_port}", connection_opts)
+    @zk2 = ZK.new("localhost:#{ZK.test_port}", connection_opts)
+    @zk3 = ZK.new("localhost:#{ZK.test_port}", connection_opts)
     @connections = [@zk, @zk2, @zk3]
     wait_until { @connections.all? { |c| c.connected? } }
     @path_to_lock = "/lock_tester"
@@ -79,7 +80,7 @@ end
 #   describe 'exception' do
 #     before do
 #       @path = '/zk_test'
-#       @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
+#       @zk = ZK.new("localhost:#{ZK.test_port}")
 #       @zk.create(@path) rescue ZK::Exceptions::NodeExists
 #     end
 
@@ -406,9 +407,11 @@ end # shared-exclusive interaction
 
 
 describe ZK::Locker do
-  let(:zk)  { ZK.new("localhost:#{ZK_TEST_PORT}") }
-  let(:zk2) { ZK.new("localhost:#{ZK_TEST_PORT}") }
-  let(:zk3) { ZK.new("localhost:#{ZK_TEST_PORT}") }
+  include_context 'connection opts'
+
+  let(:zk)  { ZK.new("localhost:#{ZK.test_port}", connection_opts) }
+  let(:zk2) { ZK.new("localhost:#{ZK.test_port}", connection_opts) }
+  let(:zk3) { ZK.new("localhost:#{ZK.test_port}", connection_opts) }
 
   let(:connections) { [zk, zk2, zk3] }
 
@@ -430,13 +433,15 @@ describe ZK::Locker do
 end # ZK::Locker
 
 describe "ZK::Locker chrooted" do
+  include_context 'connection opts'
+
   let(:chroot_path) { '/_zk_chroot_' }
 
-  let(:zk)  { ZK.new("localhost:#{ZK_TEST_PORT}#{chroot_path}") }
+  let(:zk)  { ZK.new("localhost:#{ZK.test_port}#{chroot_path}", connection_opts) }
 
   describe 'when the chroot exists' do
-    let(:zk2) { ZK.new("localhost:#{ZK_TEST_PORT}#{chroot_path}") }
-    let(:zk3) { ZK.new("localhost:#{ZK_TEST_PORT}#{chroot_path}") }
+    let(:zk2) { ZK.new("localhost:#{ZK.test_port}#{chroot_path}", connection_opts) }
+    let(:zk3) { ZK.new("localhost:#{ZK.test_port}#{chroot_path}", connection_opts) }
 
     let(:connections) { [zk, zk2, zk3] }
 
@@ -444,7 +449,7 @@ describe "ZK::Locker chrooted" do
     let(:root_lock_path) { "/_zklocking/#{path}" }
 
     before do
-      ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
+      ZK.open("localhost:#{ZK.test_port}") do |zk|
         zk.mkdir_p(chroot_path)
       end
 
@@ -455,7 +460,7 @@ describe "ZK::Locker chrooted" do
       connections.each { |c| c.close! }
       wait_until { !connections.any?(&:connected?) }
 
-      ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
+      ZK.open("localhost:#{ZK.test_port}") do |zk|
         zk.rm_rf(chroot_path)
       end
     end

data/spec/zk/module_spec.rb

@@ -4,17 +4,24 @@ require 'spec_helper'
 
 describe ZK do
   describe :new do
+    include_context 'connection opts'
+
     let(:chroot_path) { '/zktest/path/to/chroot' }
 
+    before do
+      ZK.open(*connection_args) { |z| z.rm_rf('/zktest') }
+    end
+
     after do
       mute_logger do
         @zk.close! if @zk and not @zk.closed?
+        ZK.open(*connection_args) { |z| z.rm_rf('/zktest') }
       end
     end
 
     describe %[with a chrooted connection string and a :chroot => '/path'] do
       it %[should raise an ArgumentError] do
-        lambda { @zk = ZK.new('localhost:2181/zktest', :chroot => '/zktest') }.should raise_error(ArgumentError)
+        lambda { @zk = ZK.new("#{connection_host}/zktest", :chroot => '/zktest') }.should raise_error(ArgumentError)
       end
     end
 
@@ -29,7 +36,7 @@ describe ZK do
     describe %[with a chroot] do
       before do
         mute_logger do
-          @unchroot = ZK.new
+          @unchroot = ZK.new(*connection_args)
         end
       end
 
@@ -57,7 +64,8 @@ describe ZK do
         describe %[as a connection string] do
           describe %[and no explicit option] do
             before do
-              @zk = ZK.new("localhost:2181#{chroot_path}")    # implicit create
+              @zk = ZK.new("#{connection_host}#{chroot_path}")    # implicit create
+              wait_until { @zk.connected? }
             end
 
             it %[should create the chroot path and then return the connection] do
@@ -70,7 +78,7 @@ describe ZK do
 
           describe %[and an explicit :chroot => :create] do
             before do
-              @zk = ZK.new("localhost:2181#{chroot_path}", :chroot => :create)
+              @zk = ZK.new("#{connection_host}#{chroot_path}", :chroot => :create)
             end
 
             it %[should create the chroot path and then return the connection] do
@@ -85,20 +93,20 @@ describe ZK do
             it %[should barf with a ChrootPathDoesNotExistError] do
               lambda do
                 # assign in case of a bug, that way this connection will get torn down
-                @zk = ZK.new("localhost:2181#{chroot_path}", :chroot => :check)
+                @zk = ZK.new("#{connection_host}#{chroot_path}", :chroot => :check)
               end.should raise_error(ZK::Exceptions::ChrootPathDoesNotExistError)
             end
           end
 
           describe %[and :chroot => :do_nothing] do
             it %[should return a connection in a weird state] do
-              @zk = ZK.new("localhost:2181#{chroot_path}", :chroot => :do_nothing)
+              @zk = ZK.new("#{connection_host}#{chroot_path}", :chroot => :do_nothing)
               lambda { @zk.get('/') }.should raise_error(ZK::Exceptions::NoNode)
             end
           end
 
           describe %[and :chroot => '/path'] do
-            before { @zk = ZK.new("localhost:2181", :chroot => chroot_path) }
+            before { @zk = ZK.new(connection_host, :chroot => chroot_path) }
 
             it %[should create the chroot path and then return the connection] do
               @zk.exists?('/').should be_true
@@ -127,7 +135,7 @@ describe ZK do
         describe %[as a connection string] do
           describe %[and no explicit option] do
             before do
-              @zk = ZK.new("localhost:2181#{chroot_path}")    # implicit create
+              @zk = ZK.new("#{connection_host}#{chroot_path}")    # implicit create
             end
 
             it %[should totally work] do
@@ -140,7 +148,7 @@ describe ZK do
 
           describe %[and an explicit :chroot => :create] do
             before do
-              @zk = ZK.new("localhost:2181#{chroot_path}", :chroot => :create)
+              @zk = ZK.new("#{connection_host}#{chroot_path}", :chroot => :create)
             end
 
             it %[should totally work] do
@@ -155,20 +163,20 @@ describe ZK do
             it %[should totally work] do
               lambda do
                 # assign in case of a bug, that way this connection will get torn down
-                @zk = ZK.new("localhost:2181#{chroot_path}", :chroot => :check)
+                @zk = ZK.new("#{connection_host}#{chroot_path}", :chroot => :check)
               end.should_not raise_error
             end
           end
 
           describe %[and :chroot => :do_nothing] do
             it %[should totally work] do
-              @zk = ZK.new("localhost:2181#{chroot_path}", :chroot => :do_nothing)
+              @zk = ZK.new("#{connection_host}#{chroot_path}", :chroot => :do_nothing)
               lambda { @zk.get('/') }.should_not raise_error
             end
           end
 
           describe %[and :chroot => '/path'] do
-            before { @zk = ZK.new("localhost:2181", :chroot => chroot_path) }
+            before { @zk = ZK.new(connection_host, :chroot => chroot_path) }
 
             it %[should totally work] do
               @zk.exists?('/').should be_true

data/spec/zk/mongoid_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 describe ZK::Mongoid::Locking do
+  include_context 'connection opts'
+
   before do
-    ZK::Mongoid::Locking.zk_lock_pool = ZK.new_pool('localhost:2181', :min_clients => 1, :max_clients => 5)
+    ZK::Mongoid::Locking.zk_lock_pool = ZK.new_pool(connection_host, :min_clients => 1, :max_clients => 5)
 
     @doc        = BogusMongoid.new
     @other_doc  = BogusMongoid.new

data/spec/zk/pool_spec.rb

@@ -6,7 +6,7 @@ describe ZK::Pool do
     before do
       report_realtime('opening pool') do
         @pool_size = 2
-        @connection_pool = ZK::Pool::Simple.new("localhost:#{ZK_TEST_PORT}", @pool_size, :watcher => :default)
+        @connection_pool = ZK::Pool::Simple.new("localhost:#{ZK.test_port}", @pool_size, :watcher => :default)
         @connection_pool.should be_open
       end
     end
@@ -27,7 +27,7 @@ describe ZK::Pool do
       end
 
       report_realtime("closing") do
-        ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
+        ZK.open("localhost:#{ZK.test_port}") do |zk|
           zk.delete('/test_pool') rescue ZK::Exceptions::NoNode
         end
       end
@@ -197,7 +197,7 @@ describe ZK::Pool do
     before do
       @min_clients = 1
       @max_clients = 2
-      @connection_pool = ZK::Pool::Bounded.new("localhost:#{ZK_TEST_PORT}", :min_clients => @min_clients, :max_clients => @max_clients, :timeout => @timeout)
+      @connection_pool = ZK::Pool::Bounded.new("localhost:#{ZK.test_port}", :min_clients => @min_clients, :max_clients => @max_clients, :timeout => @timeout)
       @connection_pool.should be_open
       wait_until(2) { @connection_pool.available_size > 0 }
     end

data/spec/zookeeper_spec.rb

@@ -39,7 +39,7 @@ shared_examples_for 'ZK basic' do
       wait_until(2) { !@zk.connected? }
       @zk.should_not be_connected
 
-      @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
+      @zk = ZK.new(*connection_args)
       wait_until{ @zk.connected? }
       @zk.exists?("#{@base_path}/test").should be_false
     end
@@ -50,7 +50,7 @@ shared_examples_for 'ZK basic' do
       @zk.exists?(created).should_not be_nil
       @zk.close!
 
-      @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
+      @zk = ZK.new(*connection_args)
       wait_until{ @zk.connected? }
       @zk.exists?(created).should be_false
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper
@@ -72,6 +72,8 @@ files:
 - lib/zk/event.rb
 - lib/zk/event_handler.rb
 - lib/zk/event_handler_subscription.rb
+- lib/zk/event_handler_subscription/actor.rb
+- lib/zk/event_handler_subscription/base.rb
 - lib/zk/exceptions.rb
 - lib/zk/extensions.rb
 - lib/zk/find.rb
@@ -81,8 +83,10 @@ files:
 - lib/zk/mongoid.rb
 - lib/zk/pool.rb
 - lib/zk/stat.rb
+- lib/zk/threaded_callback.rb
 - lib/zk/threadpool.rb
 - lib/zk/version.rb
+- spec/event_catcher_spec.rb
 - spec/informal/close-in-event-thread.rb
 - spec/informal/lock_with_dead_session.rb
 - spec/informal/what-the-fork.rb
@@ -91,11 +95,13 @@ files:
 - spec/shared/client_contexts.rb
 - spec/shared/client_examples.rb
 - spec/spec_helper.rb
+- spec/support/00_test_port_attr.rb
 - spec/support/bogus_mongoid.rb
 - spec/support/event_catcher.rb
 - spec/support/exist_matcher.rb
 - spec/support/logging.rb
 - spec/support/logging_progress_bar_formatter.rb
+- spec/support/pendings.rb
 - spec/support/queuey_thread.rb
 - spec/support/special_happy_funtime_error.rb
 - spec/support/wait_watchers.rb
@@ -146,6 +152,7 @@ signing_key:
 specification_version: 3
 summary: A high-level wrapper around the zookeeper driver
 test_files: 
+- spec/event_catcher_spec.rb
 - spec/informal/close-in-event-thread.rb
 - spec/informal/lock_with_dead_session.rb
 - spec/informal/what-the-fork.rb
@@ -154,11 +161,13 @@ test_files:
 - spec/shared/client_contexts.rb
 - spec/shared/client_examples.rb
 - spec/spec_helper.rb
+- spec/support/00_test_port_attr.rb
 - spec/support/bogus_mongoid.rb
 - spec/support/event_catcher.rb
 - spec/support/exist_matcher.rb
 - spec/support/logging.rb
 - spec/support/logging_progress_bar_formatter.rb
+- spec/support/pendings.rb
 - spec/support/queuey_thread.rb
 - spec/support/special_happy_funtime_error.rb
 - spec/support/wait_watchers.rb