slyphon-zookeeper 0.2.11-java → 0.3.0-java

data/Rakefile

@@ -42,7 +42,7 @@ gemset_name = 'zookeeper'
   end
 
   task rspec_task_name => bundle_task_name do
-    sh "rvm #{ruby_with_gemset} do bundle exec rspec spec"
+    sh "rvm #{ruby_with_gemset} do bundle exec rspec spec --fail-fast"
   end
 
   task "mb:test_all_rubies" => rspec_task_name

data/ext/zookeeper_base.rb

@@ -31,6 +31,7 @@ class ZookeeperBase < CZookeeper
 #       $stderr.puts "%s: calling init, self.obj_id: %x" % [self.class, object_id]
       init(@host)
 
+      # XXX: replace this with a callback
       if timeout > 0
         time_to_stop = Time.now + timeout
         until state == Zookeeper::ZOO_CONNECTED_STATE
@@ -48,6 +49,11 @@ class ZookeeperBase < CZookeeper
     @completion_reqs = {}
     @req_mutex = Monitor.new
     @current_req_id = 1
+    
+    # approximate the java behavior of raising java.lang.IllegalArgumentException if the host
+    # argument ends with '/'
+    raise ArgumentError, "Host argument #{host.inspect} may not end with /" if host.end_with?('/')
+
     @host = host
 
     @start_stop_mutex = Monitor.new
@@ -108,6 +114,14 @@ class ZookeeperBase < CZookeeper
     end
   end
 
+  # the C lib doesn't strip the chroot path off of returned path values, which
+  # is pretty damn annoying. this is used to clean things up.
+  def create(*args)
+    # since we don't care about the inputs, just glob args
+    rc, new_path = super(*args)
+    [rc, strip_chroot_from(new_path)]
+  end
+
   def set_debug_level(int)
     warn "DEPRECATION WARNING: #{self.class.name}#set_debug_level, it has moved to the class level and will be removed in a future release"
     self.class.set_debug_level(int)
@@ -143,6 +157,35 @@ class ZookeeperBase < CZookeeper
   end
 
 protected
+  # this is a hack: to provide consistency between the C and Java drivers when
+  # using a chrooted connection, we wrap the callback in a block that will
+  # strip the chroot path from the returned path (important in an async create
+  # sequential call). This is the only place where we can hook *just* the C
+  # version. The non-async manipulation is handled in ZookeeperBase#create.
+  # 
+  def setup_completion(req_id, meth_name, call_opts)
+
+    if (meth_name == :create) and cb = call_opts[:callback]
+      call_opts[:callback] = lambda do |hash|
+        # in this case the string will be the absolute zookeeper path (i.e.
+        # with the chroot still prepended to the path). Here's where we strip it off
+        hash[:string] = strip_chroot_from(hash[:string])
+
+        # call the original callback
+        cb.call(hash)
+      end
+    end
+
+    # pass this along to the ZookeeperCommon implementation
+    super(req_id, meth_name, call_opts)
+  end
+
+  # if we're chrooted, this method will strip the chroot prefix from +path+
+  def strip_chroot_from(path)
+    return path unless (chrooted? and path and path.start_with?(chroot_path))
+    path[chroot_path.length..-1]
+  end
+
   def barf_unless_running!
     @start_stop_mutex.synchronize do
       raise ShuttingDownException unless (@_running and not @_closed)
@@ -169,5 +212,22 @@ protected
       true
     }
   end
+
+  def chrooted?
+    !chroot_path.empty?
+  end
+
+  def chroot_path
+    if @chroot_path.nil?
+      @chroot_path = 
+        if idx = @host.index('/')
+          @host.slice(idx, @host.length)
+        else
+          ''
+        end
+    end
+
+    @chroot_path
+  end
 end
 

data/lib/zookeeper.rb

@@ -45,7 +45,7 @@ class Zookeeper < ZookeeperBase
     assert_supported_keys(options, [:path, :watcher, :watcher_context, :callback, :callback_context])
     assert_required_keys(options, [:path])
 
-    req_id = setup_call(options)
+    req_id = setup_call(:get, options)
     rc, value, stat = super(req_id, options[:path], options[:callback], options[:watcher])
 
     rv = { :req_id => req_id, :rc => rc }
@@ -59,7 +59,7 @@ class Zookeeper < ZookeeperBase
     assert_valid_data_size!(options[:data])
     options[:version] ||= -1
 
-    req_id = setup_call(options)
+    req_id = setup_call(:set, options)
     rc, stat = super(req_id, options[:path], options[:data], options[:callback], options[:version])
 
     rv = { :req_id => req_id, :rc => rc }
@@ -71,7 +71,7 @@ class Zookeeper < ZookeeperBase
     assert_supported_keys(options, [:path, :callback, :callback_context, :watcher, :watcher_context])
     assert_required_keys(options, [:path])
 
-    req_id = setup_call(options)
+    req_id = setup_call(:get_children, options)
     rc, children, stat = super(req_id, options[:path], options[:callback], options[:watcher])
 
     rv = { :req_id => req_id, :rc => rc }
@@ -83,7 +83,7 @@ class Zookeeper < ZookeeperBase
     assert_supported_keys(options, [:path, :callback, :callback_context, :watcher, :watcher_context])
     assert_required_keys(options, [:path])
 
-    req_id = setup_call(options)
+    req_id = setup_call(:stat, options)
     rc, stat = exists(req_id, options[:path], options[:callback], options[:watcher])
 
     rv = { :req_id => req_id, :rc => rc }
@@ -102,7 +102,7 @@ class Zookeeper < ZookeeperBase
 
     options[:acl] ||= ZOO_OPEN_ACL_UNSAFE
 
-    req_id = setup_call(options)
+    req_id = setup_call(:create, options)
     rc, newpath = super(req_id, options[:path], options[:data], options[:callback], options[:acl], flags)
 
     rv = { :req_id => req_id, :rc => rc }
@@ -115,7 +115,7 @@ class Zookeeper < ZookeeperBase
     assert_required_keys(options, [:path])
     options[:version] ||= -1
 
-    req_id = setup_call(options)
+    req_id = setup_call(:delete, options)
     rc = super(req_id, options[:path], options[:version], options[:callback])
 
     { :req_id => req_id, :rc => rc }
@@ -127,7 +127,7 @@ class Zookeeper < ZookeeperBase
     assert_required_keys(options, [:path, :acl])
     options[:version] ||= -1
 
-    req_id = setup_call(options)
+    req_id = setup_call(:set_acl, options)
     rc = super(req_id, options[:path], options[:acl], options[:callback], options[:version])
 
     { :req_id => req_id, :rc => rc }
@@ -138,7 +138,7 @@ class Zookeeper < ZookeeperBase
     assert_supported_keys(options, [:path, :callback, :callback_context])
     assert_required_keys(options, [:path])
 
-    req_id = setup_call(options)
+    req_id = setup_call(:get_acl, options)
     rc, acls, stat = super(req_id, options[:path], options[:callback])
 
     rv = { :req_id => req_id, :rc => rc }
@@ -242,22 +242,6 @@ protected
   end
 
 private
-  def setup_call(opts)
-    req_id = nil
-    @req_mutex.synchronize {
-      req_id = @current_req_id
-      @current_req_id += 1
-      setup_completion(req_id, opts) if opts[:callback]
-      setup_watcher(req_id, opts) if opts[:watcher]
-    }
-    req_id
-  end
-
-  def setup_watcher(req_id, call_opts)
-    @watcher_reqs[req_id] = { :watcher => call_opts[:watcher],
-                              :context => call_opts[:watcher_context] }
-  end
-
   # TODO: Sanitize user mistakes by unregistering watchers from ops that
   # don't return ZOK (except wexists)?  Make users clean up after themselves for now.
   def unregister_watcher(req_id)

data/lib/zookeeper/callbacks.rb

@@ -45,10 +45,12 @@ module ZookeeperCallbacks
 
   class StringCallback < Callback
     ## acreate, async
-    attr_reader :return_code, :path
+    attr_reader :return_code, :string, :context
+
+    alias path string
 
     def initialize_context(hash)
-      @return_code, @path, @context = hash[:rc], hash[:string], hash[:context]
+      @return_code, @string, @context = hash[:rc], hash[:string], hash[:context]
     end
   end
 

data/lib/zookeeper/common.rb

@@ -10,30 +10,36 @@ module ZookeeperCommon
   end
 
 protected
-  def setup_call(opts)
+  def setup_call(meth_name, opts)
     req_id = nil
     @req_mutex.synchronize {
       req_id = @current_req_id
       @current_req_id += 1
-      setup_completion(req_id, opts) if opts[:callback]
+      setup_completion(req_id, meth_name, opts) if opts[:callback]
       setup_watcher(req_id, opts) if opts[:watcher]
     }
     req_id
   end
-  
+ 
   def setup_watcher(req_id, call_opts)
     @watcher_reqs[req_id] = { :watcher => call_opts[:watcher],
                               :context => call_opts[:watcher_context] }
   end
 
-  def setup_completion(req_id, call_opts)
+  # as a hack, to provide consistency between the java implementation and the C
+  # implementation when dealing w/ chrooted connections, we override this in
+  # ext/zookeeper_base.rb to wrap the callback in a chroot-path-stripping block.
+  #
+  # we don't use meth_name here, but we need it in the C implementation
+  #
+  def setup_completion(req_id, meth_name, call_opts)
     @completion_reqs[req_id] = { :callback => call_opts[:callback],
                                  :context => call_opts[:callback_context] }
   end
   
   def get_watcher(req_id)
     @req_mutex.synchronize {
-      req_id != ZKRB_GLOBAL_CB_REQ ? @watcher_reqs.delete(req_id) : @watcher_reqs[req_id]
+      (req_id == ZKRB_GLOBAL_CB_REQ) ? @watcher_reqs[req_id] : @watcher_reqs.delete(req_id)
     }
   end
   
@@ -90,6 +96,4 @@ protected
             "Required arguments are: #{required.inspect}, but only the arguments #{args.keys.inspect} were supplied."
     end
   end
-
 end
-

data/lib/zookeeper/stat.rb

@@ -11,7 +11,11 @@ module ZookeeperStat
       @czxid, @mzxid, @ctime, @mtime, @version, @cversion, @aversion,
           @ephemeralOwner, @dataLength, @numChildren, @pzxid = val if val.is_a?(Array)
       val.each { |k,v| instance_variable_set "@#{k}", v } if val.is_a?(Hash)
-      raise ArgumentError unless (val.is_a?(Hash) or val.is_a?(Array) or val == nil)
+      raise ArgumentError unless (val.is_a?(Hash) or val.is_a?(Array) or val.nil?)
+    end
+
+    def exists?
+      @exists
     end
   end
 end

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.2.11'
+  s.version     = '0.3.0'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'eventmachine', '1.0.0.beta.4'
   s.add_development_dependency 'evented-spec', '~> 0.9.0'
   s.add_development_dependency 'rake', '~> 0.9.0'
+  s.add_development_dependency 'pry'
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ Zookeeper.logger = Logger.new(File.expand_path('../../test.log', __FILE__)).tap
   log.level = Logger::DEBUG
 end
 
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].sort.each { |f| require(f) }
 
 # NOTE: this is a useful debugging setup. have our logs and the low-level C
 # logging statements both go to stderr. to use, comment the above and uncomment
@@ -25,22 +26,6 @@ def logger
   Zookeeper.logger
 end
 
-
-require 'rspec/core/formatters/progress_formatter'
-
-module RSpec
-  module Core
-    module Formatters
-      class ProgressFormatter
-        def example_started(example)
-          Zookeeper.logger.info(yellow("=====<([ #{example.full_description} ])>====="))
-          super(example)
-        end
-      end
-    end
-  end
-end
-
 RSpec.configure do |config|
   config.mock_with :flexmock
 end
@@ -55,4 +40,3 @@ def wait_until(timeout=10, &block)
   end
 end
 
-

data/spec/support/progress_formatter.rb

@@ -0,0 +1,15 @@
+require 'rspec/core/formatters/progress_formatter'
+
+module RSpec
+  module Core
+    module Formatters
+      class ProgressFormatter
+        def example_started(example)
+          Zookeeper.logger.info(yellow("=====<([ #{example.full_description} ])>====="))
+          super(example)
+        end
+      end
+    end
+  end
+end
+

data/spec/zookeeper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__) 
+require 'spec_helper'
 
 shared_examples_for "all success return values" do
   it %[should have a return code of Zookeeper::ZOK] do
@@ -10,26 +10,32 @@ shared_examples_for "all success return values" do
   end
 end
 
-describe Zookeeper do
-  before do
-    @path = "/_zktest_"
-    @data = "underpants"
-
-    @zk = Zookeeper.new('localhost:2181')
+shared_examples_for "all" do
+  def ensure_node(path, data)
+    if zk.stat(:path => path)[:stat].exists?
+      zk.set(:path => path, :data => data)
+    else
+      zk.create(:path => path, :data => data)
+    end
+  end
 
-    # uncomment for driver debugging output
-    #@zk.set_debug_level(Zookeeper::ZOO_LOG_LEVEL_DEBUG) unless defined?(::JRUBY_VERSION)
+  before :each do
+    ensure_node(path, data)
+  end
 
-    @zk.create(:path => @path, :data => @data)
+  after :each do
+    ensure_node(path, data)
   end
 
-  after do
-    @zk.delete(:path => @path)
-    @zk.close
+  after :all do
+    Zookeeper.logger.warn "running shared examples after :all"
+    # close the chrooted connection
+    zk.delete(:path => path)
+    zk.close
 
     wait_until do 
       begin
-        !@zk.connected?
+        !zk.connected?
       rescue RuntimeError
         true
       end
@@ -43,11 +49,11 @@ describe Zookeeper do
       it_should_behave_like "all success return values"
 
       before do
-        @rv = @zk.get(:path => @path)
+        @rv = zk.get(:path => path)
       end
 
       it %[should return the data] do
-        @rv[:data].should == @data
+        @rv[:data].should == data
       end
 
       it %[should return a stat] do
@@ -63,37 +69,37 @@ describe Zookeeper do
         @event = nil
         @watcher = Zookeeper::WatcherCallback.new
 
-        @rv = @zk.get(:path => @path, :watcher => @watcher, :watcher_context => @path) 
+        @rv = zk.get(:path => path, :watcher => @watcher, :watcher_context => path) 
       end
 
       it %[should return the data] do
-        @rv[:data].should == @data
+        @rv[:data].should == data
       end
 
       it %[should set a watcher on the node] do
         # test the watcher by changing node data
-        @zk.set(:path => @path, :data => 'blah')[:rc].should be_zero
+        zk.set(:path => path, :data => 'blah')[:rc].should be_zero
 
         wait_until(1.0) { @watcher.completed? }
 
-        @watcher.path.should == @path
-        @watcher.context.should == @path
+        @watcher.path.should == path
+        @watcher.context.should == path
         @watcher.should be_completed
         @watcher.type.should == Zookeeper::ZOO_CHANGED_EVENT
       end
     end
 
     describe :async do
-      it_should_behave_like "all success return values"
-
       before do
         @cb = Zookeeper::DataCallback.new
 
-        @rv = @zk.get(:path => @path, :callback => @cb, :callback_context => @path)
+        @rv = zk.get(:path => path, :callback => @cb, :callback_context => path)
         wait_until(1.0) { @cb.completed? }
         @cb.should be_completed
       end
 
+      it_should_behave_like "all success return values"
+
       it %[should have a return code of ZOK] do
         @cb.return_code.should == Zookeeper::ZOK
       end
@@ -104,7 +110,7 @@ describe Zookeeper do
       end
 
       it %[should have the data] do
-        @cb.data.should == @data
+        @cb.data.should == data
       end
     end
 
@@ -115,7 +121,7 @@ describe Zookeeper do
         @cb = Zookeeper::DataCallback.new
         @watcher = Zookeeper::WatcherCallback.new
 
-        @rv = @zk.get(:path => @path, :callback => @cb, :callback_context => @path, :watcher => @watcher, :watcher_context => @path)
+        @rv = zk.get(:path => path, :callback => @cb, :callback_context => path, :watcher => @watcher, :watcher_context => path)
         wait_until(1.0) { @cb.completed? }
         @cb.should be_completed
       end
@@ -126,7 +132,7 @@ describe Zookeeper do
       end
 
       it %[should have the data] do
-        @cb.data.should == @data
+        @cb.data.should == data
       end
 
       it %[should have a return code of ZOK] do
@@ -134,20 +140,20 @@ describe Zookeeper do
       end
 
       it %[should set a watcher on the node] do
-        @zk.set(:path => @path, :data => 'blah')[:rc].should be_zero
+        zk.set(:path => path, :data => 'blah')[:rc].should be_zero
 
         wait_until(2) { @watcher.completed? }
 
         @watcher.should be_completed
 
-        @watcher.path.should == @path
-        @watcher.context.should == @path
+        @watcher.path.should == path
+        @watcher.context.should == path
       end
     end
 
     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(ZookeeperExceptions::ZookeeperException::BadArguments)
       end
     end
   end   # get
@@ -155,7 +161,7 @@ describe Zookeeper do
   describe :set do
     before do
       @new_data = "Four score and \007 years ago"
-      @stat = @zk.stat(:path => @path)[:stat]
+      @stat = zk.stat(:path => path)[:stat]
     end
 
     describe :sync do
@@ -163,7 +169,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.set(:path => @path, :data => @new_data)
+          @rv = zk.set(:path => path, :data => @new_data)
         end
 
         it %[should return the new stat] do
@@ -177,7 +183,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.set(:path => @path, :data => @new_data, :version => @stat.version)
+          @rv = zk.set(:path => path, :data => @new_data, :version => @stat.version)
         end
 
         it %[should return the new stat] do
@@ -190,9 +196,9 @@ describe Zookeeper do
       describe 'with outdated version' do
         before do
           # need to do a couple of sets to ramp up the version
-          3.times { |n| @stat = @zk.set(:path => @path, :data => "#{@new_data}#{n}")[:stat] }
+          3.times { |n| @stat = zk.set(:path => path, :data => "#{@new_data}#{n}")[:stat] }
 
-          @rv = @zk.set(:path => @path, :data => @new_data, :version => 0)
+          @rv = zk.set(:path => path, :data => @new_data, :version => 0)
         end
 
         it %[should have a return code of ZBADVERSION] do
@@ -208,7 +214,7 @@ describe Zookeeper 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(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
         end
       end
     end   # sync
@@ -222,7 +228,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.set(:path => @path, :data => @new_data, :callback => @cb, :callback_context => @path)
+          @rv = zk.set(:path => path, :data => @new_data, :callback => @cb, :callback_context => path)
 
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
@@ -242,7 +248,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.set(:path => @path, :data => @new_data, :callback => @cb, :callback_context => @path, :version => @stat.version)
+          @rv = zk.set(:path => path, :data => @new_data, :callback => @cb, :callback_context => path, :version => @stat.version)
 
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
@@ -261,9 +267,9 @@ describe Zookeeper do
       describe 'with outdated version' do
         before do
           # need to do a couple of sets to ramp up the version
-          3.times { |n| @stat = @zk.set(:path => @path, :data => "#{@new_data}#{n}")[:stat] }
+          3.times { |n| @stat = zk.set(:path => path, :data => "#{@new_data}#{n}")[:stat] }
 
-          @rv = @zk.set(:path => @path, :data => @new_data, :callback => @cb, :callback_context => @path, :version => 0)
+          @rv = zk.set(:path => path, :data => @new_data, :callback => @cb, :callback_context => path, :version => 0)
 
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
@@ -282,7 +288,7 @@ describe Zookeeper 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(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
         end
       end
 
@@ -294,13 +300,13 @@ describe Zookeeper do
       @children = %w[child0 child1 child2]
 
       @children.each do |name|
-        @zk.create(:path => "#{@path}/#{name}", :data => name)
+        zk.create(:path => "#{path}/#{name}", :data => name)
       end
     end
 
     after do
       @children.each do |name|
-        @zk.delete(:path => "#{@path}/#{name}")
+        zk.delete(:path => "#{path}/#{name}")
       end
     end
 
@@ -308,7 +314,7 @@ describe Zookeeper do
       it_should_behave_like "all success return values"
 
       before do
-        @rv = @zk.get_children(:path => @path)
+        @rv = zk.get_children(:path => path)
       end
 
       it %[should have an array of names of the children] do
@@ -334,11 +340,11 @@ describe Zookeeper do
 
         @watcher = Zookeeper::WatcherCallback.new
 
-        @rv = @zk.get_children(:path => @path, :watcher => @watcher, :watcher_context => @path)
+        @rv = zk.get_children(:path => path, :watcher => @watcher, :watcher_context => path)
       end
 
       after do
-        @zk.delete(:path => "#{@path}/#{@addtl_child}")
+        zk.delete(:path => "#{path}/#{@addtl_child}")
       end
 
       it %[should have an array of names of the children] do
@@ -356,13 +362,13 @@ describe Zookeeper do
       it %[should set a watcher for children on the node] do
         @watcher.should_not be_completed
 
-        @zk.create(:path => "#{@path}/#{@addtl_child}", :data => '')[:rc].should == Zookeeper::ZOK
+        zk.create(:path => "#{path}/#{@addtl_child}", :data => '')[:rc].should == Zookeeper::ZOK
 
         wait_until { @watcher.completed? }
         @watcher.should be_completed
 
-        @watcher.path.should == @path
-        @watcher.context.should == @path
+        @watcher.path.should == path
+        @watcher.context.should == path
         @watcher.type.should == Zookeeper::ZOO_CHILD_EVENT
       end
     end
@@ -372,7 +378,7 @@ describe Zookeeper do
 
       before do
         @cb = ZookeeperCallbacks::StringsCallback.new
-        @rv = @zk.get_children(:path => @path, :callback => @cb, :callback_context => @path)
+        @rv = zk.get_children(:path => path, :callback => @cb, :callback_context => path)
 
         wait_until { @cb.completed? }
         @cb.should be_completed
@@ -404,13 +410,13 @@ describe Zookeeper do
         @watcher = Zookeeper::WatcherCallback.new
         @cb = ZookeeperCallbacks::StringsCallback.new
 
-        @rv = @zk.get_children(:path => @path, :watcher => @watcher, :watcher_context => @path, :callback => @cb, :callback_context => @path)
+        @rv = zk.get_children(:path => path, :watcher => @watcher, :watcher_context => path, :callback => @cb, :callback_context => path)
         wait_until { @cb.completed? }
         @cb.should be_completed
       end
 
       after do
-        @zk.delete(:path => "#{@path}/#{@addtl_child}")
+        zk.delete(:path => "#{path}/#{@addtl_child}")
       end
 
       it %[should succeed] do
@@ -432,13 +438,13 @@ describe Zookeeper do
       it %[should set a watcher for children on the node] do
         @watcher.should_not be_completed
 
-        @zk.create(:path => "#{@path}/#{@addtl_child}", :data => '')[:rc].should == Zookeeper::ZOK
+        zk.create(:path => "#{path}/#{@addtl_child}", :data => '')[:rc].should == Zookeeper::ZOK
 
         wait_until { @watcher.completed? }
         @watcher.should be_completed
 
-        @watcher.path.should == @path
-        @watcher.context.should == @path
+        @watcher.path.should == path
+        @watcher.context.should == path
         @watcher.type.should == Zookeeper::ZOO_CHILD_EVENT
       end
     end
@@ -451,7 +457,7 @@ describe Zookeeper do
       it_should_behave_like "all success return values"
 
       before do
-        @rv = @zk.stat(:path => @path)
+        @rv = zk.stat(:path => path)
       end
 
       it %[should have a stat object] do
@@ -465,7 +471,7 @@ describe Zookeeper do
       before do
         @watcher = Zookeeper::WatcherCallback.new
 
-        @rv = @zk.stat(:path => @path, :watcher => @watcher, :watcher_context => @path)
+        @rv = zk.stat(:path => path, :watcher => @watcher, :watcher_context => path)
       end
 
       it %[should have a stat object] do
@@ -475,13 +481,13 @@ describe Zookeeper do
       it %[should set a watcher for data changes on the node] do
         @watcher.should_not be_completed
 
-        @zk.set(:path => @path, :data => 'skunk')[:rc].should == Zookeeper::ZOK
+        zk.set(:path => path, :data => 'skunk')[:rc].should == Zookeeper::ZOK
 
         wait_until { @watcher.completed? }
         @watcher.should be_completed
 
-        @watcher.path.should == @path
-        @watcher.context.should == @path
+        @watcher.path.should == path
+        @watcher.context.should == path
         @watcher.type.should == Zookeeper::ZOO_CHANGED_EVENT
       end
     end
@@ -491,7 +497,7 @@ describe Zookeeper do
 
       before do
         @cb = ZookeeperCallbacks::StatCallback.new
-        @rv = @zk.stat(:path => @path, :callback => @cb, :callback_context => @path)
+        @rv = zk.stat(:path => path, :callback => @cb, :callback_context => path)
 
         wait_until { @cb.completed? }
         @cb.should be_completed
@@ -515,14 +521,14 @@ describe Zookeeper do
         @watcher = Zookeeper::WatcherCallback.new
 
         @cb = ZookeeperCallbacks::StatCallback.new
-        @rv = @zk.stat(:path => @path, :callback => @cb, :callback_context => @path, :watcher => @watcher, :watcher_context => @path)
+        @rv = zk.stat(:path => path, :callback => @cb, :callback_context => path, :watcher => @watcher, :watcher_context => path)
 
         wait_until { @cb.completed? }
         @cb.should be_completed
       end
 
       after do
-        @zk.delete(:path => "#{@path}/#{@addtl_child}")
+        zk.delete(:path => "#{path}/#{@addtl_child}")
       end
 
       it %[should succeed] do
@@ -536,13 +542,13 @@ describe Zookeeper do
       it %[should set a watcher for data changes on the node] do
         @watcher.should_not be_completed
 
-        @zk.set(:path => @path, :data => 'skunk')[:rc].should == Zookeeper::ZOK
+        zk.set(:path => path, :data => 'skunk')[:rc].should == Zookeeper::ZOK
 
         wait_until { @watcher.completed? }
         @watcher.should be_completed
 
-        @watcher.path.should == @path
-        @watcher.context.should == @path
+        @watcher.path.should == path
+        @watcher.context.should == path
         @watcher.type.should == Zookeeper::ZOO_CHANGED_EVENT
       end
     end
@@ -551,7 +557,7 @@ describe Zookeeper do
   describe :create do
     before do
       # remove the path set up by the global 'before' block
-      @zk.delete(:path => @path)
+      zk.delete(:path => path)
     end
 
     describe :sync do
@@ -559,7 +565,7 @@ describe Zookeeper 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(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
         end
       end
 
@@ -567,15 +573,15 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.create(:path => @path)
+          @rv = zk.create(:path => path)
         end
 
         it %[should return the path that was set] do
-          @rv[:path].should == @path
+          @rv[:path].should == path
         end
 
         it %[should have created a permanent node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should == 0
@@ -586,15 +592,15 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.create(:path => @path, :ephemeral => true)
+          @rv = zk.create(:path => path, :ephemeral => true)
         end
 
         it %[should return the path that was set] do
-          @rv[:path].should == @path
+          @rv[:path].should == path
         end
 
         it %[should have created a ephemeral node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should_not be_zero
@@ -605,9 +611,13 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @orig_path  = @path
-          @rv         = @zk.create(:path => @path, :sequence => true)
-          @path       = @rv[:path]    # make sure this gets cleaned up
+          @orig_path  = path
+          @rv         = zk.create(:path => path, :sequence => true)
+          @s_path     = @rv[:path]    # make sure this gets cleaned up
+        end
+
+        after do
+          zk.delete(:path => @s_path)
         end
 
         it %[should return the path that was set] do
@@ -615,7 +625,7 @@ describe Zookeeper do
         end
 
         it %[should have created a permanent node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => @s_path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should be_zero
@@ -626,9 +636,13 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @orig_path  = @path
-          @rv         = @zk.create(:path => @path, :sequence => true, :ephemeral => true)
-          @path       = @rv[:path]    # make sure this gets cleaned up
+          @orig_path  = path
+          @rv         = zk.create(:path => path, :sequence => true, :ephemeral => true)
+          @s_path     = @rv[:path]    # make sure this gets cleaned up
+        end
+
+        after do
+          zk.delete(:path => @s_path)
         end
 
         it %[should return the path that was set] do
@@ -636,7 +650,7 @@ describe Zookeeper do
         end
 
         it %[should have created an ephemeral node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => @s_path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should_not be_zero
@@ -659,7 +673,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.create(:path => @path, :callback => @cb, :callback_context => @path)
+          @rv = zk.create(:path => path, :callback => @cb, :callback_context => path)
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
         end
@@ -669,11 +683,11 @@ describe Zookeeper do
         end
 
         it %[should return the path that was set] do
-          @cb.path.should == @path
+          @cb.path.should == path
         end
 
         it %[should have created a permanent node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should == 0
@@ -685,7 +699,7 @@ describe Zookeeper do
           large_data = '0' * (1024 ** 2)
 
           lambda do
-            @zk.create(:path => @path, :data => large_data, :callback => @cb, :callback_context => @path)
+            zk.create(:path => path, :data => large_data, :callback => @cb, :callback_context => path)
           end.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
         end
       end
@@ -695,7 +709,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.create(:path => @path, :ephemeral => true, :callback => @cb, :callback_context => @path)
+          @rv = zk.create(:path => path, :ephemeral => true, :callback => @cb, :callback_context => path)
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
         end
@@ -705,11 +719,11 @@ describe Zookeeper do
         end
 
         it %[should return the path that was set] do
-          @cb.path.should == @path
+          @cb.path.should == path
         end
 
         it %[should have created a ephemeral node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should_not be_zero
@@ -720,13 +734,17 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @orig_path  = @path
-          @rv         = @zk.create(:path => @path, :sequence => true, :callback => @cb, :callback_context => @path)
+          @orig_path  = path
+          @rv         = zk.create(:path => path, :sequence => true, :callback => @cb, :callback_context => path)
 
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
 
-          @path = @cb.path
+          @s_path = @cb.path
+        end
+
+        after do
+          zk.delete(:path => @s_path)
         end
 
         it %[should have a path] do
@@ -738,7 +756,7 @@ describe Zookeeper do
         end
 
         it %[should have created a permanent node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => @s_path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should be_zero
@@ -749,13 +767,17 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @orig_path  = @path
-          @rv         = @zk.create(:path => @path, :sequence => true, :ephemeral => true, :callback => @cb, :callback_context => @path)
-          @path       = @rv[:path]    # make sure this gets cleaned up
+          @orig_path  = path
+          @rv         = zk.create(:path => path, :sequence => true, :ephemeral => true, :callback => @cb, :callback_context => path)
+          path       = @rv[:path]    # make sure this gets cleaned up
 
           wait_until(2) { @cb.completed? }
           @cb.should be_completed
-          @path = @cb.path
+          @s_path = @cb.path
+        end
+
+        after do
+          zk.delete(:path => @s_path)
         end
 
         it %[should have a path] do
@@ -763,11 +785,11 @@ describe Zookeeper do
         end
 
         it %[should return the path that was set] do
-          @path.should_not == @orig_path
+          @s_path.should_not == @orig_path
         end
 
         it %[should have created an ephemeral node] do
-          st = @zk.stat(:path => @path)
+          st = zk.stat(:path => @s_path)
           st[:rc].should == Zookeeper::ZOK
 
           st[:stat].ephemeral_owner.should_not be_zero
@@ -782,12 +804,12 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @zk.create(:path => @path)
-          @rv = @zk.delete(:path => @path)
+          zk.create(:path => path)
+          @rv = zk.delete(:path => path)
         end
 
         it %[should have deleted the node] do
-          @zk.stat(:path => @path)[:stat].exists.should be_false
+          zk.stat(:path => path)[:stat].exists.should be_false
         end
       end
 
@@ -795,24 +817,24 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @zk.create(:path => @path)
+          zk.create(:path => path)
 
-          @stat = @zk.stat(:path => @path)[:stat]
+          @stat = zk.stat(:path => path)[:stat]
           @stat.exists.should be_true
 
-          @rv = @zk.delete(:path => @path, :version => @stat.version)
+          @rv = zk.delete(:path => path, :version => @stat.version)
         end
 
         it %[should have deleted the node] do
-          @zk.stat(:path => @path)[:stat].exists.should be_false
+          zk.stat(:path => path)[:stat].exists.should be_false
         end
       end
 
       describe 'with old version' do
         before do
-          3.times { |n| @stat = @zk.set(:path => @path, :data => n.to_s)[:stat] }
+          3.times { |n| @stat = zk.set(:path => path, :data => n.to_s)[:stat] }
 
-          @rv = @zk.delete(:path => @path, :version => 0)
+          @rv = zk.delete(:path => path, :version => 0)
         end
 
         it %[should have a return code of ZBADVERSION] do
@@ -830,7 +852,7 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @rv = @zk.delete(:path => @path, :callback => @cb, :callback_context => @path)
+          @rv = zk.delete(:path => path, :callback => @cb, :callback_context => path)
           wait_until { @cb.completed? }
           @cb.should be_completed
         end
@@ -840,7 +862,7 @@ describe Zookeeper do
         end
 
         it %[should have deleted the node] do
-          @zk.stat(:path => @path)[:stat].exists.should be_false
+          zk.stat(:path => path)[:stat].exists.should be_false
         end
       end
 
@@ -848,8 +870,8 @@ describe Zookeeper do
         it_should_behave_like "all success return values"
 
         before do
-          @stat = @zk.stat(:path => @path)[:stat]
-          @rv   = @zk.delete(:path => @path, :version => @stat.version, :callback => @cb, :callback_context => @path)
+          @stat = zk.stat(:path => path)[:stat]
+          @rv   = zk.delete(:path => path, :version => @stat.version, :callback => @cb, :callback_context => path)
           wait_until { @cb.completed? }
           @cb.should be_completed
         end
@@ -859,15 +881,15 @@ describe Zookeeper do
         end
 
         it %[should have deleted the node] do
-          @zk.stat(:path => @path)[:stat].exists.should be_false
+          zk.stat(:path => path)[:stat].exists.should be_false
         end
       end
 
       describe 'with old version' do
         before do
-          3.times { |n| @stat = @zk.set(:path => @path, :data => n.to_s)[:stat] }
+          3.times { |n| @stat = zk.set(:path => path, :data => n.to_s)[:stat] }
 
-          @rv = @zk.delete(:path => @path, :version => 0, :callback => @cb, :callback_context => @path)
+          @rv = zk.delete(:path => path, :version => 0, :callback => @cb, :callback_context => path)
           wait_until { @cb.completed? }
           @cb.should be_completed
         end
@@ -884,7 +906,7 @@ describe Zookeeper do
       it_should_behave_like "all success return values"
 
       before do
-        @rv = @zk.get_acl(:path => @path)
+        @rv = zk.get_acl(:path => path)
       end
 
       it %[should return a stat for the path] do
@@ -909,7 +931,7 @@ describe Zookeeper do
 
       before do
         @cb = Zookeeper::ACLCallback.new
-        @rv = @zk.get_acl(:path => @path, :callback => @cb, :callback_context => @path)
+        @rv = zk.get_acl(:path => path, :callback => @cb, :callback_context => path)
 
         wait_until(2) { @cb.completed? }
         @cb.should be_completed
@@ -935,7 +957,6 @@ describe Zookeeper do
   end
 
   describe :set_acl do
-
     before do
       @perms = 5
       @new_acl = [ZookeeperACLs::ACL.new(:perms => @perms, :id => ZookeeperACLs::ZOO_ANYONE_ID_UNSAFE)]
@@ -946,21 +967,83 @@ describe Zookeeper do
       it_should_behave_like "all success return values"
 
       before do
-        @rv = @zk.set_acl(:path => @path, :acl => @new_acl)
+        @rv = zk.set_acl(:path => path, :acl => @new_acl)
       end
-      
     end
   end
 
   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(Fixnum)
     end
   end
 
   describe :session_passwd do
     it %[should return the session passwd as a String] do
-      @zk.session_passwd.should be_kind_of(String)
+      zk.session_passwd.should be_kind_of(String)
     end
   end
 end
+
+describe 'Zookeeper' do
+  let(:path) { "/_zktest_" }
+  let(:data) { "underpants" } 
+  let(:zk_host) { 'localhost:2181' }
+
+  let(:zk) do
+    Zookeeper.logger.debug { "creating root instance" }
+    Zookeeper.new(zk_host)
+  end
+
+  it_should_behave_like "all"
+end
+
+
+describe 'Zookeeper chrooted' do
+  let(:path) { "/_zkchroottest_" }
+  let(:data) { "underpants" } 
+  let(:chroot_path) { '/slyphon-zookeeper-chroot' }
+
+  # Ok, i can't explain this, but when you run these tests, the zk instance
+  # gets set up *once* and re-used, which is different from above, where it's
+  # set up new each time
+  #
+  let(:zk) do
+    Zookeeper.logger.debug { "creating chrooted zk instance" }
+    Zookeeper.new("localhost:2181#{chroot_path}")
+  end
+
+  def with_open_zk(host='localhost:2181')
+    z = Zookeeper.new(host)
+    yield z
+  ensure
+    z.close
+
+    wait_until do 
+      begin
+        !z.connected?
+      rescue RuntimeError
+        true
+      end
+    end
+  end
+
+  before :all do
+    Zookeeper.logger.warn "running before :all"
+
+    with_open_zk do |z|
+      z.create(:path => chroot_path, :data => '')
+    end
+  end
+
+  after :all do
+    with_open_zk do |z|
+      z.delete(:path => chroot_path)
+    end
+  end
+
+  it_should_behave_like "all"
+end
+
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 11
-  version: 0.2.11
+  - 3
+  - 0
+  version: 0.3.0
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-27 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -105,9 +105,23 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: slyphon-log4j
+  name: pry
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: slyphon-log4j
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -119,11 +133,11 @@ dependencies:
         - 15
         version: 1.2.15
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper_jar
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -135,7 +149,7 @@ dependencies:
         - 4
         version: 3.3.4
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 description: twitter's zookeeper client
 email: 
 - slyphon@gmail.com
@@ -179,6 +193,7 @@ files:
 - spec/em_spec.rb
 - spec/log4j.properties
 - spec/spec_helper.rb
+- spec/support/progress_formatter.rb
 - spec/zookeeper_spec.rb
 - test/test_basic.rb
 - test/test_callback1.rb
@@ -225,6 +240,7 @@ test_files:
 - spec/em_spec.rb
 - spec/log4j.properties
 - spec/spec_helper.rb
+- spec/support/progress_formatter.rb
 - spec/zookeeper_spec.rb
 - test/test_basic.rb
 - test/test_callback1.rb