zk-eventmachine 0.1.4 → 0.1.5

data/lib/z_k/z_k_event_machine/client.rb

@@ -26,7 +26,9 @@ module ZK
       def connect(&blk)
         # XXX: maybe move this into initialize, need to figure out how to schedule it properly
         @cnx ||= ZookeeperEM::Client.new(@host, DEFAULT_TIMEOUT, event_handler.get_default_watcher_block).tap do |c|
-          c.on_attached { logger.debug { "connection is attached" } }
+          c.on_attached do 
+            logger.debug { "connection is attached, client_id: %0x" % [c.client_id] }
+          end
         end
 
         @cnx.on_attached(&blk)
@@ -40,14 +42,15 @@ module ZK
         on_close(&blk)
 
         if @cnx
-          logger.debug { "#{self.class.name}: calling @cnx.close" }
-          @cnx.close
-          @cnx = nil
-
-          logger.debug { "#{self.class.name}: @cnx.close callback fired, clearing event_handler" }
+          logger.debug { "#{self.class.name}: in close! clearing event_handler" }
           event_handler.clear!
-          logger.debug { "firing on_close handler" }
-          on_close.succeed
+
+          logger.debug { "#{self.class.name}: calling @cnx.close" }
+          @cnx.close do
+            logger.debug { "firing on_close handler" }
+            on_close.succeed
+            @cnx = nil
+          end
         else
           on_close.succeed
         end

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,15 @@ 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"
+  EM.epoll = true
+when 'Darwin'
+  $stderr.puts "WARN: setting EM.kqueue = true for tests"
+  EM.kqueue = true
+end
+
 RSpec.configure do |config|
   config.mock_with :flexmock
 end

data/spec/support/logging.rb

@@ -1,8 +1,14 @@
 require 'logger'
 
-ZK.logger = Logger.new(File.expand_path('../../../test.log', __FILE__)).tap {|l| l.level = Logger::DEBUG}
+logger = Logger.new(File.expand_path('../../../test.log', __FILE__)).tap {|l| l.level = Logger::DEBUG}
+
+# 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

@@ -23,7 +23,10 @@ module ZK::ZKEventMachine
         em do
           @zkem.connect do
             true.should be_true
-            @zkem.close! { done }
+            @zkem.close! do 
+              logger.debug { "calling done" }
+              done
+            end
           end
         end
       end

data/spec/z_k/z_k_event_machine/event_handler_e_m_spec.rb

@@ -7,6 +7,7 @@ module ZK::ZKEventMachine
 
     before do
       @zk = ::ZK.new
+      logger.debug { "threaded client has client id: %0x" % [@zk.cnx.client_id] }
       @base_path = '/zk-em-testing'
       @zk.rm_rf(@base_path)
       @zk.mkdir_p(@base_path)

data/zk-eventmachine.gemspec

@@ -13,6 +13,9 @@ Gem::Specification.new do |s|
   s.description = s.description
 
   s.add_dependency('zk', '~> 0.8.3')
+
+  # zk depends on slyphon-zookeeper, but we need at least this version
+  s.add_dependency('slyphon-zookeeper', '~> 0.2.4')
   s.add_dependency('eventmachine', '>= 0.12.10')
 
   s.add_development_dependency('rspec', '~> 2.5.0')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +00:00
+date: 2011-06-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: slyphon-zookeeper
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 10
         version: 0.12.10
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +81,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +97,11 @@ dependencies:
         - 0
         version: 0.7.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +113,11 @@ dependencies:
         - 0
         version: 4.4.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,11 +129,11 @@ dependencies:
         - 10
         version: 0.8.10
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: evented-spec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,7 +145,7 @@ dependencies:
         - 1
         version: 0.4.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: ""
 email: 
 - slyphon@hp.com