slyphon-zookeeper 0.9.0-java → 0.9.1-java

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.9.1 see v0.8.4 notes, same patch
+
 v0.9.0 RELEASE THE KRAK..er, GIL!!
 
   * 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!!
   * 1.8.7 is deprecated! I will continue to support 1.8.7 for the near future
     but sometime soon, you're gonna have to upgrade.
 
+v0.8.4 fix NameError, require 'forwardable'
+  
+  * Really not sure why this didn't come up in tests
+
+  * issue here https://github.com/slyphon/zk/issues/22
+
 v0.8.3 fix NonLocalJump exception in event delivery thread shutdown code
 
   * hit a corner case where we're waiting for the zkc handle setup

data/Rakefile

@@ -12,14 +12,17 @@ end
 
 gemset_name = 'zookeeper'
 
-%w[1.8.7 1.9.2 1.9.3 jruby].each do |rvm_ruby|
+
+%w[1.8.7 1.9.2 1.9.3 jruby rbx].each do |ns_name|
+  rvm_ruby = (ns_name == 'rbx') ? "rbx-2.0.testing" : ns_name
+
   ruby_with_gemset = "#{rvm_ruby}@#{gemset_name}"
 
-  create_gemset_name  = "mb:#{rvm_ruby}:create_gemset"
-  clobber_task_name   = "mb:#{rvm_ruby}:clobber"
-  build_task_name     = "mb:#{rvm_ruby}:build"
-  bundle_task_name    = "mb:#{rvm_ruby}:bundle_install"
-  rspec_task_name     = "mb:#{rvm_ruby}:run_rspec"
+  create_gemset_name  = "mb:#{ns_name}:create_gemset"
+  clobber_task_name   = "mb:#{ns_name}:clobber"
+  build_task_name     = "mb:#{ns_name}:build"
+  bundle_task_name    = "mb:#{ns_name}:bundle_install"
+  rspec_task_name     = "mb:#{ns_name}:run_rspec"
 
   task create_gemset_name do
     sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}"
@@ -50,6 +53,8 @@ gemset_name = 'zookeeper'
     sh "rvm #{ruby_with_gemset} do bundle exec rspec spec --fail-fast"
   end
 
+  task "mb:#{ns_name}" => rspec_task_name
+
   task "mb:test_all" => rspec_task_name
 end
 

data/java/zookeeper_base.rb

@@ -3,7 +3,7 @@ require 'thread'
 require 'rubygems'
 
 gem 'slyphon-log4j', '= 1.2.15'
-gem 'slyphon-zookeeper_jar', '= 3.3.4'
+gem 'slyphon-zookeeper_jar', '= 3.3.5'
 
 require 'log4j'
 require 'zookeeper_jar'

data/lib/zookeeper.rb

@@ -2,13 +2,16 @@
 
 require 'thread'
 require 'monitor'
+require 'forwardable'
+require 'logger'
+
 require 'zookeeper/common'
 require 'zookeeper/constants'
 require 'zookeeper/callbacks'
 require 'zookeeper/exceptions'
 require 'zookeeper/stat'
 require 'zookeeper/acls'
-require 'logger'
+
 
 if defined?(::JRUBY_VERSION)
   $LOAD_PATH.unshift(File.expand_path('../java', File.dirname(__FILE__))).uniq!

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.9.0'
+  s.version     = '0.9.1'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   if ENV['JAVA_GEM'] or defined?(::JRUBY_VERSION)
     s.platform = 'java'
     s.add_runtime_dependency('slyphon-log4j',         '= 1.2.15')
-    s.add_runtime_dependency('slyphon-zookeeper_jar', '= 3.3.4')
+    s.add_runtime_dependency('slyphon-zookeeper_jar', '= 3.3.5')
     s.require_paths += %w[java]
   else
     s.require_paths += %w[ext]

data/spec/chrooted_connection_spec.rb

@@ -25,13 +25,15 @@ describe 'Zookeeper chrooted' do
     z = Zookeeper.new(host)
     yield z
   ensure
-    z.close
-
-    wait_until do 
-      begin
-        !z.connected?
-      rescue RuntimeError
-        true
+    if z
+      z.close
+
+      wait_until do 
+        begin
+          !z.connected?
+        rescue RuntimeError
+          true
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-25 00:00:00 Z
+date: 2012-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -62,7 +62,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -3832400148
+        hash: -4092863702
         segments: 
         - 1
         - 0
@@ -142,12 +142,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 3
         - 3
-        - 4
-        version: 3.3.4
+        - 5
+        version: 3.3.5
   type: :runtime
   version_requirements: *id008
 description: twitter's zookeeper client
@@ -175,7 +175,7 @@ files:
 - ext/depend
 - ext/extconf.rb
 - ext/generate_gvl_code.rb
-- ext/zkc-3.3.4.tar.gz
+- ext/zkc-3.3.5.tar.gz
 - ext/zkrb_wrapper.c
 - ext/zkrb_wrapper.h
 - ext/zkrb_wrapper_compat.c