zk-eventmachine 0.2.0.beta.3 → 0.9.0

metadata

@@ -1,127 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: zk-eventmachine
-version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.3
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 59
+  prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
-authors:
+authors: 
 - Jonathan D. Simms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: zk
-  requirement: &2153417580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-  type: :runtime
   prerelease: false
-  version_requirements: *2153417580
-- !ruby/object:Gem::Dependency
-  name: slyphon-zookeeper
-  requirement: &2153416980 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: slyphon-zookeeper
   prerelease: false
-  version_requirements: *2153416980
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &2153416460 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
   prerelease: false
-  version_requirements: *2153416460
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: &2153416000 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+      - !ruby/object:Gem::Version 
+        hash: -1649268254
+        segments: 
+        - 1
+        - 0
+        - 0
+        - beta
+        - 4
+        version: 1.0.0.beta.4
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: deferred
   prerelease: false
-  version_requirements: *2153416000
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2153415040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *2153415040
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2153414480 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: *2153414480
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: &2153413980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *2153413980
-- !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: &2153413520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.10
-  type: :development
-  prerelease: false
-  version_requirements: *2153413520
-- !ruby/object:Gem::Dependency
-  name: evented-spec
-  requirement: &2153409460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: *2153409460
-description: ''
-email:
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
+        version: 0.5.3
+  type: :runtime
+  version_requirements: *id004
+description: ""
+email: 
 - slyphon@hp.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .dev_extras/README
 - .dev_extras/rspec
 - .dev_extras/rvmrc
 - .dev_extras/slyphon-project.vimrc
 - .gitignore
+- .yardopts
 - Gemfile
 - LICENSE
 - README.markdown
@@ -129,9 +106,8 @@ files:
 - lib/z_k/z_k_event_machine.rb
 - lib/z_k/z_k_event_machine/callback.rb
 - lib/z_k/z_k_event_machine/client.rb
-- lib/z_k/z_k_event_machine/deferred.rb
 - lib/z_k/z_k_event_machine/event_handler_e_m.rb
-- lib/z_k/z_k_event_machine/synchrony_client.rb
+- lib/z_k/z_k_event_machine/iterator.rb
 - lib/z_k/z_k_event_machine/unixisms.rb
 - lib/z_k/z_k_event_machine/version.rb
 - lib/zk-eventmachine.rb
@@ -139,44 +115,52 @@ files:
 - spec/support/extensions.rb
 - spec/support/logging.rb
 - spec/support/logging_progress_bar_formatter.rb
+- spec/support/wait_watchers.rb
 - spec/z_k/z_k_event_machine/callback_spec.rb
 - 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/synchrony_client_spec.rb
 - spec/z_k/z_k_event_machine/unixisms_spec.rb
 - zk-eventmachine.gemspec
 homepage: https://github.com/slyphon/zk-eventmachine
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: ZK client for EventMachine-based (async) applications
-test_files:
+test_files: 
 - spec/spec_helper.rb
 - spec/support/extensions.rb
 - spec/support/logging.rb
 - spec/support/logging_progress_bar_formatter.rb
+- spec/support/wait_watchers.rb
 - spec/z_k/z_k_event_machine/callback_spec.rb
 - 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/synchrony_client_spec.rb
 - spec/z_k/z_k_event_machine/unixisms_spec.rb
-has_rdoc: 

data/lib/z_k/z_k_event_machine/deferred.rb

@@ -1,39 +0,0 @@
-module ZK
-  module ZKEventMachine
-    module Deferred
-      include EM::Deferrable
-
-      # slight modification to EM::Deferrable, 
-      #
-      # @returns [self] to allow for chaining
-      #
-      def callback(&block)
-        super(&block)
-        self
-      end
-
-      # @see #callback
-      def errback(&block)
-        super(&block)
-        self
-      end
-
-      # adds the block to both the callback and errback chains
-      def ensure_that(&block)
-        callback(&block)
-        errback(&block)
-      end
-
-      def chain_to(other_dfr, opts={})
-        other_dfr.callback { |*a| self.succeed(*a) }
-        other_dfr.errback { |*a| self.fail(*a) } unless opts[:ignore_errors]
-        self
-      end
-
-      class Default
-        include ZK::ZKEventMachine::Deferred
-      end
-    end
-  end
-end
-

data/lib/z_k/z_k_event_machine/synchrony_client.rb

@@ -1,135 +0,0 @@
-module ZK
-  module ZKEventMachine
-    class SynchronyEventHandlerWrapper
-      include ZK::Logging
-
-      def initialize(event_handler)
-        @event_handler = event_handler
-      end
-
-      # registers a block to be called back within a fiber context
-      def register(path, &block)
-        new_block = proc do |*a|
-          Fiber.new { block.call(*a) }.resume
-        end
-
-        @event_handler.register(path, &new_block)
-      end
-
-      private
-        def method_missing(meth, *a, &b)
-          @event_handler.__send__(meth, *a, &b)
-        end
-    end
-
-    # This class is an EM::Synchrony wrapper around a ZK::ZKEventMachine::Client
-    #
-    # It should behave exactly like a ZK::Client instance (when called in a
-    # synchronous fashion), and one should look there for documentation about
-    # the various methods
-    #
-    # @note this class is implemented as a wrapper instead of a subclass of Client
-    #   so that it can support the unixisms like rm_rf and mkdir_p. The
-    #   synchrony pattern of aliasing the base class methods and specializing for 
-    #   synchrony didn't work in this case.
-    #
-    class SynchronyClient
-      include ZK::Logging
-
-      attr_reader :event_handler, :client
-
-      # @overload new(client_instance)
-      #   Wrap an existing ZK::ZKEventMachine::Client instance in an
-      #   EM::Synchrony compatible way
-      #   @param [ZK::ZKEventMachine::Client] client_instance an instance of Client to wrap
-      # @overload new(host, opts={})
-      #   Creates a new ZK::ZKEventMachine::Client instance to manage
-      #   takes the same arguments as ZK::Client::Base
-      def initialize(host, opts={})
-        case host
-        when Client
-          @client = host
-        when String
-          @client = Client.new(host, opts)
-        else
-          raise ArgumentError, "argument must be either a ZK::ZKEventMachine::Client instance or a hostname:port string"
-        end
-
-        @client.synchrony_client = self
-
-        @event_handler = SynchronyEventHandlerWrapper.new(@client.event_handler)
-      end
-
-      %w[connect get set create stat delete children get_acl set_acl mkdir_p rm_rf].each do |meth|
-        class_eval(<<-EOMETH, __FILE__, __LINE__ + 1)
-          def #{meth}(*args,&blk)
-            sync!(@client.#{meth}(*args, &blk))
-          end
-        EOMETH
-      end
-
-      # it is *crucially* important that close and close! be wrapped in a fiber.
-      # it's possible under very odd corner cases with the 1.9.3 GC to cause a
-      # '[BUG] cfp consistency error - send'
-      #
-      %w[close close!].each do |meth|
-        class_eval(<<-EOMETH, __FILE__, __LINE__ + 1)
-          def #{meth}(*args,&blk)
-            Fiber.new { sync!(@client.#{meth}(*args, &blk)) }.resume
-          end
-        EOMETH
-      end
-
-      # @deprecated for backwards compatibility only
-      def watcher
-        event_handler
-      end
-
-      def exists?(path, opts={})
-        stat(path, opts={}).exists?
-      end
-
-      # returns self
-      def to_synchrony
-        self
-      end
-
-      # returns the wrapped async client
-      def to_async
-        @client
-      end
-
-      protected
-        # a modification of EM::Synchrony.sync to handle multiple callback arguments properly
-        def sync(df)
-          f = Fiber.current
-
-          xback = proc do |*args|
-            if f == Fiber.current
-              return *args
-            else
-              f.resume(*args)
-            end
-          end
-
-          df.callback(&xback)
-          df.errback(&xback)
-
-          Fiber.yield
-        end
-
-        # like sync, but if the deferred returns an exception instance, re-raises
-        def sync!(deferred)
-          rval = sync(deferred)
-          raise rval if rval.kind_of?(Exception)
-          rval
-        end
-
-      private
-        def method_missing(meth, *a, &b)
-          @client.__send__(meth, *a, &b)
-        end
-    end
-  end
-end
-