zk 1.6.0 → 1.6.1

data/Gemfile

@@ -32,9 +32,9 @@ group :development do
   gem 'guard-rspec',    :require => false
   gem 'guard-shell',    :require => false
   gem 'guard-bundler',  :require => false
-  gem 'growl',          :require => false
 
   if RUBY_PLATFORM =~ /darwin/i
+    gem 'growl',       :require => false
     gem 'rb-readline', :platform => :ruby
   end
 end

data/RELEASES.markdown

@@ -1,5 +1,9 @@
 This file notes feature differences and bugfixes contained between releases. 
 
+### v1.6.1 ###
+
+* Small fixes for zk-eventmachine compatibilty
+
 ### v1.6.0 ###
 
 * Locker cleanup code!

data/lib/zk/client/base.rb

@@ -620,7 +620,8 @@ module ZK
         h = { :path => path }.merge(opts)
 
         setup_watcher!(:data, h) do
-          call_and_check_rc(:stat, h.merge(:ignore => :no_node)).fetch(:stat)
+          rv = call_and_check_rc(:stat, h.merge(:ignore => :no_node))
+          opts[:callback] ? rv : rv.fetch(:stat)
         end
       end
 

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/support/logging.rb

@@ -58,10 +58,11 @@ module SpecGlobalLogger
   def mute_logger
     zk_log = Logging.logger['ZK']
     orig_level, zk_log.level = zk_log.level, :off
-    orig_zk_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
+    orig_zoo_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
     yield
   ensure
-    zk_log.level = orig_zk_level
+    zk_log.level = orig_level
+    Zookeeper.debug_level = orig_zoo_level
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 Z
+date: 2012-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zookeeper