slyphon-zookeeper 0.2.7-java → 0.2.8-java

data/Rakefile

@@ -1,8 +1,49 @@
+def gemset_name
+  ENV.fetch('GEM_HOME').split('@').last
+end
+
 namespace :mb do
   task :build_gems do
-    sh "gem build slyphon-zookeeper.gemspec"
+    sh "rvm 1.8.7 do gem build slyphon-zookeeper.gemspec"
     ENV['JAVA_GEM'] = '1'
-    sh "gem build slyphon-zookeeper.gemspec"
+    sh "rvm 1.8.7 do gem build slyphon-zookeeper.gemspec"
   end
 end
 
+%w[1.8.7 1.9.2 1.9.3 jruby].each do |rvm_ruby|
+  ruby_with_gemset = "#{rvm_ruby}@#{gemset_name}"
+
+  clobber_task_name = "mb:#{rvm_ruby}:clobber"
+  build_task_name   = "mb:#{rvm_ruby}:build"
+  bundle_task_name  = "mb:#{rvm_ruby}:bundle_install"
+  rspec_task_name   = "mb:#{rvm_ruby}:run_rspec"
+
+  task clobber_task_name do
+    unless rvm_ruby == 'jruby'
+      cd 'ext' do
+        sh "rake clobber"
+      end
+    end
+  end
+
+  task build_task_name => clobber_task_name do
+    unless rvm_ruby == 'jruby'
+      cd 'ext' do
+        sh "rvm #{ruby_with_gemset} do rake build"
+      end
+    end
+  end
+
+  task bundle_task_name => build_task_name do
+    rm_f 'Gemfile.lock'
+    sh "rvm #{ruby_with_gemset} do bundle install"
+  end
+
+  task rspec_task_name => bundle_task_name do
+    sh "rvm #{ruby_with_gemset} do bundle exec rspec spec"
+  end
+
+  task "mb:test_all_rubies" => rspec_task_name
+end
+
+

data/ext/Rakefile

@@ -12,7 +12,7 @@ task :clobber => :clean do
 end
 
 task :build_zkc do
-  ruby 'extconf.rb'
+  sh 'ruby extconf.rb'
 end
 
 file 'Makefile' => :build_zkc

data/ext/extconf.rb

@@ -6,8 +6,16 @@ HERE = File.expand_path(File.dirname(__FILE__))
 BUNDLE = Dir.glob("zkc-*.tar.gz").first
 BUNDLE_PATH = "c"
 
-$CFLAGS = "#{RbConfig::CONFIG['CFLAGS']} #{$CFLAGS}".gsub("$(cflags)", "").gsub("-arch ppc", "")
-$LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS}".gsub("$(ldflags)", "").gsub("-arch ppc", "")
+$EXTRA_CONF = ''
+
+# CLANG!!!! jeez, if apple would only *stop* "thinking different"
+if cc = RbConfig::CONFIG['CC'] && cc =~ /^gcc/
+  $CC = cc
+  $EXTRA_CONF = "#{$EXTRA_CONF} CC=#{$CC}"
+end
+
+$CFLAGS = "#{$CFLAGS}".gsub("$(cflags)", "").gsub("-arch ppc", "")
+$LDFLAGS = "#{$LDFLAGS}".gsub("$(ldflags)", "").gsub("-arch ppc", "")
 $CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
 
@@ -16,7 +24,7 @@ DEBUG_CFLAGS = " -O0 -ggdb3 -DHAVE_DEBUG"
 
 if ZK_DEBUG
   $stderr.puts "*** Setting debug flags. ***"
-  $EXTRA_CONF = " --enable-debug"
+  $EXTRA_CONF = "#{$EXTRA_CONF} --enable-debug"
   $CFLAGS.gsub!(/ -O[^0] /, ' ')
   $CFLAGS << DEBUG_CFLAGS
 end

data/ext/zookeeper_base.rb

@@ -134,6 +134,14 @@ class ZookeeperBase < CZookeeper
     super
   end
 
+  def session_id
+    client_id.session_id
+  end
+
+  def session_passwd
+    client_id.passwd
+  end
+
 protected
   def barf_unless_running!
     @start_stop_mutex.synchronize do

data/ext/zookeeper_c.c

@@ -25,6 +25,7 @@
 #include "dbg.h"
 
 static VALUE Zookeeper = Qnil;
+static VALUE ZookeeperClientId = Qnil;
 
 // slyphon: possibly add a lock to this for synchronizing during get_next_event
 
@@ -542,12 +543,6 @@ static VALUE method_has_events(VALUE self) {
   return rb_event;
 }
 
-static VALUE method_client_id(VALUE self) {
-  FETCH_DATA_PTR(self, zk);
-  const clientid_t *id = zoo_client_id(zk->zh);
-  return UINT2NUM(id->client_id);
-}
-
 
 // wake up the event loop, used when shutting down
 static VALUE method_wake_event_loop_bang(VALUE self) {
@@ -612,6 +607,29 @@ static VALUE method_recv_timeout(VALUE self) {
   return INT2NUM(zoo_recv_timeout(zk->zh));
 }
 
+/*static VALUE method_client_id(VALUE self) {*/
+/*  FETCH_DATA_PTR(self, zk);*/
+/*  const clientid_t *id = zoo_client_id(zk->zh);*/
+/*  return UINT2NUM(id->client_id);*/
+/*}*/
+
+
+// returns a CZookeeper::ClientId object with the values set for session_id and passwd
+static VALUE method_client_id(VALUE self) {
+  FETCH_DATA_PTR(self, zk);
+  const clientid_t *cid = zoo_client_id(zk->zh);
+
+  VALUE session_id = LL2NUM(cid->client_id);
+  VALUE passwd = rb_str_new2(cid->passwd);
+
+  VALUE client_id_obj = rb_class_new_instance(0, RARRAY_PTR(rb_ary_new()), ZookeeperClientId);
+
+  rb_funcall(client_id_obj, rb_intern("session_id="), 1, session_id);
+  rb_funcall(client_id_obj, rb_intern("passwd="), 1, passwd);
+
+  return client_id_obj;
+}
+
 static VALUE klass_method_set_debug_level(VALUE klass, VALUE level) {
   Check_Type(level, T_FIXNUM);
   ZKRBDebugging = (FIX2INT(level) == ZOO_LOG_LEVEL_DEBUG);
@@ -662,11 +680,31 @@ static void zkrb_define_methods(void) {
   rb_define_method(Zookeeper, "wake_event_loop!", method_wake_event_loop_bang, 0);
 }
 
+// class CZookeeper::ClientId
+//   attr_accessor :session_id, :passwd
+//
+//   def initialize(session_id, passwd)
+//     @session_id = session_id
+//     @passwd = passwd
+//   end
+// end
+
+static VALUE zkrb_client_id_method_initialize(VALUE self) {
+  rb_iv_set(self, "@session_id", Qnil);
+  rb_iv_set(self, "@passwd", Qnil);
+  return Qnil;
+}
+
 void Init_zookeeper_c() {
   ZKRBDebugging = 0;
   /* initialize Zookeeper class */
   Zookeeper = rb_define_class("CZookeeper", rb_cObject);
   zkrb_define_methods();
+
+  ZookeeperClientId = rb_define_class_under(Zookeeper, "ClientId", rb_cObject);
+  rb_define_method(ZookeeperClientId, "initialize", zkrb_client_id_method_initialize, 0);
+  rb_define_attr(ZookeeperClientId, "session_id", 1, 1);
+  rb_define_attr(ZookeeperClientId, "passwd", 1, 1);
 }
 
 // vim:ts=2:sw=2:sts=2:et

data/java/zookeeper_base.rb

@@ -475,6 +475,14 @@ class ZookeeperBase
     @event_queue.clear_reads_on_pop = false
     @event_queue.selectable_io
   end
+  
+  def session_id
+    @jzk.session_id
+  end
+
+  def session_passwd
+    @jzk.session_passwd.to_s
+  end
 
   def get_next_event(blocking=true)
     @event_queue.pop(!blocking).tap do |event|

data/lib/zookeeper.rb

@@ -200,6 +200,16 @@ class Zookeeper < ZookeeperBase
     super
   end
 
+  # return the session id of the current connection as an Fixnum
+  def session_id
+    super
+  end
+
+  # Return the passwd portion of this connection's credentials as a String
+  def session_passwd
+    super
+  end
+
 protected
   # used during shutdown, awaken the event delivery thread if it's blocked
   # waiting for the next event

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.2.7'
+  s.version     = '0.2.8'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   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.add_development_dependency 'rake', '~> 0.9.0'
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

data/spec/zookeeper_spec.rb

@@ -951,4 +951,16 @@ describe Zookeeper do
       
     end
   end
+
+  describe :session_id do
+    it %[should return the session_id as a Fixnum] do
+      @zk.session_id.should be_kind_of(Fixnum)
+    end
+  end
+
+  describe :session_passwd do
+    it %[should return the session passwd as a String] do
+      @zk.session_passwd.should be_kind_of(String)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 Z
+date: 2012-01-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -89,9 +89,25 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: slyphon-log4j
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: slyphon-log4j
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -103,11 +119,11 @@ dependencies:
         - 15
         version: 1.2.15
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper_jar
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -119,7 +135,7 @@ dependencies:
         - 3
         version: 3.3.3
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: twitter's zookeeper client
 email: 
 - slyphon@gmail.com
@@ -200,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: twitter's zookeeper client