zookeeper 0.4.4 → 0.9.3

data/spec/spec_helper.rb

@@ -0,0 +1,119 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../../ext', __FILE__))
+$LOAD_PATH.uniq!
+
+require 'rubygems'
+
+gem 'flexmock', '~> 0.8.11'
+
+require 'flexmock'
+require 'zookeeper'
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].sort.each { |f| require(f) }
+
+if ENV['ZKRB_DEBUG']
+  Zookeeper.logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
+  Zookeeper.set_debug_level(4)
+else
+  Zookeeper.logger = Logger.new(File.expand_path('../../test.log', __FILE__)).tap do |log|
+    log.level = Logger::DEBUG
+  end
+end
+
+if ENV['ZKRB_NOLOG']
+  Zookeeper.logger.level = Logger::FATAL
+  Zookeeper.set_debug_level(0)
+end
+
+
+module ZookeeperSpecHeleprs
+  class TimeoutError < StandardError; end
+
+  def logger
+    Zookeeper.logger
+  end
+
+  def ensure_node(zk, path, data)
+    return if zk.closed?
+    if zk.stat(:path => path)[:stat].exists?
+      zk.set(:path => path, :data => data)
+    else
+      zk.create(:path => path, :data => data)
+    end
+  end
+
+  def with_open_zk(host='localhost:2181')
+    z = Zookeeper.new(host)
+    yield z
+  ensure
+    if z
+      unless z.closed?
+        z.close
+
+        wait_until do 
+          begin
+            !z.connected?
+          rescue RuntimeError
+            true
+          end
+        end
+      end
+    end
+  end
+
+  # this is not as safe as the one in ZK, just to be used to clean up
+  # when we're the only one adjusting a particular path
+  def rm_rf(z, path)
+    z.get_children(:path => path).tap do |h|
+      if h[:rc].zero?
+        h[:children].each do |child|
+          rm_rf(z, File.join(path, child))
+        end
+      elsif h[:rc] == ZookeeperExceptions::ZNONODE
+        # no-op
+      else
+        raise "Oh noes! unexpected return value! #{h.inspect}"
+      end
+    end
+
+    rv = z.delete(:path => path)
+
+    unless (rv[:rc].zero? or rv[:rc] == ZookeeperExceptions::ZNONODE)
+      raise "oh noes! failed to delete #{path}" 
+    end
+
+    path
+  end
+
+
+  # method to wait until block passed returns true or timeout (default is 10 seconds) is reached 
+  # raises TiemoutError on timeout
+  def wait_until(timeout=10)
+    time_to_stop = Time.now + timeout
+    while true
+      rval = yield
+      return rval if rval
+      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
+      Thread.pass
+    end
+  end
+
+  # inverse of wait_until
+  def wait_while(timeout=10)
+    time_to_stop = Time.now + timeout
+    while true
+      rval = yield
+      return rval unless rval
+      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
+      Thread.pass
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.mock_with :flexmock
+  config.include ZookeeperSpecHeleprs
+  config.extend ZookeeperSpecHeleprs
+end
+
+

data/spec/support/progress_formatter.rb

@@ -0,0 +1,15 @@
+require 'rspec/core/formatters/progress_formatter'
+
+module RSpec
+  module Core
+    module Formatters
+      class ProgressFormatter
+        def example_started(example)
+          Zookeeper.logger.info(yellow("=====<([ #{example.full_description} ])>====="))
+          super(example)
+        end
+      end
+    end
+  end
+end
+

data/spec/zookeeper_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'shared/connection_examples'
+
+
+describe 'Zookeeper' do
+  let(:path) { "/_zktest_" }
+  let(:data) { "underpants" } 
+  let(:connection_string) { 'localhost:2181' }
+
+  before do
+    @zk = Zookeeper.new(connection_string)
+  end
+
+  after do
+    @zk and @zk.close
+  end
+
+  def zk
+    @zk
+  end
+
+  it_should_behave_like "connection"
+end
+

data/zookeeper.gemspec

@@ -1,31 +1,43 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'zookeeper/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{zookeeper}
-  s.version = "0.4.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman"]
-  s.date = %q{2011-03-30}
-  s.description = %q{An interface to the Zookeeper distributed configuration server.}
-  s.email = %q{}
-  s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "ext/zookeeper_c.c", "lib/zookeeper.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "README", "Rakefile", "examples/cloud_config.rb", "ext/extconf.rb", "ext/zkc-3.3.2.tar.gz", "ext/zookeeper_c.c", "ext/zookeeper_lib.c", "ext/zookeeper_lib.h", "lib/zookeeper.rb", "lib/zookeeper/acls.rb", "lib/zookeeper/callbacks.rb", "lib/zookeeper/constants.rb", "lib/zookeeper/exceptions.rb", "lib/zookeeper/stat.rb", "test/test_basic.rb", "test/test_callback1.rb", "test/test_close.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb", "Manifest", "zookeeper.gemspec"]
-  s.homepage = %q{http://twitter.github.com/twitter/zookeeper/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zookeeper", "--main", "README"]
-  s.require_paths = ["lib", "ext"]
-  s.rubyforge_project = %q{twitter}
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{An interface to the Zookeeper distributed configuration server.}
-  s.test_files = ["test/test_basic.rb", "test/test_callback1.rb", "test/test_close.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
+  s.name        = "zookeeper"
+  s.version     = ZookeeperVersion::VERSION
+
+  s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
+  s.email       = ["slyphon@gmail.com"]
+  s.summary     = %q{Low level zookeeper client}
+  s.description = <<-EOS
+A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
+For a friendlier interface, see http://github.com/slyphon/zk
+
+Currently supported:
+
+MRI: 1.8.7, 1.9.2, 1.9.3
+JRuby: ~> 1.6.7
+Rubinius: 2.0.testing
+
+This library uses version #{ZookeeperVersion::DRIVER_VERSION} of zookeeper bindings.
+
+  EOS
+
+  s.homepage    = 'https://github.com/slyphon/zookeeper'
+
+  s.files         = `git ls-files`.split("\n")
+  s.require_paths = ["lib"]
+
+  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.5')
+    s.require_paths += %w[java]
   else
+    s.require_paths += %w[ext]
+    s.extensions = 'ext/extconf.rb'
   end
+
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 end

metadata

@@ -1,73 +1,108 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 61
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
-- Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman
+- Phillip Pearson
+- Eric Maland
+- Evan Weaver
+- Brian Wickman
+- Neil Conway
+- Jonathan D. Simms
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -07:00
-default_executable: 
+date: 2012-05-03 00:00:00 Z
 dependencies: []
 
-description: An interface to the Zookeeper distributed configuration server.
-email: ""
+description: |+
+  A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
+  For a friendlier interface, see http://github.com/slyphon/zk
+  
+  Currently supported:
+  
+  MRI: 1.8.7, 1.9.2, 1.9.3
+  JRuby: ~> 1.6.7
+  Rubinius: 2.0.testing
+  
+  This library uses version 3.3.5 of zookeeper bindings.
+  
+email: 
+- slyphon@gmail.com
 executables: []
 
 extensions: 
 - ext/extconf.rb
-extra_rdoc_files: 
-- CHANGELOG
-- LICENSE
-- README
-- ext/zookeeper_c.c
-- lib/zookeeper.rb
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
-- README
+- Manifest
+- README.markdown
 - Rakefile
 - examples/cloud_config.rb
+- ext/.gitignore
+- ext/Rakefile
+- ext/c_zookeeper.rb
+- ext/dbg.h
+- ext/depend
 - ext/extconf.rb
-- ext/zkc-3.3.2.tar.gz
+- ext/generate_gvl_code.rb
+- ext/zkc-3.3.5.tar.gz
+- ext/zkrb_wrapper.c
+- ext/zkrb_wrapper.h
+- ext/zkrb_wrapper_compat.c
+- ext/zkrb_wrapper_compat.h
+- ext/zookeeper_base.rb
 - ext/zookeeper_c.c
 - ext/zookeeper_lib.c
 - ext/zookeeper_lib.h
+- java/zookeeper_base.rb
 - lib/zookeeper.rb
 - lib/zookeeper/acls.rb
 - lib/zookeeper/callbacks.rb
+- lib/zookeeper/common.rb
+- lib/zookeeper/common/queue_with_pipe.rb
 - lib/zookeeper/constants.rb
+- lib/zookeeper/em_client.rb
 - lib/zookeeper/exceptions.rb
 - lib/zookeeper/stat.rb
+- lib/zookeeper/version.rb
+- notes.txt
+- spec/c_zookeeper_spec.rb
+- spec/chrooted_connection_spec.rb
+- spec/default_watcher_spec.rb
+- spec/em_spec.rb
+- spec/log4j.properties
+- spec/shared/all_success_return_values.rb
+- spec/shared/connection_examples.rb
+- spec/spec_helper.rb
+- spec/support/progress_formatter.rb
+- spec/zookeeper_spec.rb
 - test/test_basic.rb
 - test/test_callback1.rb
 - test/test_close.rb
 - test/test_esoteric.rb
 - test/test_watcher1.rb
 - test/test_watcher2.rb
-- Manifest
 - zookeeper.gemspec
-has_rdoc: true
-homepage: http://twitter.github.com/twitter/zookeeper/
+homepage: https://github.com/slyphon/zookeeper
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Zookeeper
-- --main
-- README
+rdoc_options: []
+
 require_paths: 
 - lib
 - ext
@@ -85,19 +120,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
+      hash: 3
       segments: 
-      - 1
-      - 2
-      version: "1.2"
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: twitter
-rubygems_version: 1.6.1
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: An interface to the Zookeeper distributed configuration server.
+summary: Low level zookeeper client
 test_files: 
+- spec/c_zookeeper_spec.rb
+- spec/chrooted_connection_spec.rb
+- spec/default_watcher_spec.rb
+- spec/em_spec.rb
+- spec/log4j.properties
+- spec/shared/all_success_return_values.rb
+- spec/shared/connection_examples.rb
+- spec/spec_helper.rb
+- spec/support/progress_formatter.rb
+- spec/zookeeper_spec.rb
 - test/test_basic.rb
 - test/test_callback1.rb
 - test/test_close.rb

data/README

@@ -1,42 +0,0 @@
-zookeeper
-
-An interface to the Zookeeper distributed configuration server.
-
-== License
-
-Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc. Licensed under the
-MIT License.  See the included LICENSE file.  Portions copyright 2008-2010
-the Apache Software Foundation, licensed under the Apache 2 license, and
-used with permission.
-
-== Install
-
-sudo gem install zookeeper
-
-== Usage
-
-Connect to a server:
-
-  require 'rubygems'
-  require 'zookeeper'
-  z = Zookeeper.new("localhost:2181")
-  z.get_children(:path => "/")
-
-== Idioms
-
-  The following methods are initially supported:
-    get
-    set
-    get_children
-    stat
-    create
-    delete
-    get_acl
-    set_acl
-
-  All support async callbacks.  get, get_children and stat support both
-  watchers and callbacks.
-
-  Calls take a dictionary of parameters.  With the exception of set_acl, the
-  only required parameter is :path.  Each call returns a dictionary with at
-  minimum two keys :req_id and :rc.