zk 1.6.0 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -32,9 +32,9 @@ group :development do
32
32
  gem 'guard-rspec', :require => false
33
33
  gem 'guard-shell', :require => false
34
34
  gem 'guard-bundler', :require => false
35
- gem 'growl', :require => false
36
35
 
37
36
  if RUBY_PLATFORM =~ /darwin/i
37
+ gem 'growl', :require => false
38
38
  gem 'rb-readline', :platform => :ruby
39
39
  end
40
40
  end
data/RELEASES.markdown CHANGED
@@ -1,5 +1,9 @@
1
1
  This file notes feature differences and bugfixes contained between releases.
2
2
 
3
+ ### v1.6.1 ###
4
+
5
+ * Small fixes for zk-eventmachine compatibilty
6
+
3
7
  ### v1.6.0 ###
4
8
 
5
9
  * Locker cleanup code!
@@ -620,7 +620,8 @@ module ZK
620
620
  h = { :path => path }.merge(opts)
621
621
 
622
622
  setup_watcher!(:data, h) do
623
- call_and_check_rc(:stat, h.merge(:ignore => :no_node)).fetch(:stat)
623
+ rv = call_and_check_rc(:stat, h.merge(:ignore => :no_node))
624
+ opts[:callback] ? rv : rv.fetch(:stat)
624
625
  end
625
626
  end
626
627
 
data/lib/zk/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ZK
2
- VERSION = "1.6.0"
2
+ VERSION = "1.6.1"
3
3
  end
@@ -58,10 +58,11 @@ module SpecGlobalLogger
58
58
  def mute_logger
59
59
  zk_log = Logging.logger['ZK']
60
60
  orig_level, zk_log.level = zk_log.level, :off
61
- orig_zk_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
61
+ orig_zoo_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
62
62
  yield
63
63
  ensure
64
- zk_log.level = orig_zk_level
64
+ zk_log.level = orig_level
65
+ Zookeeper.debug_level = orig_zoo_level
65
66
  end
66
67
  end
67
68
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zk
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15
4
+ hash: 13
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 6
9
- - 0
10
- version: 1.6.0
9
+ - 1
10
+ version: 1.6.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2012-05-29 00:00:00 Z
19
+ date: 2012-05-31 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: zookeeper