zookeeper 0.9.4 → 1.0.0.beta.1

data/spec/spec_helper.rb

@@ -4,9 +4,13 @@ $LOAD_PATH.uniq!
 
 require 'rubygems'
 
-gem 'flexmock', '~> 0.8.11'
+release_ops_path = File.expand_path('../../releaseops/lib', __FILE__)
+
+if File.exists?(release_ops_path)
+  require File.join(release_ops_path, 'releaseops')
+  ReleaseOps::SimpleCov.maybe_start
+end
 
-require 'flexmock'
 require 'zookeeper'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].sort.each { |f| require(f) }
@@ -26,94 +30,28 @@ if ENV['ZKRB_NOLOG']
 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
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.include ZookeeperSpecHeleprs
+  config.extend ZookeeperSpecHeleprs
 
-        wait_until do 
-          begin
-            !z.connected?
-          rescue RuntimeError
-            true
-          end
-        end
-      end
-    end
-  end
+  if Zookeeper.spawn_zookeeper?
+    require 'zk-server'
 
-  # 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}"
+    config.before(:suite) do 
+      Zookeeper.logger.debug { "Starting zookeeper service" }
+      ZK::Server.run do |c|
+        c.base_dir    = File.expand_path('../../.zkserver', __FILE__)
+        c.client_port = Zookeeper.test_port
+        c.force_sync  = false
+        c.snap_count  = 1_000_000
       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
+    config.after(:suite) do
+      Zookeeper.logger.debug { "stopping zookeeper service" }
+      ZK::Server.shutdown
     end
   end
 end
 
-RSpec.configure do |config|
-  config.mock_with :flexmock
-  config.include ZookeeperSpecHeleprs
-  config.extend ZookeeperSpecHeleprs
-end
-
-

data/spec/support/00_spawn_zookeeper.rb

@@ -0,0 +1,20 @@
+module Zookeeper
+  def self.spawn_zookeeper?
+    !!ENV['SPAWN_ZOOKEEPER']
+  end
+
+  def self.travis?
+    !!ENV['TRAVIS']
+  end
+
+  @test_port ||= spawn_zookeeper? ? 21811 : 2181
+
+  class << self
+    attr_accessor :test_port
+  end
+
+  def self.default_cnx_str
+    "localhost:#{test_port}"
+  end
+end
+

data/spec/support/zookeeper_spec_helpers.rb

@@ -0,0 +1,84 @@
+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=nil)
+    z = Zookeeper.new(Zookeeper.default_cnx_str)
+    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] == Zookeeper::Exceptions::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] == Zookeeper::Exceptions::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
+

data/spec/zookeeper_spec.rb

@@ -5,7 +5,7 @@ require 'shared/connection_examples'
 describe 'Zookeeper' do
   let(:path) { "/_zktest_" }
   let(:data) { "underpants" } 
-  let(:connection_string) { 'localhost:2181' }
+  let(:connection_string) { Zookeeper.default_cnx_str }
 
   before do
     @zk = Zookeeper.new(connection_string)

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: 
+  hash: 3809227699
+  prerelease: 6
   segments: 
+  - 1
   - 0
-  - 9
-  - 4
-  version: 0.9.4
+  - 0
+  - beta
+  - 1
+  version: 1.0.0.beta.1
 platform: ruby
 authors: 
 - Phillip Pearson
@@ -21,17 +23,27 @@ bindir: bin
 cert_chain: []
 
 date: 2012-05-07 00:00:00 Z
-dependencies: []
-
+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
 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
+  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, REE 1.8.7.
   
   This library uses version 3.3.5 of zookeeper bindings.
   
@@ -44,14 +56,16 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- .dotfiles/rvmrc
 - .gitignore
+- .gitmodules
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
 - Manifest
 - README.markdown
 - Rakefile
-- examples/cloud_config.rb
 - ext/.gitignore
 - ext/Rakefile
 - ext/c_zookeeper.rb
@@ -68,18 +82,23 @@ files:
 - ext/zookeeper_c.c
 - ext/zookeeper_lib.c
 - ext/zookeeper_lib.h
-- java/zookeeper_base.rb
+- java/java_base.rb
 - lib/zookeeper.rb
 - lib/zookeeper/acls.rb
 - lib/zookeeper/callbacks.rb
+- lib/zookeeper/client.rb
+- lib/zookeeper/client_methods.rb
 - lib/zookeeper/common.rb
 - lib/zookeeper/common/queue_with_pipe.rb
+- lib/zookeeper/compatibility.rb
 - lib/zookeeper/constants.rb
 - lib/zookeeper/em_client.rb
 - lib/zookeeper/exceptions.rb
+- lib/zookeeper/rake_tasks.rb
 - lib/zookeeper/stat.rb
 - lib/zookeeper/version.rb
 - notes.txt
+- scripts/upgrade-1.0-sed-alike.rb
 - spec/c_zookeeper_spec.rb
 - spec/chrooted_connection_spec.rb
 - spec/default_watcher_spec.rb
@@ -88,14 +107,10 @@ files:
 - spec/shared/all_success_return_values.rb
 - spec/shared/connection_examples.rb
 - spec/spec_helper.rb
+- spec/support/00_spawn_zookeeper.rb
 - spec/support/progress_formatter.rb
+- spec/support/zookeeper_spec_helpers.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
 - zookeeper.gemspec
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
@@ -118,19 +133,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Low level zookeeper client
+summary: Apache ZooKeeper driver for Rubies
 test_files: 
 - spec/c_zookeeper_spec.rb
 - spec/chrooted_connection_spec.rb
@@ -140,11 +157,7 @@ test_files:
 - spec/shared/all_success_return_values.rb
 - spec/shared/connection_examples.rb
 - spec/spec_helper.rb
+- spec/support/00_spawn_zookeeper.rb
 - spec/support/progress_formatter.rb
+- spec/support/zookeeper_spec_helpers.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

data/examples/cloud_config.rb

@@ -1,125 +0,0 @@
-require "rubygems"
-require "zookeeper"
-
-# A basic cloud-based YAML config library.  Ruby Zookeeper client example.
-#
-# If you pass in a file as 'zk:/foo.yml/blah' it will go out to zookeeper. 
-# Otherwise the file is assumed to be local.  The yml file will get parsed
-# and cached locally, and keys after the .yml get interpreted as keys into
-# the YAML.
-#
-# e.g. get(zk:/config/service.yml/key1/key2/key3..) => 
-#   zk.get(:path => /config/service.yml)
-#   yaml <= YAML.parse(data)
-#   yaml[key1][key2][key3]...
-#
-# If keys are unspecified, it returns the parsed YAML as one big object
-#
-# TODO if staleness is set to 0, read in YAML immediately before next
-# get(...)
-
-class CloudConfig
-  class NodeNotFound < StandardError; end
-  class BadPathError < StandardError; end
-
-  DEFAULT_SERVERS = "localhost:2181"
-
-  def initialize(zkservers = DEFAULT_SERVERS, staleness = 15)  # maximum allowed staleness in seconds
-    @staleness = staleness
-    @lock      = Mutex.new
-    @zkservers = DEFAULT_SERVERS
-    
-    # cache
-    @data      = {}
-    @zkcb      = Zookeeper::WatcherCallback.new { dirty_callback(@zkcb.context) }
-    @zk        = nil
-  end
-
-  def get(node)
-    filename, keys = extract_filename(node)
-
-    # read(filename) is potentially a zk call, so do not hold the lock during the read
-    if @lock.synchronize { !@data.has_key?(filename) }
-      d = YAML.load(read(filename))
-      @lock.synchronize { @data[filename] = d }
-    end
-    
-    # synchronized b/c we potentially have a background thread updating data nodes from zk
-    # if keys is empty, return the whole file, otherwise roll up the keys
-    @lock.synchronize {
-      keys.empty? ? @data[filename] : keys.inject(@data[filename]) { |hash, key| hash[key] }
-    }
-  end
-
-  # todo:
-  #   factor get-and-watch into a different subsystem (so you can have
-  #   polling stat() ops on local filesystem.)
-  def read(yaml)
-    # read yaml file and register watcher.  if watcher fires, set up
-    # background thread to do read and update data.
-    if yaml.match(/^zk:/)
-      @zk ||= init_zk
-      yaml = yaml['zk:'.length..-1] # strip off zk: from zk:/config/path.yml
-      resp = get_and_register(yaml)
-
-      if resp[:rc] != Zookeeper::ZOK
-        @zk.unregister_watcher(resp[:req_id])
-        raise NodeNotFound
-      end
-      
-      resp[:data]
-    else
-      raise NodeNotFound unless File.exists?(yaml)
-      File.read(yaml)
-    end
-  end
-
-  def extract_filename(node)
-    path_elements = node.split("/")
-    
-    yamlindex = path_elements.map{ |x| x.match("\.yml$") != nil }.index(true)
-    raise BadPathError unless yamlindex
-    
-    yamlname = path_elements[0..yamlindex].join '/'
-    yamlkeys = path_elements[(yamlindex+1)..-1]
-    
-    return yamlname, yamlkeys
-  end
-    
- private
-  def init_zk
-    Zookeeper.new(@zkservers)
-  end
-  
-  def get_and_register(znode)
-    @zk.get(:path => znode, :watcher => @zkcb,
-                   :watcher_context => { :path => znode,
-                                         :wait => rand(@staleness) })
-  end
-  
-  def dirty_callback(context)
-    path = context[:path]
-    wait = context[:wait]
-
-    # Fire off a background update that waits a randomized period of time up
-    # to @staleness seconds.
-    Thread.new do
-      sleep wait
-      background_update(path)
-    end
-  end
-
-  def background_update(zkpath)
-    # do a synchronous get/register a new watcher
-    resp = get_and_register(zkpath)
-    if resp[:rc] != Zookeeper::ZOK
-      # puts "Unable to read #{zkpath} from Zookeeper!"  @logger.error
-      zk.unregister_watcher(resp[:req_id])
-    else
-      # puts "Updating data."
-      d = YAML.load(resp[:data])
-      @lock.synchronize { @data["zk:#{zkpath}"] = d }
-    end
-  end
-end
-