zookeeper 0.9.4-java → 1.0.0.beta.1-java

data/spec/shared/connection_examples.rb

@@ -34,7 +34,7 @@ shared_examples_for "connection" do
 
       it %[should return a stat] do
         @rv[:stat].should_not be_nil
-        @rv[:stat].should be_kind_of(ZookeeperStat::Stat)
+        @rv[:stat].should be_kind_of(Zookeeper::Stat)
       end
     end
 
@@ -43,7 +43,7 @@ shared_examples_for "connection" do
 
       before do
         @event = nil
-        @watcher = Zookeeper::WatcherCallback.new
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
 
         @rv = zk.get(:path => path, :watcher => @watcher, :watcher_context => path) 
       end
@@ -67,7 +67,7 @@ shared_examples_for "connection" do
 
     describe :async do
       before do
-        @cb = Zookeeper::DataCallback.new
+        @cb = Zookeeper::Callbacks::DataCallback.new
 
         @rv = zk.get(:path => path, :callback => @cb, :callback_context => path)
         wait_until(1.0) { @cb.completed? }
@@ -82,7 +82,7 @@ shared_examples_for "connection" do
 
       it %[should have the stat object in the callback] do
         @cb.stat.should_not be_nil
-        @cb.stat.should be_kind_of(ZookeeperStat::Stat)
+        @cb.stat.should be_kind_of(Zookeeper::Stat)
       end
 
       it %[should have the data] do
@@ -94,8 +94,8 @@ shared_examples_for "connection" do
       it_should_behave_like "all success return values"
 
       before do
-        @cb = Zookeeper::DataCallback.new
-        @watcher = Zookeeper::WatcherCallback.new
+        @cb = Zookeeper::Callbacks::DataCallback.new
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
 
         @rv = zk.get(:path => path, :callback => @cb, :callback_context => path, :watcher => @watcher, :watcher_context => path)
         wait_until(1.0) { @cb.completed? }
@@ -104,7 +104,7 @@ shared_examples_for "connection" do
 
       it %[should have the stat object in the callback] do
         @cb.stat.should_not be_nil
-        @cb.stat.should be_kind_of(ZookeeperStat::Stat)
+        @cb.stat.should be_kind_of(Zookeeper::Stat)
       end
 
       it %[should have the data] do
@@ -129,7 +129,7 @@ shared_examples_for "connection" do
 
     describe 'bad arguments' do
       it %[should barf with a BadArguments error] do
-        lambda { zk.get(:bad_arg => 'what!?') }.should raise_error(ZookeeperExceptions::ZookeeperException::BadArguments)
+        lambda { zk.get(:bad_arg => 'what!?') }.should raise_error(Zookeeper::Exceptions::BadArguments)
       end
     end
   end   # get
@@ -150,7 +150,7 @@ shared_examples_for "connection" do
 
         it %[should return the new stat] do
           @rv[:stat].should_not be_nil
-          @rv[:stat].should be_kind_of(ZookeeperStat::Stat)
+          @rv[:stat].should be_kind_of(Zookeeper::Stat)
           @rv[:stat].version.should > @stat.version
         end
       end
@@ -164,7 +164,7 @@ shared_examples_for "connection" do
 
         it %[should return the new stat] do
           @rv[:stat].should_not be_nil
-          @rv[:stat].should be_kind_of(ZookeeperStat::Stat)
+          @rv[:stat].should be_kind_of(Zookeeper::Stat)
           @rv[:stat].version.should > @stat.version
         end
       end
@@ -190,14 +190,14 @@ shared_examples_for "connection" do
         it %[should barf if the data size is too large], :input_size => true do
           large_data = '0' * (1024 ** 2)
 
-          lambda { zk.set(:path => path, :data => large_data) }.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+          lambda { zk.set(:path => path, :data => large_data) }.should raise_error(Zookeeper::Exceptions::DataTooLargeException)
         end
       end
     end   # sync
 
     describe :async do
       before do
-        @cb = Zookeeper::StatCallback.new
+        @cb = Zookeeper::Callbacks::StatCallback.new
       end
 
       describe 'without version' do
@@ -264,7 +264,7 @@ shared_examples_for "connection" do
         it %[should barf if the data size is too large], :input_size => true do
           large_data = '0' * (1024 ** 2)
 
-          lambda { zk.set(:path => path, :data => large_data, :callback => @cb, :callback_context => path) }.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+          lambda { zk.set(:path => path, :data => large_data, :callback => @cb, :callback_context => path) }.should raise_error(Zookeeper::Exceptions::DataTooLargeException)
         end
       end
 
@@ -303,7 +303,7 @@ shared_examples_for "connection" do
 
       it %[should have a stat object whose num_children is 3] do
         @rv[:stat].should_not be_nil
-        @rv[:stat].should be_kind_of(ZookeeperStat::Stat)
+        @rv[:stat].should be_kind_of(Zookeeper::Stat)
         @rv[:stat].num_children.should == 3
       end
     end
@@ -314,7 +314,7 @@ shared_examples_for "connection" do
       before do
         @addtl_child = 'child3'
 
-        @watcher = Zookeeper::WatcherCallback.new
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
 
         @rv = zk.get_children(:path => path, :watcher => @watcher, :watcher_context => path)
       end
@@ -331,7 +331,7 @@ shared_examples_for "connection" do
 
       it %[should have a stat object whose num_children is 3] do
         @rv[:stat].should_not be_nil
-        @rv[:stat].should be_kind_of(ZookeeperStat::Stat)
+        @rv[:stat].should be_kind_of(Zookeeper::Stat)
         @rv[:stat].num_children.should == 3
       end
 
@@ -353,7 +353,7 @@ shared_examples_for "connection" do
       it_should_behave_like "all success return values"
 
       before do
-        @cb = ZookeeperCallbacks::StringsCallback.new
+        @cb = Zookeeper::Callbacks::StringsCallback.new
         @rv = zk.get_children(:path => path, :callback => @cb, :callback_context => path)
 
         wait_until { @cb.completed? }
@@ -372,7 +372,7 @@ shared_examples_for "connection" do
 
       it %[should have a stat object whose num_children is 3] do
         @cb.stat.should_not be_nil
-        @cb.stat.should be_kind_of(ZookeeperStat::Stat)
+        @cb.stat.should be_kind_of(Zookeeper::Stat)
         @cb.stat.num_children.should == 3
       end
     end
@@ -383,8 +383,8 @@ shared_examples_for "connection" do
       before do
         @addtl_child = 'child3'
 
-        @watcher = Zookeeper::WatcherCallback.new
-        @cb = ZookeeperCallbacks::StringsCallback.new
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
+        @cb = Zookeeper::Callbacks::StringsCallback.new
 
         @rv = zk.get_children(:path => path, :watcher => @watcher, :watcher_context => path, :callback => @cb, :callback_context => path)
         wait_until { @cb.completed? }
@@ -407,7 +407,7 @@ shared_examples_for "connection" do
 
       it %[should have a stat object whose num_children is 3] do
         @cb.stat.should_not be_nil
-        @cb.stat.should be_kind_of(ZookeeperStat::Stat)
+        @cb.stat.should be_kind_of(Zookeeper::Stat)
         @cb.stat.num_children.should == 3
       end
 
@@ -445,7 +445,7 @@ shared_examples_for "connection" do
       it_should_behave_like "all success return values"
 
       before do
-        @watcher = Zookeeper::WatcherCallback.new
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
 
         @rv = zk.stat(:path => path, :watcher => @watcher, :watcher_context => path)
       end
@@ -472,7 +472,7 @@ shared_examples_for "connection" do
       it_should_behave_like "all success return values"
 
       before do
-        @cb = ZookeeperCallbacks::StatCallback.new
+        @cb = Zookeeper::Callbacks::StatCallback.new
         @rv = zk.stat(:path => path, :callback => @cb, :callback_context => path)
 
         wait_until { @cb.completed? }
@@ -494,9 +494,9 @@ shared_examples_for "connection" do
       before do
         @addtl_child = 'child3'
 
-        @watcher = Zookeeper::WatcherCallback.new
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
 
-        @cb = ZookeeperCallbacks::StatCallback.new
+        @cb = Zookeeper::Callbacks::StatCallback.new
         @rv = zk.stat(:path => path, :callback => @cb, :callback_context => path, :watcher => @watcher, :watcher_context => path)
 
         wait_until { @cb.completed? }
@@ -541,7 +541,7 @@ shared_examples_for "connection" do
         it %[should barf if the data size is too large], :input_size => true do
           large_data = '0' * (1024 ** 2)
 
-          lambda { zk.create(:path => path, :data => large_data) }.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+          lambda { zk.create(:path => path, :data => large_data) }.should raise_error(Zookeeper::Exceptions::DataTooLargeException)
         end
       end
 
@@ -642,7 +642,7 @@ shared_examples_for "connection" do
 
     describe :async do
       before do
-        @cb = ZookeeperCallbacks::StringCallback.new
+        @cb = Zookeeper::Callbacks::StringCallback.new
       end
 
       describe :default_flags do
@@ -676,7 +676,7 @@ shared_examples_for "connection" do
 
           lambda do
             zk.create(:path => path, :data => large_data, :callback => @cb, :callback_context => path)
-          end.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+          end.should raise_error(Zookeeper::Exceptions::DataTooLargeException)
         end
       end
 
@@ -821,7 +821,7 @@ shared_examples_for "connection" do
 
     describe :async do
       before do
-        @cb = ZookeeperCallbacks::VoidCallback.new
+        @cb = Zookeeper::Callbacks::VoidCallback.new
       end
 
       describe 'without version' do
@@ -886,7 +886,7 @@ shared_examples_for "connection" do
       end
 
       it %[should return a stat for the path] do
-        @rv[:stat].should be_kind_of(ZookeeperStat::Stat)
+        @rv[:stat].should be_kind_of(Zookeeper::Stat)
       end
 
       it %[should return the acls] do
@@ -906,7 +906,7 @@ shared_examples_for "connection" do
       it_should_behave_like "all success return values"
 
       before do
-        @cb = Zookeeper::ACLCallback.new
+        @cb = Zookeeper::Callbacks::ACLCallback.new
         @rv = zk.get_acl(:path => path, :callback => @cb, :callback_context => path)
 
         wait_until(2) { @cb.completed? }
@@ -914,7 +914,7 @@ shared_examples_for "connection" do
       end
 
       it %[should return a stat for the path] do
-        @cb.stat.should be_kind_of(ZookeeperStat::Stat)
+        @cb.stat.should be_kind_of(Zookeeper::Stat)
       end
 
       it %[should return the acls] do
@@ -922,7 +922,7 @@ shared_examples_for "connection" do
         acls.should be_kind_of(Array)
 
         acl = acls.first
-        acl.should be_kind_of(ZookeeperACLs::ACL)
+        acl.should be_kind_of(Zookeeper::ACLs::ACL)
 
         acl.perms.should == Zookeeper::ZOO_PERM_ALL
 
@@ -935,7 +935,7 @@ shared_examples_for "connection" do
   describe :set_acl do
     before do
       @perms = 5
-      @new_acl = [ZookeeperACLs::ACL.new(:perms => @perms, :id => ZookeeperACLs::ZOO_ANYONE_ID_UNSAFE)]
+      @new_acl = [Zookeeper::ACLs::ACL.new(:perms => @perms, :id => Zookeeper::Constants::ZOO_ANYONE_ID_UNSAFE)]
       pending("No idea how to set ACLs")
     end
 
@@ -950,7 +950,7 @@ shared_examples_for "connection" do
 
   describe :session_id do
     it %[should return the session_id as a Fixnum] do
-      zk.session_id.should be_kind_of(Fixnum)
+      zk.session_id.should be_kind_of(Integer)
     end
   end
 
@@ -965,7 +965,7 @@ shared_examples_for "connection" do
       it_should_behave_like "all success return values"
 
       before do
-        @cb = Zookeeper::StringCallback.new
+        @cb = Zookeeper::Callbacks::StringCallback.new
         @rv = zk.sync(:path => path, :callback => @cb)
 
         wait_until(2) { @cb.completed }
@@ -975,7 +975,7 @@ shared_examples_for "connection" do
 
     describe :errors do
       it %[should barf with BadArguments if :callback is not given] do
-        lambda { zk.sync(:path => path) }.should raise_error(ZookeeperExceptions::ZookeeperException::BadArguments)
+        lambda { zk.sync(:path => path) }.should raise_error(Zookeeper::Exceptions::BadArguments)
       end
     end
   end
@@ -1014,5 +1014,20 @@ shared_examples_for "connection" do
       end
     end
   end
+
+  unless defined?(::JRUBY_VERSION)
+    describe 'fork protection' do
+      it %[should raise an InheritedConnectionError if the current Process.pid is different from the one that created the client] do
+        pid = Process.pid
+        begin
+          Process.stub(:pid => -1)
+          lambda { zk.stat(:path => path) }.should raise_error(Zookeeper::Exceptions::InheritedConnectionError)
+        ensure
+          # ensure we reset this, only want it to fail during the test
+          Process.stub(:pid => pid)
+        end
+      end
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -4,9 +4,13 @@ $LOAD_PATH.uniq!
 
 require 'rubygems'
 
-gem 'flexmock', '~> 0.8.11'
+release_ops_path = File.expand_path('../../releaseops/lib', __FILE__)
+
+if File.exists?(release_ops_path)
+  require File.join(release_ops_path, 'releaseops')
+  ReleaseOps::SimpleCov.maybe_start
+end
 
-require 'flexmock'
 require 'zookeeper'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].sort.each { |f| require(f) }
@@ -26,94 +30,28 @@ if ENV['ZKRB_NOLOG']
 end
 
 
-module ZookeeperSpecHeleprs
-  class TimeoutError < StandardError; end
-
-  def logger
-    Zookeeper.logger
-  end
-
-  def ensure_node(zk, path, data)
-    return if zk.closed?
-    if zk.stat(:path => path)[:stat].exists?
-      zk.set(:path => path, :data => data)
-    else
-      zk.create(:path => path, :data => data)
-    end
-  end
-
-  def with_open_zk(host='localhost:2181')
-    z = Zookeeper.new(host)
-    yield z
-  ensure
-    if z
-      unless z.closed?
-        z.close
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.include ZookeeperSpecHeleprs
+  config.extend ZookeeperSpecHeleprs
 
-        wait_until do 
-          begin
-            !z.connected?
-          rescue RuntimeError
-            true
-          end
-        end
-      end
-    end
-  end
+  if Zookeeper.spawn_zookeeper?
+    require 'zk-server'
 
-  # this is not as safe as the one in ZK, just to be used to clean up
-  # when we're the only one adjusting a particular path
-  def rm_rf(z, path)
-    z.get_children(:path => path).tap do |h|
-      if h[:rc].zero?
-        h[:children].each do |child|
-          rm_rf(z, File.join(path, child))
-        end
-      elsif h[:rc] == ZookeeperExceptions::ZNONODE
-        # no-op
-      else
-        raise "Oh noes! unexpected return value! #{h.inspect}"
+    config.before(:suite) do 
+      Zookeeper.logger.debug { "Starting zookeeper service" }
+      ZK::Server.run do |c|
+        c.base_dir    = File.expand_path('../../.zkserver', __FILE__)
+        c.client_port = Zookeeper.test_port
+        c.force_sync  = false
+        c.snap_count  = 1_000_000
       end
     end
 
-    rv = z.delete(:path => path)
-
-    unless (rv[:rc].zero? or rv[:rc] == ZookeeperExceptions::ZNONODE)
-      raise "oh noes! failed to delete #{path}" 
-    end
-
-    path
-  end
-
-
-  # method to wait until block passed returns true or timeout (default is 10 seconds) is reached 
-  # raises TiemoutError on timeout
-  def wait_until(timeout=10)
-    time_to_stop = Time.now + timeout
-    while true
-      rval = yield
-      return rval if rval
-      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
-      Thread.pass
-    end
-  end
-
-  # inverse of wait_until
-  def wait_while(timeout=10)
-    time_to_stop = Time.now + timeout
-    while true
-      rval = yield
-      return rval unless rval
-      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
-      Thread.pass
+    config.after(:suite) do
+      Zookeeper.logger.debug { "stopping zookeeper service" }
+      ZK::Server.shutdown
     end
   end
 end
 
-RSpec.configure do |config|
-  config.mock_with :flexmock
-  config.include ZookeeperSpecHeleprs
-  config.extend ZookeeperSpecHeleprs
-end
-
-

data/spec/support/00_spawn_zookeeper.rb

@@ -0,0 +1,20 @@
+module Zookeeper
+  def self.spawn_zookeeper?
+    !!ENV['SPAWN_ZOOKEEPER']
+  end
+
+  def self.travis?
+    !!ENV['TRAVIS']
+  end
+
+  @test_port ||= spawn_zookeeper? ? 21811 : 2181
+
+  class << self
+    attr_accessor :test_port
+  end
+
+  def self.default_cnx_str
+    "localhost:#{test_port}"
+  end
+end
+

data/spec/support/zookeeper_spec_helpers.rb

@@ -0,0 +1,84 @@
+module ZookeeperSpecHeleprs
+  class TimeoutError < StandardError; end
+
+  def logger
+    Zookeeper.logger
+  end
+
+  def ensure_node(zk, path, data)
+    return if zk.closed?
+    if zk.stat(:path => path)[:stat].exists?
+      zk.set(:path => path, :data => data)
+    else
+      zk.create(:path => path, :data => data)
+    end
+  end
+
+  def with_open_zk(host=nil)
+    z = Zookeeper.new(Zookeeper.default_cnx_str)
+    yield z
+  ensure
+    if z
+      unless z.closed?
+        z.close
+
+        wait_until do 
+          begin
+            !z.connected?
+          rescue RuntimeError
+            true
+          end
+        end
+      end
+    end
+  end
+
+  # this is not as safe as the one in ZK, just to be used to clean up
+  # when we're the only one adjusting a particular path
+  def rm_rf(z, path)
+    z.get_children(:path => path).tap do |h|
+      if h[:rc].zero?
+        h[:children].each do |child|
+          rm_rf(z, File.join(path, child))
+        end
+      elsif h[:rc] == Zookeeper::Exceptions::ZNONODE
+        # no-op
+      else
+        raise "Oh noes! unexpected return value! #{h.inspect}"
+      end
+    end
+
+    rv = z.delete(:path => path)
+
+    unless (rv[:rc].zero? or rv[:rc] == Zookeeper::Exceptions::ZNONODE)
+      raise "oh noes! failed to delete #{path}" 
+    end
+
+    path
+  end
+
+
+  # method to wait until block passed returns true or timeout (default is 10 seconds) is reached 
+  # raises TiemoutError on timeout
+  def wait_until(timeout=10)
+    time_to_stop = Time.now + timeout
+    while true
+      rval = yield
+      return rval if rval
+      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
+      Thread.pass
+    end
+  end
+
+  # inverse of wait_until
+  def wait_while(timeout=10)
+    time_to_stop = Time.now + timeout
+    while true
+      rval = yield
+      return rval unless rval
+      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
+      Thread.pass
+    end
+  end
+end
+

data/spec/zookeeper_spec.rb

@@ -5,7 +5,7 @@ require 'shared/connection_examples'
 describe 'Zookeeper' do
   let(:path) { "/_zktest_" }
   let(:data) { "underpants" } 
-  let(:connection_string) { 'localhost:2181' }
+  let(:connection_string) { Zookeeper.default_cnx_str }
 
   before do
     @zk = Zookeeper.new(connection_string)

data/zookeeper.gemspec

@@ -3,28 +3,25 @@ $:.push File.expand_path("../lib", __FILE__)
 require 'zookeeper/version'
 
 Gem::Specification.new do |s|
-  s.name        = ENV.fetch('ZOOKEEPER_GEM_NAME', 'zookeeper')
-  s.version     = ZookeeperVersion::VERSION
+  s.name        = 'zookeeper'
+  s.version     = Zookeeper::VERSION
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]
-  s.summary     = %q{Low level zookeeper client}
+  s.summary     = %q{Apache ZooKeeper driver for Rubies}
   s.description = <<-EOS
-A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
-For a friendlier interface, see http://github.com/slyphon/zk
+A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
+friendlier interface, see http://github.com/slyphon/zk. Currently supported:
+MRI: {1.8.7, 1.9.2, 1.9.3}, JRuby: ~> 1.6.7, Rubinius: 2.0.testing, REE 1.8.7.
 
-Currently supported:
-
-MRI: 1.8.7, 1.9.2, 1.9.3
-JRuby: ~> 1.6.7
-Rubinius: 2.0.testing
-
-This library uses version #{ZookeeperVersion::DRIVER_VERSION} of zookeeper bindings.
+This library uses version #{Zookeeper::DRIVER_VERSION} of zookeeper bindings.
 
   EOS
 
   s.homepage    = 'https://github.com/slyphon/zookeeper'
 
+  s.add_runtime_dependency 'backports', '~> 2.5.1'
+
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]