zookeeper 0.9.4 → 1.0.0.beta.1

data/lib/zookeeper/version.rb

@@ -1,6 +1,4 @@
-# this "namespacing" is retarded. fix this in 1.0
-# @private
-module ZookeeperVersion
-  VERSION = '0.9.4'
+module Zookeeper
+  VERSION = '1.0.0.beta.1'
   DRIVER_VERSION = '3.3.5'
 end

data/scripts/upgrade-1.0-sed-alike.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+if ARGV.empty?
+  $stderr.puts <<-EOS
+Usage: #{File.basename(__FILE__)} file1 file2 file3
+
+Fix references to Zookeeper classes and modules.
+
+This script acts like sed and edits files in place (not saving backups,
+as you *are* using source control and aren't a complete tool). 
+
+if you have any doubts, *read the script*:
+----------------------------------------------------------------------
+
+#{File.read(__FILE__)}
+
+  EOS
+
+  exit 1
+end
+
+
+require 'tempfile'
+require 'fileutils'
+
+ARGV.each do |path|
+  Tempfile.open(File.basename(path)) do |tmp|
+    File.open(path) do |input|
+      while line = input.gets
+        tmp.puts line.gsub(/\bZookeeperStat::Stat\b/, 'Zookeeper::Stat').
+          gsub(/\bZookeeper::(\w+)Callback\b/, 'Zookeeper::Callbacks::\1Callback').
+          gsub(/\bZookeeperACLs::(ZOO_\w+)\b/, 'Zookeeper::Constants::\1').
+          gsub(/\bZookeeperExceptions::ZookeeperException::(\w+)\b/, 'Zookeeper::Exceptions::\1').
+          gsub(/\bZookeeper(Constants|Exceptions|Common|ACLs|Callbacks)\b/, 'Zookeeper::\1').
+          gsub(/\bZookeeperException::(\w+)\b/, 'Exceptions::\1')
+
+      end
+    end
+
+    tmp.fsync
+    tmp.close
+
+    FileUtils.mv(tmp.path, path)
+  end
+end
+

data/spec/c_zookeeper_spec.rb

@@ -1,8 +1,9 @@
 # tests the CZookeeper, obviously only available when running under MRI
-require 'spec_helper'
 
-if Module.const_defined?(:CZookeeper)
-  describe CZookeeper do
+unless defined?(::JRUBY_VERSION)
+  require 'spec_helper'
+
+  describe Zookeeper::CZookeeper do
     def pop_all_events
       [].tap do |rv|
         begin
@@ -13,13 +14,13 @@ if Module.const_defined?(:CZookeeper)
     end
 
     def wait_until_connected(timeout=2)
-      wait_until(timeout) { @czk.state == ZookeeperConstants::ZOO_CONNECTED_STATE }
+      wait_until(timeout) { @czk.state == Zookeeper::Constants::ZOO_CONNECTED_STATE }
     end
 
     describe do
       before do
-        @event_queue = ZookeeperCommon::QueueWithPipe.new
-        @czk = CZookeeper.new('localhost:2181', @event_queue)
+        @event_queue = Zookeeper::Common::QueueWithPipe.new
+        @czk = Zookeeper::CZookeeper.new(Zookeeper.default_cnx_str, @event_queue)
       end
 
       after do
@@ -39,9 +40,9 @@ if Module.const_defined?(:CZookeeper)
         it %[should have a connection event after being connected] do
           event = wait_until(2) { @event_queue.pop }
           event.should be
-          event[:req_id].should == ZookeeperCommon::ZKRB_GLOBAL_CB_REQ
-          event[:type].should   == ZookeeperConstants::ZOO_SESSION_EVENT
-          event[:state].should  == ZookeeperConstants::ZOO_CONNECTED_STATE
+          event[:req_id].should == Zookeeper::Common::ZKRB_GLOBAL_CB_REQ
+          event[:type].should   == Zookeeper::Constants::ZOO_SESSION_EVENT
+          event[:state].should  == Zookeeper::Constants::ZOO_CONNECTED_STATE
         end
       end
     end

data/spec/chrooted_connection_spec.rb

@@ -6,7 +6,7 @@ describe 'Zookeeper chrooted' do
   let(:data) { "underpants" } 
   let(:chroot_path) { '/slyphon-zookeeper-chroot' }
 
-  let(:connection_string) { "localhost:2181#{chroot_path}" }
+  let(:connection_string) { "#{Zookeeper.default_cnx_str}#{chroot_path}" }
 
   before do
     @zk = Zookeeper.new(connection_string)
@@ -52,7 +52,7 @@ describe 'Zookeeper chrooted' do
         it %[should return ZNONODE] do
           rv = zk.create(:path => '/', :data => '')
           rv[:rc].should_not be_zero
-          rv[:rc].should == ZookeeperExceptions::ZNONODE
+          rv[:rc].should == Zookeeper::Exceptions::ZNONODE
         end
       end
     end

data/spec/default_watcher_spec.rb

@@ -5,18 +5,18 @@ describe Zookeeper do
     before do
       @events = []
       @watch_block = lambda do |hash| 
-        $stderr.puts "watch_block: #{hash.inspect}"
+        logger.debug "watch_block: #{hash.inspect}"
         @events << hash
       end
 
-      @zk = Zookeeper.new('localhost:2181', 10, @watch_block)
+      @zk = Zookeeper.new(Zookeeper.default_cnx_str, 10, @watch_block)
 
       wait_until(2) { @zk.connected? }
       @zk.should be_connected
-      $stderr.puts "connected!"
+      logger.debug "connected!"
 
       wait_until(2) { !@events.empty? }
-      $stderr.puts "got events!"
+      logger.debug "got events!"
     end
 
     after do

data/spec/em_spec.rb

@@ -11,7 +11,7 @@ describe 'ZookeeperEM' do
     default_timeout 3.0
 
     def setup_zk
-      @zk = ZookeeperEM::Client.new('localhost:2181')
+      @zk = ZookeeperEM::Client.new(Zookeeper.default_cnx_str)
       em do
         @zk.on_attached do
           yield

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