zookeeper 1.2.10-java → 1.2.11-java

data/CHANGELOG

@@ -1,3 +1,11 @@
+v1.2.11 remove dependency on backports gem
+
+  * Somewhat naively we were requiring the backports gem to provide
+    Kernel#require_relative. This release implements similar functionlity
+    inside the Zookeeper module and doesn't affect the global namespace.
+
+    We apologise for the inconvenience.
+
 v1.2.10 minor bug fix in java code
   
   * Don't obscure a legitimate exception because of an unexpected nil

data/README.markdown

@@ -28,6 +28,20 @@ Portions contributed to the open source community by HPDC, L.P.
 
 sudo gem install zookeeper
 
+### rbenv is awesome
+
+Let me start out by saying I prefer rvm, and that I really don't know a whole lot about linking on OS X. Or Linux. Any suggestions or constructive insults would be greatly appreciated if you have insight into what i'm doing wrong here.
+
+So, it seems that [ruby-build][] doesn't use `--enable-shared` by default. I'm told this is for speed. 
+
+If you run into problems with installing this gem (specifically with linking ex. `Undefined symbols for architecture x86_64`) and you're using rbenv, for now you need to ensure that your ruby was built with `--enable-shared`. I'm sorry for the inconvenience. (no, really)
+
+```shell
+~ $ CONFIGURE_OPTS='--enable-shared --disable-install-doc' rbenv install 1.9.3-p194
+```
+
+[ruby-build]: https://github.com/sstephenson/ruby-build
+
 ## Usage
 
 Connect to a server:

data/ext/c_zookeeper.rb

@@ -1,8 +1,11 @@
-require_relative '../lib/zookeeper/logger'
-require_relative '../lib/zookeeper/common'
-require_relative '../lib/zookeeper/constants'
-require_relative '../lib/zookeeper/exceptions' # zookeeper_c depends on exceptions defined in here
-require_relative 'zookeeper_c'
+Zookeeper.require_lib(
+  'zookeeper/logger',
+  'zookeeper/common',
+  'zookeeper/constants',
+  'zookeeper/exceptions' # zookeeper_c depends on exceptions defined in here
+)
+
+Zookeeper.require_root 'ext/zookeeper_c'
 
 # require File.expand_path('../zookeeper_c', __FILE__)
 

data/ext/zookeeper_base.rb

@@ -1,6 +1,7 @@
-require_relative 'c_zookeeper'
 require 'forwardable'
 
+Zookeeper.require_root 'ext/c_zookeeper'
+
 # The low-level wrapper-specific methods for the C lib
 # subclassed by the top-level Zookeeper class
 module Zookeeper

data/lib/zookeeper.rb

@@ -8,29 +8,45 @@ require 'benchmark'
 require 'logging'
 
 module Zookeeper
-  # establishes the namespace
-end
+  ZOOKEEPER_ROOT = File.expand_path('../..', __FILE__)
 
-require File.expand_path('../zookeeper/core_ext', __FILE__)
+  # require a path relative to the lib directory
+  # this is to avoid monkeying explicitly with $LOAD_PATH
+  #
+  # @private
+  def self.require_lib(*relpaths)
+    relpaths.each do |relpath|
+      require File.join(ZOOKEEPER_ROOT, 'lib', relpath)
+    end
+  end
 
-require 'backports' if RUBY_VERSION =~ /\A1\.8\./
+  # require a path that's relative to ZOOKEEPER_ROOT
+  # @private
+  def self.require_root(*relpaths)
+    relpaths.each do |relpath|
+      require File.join(ZOOKEEPER_ROOT, relpath)
+    end
+  end
+end
 
-require_relative 'zookeeper/monitor'
-require_relative 'zookeeper/logger'
-require_relative 'zookeeper/forked'
-require_relative 'zookeeper/latch'
-require_relative 'zookeeper/acls'
-require_relative 'zookeeper/constants'
-require_relative 'zookeeper/exceptions'
-require_relative 'zookeeper/continuation'
-require_relative 'zookeeper/common'
-require_relative 'zookeeper/callbacks'
-require_relative 'zookeeper/stat'
-require_relative 'zookeeper/client_methods'
+Zookeeper.require_lib(
+  'zookeeper/core_ext',
+  'zookeeper/monitor',
+  'zookeeper/logger',
+  'zookeeper/forked',
+  'zookeeper/latch',
+  'zookeeper/acls',
+  'zookeeper/constants',
+  'zookeeper/exceptions',
+  'zookeeper/continuation',
+  'zookeeper/common',
+  'zookeeper/callbacks',
+  'zookeeper/stat',
+  'zookeeper/client_methods'
+)
 
 # ok, now we construct the client
-
-require_relative 'zookeeper/client'
+Zookeeper.require_lib 'zookeeper/client'
 
 module Zookeeper
   include Constants
@@ -90,7 +106,7 @@ module Zookeeper
 end
 
 # just for first test, get rid of this soon
-require_relative 'zookeeper/compatibility'
+Zookeeper.require_lib 'zookeeper/compatibility'
 
 if ENV['ZKRB_DEBUG']
   Zookeeper.debug_level = Zookeeper::Constants::ZOO_LOG_LEVEL_DEBUG

data/lib/zookeeper/client.rb

@@ -3,9 +3,9 @@
 # or which class we're subclassing.
 
 if defined?(::JRUBY_VERSION)
-  require_relative('../../java/java_base')
+  Zookeeper.require_root('java/java_base')
 else
-  require_relative('../../ext/zookeeper_base')
+  Zookeeper.require_root('ext/zookeeper_base')
 end
 
 

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.2.10'
+  VERSION = '1.2.11'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 2
-  - 10
-  version: 1.2.10
+  - 11
+  version: 1.2.11
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,28 +20,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 Z
+date: 2012-07-18 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: backports
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 5
-        - 1
-        version: 2.5.1
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: logging
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -53,11 +37,11 @@ dependencies:
         - 2
         version: 1.7.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: slyphon-log4j
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -69,11 +53,11 @@ dependencies:
         - 15
         version: 1.2.15
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper_jar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -85,7 +69,7 @@ dependencies:
         - 5
         version: 3.3.5
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: |+
   A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
   friendlier interface, see http://github.com/slyphon/zk. Currently supported: