slyphon-zookeeper 0.2.4 → 0.2.5

data/README.markdown

@@ -0,0 +1,48 @@
+zookeeper
+
+An interface to the Zookeeper distributed configuration server.
+
+For a higher-level interface with a slightly more convenient API and features
+such as locks, have a look at [ZK](https://github.com/slyphon/zk) (also
+available is [ZK-EventMachine](https://github.com/slyphon/zk-eventmachine) for
+those who prefer async).
+
+## 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.
+

data/ext/.gitignore

@@ -3,3 +3,4 @@ include
 lib
 *.bundle
 
+c

data/ext/Rakefile

@@ -0,0 +1,25 @@
+
+task :clean do
+  if File.exists?('Makefile')
+    sh 'make clean'
+  else
+    $stderr.puts "nothing to clean, no Makefile"
+  end
+end
+
+task :clobber => :clean do
+  rm_rf %w[Makefile c lib bin include]
+end
+
+task :build_zkc do
+  ruby 'extconf.rb'
+end
+
+file 'Makefile' => :build_zkc
+
+task :build => 'Makefile' do
+  sh 'make'
+end
+
+task :default => :build
+

data/ext/extconf.rb

@@ -11,6 +11,7 @@ $LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS}".gsub("$(ldflags)", "").g
 $CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
+
 if ENV['DEBUG']
   $stderr.puts "*** Setting debug flags. ***"
   $CFLAGS << " -O0 -ggdb3 -DHAVE_DEBUG"
@@ -25,23 +26,31 @@ $LDFLAGS = "#{$libraries} #{$LDFLAGS}"
 $LIBPATH = ["#{HERE}/lib"]
 $DEFLIBPATH = []
 
+def safe_sh(cmd)
+  puts cmd
+  system(cmd)
+  unless $?.exited? and $?.success?
+    raise "command failed! #{cmd}"
+  end
+end
+
 Dir.chdir(HERE) do
   if File.exist?("lib")
     puts "Zkc already built; run 'rake clean' first if you need to rebuild."
   else
     puts "Building zkc."
-    puts(cmd = "tar xzf #{BUNDLE} 2>&1")
-    raise "'#{cmd}' failed" unless system(cmd)
 
-    Dir.chdir(BUNDLE_PATH) do        
-      puts(cmd = "env CC=gcc CXX=g++ CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
-      raise "'#{cmd}' failed" unless system(cmd)
-      puts(cmd = "make CXXFLAGS='#{$CXXFLAGS}' CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' || true 2>&1")
-      raise "'#{cmd}' failed" unless system(cmd)
-      puts(cmd = "make install || true 2>&1")
+    unless File.exists?('c')
+      puts(cmd = "tar xzf #{BUNDLE} 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
     end
 
+    Dir.chdir(BUNDLE_PATH) do        
+      safe_sh("./configure --prefix=#{HERE} --with-pic --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
+      safe_sh("make  2>&1")
+      safe_sh("make install 2>&1")
+    end
+
     system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
   end
 end

data/ext/zookeeper_c.c

@@ -140,17 +140,13 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
     zoo_set_debug_level(0); // no log messages
   } else {
     Check_Type(log_level, T_FIXNUM);
-    zoo_set_debug_level(log_level);
+    zoo_set_debug_level((int)log_level);
   }
 
 
   VALUE data;
   struct zkrb_instance_data *zk_local_ctx;
-  data = Data_Make_Struct(Zookeeper,
-           struct zkrb_instance_data,
-           0,
-           free_zkrb_instance_data,
-           zk_local_ctx);
+  data = Data_Make_Struct(Zookeeper, struct zkrb_instance_data, 0, free_zkrb_instance_data, zk_local_ctx);
   zk_local_ctx->queue = zkrb_queue_alloc();
 
   zoo_deterministic_conn_order(0);
@@ -292,10 +288,11 @@ static VALUE method_create(VALUE self, VALUE reqid, VALUE path, VALUE data, VALU
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_create(zk->zh, RSTRING_PTR(path), data_ptr, data_len, aclptr, FIX2INT(flags), realpath, sizeof(realpath));
+      // casting data_len to int is OK as you can only store 1MB in zookeeper
+      rc = zoo_create(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, aclptr, FIX2INT(flags), realpath, sizeof(realpath));
       break;
     case ASYNC:
-      rc = zoo_acreate(zk->zh, RSTRING_PTR(path), data_ptr, data_len, aclptr, FIX2INT(flags), zkrb_string_callback, data_ctx);
+      rc = zoo_acreate(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, aclptr, FIX2INT(flags), zkrb_string_callback, data_ctx);
       break;
     default:
       /* TODO(wickman) raise proper argument error */
@@ -394,10 +391,10 @@ static VALUE method_set(VALUE self, VALUE reqid, VALUE path, VALUE data, VALUE a
   int rc;
   switch (call_type) {
     case SYNC:
-      rc = zoo_set2(zk->zh, RSTRING_PTR(path), data_ptr, data_len, FIX2INT(version), &stat);
+      rc = zoo_set2(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, FIX2INT(version), &stat);
       break;
     case ASYNC:
-      rc = zoo_aset(zk->zh, RSTRING_PTR(path), data_ptr, data_len, FIX2INT(version),
+      rc = zoo_aset(zk->zh, RSTRING_PTR(path), data_ptr, (int)data_len, FIX2INT(version),
                             zkrb_stat_callback, data_ctx);
       break;
     default:
@@ -507,16 +504,8 @@ static VALUE method_get_next_event(VALUE self, VALUE blocking) {
         int fd = zk->queue->pipe_read;
         ssize_t bytes_read = 0;
 
-        fd_set rset;        // a file descriptor set for use w/ select()
-
-        FD_ZERO(&rset);     // FD_ZERO clears the set
-        FD_SET(fd, &rset);  // FD_SET adds fd to the rset
-
-        // first arg is nfds: "the highest-numbered file descriptor in any of the three sets, plus 1"
-        // why? F*** you, that's why!
-
-        if (rb_thread_select(fd + 1, &rset, NULL, NULL, NULL) == -1)
-          rb_raise(rb_eRuntimeError, "select failed: %d", errno);
+        // wait for an fd to become readable, opposite of rb_thread_fd_writable
+        rb_thread_wait_fd(fd);
 
         bytes_read = read(fd, buf, sizeof(buf));
 

data/ext/zookeeper_lib.c

@@ -522,11 +522,12 @@ VALUE zkrb_acl_to_ruby(struct ACL *acl) {
 }
 
 #warning [wickman] TODO test zkrb_ruby_to_aclvector
+#warning [slyphon] TODO size checking on acl_ary (cast to int)
 struct ACL_vector * zkrb_ruby_to_aclvector(VALUE acl_ary) {
   Check_Type(acl_ary, T_ARRAY);
 
   struct ACL_vector *v = malloc(sizeof(struct ACL_vector));
-  allocate_ACL_vector(v, RARRAY_LEN(acl_ary));
+  allocate_ACL_vector(v, (int)RARRAY_LEN(acl_ary));
 
   int k;
   for (k = 0; k < v->count; ++k) {

data/lib/zookeeper.rb

@@ -56,6 +56,7 @@ class Zookeeper < ZookeeperBase
     assert_open
     assert_supported_keys(options, [:path, :data, :version, :callback, :callback_context])
     assert_required_keys(options, [:path])
+    assert_valid_data_size!(options[:data])
     options[:version] ||= -1
 
     req_id = setup_call(options)
@@ -93,6 +94,7 @@ class Zookeeper < ZookeeperBase
     assert_open
     assert_supported_keys(options, [:path, :data, :acl, :ephemeral, :sequence, :callback, :callback_context])
     assert_required_keys(options, [:path])
+    assert_valid_data_size!(options[:data])
 
     flags = 0
     flags |= ZOO_EPHEMERAL if options[:ephemeral]
@@ -219,6 +221,16 @@ protected
     Zookeeper.logger
   end
 
+  def assert_valid_data_size!(data)
+    return if data.nil?
+
+    data = data.to_s
+    if data.length >= 1048576 # one megabyte 
+      raise ZookeeperException::DataTooLargeException, "data must be smaller than 1 MiB, your data starts with: #{data[0..32].inspect}"
+    end
+    nil
+  end
+
 private
   def setup_call(opts)
     req_id = nil

data/lib/zookeeper/exceptions.rb

@@ -57,6 +57,7 @@ module ZookeeperExceptions
     class ConnectionClosed        < ZookeeperException; end
     class NotConnected            < ZookeeperException; end 
     class ShuttingDownException   < ZookeeperException; end
+    class DataTooLargeException   < ZookeeperException; end
     
     def self.by_code(code)
       case code

data/slyphon-zookeeper.gemspec

@@ -3,15 +3,18 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.2.4'
+  s.version     = '0.2.5'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]
   s.summary     = %q{twitter's zookeeper client}
   s.description = s.summary
+  s.homepage    = 'https://github.com/slyphon/zookeeper'
 
   s.add_development_dependency "rspec", ">= 2.0.0"
   s.add_development_dependency 'flexmock', '~> 0.8.11'
+  s.add_development_dependency 'eventmachine', '1.0.0.beta.4'
+  s.add_development_dependency 'evented-spec', '~> 0.9.0'
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

data/spec/em_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'zookeeper/em_client'
 
-gem 'evented-spec', '~> 0.4.1'
+gem 'evented-spec', '~> 0.9.0'
 require 'evented-spec'
 
 

data/spec/zookeeper_spec.rb

@@ -203,6 +203,14 @@ describe Zookeeper do
           @rv[:stat].exists.should be_false
         end
       end
+
+      describe 'error' do
+        it %[should barf if the data size is too large], :input_size => true do
+          large_data = '0' * (1024 ** 2)
+
+          lambda { @zk.set(:path => @path, :data => large_data) }.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+        end
+      end
     end   # sync
 
     describe :async do
@@ -269,8 +277,17 @@ describe Zookeeper do
           @cb.stat.exists.should be_false
         end
       end
-    end
-  end
+
+      describe 'error' do
+        it %[should barf if the data size is too large], :input_size => true do
+          large_data = '0' * (1024 ** 2)
+
+          lambda { @zk.set(:path => @path, :data => large_data, :callback => @cb, :callback_context => @path) }.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+        end
+      end
+
+    end # async
+  end # set
 
   describe :get_children do
     before do
@@ -538,6 +555,14 @@ describe Zookeeper do
     end
 
     describe :sync do
+      describe 'error' do
+        it %[should barf if the data size is too large], :input_size => true do
+          large_data = '0' * (1024 ** 2)
+
+          lambda { @zk.create(:path => @path, :data => large_data) }.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+        end
+      end
+
       describe :default_flags do
         it_should_behave_like "all success return values"
 
@@ -655,6 +680,17 @@ describe Zookeeper do
         end
       end
 
+      describe 'error' do
+        it %[should barf if the data size is too large], :input_size => true do
+          large_data = '0' * (1024 ** 2)
+
+          lambda do
+            @zk.create(:path => @path, :data => large_data, :callback => @cb, :callback_context => @path)
+          end.should raise_error(ZookeeperExceptions::ZookeeperException::DataTooLargeException)
+        end
+      end
+
+
       describe :ephemeral do
         it_should_behave_like "all success return values"
 
@@ -736,15 +772,9 @@ describe Zookeeper do
 
           st[:stat].ephemeral_owner.should_not be_zero
         end
-      end
-
-      describe :acl do
-        it %[should work] do
-          pending "need to write acl tests"
-        end
-      end
-    end
-  end
+      end # ephemeral_sequence
+    end # async
+  end # create
 
   describe :delete do
     describe :sync do
@@ -846,7 +876,7 @@ describe Zookeeper do
           @cb.return_code.should == Zookeeper::ZBADVERSION
         end
       end
-    end
+    end # async
   end # delete
 
   describe :get_acl do

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slyphon-zookeeper
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Phillip Pearson
 - Eric Maland
 - Evan Weaver
@@ -19,61 +14,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70134739892840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70134739892840
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &70134739892020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 8
-        - 11
+      - !ruby/object:Gem::Version
         version: 0.8.11
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70134739892020
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70134739891420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
+  type: :development
+  prerelease: false
+  version_requirements: *70134739891420
+- !ruby/object:Gem::Dependency
+  name: evented-spec
+  requirement: &70134739890760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: *70134739890760
 description: twitter's zookeeper client
-email: 
+email:
 - slyphon@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
 - LICENSE
 - Manifest
-- README
+- README.markdown
 - Rakefile
 - examples/cloud_config.rb
 - ext/.gitignore
+- ext/Rakefile
 - ext/extconf.rb
 - ext/zkc-3.3.3.tar.gz
 - ext/zookeeper_base.rb
@@ -102,42 +106,32 @@ files:
 - test/test_esoteric.rb
 - test/test_watcher1.rb
 - test/test_watcher2.rb
-has_rdoc: true
-homepage: 
+homepage: https://github.com/slyphon/zookeeper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: twitter's zookeeper client
-test_files: 
+test_files:
 - spec/default_watcher_spec.rb
 - spec/em_spec.rb
 - spec/log4j.properties

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.