zk-eventmachine 1.0.1 → 1.0.2

data/Gemfile

@@ -1,17 +1,32 @@
-source "http://rubygems.org"
+source :rubygems
 
 # gem 'zk', :path => '~/zk'
 
 group :test do
   gem 'rspec',       '~> 2.8.0'
-  gem 'yard',        '~> 0.7.0'
-  gem 'autotest',    '>= 4.4.0'
   gem 'flexmock',    '~> 0.8.10'
   gem 'evented-spec','~> 0.9.0'
 end
 
+group :docs do
+  gem 'yard', '~> 0.8.0'
+
+  platform :mri_19 do
+    gem 'redcarpet'
+  end
+end
+
 group :development do
-  gem 'redcarpet',   '~> 2.1.0'
+  gem 'guard',          :require => false
+  gem 'guard-rspec',    :require => false
+  gem 'guard-shell',    :require => false
+  gem 'guard-bundler',  :require => false
+
+  if RUBY_PLATFORM =~ /darwin/i
+    gem 'growl',       :require => false
+    gem 'rb-readline', :platform => :ruby
+  end
+
   gem 'rake'
   gem 'pry'
 end

data/Guardfile

@@ -0,0 +1,22 @@
+guard 'bundler' do
+  watch 'Gemfile'
+  watch /\A.+\.gemspec\Z/
+end
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+
+  watch(%r{^lib/(.+)\.rb$}) do |m| 
+    generic = "spec/#{m[1]}_spec.rb"
+
+    if test(?f, generic)
+      generic
+    else
+      'spec'
+    end
+  end
+
+  watch(%r%^spec/(spec_helper.rb|support|shared)(?:$|/)%)  { "spec" }
+
+end
+

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/spec_helper.rb

@@ -27,4 +27,6 @@ RSpec.configure do |config|
   config.include  WaitWatchers
 end
 
+Thread.current[:name] = 'main'
+
 

data/spec/support/logging.rb

@@ -1,31 +1,73 @@
 require 'logger'
 
-log_file = File.open(File.expand_path('../../../test.log', __FILE__), 'a').tap { |f| f.sync = true }
 
-Logger.new(log_file).tap do |log| 
-  log.level = Logger::DEBUG 
-  ZK.logger = log
-#   Zookeeper.logger = log
+module ZK
+  TEST_LOG_PATH = File.expand_path('../../../test.log', __FILE__)
+
+  def self.logging_gem_setup
+    layout_opts = { 
+      :pattern => '%.1l, [%d #%p] (%9.9T) %25.25c{2}:  %m\n',
+    }
+
+    layout_opts[:date_pattern] = ZK.jruby? ? '%H:%M:%S.%3N' : '%H:%M:%S.%6N'
+
+    layout = ::Logging.layouts.pattern(layout_opts)
+
+    appender = ENV['ZK_DEBUG'] ? ::Logging.appenders.stderr : ::Logging.appenders.file(ZK::TEST_LOG_PATH)
+    appender.layout = layout
+#     appender.immediate_at = "debug,info,warn,error,fatal"
+#     appender.auto_flushing = true
+    appender.auto_flushing = 25
+    appender.flush_period = 5
+
+    %w[ZK ClientForker spec Zookeeper].each do |name|
+      ::Logging.logger[name].tap do |log|
+        log.appenders = [appender]
+        log.level = :debug
+      end
+    end
+
+    # this logger is kinda noisy
+    ::Logging.logger['ZK::EventHandler'].level = :info
+
+    Zookeeper.logger = ::Logging.logger['Zookeeper']
+    Zookeeper.logger.level = ENV['ZOOKEEPER_DEBUG'] ? :debug : :warn
+
+    ZK::ForkHook.after_fork_in_child { ::Logging.reopen }
+  end
+
+  def self.stdlib_logger_setup
+    require 'logger'
+    log = ::Logger.new($stderr).tap {|l| l.level = ::Logger::DEBUG }
+    ZK.logger = log
+    Zookeeper.logger = log
+  end
 end
 
-# for debugging along with C output uncomment the following
+ZK.logging_gem_setup
+
+# for debugging along with C output comment above and
+# uncomment the following
 #
+# ZK.stdlib_logger_setup
 # $stderr.sync = true
 # logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
 # Zookeeper.set_debug_level(4)
 
 module SpecGlobalLogger
   def logger
-    ZK.logger
+    @spec_global_logger ||= ::Logging.logger['spec']
   end
-
+  
   # sets the log level to FATAL for the duration of the block
   def mute_logger
-    orig_level, ZK.logger.level = ZK.logger.level, Logger::FATAL
-    orig_zk_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
+    zk_log = Logging.logger['ZK']
+    orig_level, zk_log.level = zk_log.level, :off
+    orig_zoo_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
     yield
   ensure
-    ZK.logger.level = orig_level
+    zk_log.level = orig_level
+    Zookeeper.debug_level = orig_zoo_level
   end
 end
 

data/spec/support/logging_progress_bar_formatter.rb

@@ -17,7 +17,7 @@ module RSpec
     module Formatters
       class ProgressFormatter
         def example_started(example)
-          ZK.logger << yellow("\n=====<([ #{example.full_description} ])>=====\n\n")
+          ::Logging.logger['spec'].write(yellow("\n=====<([ #{example.full_description} ])>=====\n\n"))
           super(example)
         end
       end

data/spec/z_k/z_k_event_machine/client_spec.rb

@@ -21,6 +21,7 @@ module ZK::ZKEventMachine
       flexmock(name).tap do |ev|
         ev.should_receive(:node_event?).and_return(false)
         ev.should_receive(:state_event?).and_return(true)
+        ev.should_receive(:session_event?).and_return(true)
         ev.should_receive(:zk=).with_any_args
         yield ev if block_given?
       end

data/zk-eventmachine.gemspec

@@ -12,12 +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', '~> 1.4.1'
+  s.add_dependency 'zk', '~> 1.6.2'
 
-  # zk depends on slyphon-zookeeper, but we need at least this version
-  s.add_dependency 'zookeeper', '~> 1.1.0'
-  s.add_dependency 'eventmachine',      '~> 1.0.0.beta.4'
-  s.add_dependency 'deferred',          '~> 0.5.3'
+  s.add_dependency 'eventmachine',  '~> 1.0.0.beta.4'
+  s.add_dependency 'deferred',      '~> 0.5.3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-14 00:00:00 Z
+date: 2012-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zk
@@ -25,39 +25,23 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 11
         segments: 
         - 1
-        - 4
-        - 1
-        version: 1.4.1
+        - 6
+        - 2
+        version: 1.6.2
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: zookeeper
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3300709603
+        hash: 534666235
         segments: 
         - 1
         - 0
@@ -66,11 +50,11 @@ dependencies:
         - 4
         version: 1.0.0.beta.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: deferred
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,7 +66,7 @@ dependencies:
         - 3
         version: 0.5.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: ""
 email: 
 - slyphon@hp.com
@@ -101,6 +85,7 @@ files:
 - .gitmodules
 - .yardopts
 - Gemfile
+- Guardfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -151,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ZK client for EventMachine-based (async) applications
@@ -165,3 +150,4 @@ test_files:
 - spec/z_k/z_k_event_machine/client_spec.rb
 - spec/z_k/z_k_event_machine/event_handler_e_m_spec.rb
 - spec/z_k/z_k_event_machine/unixisms_spec.rb
+has_rdoc: