zk-eventmachine 0.1.12 → 0.1.13

data/Gemfile

@@ -1,9 +1,7 @@
-source 'http://localhost:50000'
+source ENV['MBOX_BUNDLER_SOURCE'] if ENV['MBOX_BUNDLER_SOURCE']
 source "http://rubygems.org"
 
-
 # Specify your gem's dependencies in zk-em.gemspec
 gemspec
 
-
 # vim:ft=ruby

data/Rakefile

@@ -20,7 +20,7 @@ end
   rspec_task_name     = "mb:#{rvm_ruby}:run_rspec"
 
   task create_gemset_name do
-    sh "rvm #{rvm_ruby} && rvm gemset create #{gemset_name}" 
+    sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}" 
   end
 
   task bundle_task_name => create_gemset_name do
@@ -29,7 +29,7 @@ end
   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' => rspec_task_name

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

data/spec/spec_helper.rb

@@ -10,8 +10,6 @@ require 'evented-spec'
 # in spec/support/ and its subdirectories.
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f}
 
-$stderr.sync = true
-
 case `uname -s`.chomp
 when 'Linux'
   $stderr.puts "WARN: setting EM.epoll = true for tests"
@@ -21,6 +19,25 @@ when 'Darwin'
   EM.kqueue = true
 end
 
+# method to wait until block passed returns true or timeout (default is 2 seconds) is reached 
+def wait_until(timeout=2)
+  time_to_stop = Time.now + timeout
+
+  until yield 
+    break if Time.now > time_to_stop
+    Thread.pass
+  end
+end
+
+def wait_while(timeout=2)
+  time_to_stop = Time.now + timeout
+
+  while yield 
+    break if Time.now > time_to_stop
+    Thread.pass
+  end
+end
+
 RSpec.configure do |config|
   config.mock_with :flexmock
 end

data/spec/support/logging.rb

@@ -1,14 +1,19 @@
 require 'logger'
 
-logger = Logger.new(File.expand_path('../../../test.log', __FILE__)).tap {|l| l.level = Logger::DEBUG}
+log_file = File.open(File.expand_path('../../../test.log', __FILE__), 'a').tap { |f| f.sync = true }
 
+Logger.new(log_file).tap do |log| 
+  log.level = Logger::DEBUG 
+  ZK.logger = log
+  Zookeeper.logger = log
+end
+
+# for debugging along with C output uncomment the following
+#
+# $stderr.sync = true
 # logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
 # Zookeeper.set_debug_level(4)
 
-ZK.logger = logger
-Zookeeper.logger = ZK.logger
-
-
 def logger
   ZK.logger
 end

data/spec/z_k/z_k_event_machine/client_spec.rb

@@ -1,20 +1,19 @@
 require 'spec_helper'
 
 module ZK::ZKEventMachine
-  describe 'Client' do
+  shared_examples_for 'Client' do
     include EventedSpec::SpecHelper
     default_timeout 2.0
 
+    let(:base_path) { '/zk-em-testing' }
+
     before do
-      @zk = ::ZK.new
-      @base_path = '/zk-em-testing'
-      @zk.rm_rf(@base_path)
-      @zk.mkdir_p(@base_path)
-      @zkem = ZK::ZKEventMachine::Client.new('localhost:2181')
+      @zk.rm_rf(base_path)
+      @zk.mkdir_p(base_path)
     end
 
     after do
-      @zk.rm_rf(@base_path)
+      @zk.rm_rf(base_path)
       @zk.close!
     end
 
@@ -54,11 +53,10 @@ module ZK::ZKEventMachine
       end
     end
 
-
     describe 'get' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @data = 'this is data'
           @zk.create(@path, @data)
         end
@@ -101,7 +99,7 @@ module ZK::ZKEventMachine
 
       describe 'failure' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
         end
 
@@ -139,7 +137,7 @@ module ZK::ZKEventMachine
     describe 'create' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
 
           @data = 'this is data'
@@ -205,7 +203,7 @@ module ZK::ZKEventMachine
 
       describe 'failure' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.create(@path, '')
         end
 
@@ -242,7 +240,7 @@ module ZK::ZKEventMachine
     describe 'set' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @data = 'this is data'
           @new_data = 'this is better data'
           @zk.create(@path, @data)
@@ -292,7 +290,7 @@ module ZK::ZKEventMachine
 
       describe 'failure' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
         end
 
@@ -328,7 +326,7 @@ module ZK::ZKEventMachine
 
     describe 'exists?' do
       before do
-        @path = [@base_path, 'foo'].join('/')
+        @path = [base_path, 'foo'].join('/')
         @data = 'this is data'
       end
 
@@ -374,7 +372,7 @@ module ZK::ZKEventMachine
     describe 'stat' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @data = 'this is data'
           @zk.create(@path, @data)
           @orig_stat = @zk.stat(@path)
@@ -416,7 +414,7 @@ module ZK::ZKEventMachine
 
       describe 'non-existent node' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
         end
 
@@ -445,7 +443,7 @@ module ZK::ZKEventMachine
     describe 'delete' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @data = 'this is data'
           @zk.create(@path, @data)
         end
@@ -483,7 +481,7 @@ module ZK::ZKEventMachine
 
       describe 'failure' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
         end
 
@@ -520,7 +518,7 @@ module ZK::ZKEventMachine
     describe 'children' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @child_1_path = [@path, 'child_1'].join('/')
           @child_2_path = [@path, 'child_2'].join('/')
 
@@ -574,7 +572,7 @@ module ZK::ZKEventMachine
 
       describe 'failure' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
         end
 
@@ -611,7 +609,7 @@ module ZK::ZKEventMachine
     describe 'get_acl' do
       describe 'success' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @data = 'this is data'
           @zk.create(@path, @data)
         end
@@ -655,7 +653,7 @@ module ZK::ZKEventMachine
 
       describe 'failure' do
         before do
-          @path = [@base_path, 'foo'].join('/')
+          @path = [base_path, 'foo'].join('/')
           @zk.delete(@path) rescue ZK::Exceptions::NoNode
         end
 
@@ -717,7 +715,6 @@ module ZK::ZKEventMachine
         em do
           @zkem.session_passwd.should be_nil
 
-
           @zkem.connect do
             @zkem.session_passwd.should be_kind_of(String)
             @zkem.close! { done }
@@ -728,7 +725,7 @@ module ZK::ZKEventMachine
 
     describe 'on_connection_lost' do
       before do
-        @path = [@base_path, 'foo'].join('/')
+        @path = [base_path, 'foo'].join('/')
         @data = 'this is data'
         @zk.create(@path, @data)
       end
@@ -816,5 +813,42 @@ module ZK::ZKEventMachine
       end
     end # on_connecting
   end # Client
+
+  describe 'regular' do
+
+    before do
+      @zkem = ZK::ZKEventMachine::Client.new('localhost:2181')
+      @zk = ZK.new.tap { |z| wait_until { z.connected? } }
+      @zk.should be_connected
+    end
+
+    it_should_behave_like 'Client'
+  end
+
+  describe 'chrooted' do
+    let(:chroot_path) { '/_zkem_chroot_' }
+    let(:zk_connect_host) { "localhost:2181#{chroot_path}" }
+
+    before :all do
+      ZK.open('localhost:2181') do |z|
+        z.rm_rf(chroot_path)
+        z.mkdir_p(chroot_path)
+      end
+    end
+
+    after :all do
+      ZK.open('localhost:2181') do |z|
+        z.rm_rf(chroot_path)
+      end
+    end
+
+    before do
+      @zkem = ZK::ZKEventMachine::Client.new(zk_connect_host)
+      @zk = ZK.new(zk_connect_host).tap { |z| wait_until { z.connected? } }
+      @zk.should be_connected
+    end
+
+    it_should_behave_like 'Client'
+  end
 end # ZK::ZKEventMachine
 

data/zk-eventmachine.gemspec

@@ -12,19 +12,20 @@ Gem::Specification.new do |s|
   s.summary     = %q{ZK client for EventMachine-based (async) applications}
   s.description = s.description
 
-  s.add_dependency('zk', '~> 0.8.6')
+  s.add_dependency 'zk', '~> 0.8.7'
 
   # zk depends on slyphon-zookeeper, but we need at least this version
-  s.add_dependency('slyphon-zookeeper', '~> 0.2.8')
-  s.add_dependency('eventmachine', '~> 1.0.0.beta.3')
-  s.add_dependency('deferred', '~> 0.5.3')
+  s.add_dependency 'slyphon-zookeeper', '~> 0.3.0'
+  s.add_dependency 'eventmachine',      '~> 1.0.0.beta.4'
+  s.add_dependency 'deferred',          '~> 0.5.3'
 
-  s.add_development_dependency('rspec', '~> 2.5.0')
-  s.add_development_dependency('yard', '~> 0.7.0')
-  s.add_development_dependency('autotest', '>= 4.4.0')
-  s.add_development_dependency('flexmock', '~> 0.8.10')
-  s.add_development_dependency('evented-spec', '~> 0.4.1')
-  s.add_development_dependency('redcarpet', '~> 2.1.0')
+  s.add_development_dependency 'rspec',       '~> 2.8.0'
+  s.add_development_dependency 'yard',        '~> 0.7.0'
+  s.add_development_dependency 'autotest',    '>= 4.4.0'
+  s.add_development_dependency 'flexmock',    '~> 0.8.10'
+  s.add_development_dependency 'evented-spec','~> 0.9.0'
+  s.add_development_dependency 'redcarpet',   '~> 2.1.0'
+  s.add_development_dependency 'rake'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zk
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 8
-        - 6
-        version: 0.8.6
+        - 7
+        version: 0.8.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 8
-        version: 0.2.8
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,14 +57,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196357
+        hash: 62196363
         segments: 
         - 1
         - 0
         - 0
         - beta
-        - 3
-        version: 1.0.0.beta.3
+        - 4
+        version: 1.0.0.beta.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -91,12 +91,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 47
         segments: 
         - 2
-        - 5
+        - 8
         - 0
-        version: 2.5.0
+        version: 2.8.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -155,12 +155,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 59
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 9
+        - 0
+        version: 0.9.0
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,20 @@ dependencies:
         version: 2.1.0
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: ""
 email: 
 - slyphon@hp.com