zk 1.9.5 → 1.9.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2UxZTVhMDZjMGQxOTllZDc3NTQ5ZDliODA0ODkzZTM5MzM2ZGFkZg==
+    YWUxMzk1MjRkMmFhZjEyMDg2OTA1ODQ3NTQxYjBiNWNjODc4OGQ3ZA==
   data.tar.gz: !binary |-
-    NjE0NGRmNTNjN2YxNzc2YWE5ZTY0NDE1YTkyODg1YmZjZTI2NjNiMg==
+    NjViMTA4YTA1YTUxYTA4ZWJiMTA4Y2JiNDIxMGMyZDVkZjY5ZmMyMw==
 SHA512:
   metadata.gz: !binary |-
-    NWMxODIyZjY4YjM2NDAwODdjZTZlOTZkNjMzNjFkYmM3YmZlYzY3NTFhOWIz
-    NzQ5ODJjNjg3NWE4ZDRhYmU4YjhhYjhlNjViMWJjYTVhOGQ1NjhiNjE4OGY5
-    MGNhNjdmMGQ3ZDE3NjEzNjM0YTJjM2YwZDEyNmU0ZjBhNzQ5Nzg=
+    N2UwYzk3YTMxY2M1ZGFiNGU4ZjgwMmEyYjVjNTQ2MzIxNWRhZWNiNmUzMjIz
+    ZjVhZTZmNTkyMmE3MDRhMTFlODY4MTM0MDBkMWY3MWQxNDRlNjA1OTVkOGQy
+    NjU2YTU2ODIwZGEzY2Y2YTg4MjlkY2FjNGY3NTgzYWNjOTI1ZTQ=
   data.tar.gz: !binary |-
-    Njk5ODY2NWM4ZTU1MTJjZmZkZjBjYzg1NWI4OTM4MmMzZWEyNGU2MTkwNGFh
-    ZmFjMGEyMTY2MDljZDRlZDY1YjMzMjFkM2E3N2M2YWZkZjFmNjE0YTFkODY2
-    NjYxN2JjMTVjYzU3YWI4NjExNjIyYTE5OTY1MjJiMjgyYThhOWM=
+    NjY5YTA0MzRkMDEwMTQzYzAxYjRjODZiOTlkNGMwZmQ0MTI4MzhlOGJiODgx
+    ZGVhODY2YWQzM2I5NzJkZDgwNzMwZDBkMTZmMmU5N2IxY2VlYTg4M2ExMzcx
+    NGZjM2QwMjhhMzRkYWY2OTA4OWI5YTA2YTdkMmJiNDllODM2ZmQ=

data/.travis.yml

@@ -1,4 +1,6 @@
----
+# This should kick us over to the docker system
+sudo: false
+
 notifications:
   email:
     - slyphon@gmail.com
@@ -9,6 +11,7 @@ env:
 
 # pull in releaseops submodule
 before_install:
+  - gem update bundler
   - git submodule update --init --recursive
 
 rvm:
@@ -19,9 +22,6 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
-matrix:
-  allow_failures:
-    - rvm: 2.2.0
 
 # jruby specs are too intesive for travis
 #   - jruby-18mode

data/Gemfile

@@ -43,6 +43,7 @@ group :test do
   gem 'rspec', '~> 2.8.0'
   gem 'flexmock', '~> 0.8.10'
   gem 'zk-server', '~> 1.1.4'
+  gem 'test-unit', :platforms => [:ruby_22]
 end
 
 # Specify your gem's dependencies in zk.gemspec

data/RELEASES.markdown

@@ -1,5 +1,10 @@
 This file notes feature differences and bugfixes contained between releases.
 
+### v1.9.6 ###
+
+* Fixes from @rickypai for ruby 2.2 (#89)
+* Remove dependency on logging gem #90 (h/t: @eric)
+
 ### v1.9.5 ###
 
 * Really clear hooks when clear! is called #83 (h/t: Liam Stewart)

data/lib/zk.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 
-require 'logging'
 require 'zookeeper'
 
 # XXX: after 1.0 we'll need this
@@ -23,7 +22,7 @@ end
 require 'zk/core_ext'
 require 'zk/exceptions'
 require 'zk/extensions'
-require 'zk/logging'
+require 'zk/logger'
 require 'zk/event'
 require 'zk/stat'
 require 'zk/subscription'
@@ -307,6 +306,3 @@ module ZK
       cnx_str   # the possibly-modified connection string (with chroot info)
     end
 end
-
-ZK::Logging.set_default
-

data/lib/zk/client/threaded.rb

@@ -39,7 +39,7 @@ module ZK
       include StateMixin
       include Unixisms
       include Conveniences
-      include Logging
+      include Logger
 
       DEFAULT_THREADPOOL_SIZE = 1
 

data/lib/zk/election.rb

@@ -60,7 +60,7 @@ module ZK
     }.freeze
  
     class Base
-     include Logging
+     include Logger
 
      attr_reader :zk, :vote_path, :root_election_node
 

data/lib/zk/event_handler.rb

@@ -6,7 +6,7 @@ module ZK
   # you never really need to initialize this yourself
   class EventHandler
     include Java::OrgApacheZookeeper::Watcher if defined?(JRUBY_VERSION)
-    include ZK::Logging
+    include ZK::Logger
 
     # @private
     VALID_WATCH_TYPES = [:data, :child].freeze

data/lib/zk/event_handler_subscription/base.rb

@@ -1,7 +1,7 @@
 module ZK
   module EventHandlerSubscription
     class Base < Subscription::Base
-      include ZK::Logging
+      include ZK::Logger
 
       # the path this subscription is for
       # @return [String]

data/lib/zk/fork_hook.rb

@@ -1,6 +1,6 @@
 module ZK
   module ForkHook
-    include ZK::Logging
+    include ZK::Logger
     extend self
 
     @mutex = Mutex.new unless @mutex
@@ -94,6 +94,10 @@ module ZK
       register(:after_child, callable || blk)
     end
 
+    def self.logger
+      @logger ||= ::ZK.logger || Zookeeper::Logger::ForwardingLogger.for(::ZK::Logger.wrapped_logger, _zk_logger_name)
+    end
+
     class ForkSubscription < Subscription::Base
       attr_reader :hook_type
 
@@ -108,4 +112,5 @@ module ZK
   def self.install_fork_hook
     require 'zk/install_fork_hooks'
   end
+
 end # ZK

data/lib/zk/locker/locker_base.rb

@@ -8,7 +8,7 @@ module ZK
     # author, and it may be corrected sometime in the future.
     #
     class LockerBase
-      include ZK::Logging
+      include ZK::Logger
       include ZK::Exceptions
 
       # @private

data/lib/zk/logger.rb

@@ -0,0 +1,34 @@
+module ZK
+  # use the ZK.logger if non-nil (to allow users to override the logger)
+  # otherwise, use a Loggging logger based on the class name
+  module Logger
+    def self.wrapped_logger
+      if defined?(@@wrapped_logger)
+        @@wrapped_logger
+      else
+        @@wrapped_logger = ::Logger.new(STDERR).tap { |l| l.level = ::Logger::FATAL }
+      end
+    end
+
+    def self.wrapped_logger=(log)
+      @@wrapped_logger = log
+    end
+
+    # @private
+    module ClassMethods
+      def logger
+        ::ZK.logger || Zookeeper::Logger::ForwardingLogger.for(::ZK::Logger.wrapped_logger, _zk_logger_name)
+      end
+    end
+
+    def self.included(base)
+      # return false if base < self    # avoid infinite recursion
+      base.extend(ClassMethods)
+    end
+
+    def logger
+      @logger ||= (::ZK.logger || self.class.logger)
+    end
+  end
+end
+

data/lib/zk/node_deletion_watcher.rb

@@ -2,7 +2,7 @@ module ZK
   class NodeDeletionWatcher
     include Zookeeper::Constants
     include Exceptions
-    include Logging
+    include Logger
 
     # @private
     module Constants

data/lib/zk/pool.rb

@@ -18,7 +18,7 @@ module ZK
     # complexity.
     #
     class Base
-      include Logging
+      include Logger
 
       attr_reader :connections #:nodoc:
 

data/lib/zk/subscription.rb

@@ -7,7 +7,7 @@ module ZK
   # be passed the subscription instance 
   module Subscription
     class Base
-      include ZK::Logging
+      include ZK::Logger
 
       # the object from which we will attempt to #unregister on
       # XXX: need a better name for this

data/lib/zk/threaded_callback.rb

@@ -4,7 +4,7 @@ module ZK
   # You will not have a useful return value from `call` so this is only useful
   # for background processing.
   class ThreadedCallback
-    include ZK::Logging
+    include ZK::Logger
     include ZK::Exceptions
 
     attr_reader :callback

data/lib/zk/threadpool.rb

@@ -1,7 +1,7 @@
 module ZK
   # a simple threadpool for running blocks of code off the main thread
   class Threadpool
-    include Logging
+    include Logger
     include Exceptions
 
     DEFAULT_SIZE = 5

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.9.5"
+  VERSION = "1.9.6"
 end

data/spec/logging_progress_bar_formatter.rb

@@ -5,7 +5,7 @@ require 'rspec/core/formatters/progress_formatter'
 # easier to match up tests with the SQL they produce
 class LoggingProgressBarFormatter < RSpec::Core::Formatters::ProgressFormatter
   def example_started(example)
-    ::Logging.logger['spec'].write(yellow("\n=====<([ #{example.full_description} ])>=====\n"))
+    SpecGlobalLogger.logger << yellow("\n=====<([ #{example.full_description} ])>=====\n")
     super
   end
 end

data/spec/spec_helper.rb

@@ -49,7 +49,7 @@ RSpec.configure do |config|
     require 'zk-server'
 
     config.before(:suite) do 
-      ::Logging.logger['spec'].debug { "Starting zookeeper service" }
+      SpecGlobalLogger.logger.debug { "Starting zookeeper service" }
       ZK::Server.run do |c|
         c.client_port = ZK.test_port
         c.force_sync  = false
@@ -58,7 +58,7 @@ RSpec.configure do |config|
     end
 
     config.after(:suite) do
-      ::Logging.logger['spec'].debug { "stopping zookeeper service" }
+      SpecGlobalLogger.logger.debug  { "stopping zookeeper service" }
       ZK::Server.shutdown
     end
   end

data/spec/support/bogus_mongoid.rb

@@ -1,6 +1,6 @@
 class BogusMongoid
   include ZK::Mongoid::Locking
-  include ZK::Logging
+  include ZK::Logger
 
   attr_reader :id
 

data/spec/support/client_forker.rb

@@ -1,5 +1,5 @@
 class ClientForker
-  include ZK::Logging
+  include ZK::Logger
   attr_reader :base_path, :cnx_args, :stat
 
   def self.run(cnx_args, base_path)

data/spec/support/event_catcher.rb

@@ -1,6 +1,6 @@
 class EventCatcher
   extend Forwardable
-  include ZK::Logging
+  include ZK::Logger
 
   def_delegators :@mutex, :synchronize
 

data/spec/support/logging.rb

@@ -1,68 +1,36 @@
 module ZK
   TEST_LOG_PATH = File.join(ZK::ZK_ROOT, 'test.log')
 
-  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
+  def self.setup_test_logger
+    log =
+      if ENV['ZK_DEBUG']
+        ::Logger.new(STDERR)
+      else
+        ::Logger.new(TEST_LOG_PATH)
       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
 
+    log.level = ::Logger::DEBUG
 
-  def self.stdlib_logger_setup
-    require 'logger'
-    log = ::Logger.new($stderr).tap {|l| l.level = ::Logger::DEBUG }
-    ZK.logger = log
-    Zookeeper.logger = log
+    ZK::Logger.wrapped_logger = log
   end
 end
 
-ZK.logging_gem_setup
-# ZK.stdlib_logger_setup
-
-# Zookeeper.logger = ZK.logger.clone_new_log(:progname => 'zoo')
-# Zookeeper.logger = ZK.logger
-# Zookeeper.set_debug_level(4)
+ZK.setup_test_logger
 
 module SpecGlobalLogger
+  extend self
+
   def logger
-    @spec_global_logger ||= ::Logging.logger['spec']
+    @spec_global_logger ||= Zookeeper::Logger::ForwardingLogger.for(ZK::Logger.wrapped_logger, 'spec')
   end
 
   # sets the log level to FATAL for the duration of the block
   def mute_logger
-    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
+    zk_log = ZK::Logger.wrapped_logger
+
+    orig_level, zk_log.level = zk_log.level, ::Logger::FATAL
     yield
   ensure
     zk_log.level = orig_level
-    Zookeeper.debug_level = orig_zoo_level
   end
 end
-

data/zk.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.description = s.summary + "\n"
 
   s.add_runtime_dependency 'zookeeper', '~> 1.4.0'
-  s.add_runtime_dependency 'logging',   '~> 1.8.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zk
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Jonathan D. Simms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zookeeper
@@ -25,20 +25,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.2
 description: ! 'A high-level wrapper around the zookeeper driver
 
 '
@@ -91,7 +77,7 @@ files:
 - lib/zk/locker/locker_base.rb
 - lib/zk/locker/semaphore.rb
 - lib/zk/locker/shared_locker.rb
-- lib/zk/logging.rb
+- lib/zk/logger.rb
 - lib/zk/message_queue.rb
 - lib/zk/mongoid.rb
 - lib/zk/node_deletion_watcher.rb
@@ -167,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A high-level wrapper around the zookeeper driver

data/lib/zk/logging.rb

@@ -1,36 +0,0 @@
-module ZK
-  # use the ZK.logger if non-nil (to allow users to override the logger)
-  # otherwise, use a Loggging logger based on the class name
-  module Logging
-    extend ZK::Concern
-
-    included do
-      def self.logger
-        ::ZK.logger || ::Logging.logger[logger_name]
-      end
-    end
-
-    def self.set_default
-      ::Logging.logger['ZK'].tap do |ch_root|
-        ::Logging.appenders.stderr.tap do |serr|
-          serr.layout = ::Logging.layouts.pattern(
-            :pattern => '%.1l, [%d #p] %c30.30{2}:  %m\n',
-            :date_pattern => '%Y-%m-%d %H:%M:%S.%6N' 
-          )
-
-          serr.auto_flushing = 25
-          serr.flush_period = 5
-
-          ch_root.add_appenders(serr)
-        end
-
-        ch_root.level = ENV['ZK_DEBUG'] ? :debug : :off
-      end
-    end
-
-    def logger
-      self.class.logger
-    end
-  end
-end
-