zookeeper 0.1 → 0.2

data/CHANGELOG

@@ -1,2 +1,4 @@
 
+v0.2. Bundle C dependencies, like memcached.gem.
+
 v0.1. First release.

data/LICENSE

@@ -0,0 +1,23 @@
+(The MIT License)
+
+Copyright (C) 2008 Phillip Pearson
+Copyright (C) 2010 Twitter, Inc.
+
+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/Manifest

@@ -1,8 +1,10 @@
 CHANGELOG
+LICENSE
+Manifest
 README
 Rakefile
-ext/zookeeper_c/extconf.rb
-ext/zookeeper_c/zookeeper_ruby.c
-lib/zookeeper_client.rb
+ext/extconf.rb
+ext/zkc-3.2.2.tar.gz
+ext/zookeeper_c.c
+lib/zookeeper.rb
 test/test_basic.rb
-Manifest

data/README

@@ -1,36 +1,21 @@
-zookeeper_client
-    by Phillip Pearson
-    http://github.com/myelin/zookeeper_client
+zookeeper
 
-== DESCRIPTION:
+An interface to the ZooKeeper distributed configuration server.
 
-zookeeper_client is a Ruby library to interface with the ZooKeeper
-replicated object store / lock server.
+== License
 
-Project maturity: early alpha.  Working, although very chatty and
-there may be bugs to do with threading.  Expect to get your hands
-dirty.
+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.
 
-== REQUIREMENTS:
+== Install
 
-* ZooKeeper C client library (http://zookeeper.sourceforge.net/)
+sudo gem install zookeeper
 
-  See installation instructions in c/README, in the ZooKeeper source
-  distribution.  zookeeper_client expects the headers to live in
-  /usr/include/c-client-src/, which doesn't feel right but is where
-  they go on my system when I run 'make install'.
-
-== INSTALL:
-
-  $ gem sources -a http://gems.github.com/
-  $ gem install myelin-zookeeper_client
-
-== USAGE:
+== Usage
 
 = Connect to a server
 
   require 'rubygems'
-  require 'myelin-zookeeper_client'
+  require 'zookeeper'
   z = ZooKeeper.new("localhost:2181")
 
 = Create, set and read nodes
@@ -71,28 +56,3 @@ dirty.
   end
   # we have the lock
   # => nil
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (C) 2008 Phillip Pearson
-
-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/Rakefile

@@ -6,4 +6,5 @@ Echoe.new("zookeeper") do |p|
   p.summary = "A Ruby wrapper for the ZooKeeper C client library."
   p.url = "http://blog.evanweaver.com/files/doc/fauna/zookeeper/"
   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+  p.clean_pattern += ["ext/lib", "ext/include", "ext/c", "ext/bin", "ext/conftest.dSYM"]
 end

data/ext/extconf.rb

@@ -0,0 +1,55 @@
+
+require 'mkmf'
+require 'rbconfig'
+
+HERE = File.expand_path(File.dirname(__FILE__))
+BUNDLE = Dir.glob("zkc-*.tar.gz").first
+BUNDLE_PATH = "c"
+
+$CFLAGS = "#{RbConfig::CONFIG['CFLAGS']} #{$CFLAGS}".gsub("$(cflags)", "")
+$LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS}".gsub("$(ldflags)", "")
+$CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
+$CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
+
+if ENV['DEBUG']
+  puts "Setting debug flags."
+  $CFLAGS << " -O0 -ggdb -DHAVE_DEBUG"
+  $EXTRA_CONF = " --enable-debug"
+end
+
+$includes = " -I#{HERE}/include"
+$libraries = " -L#{HERE}/lib"
+$CFLAGS = "#{$includes} #{$libraries} #{$CFLAGS}"
+$LDFLAGS = "#{$libraries} #{$LDFLAGS}"
+$LIBPATH = ["#{HERE}/lib"]
+$DEFLIBPATH = []
+
+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 CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} #{$EXTRA_CONF} 2>&1")
+      raise "'#{cmd}' failed" unless system(cmd)
+      puts(cmd = "make CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")
+      raise "'#{cmd}' failed" unless system(cmd)
+      puts(cmd = "make install || true 2>&1")
+      raise "'#{cmd}' failed" unless system(cmd)
+    end
+
+    system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
+  end
+end
+
+# Absolutely prevent the linker from picking up any other zookeeper_mt
+Dir.chdir("#{HERE}/lib") do
+  system("cp -f libzookeeper_mt.a libzookeeper_mt_gem.a") 
+  system("cp -f libzookeeper_mt.la libzookeeper_mt_gem.la") 
+end
+$LIBS << " -lzookeeper_mt_gem"
+
+create_makefile 'zookeeper_c'

data/ext/{zookeeper_c/zookeeper_ruby.c → zookeeper_c.c}

@@ -7,7 +7,7 @@
 
 #include "ruby.h"
 
-#include "zookeeper/zookeeper.h"
+#include "c-client-src/zookeeper.h"
 #include <errno.h>
 #include <stdio.h>
 

data/test/test_basic.rb

@@ -1,6 +1,6 @@
-$LOAD_PATH << '/home/eric/zk-clients/lib'
-require 'rubygems'
-require 'zookeeper_client'
+HERE = File.expand_path(File.dirname(__FILE__))
+
+require "#{HERE}/../lib/zookeeper"
 
 z = ZooKeeper.new("localhost:2181")
 

data/zookeeper.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zookeeper}
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phillip Pearson, Eric Maland, Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-03-02}
   s.description = %q{A Ruby wrapper for the ZooKeeper C client library.}
   s.email = %q{}
-  s.extensions = ["ext/zookeeper_c/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG", "README", "ext/zookeeper_c/extconf.rb", "ext/zookeeper_c/zookeeper_ruby.c", "lib/zookeeper_client.rb"]
-  s.files = ["CHANGELOG", "README", "Rakefile", "ext/zookeeper_c/extconf.rb", "ext/zookeeper_c/zookeeper_ruby.c", "lib/zookeeper_client.rb", "test/test_basic.rb", "Manifest", "zookeeper.gemspec"]
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "ext/extconf.rb", "ext/zkc-3.2.2.tar.gz", "ext/zookeeper_c.c", "lib/zookeeper.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "ext/extconf.rb", "ext/zkc-3.2.2.tar.gz", "ext/zookeeper_c.c", "lib/zookeeper.rb", "test/test_basic.rb", "zookeeper.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/zookeeper/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zookeeper", "--main", "README"]
   s.require_paths = ["lib", "ext"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Phillip Pearson, Eric Maland, Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -39,22 +39,26 @@ email: ""
 executables: []
 
 extensions: 
-- ext/zookeeper_c/extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: 
 - CHANGELOG
+- LICENSE
 - README
-- ext/zookeeper_c/extconf.rb
-- ext/zookeeper_c/zookeeper_ruby.c
-- lib/zookeeper_client.rb
+- ext/extconf.rb
+- ext/zkc-3.2.2.tar.gz
+- ext/zookeeper_c.c
+- lib/zookeeper.rb
 files: 
 - CHANGELOG
+- LICENSE
+- Manifest
 - README
 - Rakefile
-- ext/zookeeper_c/extconf.rb
-- ext/zookeeper_c/zookeeper_ruby.c
-- lib/zookeeper_client.rb
+- ext/extconf.rb
+- ext/zkc-3.2.2.tar.gz
+- ext/zookeeper_c.c
+- lib/zookeeper.rb
 - test/test_basic.rb
-- Manifest
 - zookeeper.gemspec
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/zookeeper/

data/ext/zookeeper_c/extconf.rb

@@ -1,14 +0,0 @@
-require 'mkmf'
-
-dir_config("zookeeper")
-
-have_header "sys/errno.h" 
-have_header "stdio.h"
-find_header("zookeeper/zookeeper.h") or
-  raise "zookeeper.h not found."
-find_library("zookeeper_mt", "zoo_set_debug_level") or 
-  raise "libzookeeper_mt not found."
-  
-dir_config('zookeeper_c')
-create_makefile( 'zookeeper_c')
-