zookeeper 0.9.4 → 1.0.0.beta.1

data/lib/zookeeper/constants.rb

@@ -1,4 +1,7 @@
-module ZookeeperConstants
+module Zookeeper
+module Constants
+  include ACLs::Constants
+
   # file type masks
   ZOO_EPHEMERAL = 1
   ZOO_SEQUENCE  = 2
@@ -25,6 +28,36 @@ module ZookeeperConstants
   ZOO_LOG_LEVEL_INFO  = 3
   ZOO_LOG_LEVEL_DEBUG = 4
 
+  # exceptions/errors
+  ZOK                    =  0
+  ZSYSTEMERROR           = -1
+  ZRUNTIMEINCONSISTENCY  = -2
+  ZDATAINCONSISTENCY     = -3
+  ZCONNECTIONLOSS        = -4
+  ZMARSHALLINGERROR      = -5
+  ZUNIMPLEMENTED         = -6
+  ZOPERATIONTIMEOUT      = -7
+  ZBADARGUMENTS          = -8
+  ZINVALIDSTATE          = -9
+  
+  # api errors
+  ZAPIERROR                 = -100
+  ZNONODE                   = -101
+  ZNOAUTH                   = -102
+  ZBADVERSION               = -103
+  ZNOCHILDRENFOREPHEMERALS  = -108
+  ZNODEEXISTS               = -110
+  ZNOTEMPTY                 = -111
+  ZSESSIONEXPIRED           = -112
+  ZINVALIDCALLBACK          = -113
+  ZINVALIDACL               = -114
+  ZAUTHFAILED               = -115
+  ZCLOSING                  = -116
+  ZNOTHING                  = -117
+  ZSESSIONMOVED             = -118
+
+  ZKRB_GLOBAL_CB_REQ = -1
+
   # used to find the name for a numeric event
   # @private
   EVENT_TYPE_NAMES = {
@@ -55,3 +88,4 @@ module ZookeeperConstants
     (name = STATE_NAMES[v]) ?  "ZOO_#{name.upcase}_STATE" : ''
   end
 end
+end

data/lib/zookeeper/em_client.rb

@@ -2,7 +2,7 @@ require 'zookeeper'
 require 'eventmachine'
 
 module ZookeeperEM 
-  class Client < Zookeeper
+  class Client < Zookeeper::Client
     # @private
     # the EM Connection instance we receive once we call EM.watch on our selectable_io
     attr_reader :em_connection

data/lib/zookeeper/exceptions.rb

@@ -1,100 +1,124 @@
-module ZookeeperExceptions
-  # exceptions/errors
-  ZOK                    =  0
-  ZSYSTEMERROR           = -1
-  ZRUNTIMEINCONSISTENCY  = -2
-  ZDATAINCONSISTENCY     = -3
-  ZCONNECTIONLOSS        = -4
-  ZMARSHALLINGERROR      = -5
-  ZUNIMPLEMENTED         = -6
-  ZOPERATIONTIMEOUT      = -7
-  ZBADARGUMENTS          = -8
-  ZINVALIDSTATE          = -9
-  
-  # api errors
-  ZAPIERROR                 = -100
-  ZNONODE                   = -101
-  ZNOAUTH                   = -102
-  ZBADVERSION               = -103
-  ZNOCHILDRENFOREPHEMERALS  = -108
-  ZNODEEXISTS               = -110
-  ZNOTEMPTY                 = -111
-  ZSESSIONEXPIRED           = -112
-  ZINVALIDCALLBACK          = -113
-  ZINVALIDACL               = -114
-  ZAUTHFAILED               = -115
-  ZCLOSING                  = -116
-  ZNOTHING                  = -117
-  ZSESSIONMOVED             = -118
+module Zookeeper
+module Exceptions
+  include Constants
 
   class ZookeeperException < StandardError
-    class EverythingOk            < ZookeeperException; end
-    class SystemError             < ZookeeperException; end
-    class RunTimeInconsistency    < ZookeeperException; end
-    class DataInconsistency       < ZookeeperException; end
-    class ConnectionLoss          < ZookeeperException; end
-    class MarshallingError        < ZookeeperException; end
-    class Unimplemented           < ZookeeperException; end
-    class OperationTimeOut        < ZookeeperException; end
-    class BadArguments            < ZookeeperException; end
-    class InvalidState            < ZookeeperException; end
-    class ApiError                < ZookeeperException; end
-    class NoNode                  < ZookeeperException; end
-    class NoAuth                  < ZookeeperException; end
-    class BadVersion              < ZookeeperException; end
-    class NoChildrenForEphemerals < ZookeeperException; end
-    class NodeExists              < ZookeeperException; end
-    class NotEmpty                < ZookeeperException; end
-    class SessionExpired          < ZookeeperException; end
-    class InvalidCallback         < ZookeeperException; end
-    class InvalidACL              < ZookeeperException; end
-    class AuthFailed              < ZookeeperException; end
-    class Closing                 < ZookeeperException; end
-    class Nothing                 < ZookeeperException; end
-    class SessionMoved            < ZookeeperException; end
-    
-    # these are Ruby client exceptions
-    class ConnectionClosed        < ZookeeperException; end
-    class NotConnected            < ZookeeperException; end 
-    class ShuttingDownException   < ZookeeperException; end
-    class DataTooLargeException   < ZookeeperException; end
-
-    # yes, make an alias, this is the way zookeeper refers to it
-    ExpiredSession = SessionExpired
-    
-    def self.by_code(code)
-      case code
-        when ZOK then EverythingOk
-        when ZSYSTEMERROR then SystemError
-        when ZRUNTIMEINCONSISTENCY then RunTimeInconsistency
-        when ZDATAINCONSISTENCY then DataInconsistency
-        when ZCONNECTIONLOSS then ConnectionLoss
-        when ZMARSHALLINGERROR then MarshallingError
-        when ZUNIMPLEMENTED then Unimplemented
-        when ZOPERATIONTIMEOUT then OperationTimeOut
-        when ZBADARGUMENTS then BadArguments
-        when ZINVALIDSTATE then InvalidState
-        when ZAPIERROR then ApiError
-        when ZNONODE then NoNode
-        when ZNOAUTH then NoAuth
-        when ZBADVERSION then BadVersion
-        when ZNOCHILDRENFOREPHEMERALS then NoChildrenForEphemerals 
-        when ZNODEEXISTS then NodeExists              
-        when ZNOTEMPTY then NotEmpty                
-        when ZSESSIONEXPIRED then SessionExpired          
-        when ZINVALIDCALLBACK then InvalidCallback         
-        when ZINVALIDACL then InvalidACL
-        when ZAUTHFAILED then AuthFailed
-        when ZCLOSING then Closing
-        when ZNOTHING then Nothing
-        when ZSESSIONMOVED then SessionMoved
-      else Exception.new("no exception defined for code #{code}")
+
+    unless defined?(CONST_MISSING_WARNING)
+
+      CONST_MISSING_WARNING = <<-EOS
+
+------------------------------------------------------------------------------------------
+WARNING! THE ZOOKEEPER NAMESPACE HAS CHNAGED AS OF 1.0!
+
+Please update your code to use the new heirarchy!
+
+The constant that got you this was ZookeeperExceptions::ZookeeperException::%s
+
+stacktrace: 
+%s
+
+------------------------------------------------------------------------------------------
+
+      EOS
+    end
+
+    # NOTE(slyphon): Since 0.4 all of the ZookeeperException subclasses were
+    #   defined inside of ZookeeperException, which always seemed well, icky.
+    #   if someone references one of these we'll print out a warning and 
+    #   then give them the constant
+    # 
+    def self.const_missing(const)
+      if Zookeeper::Exceptions.const_defined?(const)
+
+        stacktrace = caller[0..-2].reject {|n| n =~ %r%/rspec/% }.map { |n| "\t#{n}" }.join("\n")
+
+        Zookeeper.deprecation_warning(CONST_MISSING_WARNING % [const.to_s, stacktrace])
+
+
+        Zookeeper::Exceptions.const_get(const).tap do |const_val|
+          self.const_set(const, const_val)
+        end
+      else
+        super
       end
     end
+  end
+
+
+  class EverythingOk            < ZookeeperException; end
+  class SystemError             < ZookeeperException; end
+  class RunTimeInconsistency    < ZookeeperException; end
+  class DataInconsistency       < ZookeeperException; end
+  class ConnectionLoss          < ZookeeperException; end
+  class MarshallingError        < ZookeeperException; end
+  class Unimplemented           < ZookeeperException; end
+  class OperationTimeOut        < ZookeeperException; end
+  class BadArguments            < ZookeeperException; end
+  class InvalidState            < ZookeeperException; end
+  class ApiError                < ZookeeperException; end
+  class NoNode                  < ZookeeperException; end
+  class NoAuth                  < ZookeeperException; end
+  class BadVersion              < ZookeeperException; end
+  class NoChildrenForEphemerals < ZookeeperException; end
+  class NodeExists              < ZookeeperException; end
+  class NotEmpty                < ZookeeperException; end
+  class SessionExpired          < ZookeeperException; end
+  class InvalidCallback         < ZookeeperException; end
+  class InvalidACL              < ZookeeperException; end
+  class AuthFailed              < ZookeeperException; end
+  class Closing                 < ZookeeperException; end
+  class Nothing                 < ZookeeperException; end
+  class SessionMoved            < ZookeeperException; end
+  
+  # these are Ruby client exceptions
+  class ConnectionClosed        < ZookeeperException; end
+  class NotConnected            < ZookeeperException; end 
+  class ShuttingDownException   < ZookeeperException; end
+  class DataTooLargeException   < ZookeeperException; end
+
+  # raised when the user tries to use a connection after a fork()
+  # without calling reopen() in the C client
+  #
+  # (h/t: @pletern http://git.io/zIsq1Q)
+  class InheritedConnectionError < ZookeeperException; end
+
+  # yes, make an alias, this is the way zookeeper refers to it
+  ExpiredSession = SessionExpired unless defined?(ExpiredSession)
     
-    def self.raise_on_error(code)
-      exc = self.by_code(code)
-      raise exc unless exc == EverythingOk
+  def self.by_code(code)
+    case code
+      when ZOK then EverythingOk
+      when ZSYSTEMERROR then SystemError
+      when ZRUNTIMEINCONSISTENCY then RunTimeInconsistency
+      when ZDATAINCONSISTENCY then DataInconsistency
+      when ZCONNECTIONLOSS then ConnectionLoss
+      when ZMARSHALLINGERROR then MarshallingError
+      when ZUNIMPLEMENTED then Unimplemented
+      when ZOPERATIONTIMEOUT then OperationTimeOut
+      when ZBADARGUMENTS then BadArguments
+      when ZINVALIDSTATE then InvalidState
+      when ZAPIERROR then ApiError
+      when ZNONODE then NoNode
+      when ZNOAUTH then NoAuth
+      when ZBADVERSION then BadVersion
+      when ZNOCHILDRENFOREPHEMERALS then NoChildrenForEphemerals 
+      when ZNODEEXISTS then NodeExists              
+      when ZNOTEMPTY then NotEmpty                
+      when ZSESSIONEXPIRED then SessionExpired          
+      when ZINVALIDCALLBACK then InvalidCallback         
+      when ZINVALIDACL then InvalidACL
+      when ZAUTHFAILED then AuthFailed
+      when ZCLOSING then Closing
+      when ZNOTHING then Nothing
+      when ZSESSIONMOVED then SessionMoved
+    else ZookeeperException.new("no exception defined for code #{code}")
     end
   end
-end
+  
+  def self.raise_on_error(code)
+    exc = self.by_code(code)
+    raise exc unless exc == EverythingOk
+  end
+end # Exceptions
+end # Zookeeper

data/lib/zookeeper/rake_tasks.rb

@@ -0,0 +1,165 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Zookeeper
+  # @private
+  module RakeTasks
+    def self.define_test_tasks_for(*rubies)
+      rubies.each do |r|
+
+        TestOneRuby.new(:name => r) do |tor|
+          yield tor if block_given?
+        end
+      end
+    end
+
+    class TestOneRuby < ::Rake::TaskLib
+      include ::Rake::DSL if defined?(::Rake::DSL)
+
+      DEFAULT_RVM_RUBY_NAME = '1.9.3'
+
+      # defaults to 'zk', test tasks will be built under this
+      attr_accessor :namespace
+
+      # the name of the task
+      # (tasks will be 'zk:1.9.3:run_rspec')
+      #
+      # this is mainly here so that the rvm ruby name rbx-2.0.testing 
+      # will have its tasks defined as 'zk:rbx'
+      attr_accessor :name
+
+      # what is the rvm name we should use for testing? (i.e. could be an alias)
+      # defaults to {#name}
+      attr_accessor :rvm_ruby_name
+
+      # any extra environment variables?
+      attr_accessor :env
+
+      # gemset name to use, deafults to the name of the gemspec in the top of the
+      # project directory (minus the .gempsec)
+      attr_accessor :gemset_name
+
+      # @private
+      attr_reader :ruby_with_gemset,       
+        :create_gemset_name,
+        :clobber_task_name,
+        :clean_task_name,
+        :build_task_name,
+        :bundle_task_name,
+        :rspec_task_name,
+        :phony_gemfile_link_name,
+        :phony_gemfile_lock_name
+
+
+      def self.default_gemset_name
+        ary = Dir['*.gemspec']
+        raise 'No gemspec found' if ary.empty?
+        ary.first[/(.+)\.gemspec\Z/, 1]
+      end
+
+      def initialize(opts={})
+        @namespace      = 'zk'
+        @name           = nil
+        @env            = {}
+        @rvm_ruby_name  = nil
+        @gemset_name    = nil
+
+        opts.each { |k,v| __send__(:"#{k}=", v) }
+
+        yield self if block_given?
+
+        @gemset_name    ||= self.class.default_gemset_name
+        
+        # XXX: add an exception just for me in here (yes, i know this is naughty)
+        #      or else i'd have to do this in every zk variant i want to test
+        #      (like i have to now)
+
+        unless @rvm_ruby_name
+          @rvm_ruby_name = 'rbx-2.0.testing' if @name == 'rbx'
+        end
+
+        @rvm_ruby_name  ||= name
+
+        @ruby_with_gemset         = "#{@rvm_ruby_name}@#{@gemset_name}"
+        @create_gemset_name       = "#{namespace}:#{name}:create_gemset"
+        @clobber_task_name        = "#{namespace}:#{name}:clobber"
+        @clean_task_name          = "#{namespace}:#{name}:clean"
+        @build_task_name          = "#{namespace}:#{name}:build"
+        @bundle_task_name         = "#{namespace}:#{name}:bundle_install"
+        @rspec_task_name          = "#{namespace}:#{name}:run_rspec"
+        @phony_gemfile_link_name  = "Gemfile.#{name}"
+        @phony_gemfile_lock_name  = "#{phony_gemfile_link_name}.lock"
+
+        define_tasks
+      end
+
+      private
+        def need_ext_build?
+          name != 'jruby' && File.directory?('./ext')
+        end
+
+        def define_tasks
+          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_name do
+            sh "rvm #{rvm_ruby_name} do rvm gemset create #{gemset_name}"
+          end
+
+          task clobber_task_name do
+            if need_ext_build?
+              cd 'ext' do
+                sh "rake clobber"
+              end
+            end
+          end
+
+          task clean_task_name do
+            if need_ext_build?
+              cd 'ext' do
+                sh "rake clean"
+              end
+            end
+          end
+
+          task build_task_name => [create_gemset_name, clean_task_name] do
+            if need_ext_build?
+              cd 'ext' do
+                sh "rvm #{ruby_with_gemset} do rake build"
+              end
+            end
+          end
+
+          task bundle_task_name => [phony_gemfile_link_name, build_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 env BUNDLE_GEMFILE=#{phony_gemfile_link_name} bundle exec rspec spec --fail-fast"
+          end
+
+          task "#{namespace}:#{name}" => rspec_task_name
+
+          task "#{namespace}:test_all_rubies" => rspec_task_name
+
+          unless Rake::Task.task_defined?("#{namespace}:test_all")
+            task "#{namespace}:test_all" do
+              require 'benchmark'
+              t = Benchmark.realtime do
+                Rake::Task["#{namespace}:test_all_rubies"].invoke
+              end
+
+              $stderr.puts "Test run took: #{t} s"
+            end
+          end
+        end
+    end
+  end
+end
+

data/lib/zookeeper/stat.rb

@@ -1,21 +1,21 @@
-module ZookeeperStat
-  class Stat
-    attr_reader :version, :exists, :czxid, :mzxid, :ctime, :mtime, :cversion, :aversion, :ephemeralOwner, :dataLength, :numChildren, :pzxid
+module Zookeeper
+class Stat
+  attr_reader :version, :exists, :czxid, :mzxid, :ctime, :mtime, :cversion, :aversion, :ephemeralOwner, :dataLength, :numChildren, :pzxid
 
-    alias :ephemeral_owner :ephemeralOwner
-    alias :num_children :numChildren
-    alias :data_length :dataLength
+  alias :ephemeral_owner :ephemeralOwner
+  alias :num_children :numChildren
+  alias :data_length :dataLength
 
-    def initialize(val)
-      @exists = !!val
-      @czxid, @mzxid, @ctime, @mtime, @version, @cversion, @aversion,
-          @ephemeralOwner, @dataLength, @numChildren, @pzxid = val if val.is_a?(Array)
-      val.each { |k,v| instance_variable_set "@#{k}", v } if val.is_a?(Hash)
-      raise ArgumentError unless (val.is_a?(Hash) or val.is_a?(Array) or val.nil?)
-    end
+  def initialize(val)
+    @exists = !!val
+    @czxid, @mzxid, @ctime, @mtime, @version, @cversion, @aversion,
+        @ephemeralOwner, @dataLength, @numChildren, @pzxid = val if val.is_a?(Array)
+    val.each { |k,v| instance_variable_set "@#{k}", v } if val.is_a?(Hash)
+    raise ArgumentError unless (val.is_a?(Hash) or val.is_a?(Array) or val.nil?)
+  end
 
-    def exists?
-      @exists
-    end
+  def exists?
+    @exists
   end
 end
+end