zk 0.6.4 → 0.6.5

data/Gemfile

@@ -5,6 +5,6 @@ source "http://localhost:50000"
 # Specify your gem's dependencies in zk.gemspec
 gemspec
 
-gem 'ruby-debug'
+# gem 'ruby-debug'
 
 # vim:ft=ruby

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 by Hewlett Packard Development Company, L.P.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/z_k/client.rb

@@ -269,7 +269,7 @@ module ZK
         end
       end
 
-      rv = check_rc(@cnx.create(h))
+      rv = check_rc(@cnx.create(h), h)
 
       h[:callback] ? rv : rv[:path]
     end
@@ -323,7 +323,7 @@ module ZK
 
       setup_watcher!(:data, h)
 
-      rv = check_rc(@cnx.get(h))
+      rv = check_rc(@cnx.get(h), h)
 
       opts[:callback] ? rv : rv.values_at(:data, :stat)
     end
@@ -372,7 +372,7 @@ module ZK
     def set(path, data, opts={})
       h = { :path => path, :data => data }.merge(opts)
 
-      rv = check_rc(@cnx.set(h))
+      rv = check_rc(@cnx.set(h), h)
 
       opts[:callback] ? nil : rv[:stat]
     end
@@ -436,7 +436,7 @@ module ZK
       when Zookeeper::ZOK, Zookeeper::ZNONODE
         rv[:stat]
       else
-        check_rc(rv) # throws the appropriate error
+        check_rc(rv, h) # throws the appropriate error
       end
     end
 
@@ -514,7 +514,7 @@ module ZK
     #++
     def delete(path, opts={})
       h = { :path => path, :version => -1 }.merge(opts)
-      rv = check_rc(@cnx.delete(h))
+      rv = check_rc(@cnx.delete(h), h)
       nil
     end
 
@@ -571,7 +571,7 @@ module ZK
 
       setup_watcher!(:child, h)
 
-      rv = check_rc(@cnx.get_children(h))
+      rv = check_rc(@cnx.get_children(h), h)
       opts[:callback] ? nil : rv[:children]
     end
 
@@ -615,7 +615,7 @@ module ZK
     #++
     def get_acl(path, opts={})
       h = { :path => path }.merge(opts)
-      rv = check_rc(@cnx.get_acl(h))
+      rv = check_rc(@cnx.get_acl(h), h)
       opts[:callback] ? nil : rv.values_at(:children, :stat)
     end
 
@@ -645,12 +645,10 @@ module ZK
     #
     def set_acl(path, acls, opts={})
       h = { :path => path, :acl => acls }.merge(opts)
-      rv = check_rc(@cnx.set_acl(h))
+      rv = check_rc(@cnx.set_acl(h), h)
       opts[:callback] ? nil : rv[:stat]
     end
 
-      
-
     #--
     #
     # EXTENSIONS
@@ -705,6 +703,11 @@ module ZK
       end
     end
 
+    # see ZK::Find for explanation
+    def find(*paths, &block)
+      ZK::Find.find(self, *paths, &block)
+    end
+
     # will block the caller until +abs_node_path+ has been removed
     #
     # NOTE: this is dangerous to use in callbacks! there is only one
@@ -890,10 +893,11 @@ module ZK
         false
       end
 
-      def check_rc(hash)
+      def check_rc(hash, inputs=nil)
         hash.tap do |h|
           if code = h[:rc]
-            raise Exceptions::KeeperException.by_code(code) unless code == Zookeeper::ZOK
+            msg = inputs ? "inputs: #{inputs.inspect}" : nil
+            raise Exceptions::KeeperException.by_code(code), msg unless code == Zookeeper::ZOK
           end
         end
       end

data/lib/z_k/find.rb

@@ -0,0 +1,28 @@
+module ZK
+  module Find
+    # like ruby's Find module, will call the given block with each _absolute_ znode path 
+    # under +paths+. you can call ZK::Find.prune if you want to not recurse
+    # deeper under the current directory path.
+    def find(zk, *paths) #:yield: znode_path
+      paths.collect!{|d| d.dup}
+
+      while p = paths.shift
+        catch(:prune) do
+          yield p.dup.taint
+          next unless zk.exists?(p)
+
+          zk.children(p).each do |ch| 
+            paths.unshift ZK.join(p, ch).untaint
+          end
+        end
+      end
+    end
+
+    def prune
+      throw :prune
+    end
+
+    module_function :find, :prune
+  end
+end
+

data/lib/z_k/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/z_k.rb

@@ -21,6 +21,7 @@ require 'z_k/election'
 require 'z_k/mongoid'
 require 'z_k/client'
 require 'z_k/pool'
+require 'z_k/find'
 
 module ZK
   ZK_ROOT = File.expand_path('../..', __FILE__)
@@ -69,5 +70,21 @@ module ZK
   def self.new_pool(host, opts={})
     ZK::Pool::Bounded.new(host, opts)
   end
+
+  # Eventually this will implement proper File.join-like behavior, but only
+  # using the '/' char for a separator. for right now, this simply delegates to
+  # File.join
+  #--
+  # like File.join but ignores $INPUT_RECORD_SEPARATOR (i.e. $/, which is
+  # platform dependent) and only uses the '/' character
+  def self.join(*paths)
+    File.join(*paths)
+  end
+
+  protected
+    def self.chomp_sep(str)
+      p = (p[0] == ?/ ) ? p[1..-1] : p
+      p = (p[-1] == ?/) ? p[0..-2] : p
+    end
 end
 

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f}
 $stderr.sync = true
 
 # COMMENT THESE LINES FOR REMOTE DEBUGGING
-require 'ruby-debug'
+# require 'ruby-debug'
 require 'flexmock'
 
 RSpec.configure do |config|

data/spec/threadpool_spec.rb

@@ -33,7 +33,7 @@ describe ZK::Threadpool do
     end
 
     it %[should barf if the argument is not callable] do
-      bad_obj = mock(:not_callable)
+      bad_obj = flexmock(:not_callable)
       bad_obj.should_not respond_to(:call)
 
       lambda { @threadpool.defer(bad_obj) }.should raise_error(ArgumentError)

data/zk.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{A high-level wrapper around the zookeeper driver}
   s.description = s.summary
 
-  s.add_runtime_dependency 'slyphon-zookeeper', '~> 0.1.4'
+  s.add_runtime_dependency 'slyphon-zookeeper', '~> 0.1.7'
   s.add_development_dependency 'rspec', '~> 2.4.0'
   s.add_development_dependency 'wirble'
   s.add_development_dependency 'flexmock', '~> 0.8.10'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +00:00
+date: 2011-05-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 21
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 7
+        version: 0.1.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- LICENSE
 - Rakefile
 - lib/z_k.rb
 - lib/z_k/client.rb
@@ -102,6 +103,7 @@ files:
 - lib/z_k/event_handler_subscription.rb
 - lib/z_k/exceptions.rb
 - lib/z_k/extensions.rb
+- lib/z_k/find.rb
 - lib/z_k/locker.rb
 - lib/z_k/logging.rb
 - lib/z_k/message_queue.rb