zk 0.8.7 → 0.8.8

data/Rakefile

@@ -9,12 +9,17 @@
 
 gemset_name = 'zk'
 
-%w[1.9.3 jruby].each do |rvm_ruby|
+%w[1.8.7 1.9.2 1.9.3 jruby].each do |rvm_ruby|
   ruby_with_gemset = "#{rvm_ruby}@#{gemset_name}"
-  bundle_task_name  = "mb:#{rvm_ruby}:bundle_install"
-  rspec_task_name   = "mb:#{rvm_ruby}:run_rspec"
+  create_gemset_task_name = "mb:#{rvm_ruby}:create_gemset"
+  bundle_task_name        = "mb:#{rvm_ruby}:bundle_install"
+  rspec_task_name         = "mb:#{rvm_ruby}:run_rspec"
 
-  task bundle_task_name do
+  task create_gemset_task_name do
+    sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}"
+  end
+
+  task bundle_task_name => create_gemset_task_name do
     rm_f 'Gemfile.lock'
     sh "rvm #{ruby_with_gemset} do bundle install"
   end
@@ -23,6 +28,6 @@ gemset_name = 'zk'
     sh "rvm #{ruby_with_gemset} do bundle exec rspec spec --fail-fast"
   end
 
-  task "mb:test_all_rubies" => rspec_task_name
+  task "mb:test_all" => rspec_task_name
 end
 

data/lib/z_k/client/unixisms.rb

@@ -25,7 +25,7 @@ module ZK
       rescue Exceptions::NoNode
         if File.dirname(path) == '/'
           # ok, we're screwed, blow up
-          raise KeeperException, "could not create '/', something is wrong", caller
+          raise Exceptions::NonExistentRootError, "could not create '/', are you chrooted into a non-existent path?", caller
         end
 
         mkdir_p(File.dirname(path))

data/lib/z_k/exceptions.rb

@@ -96,6 +96,10 @@ module ZK
 
     # raised when assert_locked_for_share! is called and no shared lock is held
     class MustBeShareLockedException < ZKError; end
+
+    # raised for certain operations when using a chrooted connection, but the
+    # root doesn't exist.
+    class NonExistentRootError < ZKError; end
   end
 end
 

data/lib/z_k/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/spec/z_k/locker_spec.rb

@@ -393,33 +393,53 @@ describe "ZK::Locker chrooted" do
   let(:chroot_path) { '/_zk_chroot_' }
 
   let(:zk)  { ZK.new("localhost:#{ZK_TEST_PORT}#{chroot_path}") }
-  let(:zk2) { ZK.new("localhost:#{ZK_TEST_PORT}#{chroot_path}") }
-  let(:zk3) { ZK.new("localhost:#{ZK_TEST_PORT}#{chroot_path}") }
 
-  let(:connections) { [zk, zk2, zk3] }
+  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(:path) { "shlock" }
-  let(:root_lock_path) { "/_zklocking/#{path}" }
+    let(:connections) { [zk, zk2, zk3] }
 
-  before do
-    ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
-      zk.mkdir_p(chroot_path)
+    let(:path) { "shlock" }
+    let(:root_lock_path) { "/_zklocking/#{path}" }
+
+    before do
+      ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
+        zk.mkdir_p(chroot_path)
+      end
+
+      wait_until{ connections.all?(&:connected?) }
     end
 
-    wait_until{ connections.all?(&:connected?) }
+    after do
+      connections.each { |c| c.close! }
+      wait_until { !connections.any?(&:connected?) }
+
+      ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
+        zk.rm_rf(chroot_path)
+      end
+    end
+
+    it_should_behave_like 'SharedLocker'
+    it_should_behave_like 'ExclusiveLocker'
+    it_should_behave_like 'shared-exclusive interaction'
   end
 
-  after do
-    connections.each { |c| c.close! }
-    wait_until { !connections.any?(&:connected?) }
+  describe "when the root doesn't exist" do
+    let(:lock_name) { 'master' }
+
+    it %[should raise a NonExistentRootError] do
+      @got_lock = false
+
+      lambda do
+        zk.with_lock(lock_name) do
+          @got_lock = true
+        end
+      end.should raise_error(ZK::Exceptions::NonExistentRootError)
+
 
-    ZK.open("localhost:#{ZK_TEST_PORT}") do |zk|
-      zk.rm_rf(chroot_path)
+      @got_lock.should_not be_true
     end
   end
-
-  it_should_behave_like 'SharedLocker'
-  it_should_behave_like 'ExclusiveLocker'
-  it_should_behave_like 'shared-exclusive interaction'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-11 00:00:00 Z
+date: 2012-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A high-level wrapper around the zookeeper driver