zk-eventmachine 0.9.0 → 1.0.0

data/.gitignore

@@ -1,6 +1,6 @@
 *.gem
 .bundle
-Gemfile.lock
+Gemfile.*
 pkg/*
 .rvmrc
 .vimrc

data/Gemfile

@@ -1,6 +1,7 @@
-source ENV['MBOX_BUNDLER_SOURCE'] if ENV['MBOX_BUNDLER_SOURCE']
 source "http://rubygems.org"
 
+# gem 'zk', :path => '~/zk'
+
 group :test do
   gem 'rspec',       '~> 2.8.0'
   gem 'yard',        '~> 0.7.0'

data/Rakefile

@@ -12,26 +12,51 @@ task :yard do
   Rake::Task[:run_yardoc].invoke
 end
 
-%w[1.8.7 1.9.2 1.9.3 jruby].each do |rvm_ruby|
-  gemset_name         = 'zk-em'
-  ruby_with_gemset    = "#{rvm_ruby}@#{gemset_name}"
-  create_gemset_name  = "mb:#{rvm_ruby}:create_gemset"
-  bundle_task_name    = "mb:#{rvm_ruby}:bundle_install"
-  rspec_task_name     = "mb:#{rvm_ruby}:run_rspec"
-
-  task create_gemset_name do
+gemset_name  = 'zk-em'
+
+%w[1.8.7 1.9.2 jruby rbx 1.9.3].each do |ns_name|
+  rvm_ruby = (ns_name == 'rbx') ? "rbx-2.0.testing" : ns_name
+
+  ruby_with_gemset        = "#{rvm_ruby}@#{gemset_name}"
+  create_gemset_task_name = "mb:#{ns_name}:create_gemset"
+  bundle_task_name        = "mb:#{ns_name}:bundle_install"
+  rspec_task_name         = "mb:#{ns_name}:run_rspec"
+
+  phony_gemfile_link_name = "Gemfile.#{ns_name}"
+  phony_gemfile_lock_name = "#{phony_gemfile_link_name}.lock"
+
+  file phony_gemfile_link_name do
+    # apparently, rake doesn't deal with symlinks intelligently :P
+    ln_s('Gemfile', phony_gemfile_link_name) unless File.symlink?(phony_gemfile_link_name)
+  end
+
+  task :clean do
+    rm_rf [phony_gemfile_lock_name, phony_gemfile_lock_name]
+  end
+
+  task create_gemset_task_name do
     sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}" 
   end
 
-  task bundle_task_name => create_gemset_name do
-    rm_f 'Gemfile.lock'
-    sh "rvm #{ruby_with_gemset} do bundle install"
+  task bundle_task_name => [phony_gemfile_link_name, create_gemset_task_name] do
+    sh "rvm #{ruby_with_gemset} do bundle install --gemfile #{phony_gemfile_link_name}"
   end
 
   task rspec_task_name => bundle_task_name do
-    sh "rvm #{ruby_with_gemset} do bundle exec rspec spec --fail-fast"
+    sh "rvm #{ruby_with_gemset} do env BUNDLE_GEMFILE=#{phony_gemfile_link_name} bundle exec rspec spec --fail-fast"
+  end
+
+  task "mb:#{ns_name}" => rspec_task_name
+
+  task "mb:test_all_rubies" => rspec_task_name
+end
+
+task 'mb:test_all' do
+  require 'benchmark'
+  tm = Benchmark.realtime do
+    Rake::Task['mb:test_all_rubies'].invoke
   end
 
-  task 'mb:test_all' => rspec_task_name
+  $stderr.puts "Test run took: #{tm}"
 end
 

data/lib/z_k/z_k_event_machine/client.rb

@@ -192,6 +192,15 @@ module ZK
         @cnx.session_passwd
       end
 
+      # Used by the event_handler to deliver callbacks. This hopefully won't
+      # have any other side-effects, as it's not happening on a separate
+      # thread, rather just in the next reactor tick.
+      #
+      # @private
+      def defer
+        EM.next_tick { yield }
+      end
+
     protected
       # @private
       def register_default_event_handlers!

data/lib/z_k/z_k_event_machine/event_handler_e_m.rb

@@ -6,17 +6,6 @@ module ZK
     class EventHandlerEM < ZK::EventHandler
       include ZK::Logging
 
-      def register(path, &block)
-        # use the supplied block, but ensure that it gets called on the reactor
-        # thread
-        new_blk = lambda do |*a|
-          EM.schedule { block.call(*a) }
-        end
-
-        super(path, &new_blk)
-      end
-      alias :subscribe :register
-
       def process(event)
         EM.schedule { super(event) }
       end

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "0.9.0"
+    VERSION = "1.0.0"
   end
 end

data/spec/z_k/z_k_event_machine/event_handler_e_m_spec.rb

@@ -50,7 +50,9 @@ module ZK::ZKEventMachine
             @zkem.stat(@path, :watch => true) do |e,*a| 
               raise e if e
 
-              @zkem.set(@path, @new_data) { |e| raise e if e }
+              @zkem.set(@path, @new_data) do |e,*a|
+                raise e if e
+              end
             end
           end
         end

data/zk-eventmachine.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.summary     = %q{ZK client for EventMachine-based (async) applications}
   s.description = s.description
 
-  s.add_dependency 'zk', '~> 0.9.0'
+  s.add_dependency 'zk', '~> 1.0.0'
 
   # zk depends on slyphon-zookeeper, but we need at least this version
-  s.add_dependency 'slyphon-zookeeper', '~> 0.8.1'
+  s.add_dependency 'slyphon-zookeeper', '~> 0.9.2'
   s.add_dependency 'eventmachine',      '~> 1.0.0.beta.4'
   s.add_dependency 'deferred',          '~> 0.5.3'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
   - 0
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zk
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 9
         - 0
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 63
         segments: 
         - 0
-        - 8
-        - 1
-        version: 0.8.1
+        - 9
+        - 2
+        version: 0.9.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1649268254
+        hash: 2603058889
         segments: 
         - 1
         - 0