zk 1.9.3 → 1.9.4

data/Gemfile

@@ -23,9 +23,9 @@ group :docs do
   end
 end
 
-platform :mri_19 do
-  gem 'simplecov', :group => :coverage, :require => false
-end
+# platform :mri_19 do
+#   gem 'simplecov', :group => :coverage, :require => false
+# end
 
 group :development do
   gem 'guard',          :require => false

data/RELEASES.markdown

@@ -1,5 +1,13 @@
 This file notes feature differences and bugfixes contained between releases.
 
+### v1.9.4 ###
+
+* Forward options to underlying connection #69 (h/t: avalanche123)
+* Don't check connection state in Locker#assert! - leads to better retry behavior
+* allow specifying session-id
+* upgrade logging gem dependency
+
+
 ### v1.9.3 ###
 
 * Fix deadlocks between watchers and reconnecting

data/lib/zk/client/threaded.rb

@@ -180,7 +180,7 @@ module ZK
 
         ObjectSpace.define_finalizer(self, self.class.finalizer(@fork_subs))
 
-        connect if opts.fetch(:connect, true)
+        connect(opts) if opts.fetch(:connect, true)
       end
       
       # ensure that the initializer and the reopen code set up the mutexes
@@ -626,7 +626,7 @@ module ZK
           # create the connection.
           @last_cnx_state = Zookeeper::ZOO_CONNECTING_STATE
 
-          @cnx = create_connection(@host, timeout, @event_handler.get_default_watcher_block)
+          @cnx = create_connection(@host, timeout, @event_handler.get_default_watcher_block, opts)
 
           spawn_reconnect_thread
           

data/lib/zk/locker/locker_base.rb

@@ -277,7 +277,6 @@ module ZK
       def assert!
         @mutex.synchronize do
           raise LockAssertionFailedError, "have not obtained the lock yet"            unless locked?
-          raise LockAssertionFailedError, "not connected"                             unless zk.connected?
           raise LockAssertionFailedError, "lock_path was #{lock_path.inspect}"        unless lock_path
           raise LockAssertionFailedError, "the lock path #{lock_path} did not exist!" unless zk.exists?(lock_path)
           raise LockAssertionFailedError, "the parent node was replaced!"             unless root_lock_path_same?

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 end

data/zk.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = s.summary + "\n"
 
   s.add_runtime_dependency 'zookeeper', '~> 1.4.0'
-  s.add_runtime_dependency 'logging',   '~> 1.7.2'
+  s.add_runtime_dependency 'logging',   '~> 1.8.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zk
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zookeeper
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.2
 description: ! 'A high-level wrapper around the zookeeper driver
 
 '
@@ -165,12 +165,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2576608496404103382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2576608496404103382
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -222,3 +228,4 @@ test_files:
 - spec/zk/threadpool_spec.rb
 - spec/zk/watch_spec.rb
 - spec/zk/zookeeper_spec.rb
+has_rdoc: