slyphon-zookeeper 0.9.0-java → 0.9.1-java

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -1,3 +1,5 @@
1
+ v0.9.1 see v0.8.4 notes, same patch
2
+
1
3
  v0.9.0 RELEASE THE KRAK..er, GIL!!
2
4
 
3
5
  * In >= 1.9.2 the ruby interpreter allows you to release the GIL when
@@ -14,6 +16,12 @@ v0.9.0 RELEASE THE KRAK..er, GIL!!
14
16
  * 1.8.7 is deprecated! I will continue to support 1.8.7 for the near future
15
17
  but sometime soon, you're gonna have to upgrade.
16
18
 
19
+ v0.8.4 fix NameError, require 'forwardable'
20
+
21
+ * Really not sure why this didn't come up in tests
22
+
23
+ * issue here https://github.com/slyphon/zk/issues/22
24
+
17
25
  v0.8.3 fix NonLocalJump exception in event delivery thread shutdown code
18
26
 
19
27
  * hit a corner case where we're waiting for the zkc handle setup
data/Rakefile CHANGED
@@ -12,14 +12,17 @@ end
12
12
 
13
13
  gemset_name = 'zookeeper'
14
14
 
15
- %w[1.8.7 1.9.2 1.9.3 jruby].each do |rvm_ruby|
15
+
16
+ %w[1.8.7 1.9.2 1.9.3 jruby rbx].each do |ns_name|
17
+ rvm_ruby = (ns_name == 'rbx') ? "rbx-2.0.testing" : ns_name
18
+
16
19
  ruby_with_gemset = "#{rvm_ruby}@#{gemset_name}"
17
20
 
18
- create_gemset_name = "mb:#{rvm_ruby}:create_gemset"
19
- clobber_task_name = "mb:#{rvm_ruby}:clobber"
20
- build_task_name = "mb:#{rvm_ruby}:build"
21
- bundle_task_name = "mb:#{rvm_ruby}:bundle_install"
22
- rspec_task_name = "mb:#{rvm_ruby}:run_rspec"
21
+ create_gemset_name = "mb:#{ns_name}:create_gemset"
22
+ clobber_task_name = "mb:#{ns_name}:clobber"
23
+ build_task_name = "mb:#{ns_name}:build"
24
+ bundle_task_name = "mb:#{ns_name}:bundle_install"
25
+ rspec_task_name = "mb:#{ns_name}:run_rspec"
23
26
 
24
27
  task create_gemset_name do
25
28
  sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}"
@@ -50,6 +53,8 @@ gemset_name = 'zookeeper'
50
53
  sh "rvm #{ruby_with_gemset} do bundle exec rspec spec --fail-fast"
51
54
  end
52
55
 
56
+ task "mb:#{ns_name}" => rspec_task_name
57
+
53
58
  task "mb:test_all" => rspec_task_name
54
59
  end
55
60
 
Binary file
@@ -3,7 +3,7 @@ require 'thread'
3
3
  require 'rubygems'
4
4
 
5
5
  gem 'slyphon-log4j', '= 1.2.15'
6
- gem 'slyphon-zookeeper_jar', '= 3.3.4'
6
+ gem 'slyphon-zookeeper_jar', '= 3.3.5'
7
7
 
8
8
  require 'log4j'
9
9
  require 'zookeeper_jar'
data/lib/zookeeper.rb CHANGED
@@ -2,13 +2,16 @@
2
2
 
3
3
  require 'thread'
4
4
  require 'monitor'
5
+ require 'forwardable'
6
+ require 'logger'
7
+
5
8
  require 'zookeeper/common'
6
9
  require 'zookeeper/constants'
7
10
  require 'zookeeper/callbacks'
8
11
  require 'zookeeper/exceptions'
9
12
  require 'zookeeper/stat'
10
13
  require 'zookeeper/acls'
11
- require 'logger'
14
+
12
15
 
13
16
  if defined?(::JRUBY_VERSION)
14
17
  $LOAD_PATH.unshift(File.expand_path('../java', File.dirname(__FILE__))).uniq!
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "slyphon-zookeeper"
6
- s.version = '0.9.0'
6
+ s.version = '0.9.1'
7
7
 
8
8
  s.authors = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
9
9
  s.email = ["slyphon@gmail.com"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
24
24
  if ENV['JAVA_GEM'] or defined?(::JRUBY_VERSION)
25
25
  s.platform = 'java'
26
26
  s.add_runtime_dependency('slyphon-log4j', '= 1.2.15')
27
- s.add_runtime_dependency('slyphon-zookeeper_jar', '= 3.3.4')
27
+ s.add_runtime_dependency('slyphon-zookeeper_jar', '= 3.3.5')
28
28
  s.require_paths += %w[java]
29
29
  else
30
30
  s.require_paths += %w[ext]
@@ -25,13 +25,15 @@ describe 'Zookeeper chrooted' do
25
25
  z = Zookeeper.new(host)
26
26
  yield z
27
27
  ensure
28
- z.close
29
-
30
- wait_until do
31
- begin
32
- !z.connected?
33
- rescue RuntimeError
34
- true
28
+ if z
29
+ z.close
30
+
31
+ wait_until do
32
+ begin
33
+ !z.connected?
34
+ rescue RuntimeError
35
+ true
36
+ end
35
37
  end
36
38
  end
37
39
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: slyphon-zookeeper
3
3
  version: !ruby/object:Gem::Version
4
- hash: 59
4
+ hash: 57
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 9
9
- - 0
10
- version: 0.9.0
9
+ - 1
10
+ version: 0.9.1
11
11
  platform: java
12
12
  authors:
13
13
  - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
20
20
  bindir: bin
21
21
  cert_chain: []
22
22
 
23
- date: 2012-04-25 00:00:00 Z
23
+ date: 2012-04-26 00:00:00 Z
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
@@ -62,7 +62,7 @@ dependencies:
62
62
  requirements:
63
63
  - - "="
64
64
  - !ruby/object:Gem::Version
65
- hash: -3832400148
65
+ hash: -4092863702
66
66
  segments:
67
67
  - 1
68
68
  - 0
@@ -142,12 +142,12 @@ dependencies:
142
142
  requirements:
143
143
  - - "="
144
144
  - !ruby/object:Gem::Version
145
- hash: 3
145
+ hash: 1
146
146
  segments:
147
147
  - 3
148
148
  - 3
149
- - 4
150
- version: 3.3.4
149
+ - 5
150
+ version: 3.3.5
151
151
  type: :runtime
152
152
  version_requirements: *id008
153
153
  description: twitter's zookeeper client
@@ -175,7 +175,7 @@ files:
175
175
  - ext/depend
176
176
  - ext/extconf.rb
177
177
  - ext/generate_gvl_code.rb
178
- - ext/zkc-3.3.4.tar.gz
178
+ - ext/zkc-3.3.5.tar.gz
179
179
  - ext/zkrb_wrapper.c
180
180
  - ext/zkrb_wrapper.h
181
181
  - ext/zkrb_wrapper_compat.c
data/ext/zkc-3.3.4.tar.gz DELETED
Binary file