zk-eventmachine 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -1,17 +1,32 @@
1
- source "http://rubygems.org"
1
+ source :rubygems
2
2
 
3
3
  # gem 'zk', :path => '~/zk'
4
4
 
5
5
  group :test do
6
6
  gem 'rspec', '~> 2.8.0'
7
- gem 'yard', '~> 0.7.0'
8
- gem 'autotest', '>= 4.4.0'
9
7
  gem 'flexmock', '~> 0.8.10'
10
8
  gem 'evented-spec','~> 0.9.0'
11
9
  end
12
10
 
11
+ group :docs do
12
+ gem 'yard', '~> 0.8.0'
13
+
14
+ platform :mri_19 do
15
+ gem 'redcarpet'
16
+ end
17
+ end
18
+
13
19
  group :development do
14
- gem 'redcarpet', '~> 2.1.0'
20
+ gem 'guard', :require => false
21
+ gem 'guard-rspec', :require => false
22
+ gem 'guard-shell', :require => false
23
+ gem 'guard-bundler', :require => false
24
+
25
+ if RUBY_PLATFORM =~ /darwin/i
26
+ gem 'growl', :require => false
27
+ gem 'rb-readline', :platform => :ruby
28
+ end
29
+
15
30
  gem 'rake'
16
31
  gem 'pry'
17
32
  end
@@ -0,0 +1,22 @@
1
+ guard 'bundler' do
2
+ watch 'Gemfile'
3
+ watch /\A.+\.gemspec\Z/
4
+ end
5
+
6
+ guard 'rspec', :version => 2 do
7
+ watch(%r{^spec/.+_spec\.rb$})
8
+
9
+ watch(%r{^lib/(.+)\.rb$}) do |m|
10
+ generic = "spec/#{m[1]}_spec.rb"
11
+
12
+ if test(?f, generic)
13
+ generic
14
+ else
15
+ 'spec'
16
+ end
17
+ end
18
+
19
+ watch(%r%^spec/(spec_helper.rb|support|shared)(?:$|/)%) { "spec" }
20
+
21
+ end
22
+
@@ -1,5 +1,5 @@
1
1
  module ZK
2
2
  module ZKEventMachine
3
- VERSION = "1.0.1"
3
+ VERSION = "1.0.2"
4
4
  end
5
5
  end
@@ -27,4 +27,6 @@ RSpec.configure do |config|
27
27
  config.include WaitWatchers
28
28
  end
29
29
 
30
+ Thread.current[:name] = 'main'
31
+
30
32
 
@@ -1,31 +1,73 @@
1
1
  require 'logger'
2
2
 
3
- log_file = File.open(File.expand_path('../../../test.log', __FILE__), 'a').tap { |f| f.sync = true }
4
3
 
5
- Logger.new(log_file).tap do |log|
6
- log.level = Logger::DEBUG
7
- ZK.logger = log
8
- # Zookeeper.logger = log
4
+ module ZK
5
+ TEST_LOG_PATH = File.expand_path('../../../test.log', __FILE__)
6
+
7
+ def self.logging_gem_setup
8
+ layout_opts = {
9
+ :pattern => '%.1l, [%d #%p] (%9.9T) %25.25c{2}: %m\n',
10
+ }
11
+
12
+ layout_opts[:date_pattern] = ZK.jruby? ? '%H:%M:%S.%3N' : '%H:%M:%S.%6N'
13
+
14
+ layout = ::Logging.layouts.pattern(layout_opts)
15
+
16
+ appender = ENV['ZK_DEBUG'] ? ::Logging.appenders.stderr : ::Logging.appenders.file(ZK::TEST_LOG_PATH)
17
+ appender.layout = layout
18
+ # appender.immediate_at = "debug,info,warn,error,fatal"
19
+ # appender.auto_flushing = true
20
+ appender.auto_flushing = 25
21
+ appender.flush_period = 5
22
+
23
+ %w[ZK ClientForker spec Zookeeper].each do |name|
24
+ ::Logging.logger[name].tap do |log|
25
+ log.appenders = [appender]
26
+ log.level = :debug
27
+ end
28
+ end
29
+
30
+ # this logger is kinda noisy
31
+ ::Logging.logger['ZK::EventHandler'].level = :info
32
+
33
+ Zookeeper.logger = ::Logging.logger['Zookeeper']
34
+ Zookeeper.logger.level = ENV['ZOOKEEPER_DEBUG'] ? :debug : :warn
35
+
36
+ ZK::ForkHook.after_fork_in_child { ::Logging.reopen }
37
+ end
38
+
39
+ def self.stdlib_logger_setup
40
+ require 'logger'
41
+ log = ::Logger.new($stderr).tap {|l| l.level = ::Logger::DEBUG }
42
+ ZK.logger = log
43
+ Zookeeper.logger = log
44
+ end
9
45
  end
10
46
 
11
- # for debugging along with C output uncomment the following
47
+ ZK.logging_gem_setup
48
+
49
+ # for debugging along with C output comment above and
50
+ # uncomment the following
12
51
  #
52
+ # ZK.stdlib_logger_setup
13
53
  # $stderr.sync = true
14
54
  # logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
15
55
  # Zookeeper.set_debug_level(4)
16
56
 
17
57
  module SpecGlobalLogger
18
58
  def logger
19
- ZK.logger
59
+ @spec_global_logger ||= ::Logging.logger['spec']
20
60
  end
21
-
61
+
22
62
  # sets the log level to FATAL for the duration of the block
23
63
  def mute_logger
24
- orig_level, ZK.logger.level = ZK.logger.level, Logger::FATAL
25
- orig_zk_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
64
+ zk_log = Logging.logger['ZK']
65
+ orig_level, zk_log.level = zk_log.level, :off
66
+ orig_zoo_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
26
67
  yield
27
68
  ensure
28
- ZK.logger.level = orig_level
69
+ zk_log.level = orig_level
70
+ Zookeeper.debug_level = orig_zoo_level
29
71
  end
30
72
  end
31
73
 
@@ -17,7 +17,7 @@ module RSpec
17
17
  module Formatters
18
18
  class ProgressFormatter
19
19
  def example_started(example)
20
- ZK.logger << yellow("\n=====<([ #{example.full_description} ])>=====\n\n")
20
+ ::Logging.logger['spec'].write(yellow("\n=====<([ #{example.full_description} ])>=====\n\n"))
21
21
  super(example)
22
22
  end
23
23
  end
@@ -21,6 +21,7 @@ module ZK::ZKEventMachine
21
21
  flexmock(name).tap do |ev|
22
22
  ev.should_receive(:node_event?).and_return(false)
23
23
  ev.should_receive(:state_event?).and_return(true)
24
+ ev.should_receive(:session_event?).and_return(true)
24
25
  ev.should_receive(:zk=).with_any_args
25
26
  yield ev if block_given?
26
27
  end
@@ -12,12 +12,10 @@ Gem::Specification.new do |s|
12
12
  s.summary = %q{ZK client for EventMachine-based (async) applications}
13
13
  s.description = s.description
14
14
 
15
- s.add_dependency 'zk', '~> 1.4.1'
15
+ s.add_dependency 'zk', '~> 1.6.2'
16
16
 
17
- # zk depends on slyphon-zookeeper, but we need at least this version
18
- s.add_dependency 'zookeeper', '~> 1.1.0'
19
- s.add_dependency 'eventmachine', '~> 1.0.0.beta.4'
20
- s.add_dependency 'deferred', '~> 0.5.3'
17
+ s.add_dependency 'eventmachine', '~> 1.0.0.beta.4'
18
+ s.add_dependency 'deferred', '~> 0.5.3'
21
19
 
22
20
  s.files = `git ls-files`.split("\n")
23
21
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zk-eventmachine
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 19
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 1
10
- version: 1.0.1
9
+ - 2
10
+ version: 1.0.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-05-14 00:00:00 Z
18
+ date: 2012-06-01 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: zk
@@ -25,39 +25,23 @@ dependencies:
25
25
  requirements:
26
26
  - - ~>
27
27
  - !ruby/object:Gem::Version
28
- hash: 5
28
+ hash: 11
29
29
  segments:
30
30
  - 1
31
- - 4
32
- - 1
33
- version: 1.4.1
31
+ - 6
32
+ - 2
33
+ version: 1.6.2
34
34
  type: :runtime
35
35
  version_requirements: *id001
36
- - !ruby/object:Gem::Dependency
37
- name: zookeeper
38
- prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
40
- none: false
41
- requirements:
42
- - - ~>
43
- - !ruby/object:Gem::Version
44
- hash: 19
45
- segments:
46
- - 1
47
- - 1
48
- - 0
49
- version: 1.1.0
50
- type: :runtime
51
- version_requirements: *id002
52
36
  - !ruby/object:Gem::Dependency
53
37
  name: eventmachine
54
38
  prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
39
+ requirement: &id002 !ruby/object:Gem::Requirement
56
40
  none: false
57
41
  requirements:
58
42
  - - ~>
59
43
  - !ruby/object:Gem::Version
60
- hash: 3300709603
44
+ hash: 534666235
61
45
  segments:
62
46
  - 1
63
47
  - 0
@@ -66,11 +50,11 @@ dependencies:
66
50
  - 4
67
51
  version: 1.0.0.beta.4
68
52
  type: :runtime
69
- version_requirements: *id003
53
+ version_requirements: *id002
70
54
  - !ruby/object:Gem::Dependency
71
55
  name: deferred
72
56
  prerelease: false
73
- requirement: &id004 !ruby/object:Gem::Requirement
57
+ requirement: &id003 !ruby/object:Gem::Requirement
74
58
  none: false
75
59
  requirements:
76
60
  - - ~>
@@ -82,7 +66,7 @@ dependencies:
82
66
  - 3
83
67
  version: 0.5.3
84
68
  type: :runtime
85
- version_requirements: *id004
69
+ version_requirements: *id003
86
70
  description: ""
87
71
  email:
88
72
  - slyphon@hp.com
@@ -101,6 +85,7 @@ files:
101
85
  - .gitmodules
102
86
  - .yardopts
103
87
  - Gemfile
88
+ - Guardfile
104
89
  - LICENSE
105
90
  - README.markdown
106
91
  - Rakefile
@@ -151,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
151
136
  requirements: []
152
137
 
153
138
  rubyforge_project:
154
- rubygems_version: 1.8.15
139
+ rubygems_version: 1.8.24
155
140
  signing_key:
156
141
  specification_version: 3
157
142
  summary: ZK client for EventMachine-based (async) applications
@@ -165,3 +150,4 @@ test_files:
165
150
  - spec/z_k/z_k_event_machine/client_spec.rb
166
151
  - spec/z_k/z_k_event_machine/event_handler_e_m_spec.rb
167
152
  - spec/z_k/z_k_event_machine/unixisms_spec.rb
153
+ has_rdoc: