dcell 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9999eedc6fc4f7c1debdedd7e1018cc7cec0ed15
-  data.tar.gz: 9aa0515298bd46ed83766af9ce7e8e5b96ba924a
+  metadata.gz: 5b7abd2458deb859bd4f406ee25e70e2a2acefb1
+  data.tar.gz: 37da6fd6c1177b19898b048eade8700fd965cd25
 SHA512:
-  metadata.gz: 3af037c3b4a032cf8ded2086f538aa57f71168370e0a11f01c54a1eaa4b587d42782d7ff2a16a2a4f2c7af9ae7b82e3c8ee0a2148e3c2ad6ffb181d096598a16
-  data.tar.gz: 866b10be6c0dea652423187a43df0eaa2794f79db7db9ee6de599d7f0e93db80db9bd012270d754a044fd9383cfbf50ec3a73d88d06d529ca78394976f2d3c95
+  metadata.gz: a37879c2a2962fcf4dbcb6b424357b1686e4689a4cefcb6627936d08c66ac998ccc0faac64d1c54d5eb26b3df8de7656fa5991677c7f9ad87493e2433b9a139b
+  data.tar.gz: 9566d8144677141bc87a371f3f8ba70641b78538e804ed79f3481417dd04e5b06aea6124980227e913789925ae5f5ea821258fd24dd25dfc5e2377f3bf5e2db9

data/.rspec

@@ -1,4 +1,4 @@
 --color
 --format documentation
 --backtrace
---default_path spec
+--warnings

data/.travis.yml

@@ -1,5 +1,11 @@
+language: ruby
+
 before_install: sudo apt-get install libzmq3-dev
 
+services:
+  - mongodb
+  - redis-server
+
 rvm:
   - 1.9.3
   - 2.0.0
@@ -15,5 +21,10 @@ matrix:
     - rvm: jruby-19mode
     - rvm: rbx-19mode # rbx seems to be losing exception messages o_O
 
-notifications:
-  irc: "irc.freenode.org#celluloid"
+branches:
+  only:
+    - master
+
+env:
+    - DCELL_TEST_ADAPTER=redis
+    - DCELL_TEST_ADAPTER=mongodb

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.16.1 (2014-12-17)
+-------------------
+* Bugfixes for Celluloid 0.16 compatibility
+
 0.16.0 (2014-09-04)
 -------------------
 * Timeouts for cell discovery

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
 
-gem 'celluloid',        github: 'celluloid/celluloid',        branch: 'master'
-gem 'celluloid-io',     github: 'celluloid/celluloid-io',     branch: 'master'
-gem 'celluloid-zmq',    github: 'celluloid/celluloid-zmq',    branch: 'master'
+gem 'celluloid',        github: 'celluloid/celluloid',        tag: 'v0.16.0'
+gem 'celluloid-io',     github: 'celluloid/celluloid-io',     tag: 'v0.16.1'
+gem 'celluloid-zmq',    github: 'celluloid/celluloid-zmq',    tag: 'v0.16.0'
 gem 'celluloid-redis',  github: 'celluloid/celluloid-redis',  branch: 'master'
-gem 'reel',             github: 'celluloid/reel',             branch: 'master'
+gem 'reel',             github: 'celluloid/reel',             tag: 'v0.4.0'
 
 #gem 'ffi-rzmq', github: 'chuckremes/ffi-rzmq'
 
@@ -15,3 +15,4 @@ gem 'coveralls',     require: false
 gemspec
 
 gem 'zk'
+gem 'mongoid'

data/README.md

@@ -2,7 +2,6 @@
 =====
 [![Gem Version](https://badge.fury.io/rb/dcell.png)](http://rubygems.org/gems/dcell)
 [![Build Status](https://secure.travis-ci.org/celluloid/dcell.png?branch=master)](http://travis-ci.org/celluloid/dcell)
-[![Dependency Status](https://gemnasium.com/celluloid/dcell.png)](https://gemnasium.com/celluloid/dcell)
 [![Code Climate](https://codeclimate.com/github/celluloid/dcell.png)](https://codeclimate.com/github/celluloid/dcell)
 [![Coverage Status](https://coveralls.io/repos/celluloid/dcell/badge.png?branch=master)](https://coveralls.io/r/celluloid/dcell)
 

data/dcell.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "celluloid",     ">= 0.16.0"
-  gem.add_runtime_dependency "celluloid-zmq", ">= 0.16.0"
-  gem.add_runtime_dependency "reel"
+  gem.add_runtime_dependency "celluloid",     "~> 0.16.0"
+  gem.add_runtime_dependency "celluloid-zmq", "~> 0.16.0"
+  gem.add_runtime_dependency "reel",          "~> 0.4.0"
+  gem.add_runtime_dependency "http",          "~> 0.5.0"
   gem.add_runtime_dependency "celluloid-redis"
   gem.add_runtime_dependency "redis-namespace"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec",     "~> 2.14.0"
 end

data/examples/itchy.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'dcell'
 
-DCell.start :id => "itchy", :addr => "tcp://127.0.0.1:9001"
+DCell.start :id => "itchy"
 
 class Itchy
   include Celluloid
@@ -12,12 +12,13 @@ class Itchy
   end
 
   def fight
-    @n = (@n % 6) + 1
-    if @n <= 3
+    @n += 1
+    if @n % 6 == 0
       puts "Bite!"
     else
       puts "Fight!"
     end
+    @n
   end
 end
 

data/examples/scratchy.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 require 'dcell'
 
-DCell.start :id => "scratchy", :addr => "tcp://127.0.0.1:9002"
+DCell.start
 itchy_node = DCell::Node["itchy"]
 
 puts "Fighting itchy! (check itchy's output)"
 
-6.times do
-  itchy_node[:itchy].fight
+300.times do
+  puts itchy_node[:itchy].fight
   sleep 1
 end

data/lib/dcell.rb

@@ -1,6 +1,8 @@
 require 'celluloid'
 require 'reel'
 require 'celluloid/zmq'
+require 'socket'
+require 'securerandom'
 
 Celluloid::ZMQ.init
 
@@ -27,7 +29,6 @@ require 'dcell/celluloid_ext'
 module DCell
   class NotConfiguredError < RuntimeError; end # Not configured yet
 
-  DEFAULT_PORT  = 7777 # Default DCell port
   @config_lock  = Mutex.new
 
   class << self
@@ -45,11 +46,11 @@ module DCell
       @config_lock.synchronize do
         @configuration = {
           'id'   => generate_node_id,
-          'addr' => "tcp://127.0.0.1:#{DEFAULT_PORT}",
+          'addr' => "tcp://127.0.0.1:*",
           'registry' => {'adapter' => 'redis', 'server' => 'localhost'}
         }.merge(options)
 
-        @me = Node.new @configuration['id'], @configuration['addr']
+        @me = Node.new @configuration['id'], nil
 
         registry_adapter = @configuration['registry'][:adapter] || @configuration['registry']['adapter']
         raise ArgumentError, "no registry adapter given in config" unless registry_adapter
@@ -64,8 +65,7 @@ module DCell
 
         @registry = registry_class.new(@configuration['registry'])
 
-        addr = @configuration['public'] || @configuration['addr']
-        DCell::Directory.set @configuration['id'], addr
+        ObjectSpace.define_finalizer(me, proc {Directory.remove @configuration['id']})
       end
 
       me
@@ -81,9 +81,22 @@ module DCell
     def addr; @configuration['addr']; end
     alias_method :address, :addr
 
+    def addr=(addr)
+      @configuration['addr'] = addr
+      @me.update_server_address addr
+    end
+    alias_method :address=, :addr=
+
     # Attempt to generate a unique node ID for this machine
     def generate_node_id
-      `hostname`.strip # Super creative I know
+      # a little bit more creative
+      if @registry.respond_to? :unique
+        @registry.unique
+      else
+        digest = Digest::SHA512.new
+        seed = Socket.gethostname + rand.to_s + Time.now.to_s + SecureRandom.hex
+        digest.update(seed).to_s
+      end
     end
 
     # Run the DCell application

data/lib/dcell/actor_proxy.rb

@@ -1,6 +1,6 @@
 module DCell
   # Proxy object for actors that live on remote nodes
-  class ActorProxy < Celluloid::ActorProxy; end
+  class CellProxy < Celluloid::CellProxy; end
 
   class ThreadHandleProxy
     def kill
@@ -23,7 +23,8 @@ module DCell
       @mailbox = mailbox
       @thread  = ThreadHandleProxy.new
       @subject = SubjectProxy.new
+      @proxy = Celluloid::ActorProxy.new(@thread, @mailbox)
     end
-    attr_reader :mailbox, :thread, :subject
+    attr_reader :mailbox, :thread, :subject, :proxy
   end
 end

data/lib/dcell/celluloid_ext.rb

@@ -9,7 +9,7 @@
 # DCell overlay network back to the node where the actor actually exists
 
 module Celluloid
-  class ActorProxy
+  class CellProxy
     # Marshal uses respond_to? to determine if this object supports _dump so
     # unfortunately we have to monkeypatch in _dump support as the proxy
     # itself normally jacks respond_to? and proxies to the actor
@@ -33,11 +33,12 @@ module Celluloid
       case mailbox
       when ::DCell::MailboxProxy
         actor = ::DCell::Actor.new(mailbox)
-        ::DCell::ActorProxy.new actor, mailbox
+        ::DCell::CellProxy.new actor.proxy, mailbox, actor.subject.class.to_s
       when ::Celluloid::Mailbox
         actor = find_actor(mailbox)
-        ::Celluloid::ActorProxy.new(actor)
-      else ::Kernel.raise "funny, I did not expect to see a #{mailbox.class} here"
+        ::Celluloid::CellProxy.new actor.proxy, mailbox, actor.behavior.subject.class.to_s
+      else
+        ::Kernel.raise "funny, I did not expect to see a #{mailbox.class} here"
       end
     end
 

data/lib/dcell/directory.rb

@@ -19,5 +19,13 @@ module DCell
     def all
       DCell.registry.nodes
     end
+
+    def clear_all
+      DCell.registry.clear_all_nodes
+    end
+
+    def remove(node)
+      DCell.registry.remove_node node
+    end
   end
 end

data/lib/dcell/explorer.rb

@@ -6,7 +6,7 @@ require 'erb'
 module DCell
   # Web UI for DCell
   # TODO: rewrite this entire thing with less hax
-  class Explorer < Reel::Server::HTTP
+  class Explorer < Reel::Server
     ASSET_ROOT = Pathname.new File.expand_path("../../../explorer", __FILE__)
 
     def initialize(host = "127.0.0.1", port = 7778)

data/lib/dcell/node.rb

@@ -18,6 +18,7 @@ module DCell
       Celluloid::Logger.info "Connected to #{id}"
     end
     state :partitioned do
+      @heartbeat.cancel
       Celluloid::Logger.warn "Communication with #{id} interrupted"
     end
     
@@ -32,7 +33,7 @@ module DCell
       include Enumerable
       extend Forwardable
 
-      def_delegators "Celluloid::Actor[:node_manager]", :all, :each, :find, :[]
+      def_delegators "Celluloid::Actor[:node_manager]", :all, :each, :find, :[], :remove, :update
       def_delegators "Celluloid::Actor[:node_manager]", :heartbeat_rate, :heartbeat_timeout
     end
 
@@ -45,6 +46,15 @@ module DCell
       attach self
     end
 
+    def update_client_address( addr )
+      @addr = addr
+      send_heartbeat
+    end
+
+    def update_server_address(addr)
+      @addr = addr
+    end
+
     def shutdown
       transition :shutdown
       @socket.close if @socket

data/lib/dcell/node_manager.rb

@@ -4,6 +4,8 @@ module DCell
     include Celluloid::ZMQ
     include Enumerable
 
+    trap_exit :node_died
+
     attr_reader :heartbeat_rate, :heartbeat_timeout
 
     def initialize
@@ -39,11 +41,39 @@ module DCell
         node = DCell.me
       else
         node = Node.new(id, addr)
+        self.link node
       end
 
       @nodes[id] ||= node
       @nodes[id]
     end
     alias_method :[], :find
+
+    def node_died(node, reason)
+      if reason.nil? # wtf?
+        # this wtf error seems to come from node socket writes
+        # when the socket is not reachable anymore
+        Celluloid::logger.debug "wtf?"
+        return
+      end
+      # Handle dead node???
+    end
+
+    def update(id)
+      addr = Directory[id]
+      return unless addr
+      if ( node = @nodes[id] ) and node.alive?
+        node.update_client_address( addr )
+      else
+        @nodes[id] = Node.new( id, addr )
+      end
+    end
+
+    def remove(id)
+      if @nodes[id]
+        @nodes[id].terminate if @nodes[id].alive?
+        @nodes.delete(id)
+      end
+    end
   end
 end

data/lib/dcell/registries/cassandra_adapter.rb

@@ -48,12 +48,16 @@ module DCell
         @global_registry = GlobalRegistry.new(cass, columnfamily)
       end
 
-      def clear_nodes
-        @node_registry.clear
+      def remove_node(node)
+        @node_registry.remove node
+      end
+
+      def clear_all_nodes
+        @node_registry.clear_all
       end
 
       def clear_globals
-        @global_registry.clear
+        @global_registry.clear_all
       end
 
       class NodeRegistry
@@ -74,7 +78,11 @@ module DCell
           @cass.get(@cf, "nodes").keys
         end
 
-        def clear
+        def remove(node)
+          @cass.remove @cf, "nodes", { node_id => node }
+        end
+
+        def clear_all
           @cass.del @cf, "nodes"
         end
       end
@@ -105,7 +113,7 @@ module DCell
           @cass.get(@cf, "globals").keys
         end
 
-        def clear
+        def clear_all
           @cass.del @cf, "globals"
         end
       end

data/lib/dcell/registries/mongodb_adapter.rb

@@ -0,0 +1,85 @@
+require 'mongoid'
+
+module DCell
+  module Registry
+    class MongodbAdapter
+      # Setup connection to mongodb
+      # config: path to mongoid configuration file
+      # env: mongoid environment to use
+      def initialize(options)
+        if options[:config]
+          Mongoid.load! options[:config], options[:env]
+        elsif options[:db]
+          Mongoid.connect_to options[:db]
+        end
+        if options[:options]
+          Mongoid.options = options[:options]
+        end
+      end
+
+      class DCellNode
+        include Mongoid::Document
+
+        field :key, type: String
+        field :value, type: Hash
+      end
+
+      class DCellGlobal
+        include Mongoid::Document
+
+        field :key, type: String
+        field :value, type: Hash
+      end
+
+      class Proxy
+        class << self
+          def set(storage, key, value)
+            entry = storage.find_or_create_by(key: key)
+            entry.value = {'v' => value}
+            entry.save!
+            value
+          end
+
+          def get(storage, key)
+            first = storage.where(key: key).first
+            if first and first.value
+              return first.value['v']
+            end
+            nil
+          end
+
+          def all(storage)
+            keys = []
+            storage.each do |entry|
+              keys << entry.key
+            end
+            keys
+          end
+
+          def remove(storage, key)
+            begin
+              storage.where(key: key).delete
+            rescue
+            end
+          end
+
+          def clear_all(storage)
+            storage.delete_all
+          end
+        end
+      end
+
+      def get_node(node_id);       Proxy.get(DCellNode, node_id) end
+      def set_node(node_id, addr); Proxy.set(DCellNode, node_id, addr) end
+      def nodes;                   Proxy.all(DCellNode) end
+      def remove_node(node_id);    Proxy.remove(DCellNode, node_id) end
+      def clear_all_nodes;         Proxy.clear_all(DCellNode) end
+
+      def get_global(key);         Proxy.get(DCellGlobal, key) end
+      def set_global(key, value);  Proxy.set(DCellGlobal, key, value) end
+      def global_keys;             Proxy.all(DCellGlobal) end
+      def clear_globals;           Proxy.clear_all(DCellGlobal) end
+
+    end
+  end
+end

data/lib/dcell/registries/redis_adapter.rb

@@ -19,12 +19,16 @@ module DCell
         @global_registry = GlobalRegistry.new(@redis)
       end
 
-      def clear_nodes
-        @node_registry.clear
+      def remove_node(node)
+        @node_registry.remove node
+      end
+
+      def clear_all_nodes
+        @node_registry.clear_all
       end
 
       def clear_globals
-        @global_registry.clear
+        @global_registry.clear_all
       end
 
       class NodeRegistry
@@ -44,7 +48,11 @@ module DCell
           @redis.hkeys 'nodes'
         end
 
-        def clear
+        def remove(node)
+          @redis.hdel 'nodes', node
+        end
+
+        def clear_all
           @redis.del 'nodes'
         end
       end
@@ -74,7 +82,7 @@ module DCell
           @redis.hkeys 'globals'
         end
 
-        def clear
+        def clear_all
           @redis.del 'globals'
         end
       end

data/lib/dcell/registries/zk_adapter.rb

@@ -46,15 +46,36 @@ module DCell
           @base_path = File.join(base_path, name.to_s)
           @ephemeral = ephemeral
           @zk.mkdir_p @base_path
+          @events = {}
+        end
+
+        def register(key)
+          path = "#{@base_path}/#{key}"
+          @events[path] ||= @zk.register(path) do |event|
+            key = event.path.match(/#{@base_path}\/(\w+)/)[1]
+            @events[event.path].unsubscribe
+            @events[event.path] = nil
+            if event.node_changed?
+              Celluloid::logger.debug "zk callback: node changed!"
+              Node.update(key)
+            end
+            if event.node_deleted?
+              Celluloid::logger.debug "zk callback: node deleted!"
+              Node.remove(key)
+            end
+
+          end
         end
 
         def get(key)
-          result, _ = @zk.get("#{@base_path}/#{key}")
+          register(key)
+          result, _ = @zk.get("#{@base_path}/#{key}", watch: true)
           Marshal.load result
         rescue ZK::Exceptions::NoNode
         end
 
         def set(key, value)
+          register(key)
           path = "#{@base_path}/#{key}"
           string = Marshal.dump value
           @zk.set path, string
@@ -66,7 +87,21 @@ module DCell
           @zk.children @base_path
         end
 
-        def clear
+        def remove(key)
+          keys.each do |key|
+            path = "#{@base_path}/#{key}"
+            @zk.delete path
+          end
+        end
+
+        def clear_all
+          # delete znodes so any registered
+          # callback is triggered
+          all.each do |key|
+            remove key
+          end
+          @events.values.compact.each(&:unsubscribe)
+          @events.clear
           @zk.rm_rf @base_path
           @zk.mkdir_p @base_path
         end
@@ -75,12 +110,13 @@ module DCell
       def get_node(node_id);       @node_registry.get(node_id) end
       def set_node(node_id, addr); @node_registry.set(node_id, addr) end
       def nodes;                   @node_registry.all end
-      def clear_nodes;             @node_registry.clear end
+      def remove_node(node_id);    @node_registry.clear(node_id) end
+      def clear_all_nodes;         @node_registry.clear_all end
 
       def get_global(key);        @global_registry.get(key) end
       def set_global(key, value); @global_registry.set(key, value) end
       def global_keys;            @global_registry.all end
-      def clear_globals;          @global_registry.clear end
+      def clear_globals;          @global_registry.clear_all end
 
     end
   end

data/lib/dcell/server.rb

@@ -10,11 +10,13 @@ module DCell
       # The gossip protocol is dependent on the node manager
       link Celluloid::Actor[:node_manager]
 
-      @addr   = DCell.addr
       @socket = PullSocket.new
 
       begin
-        @socket.bind(@addr)
+        @socket.bind(DCell.addr)
+        real_addr = @socket.get(::ZMQ::LAST_ENDPOINT).strip
+        DCell::Directory.set DCell.id, real_addr
+        DCell.addr = real_addr
       rescue IOError
         @socket.close
         raise

data/lib/dcell/version.rb

@@ -1,3 +1,3 @@
 module DCell
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

data/spec/dcell/actor_proxy_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe DCell::ActorProxy do
+describe DCell::CellProxy do
   before :all do
-    @node = DCell::Node['test_node']
-    @node.id.should == 'test_node'
+    @node = DCell::Node[TEST_NODE[:id]]
+    @node.id.should == TEST_NODE[:id]
     @remote_actor = @node[:test_actor]
 
     class LocalActor

data/spec/dcell/celluloid_ext_spec.rb

@@ -12,7 +12,7 @@ describe Celluloid, "extensions" do
     @marshal = WillKane.new
   end
 
-  it "marshals Celluloid::ActorProxy objects" do
+  it "marshals Celluloid::CellProxy objects" do
     string = Marshal.dump(@marshal)
     Marshal.load(string).should be_alive
   end

data/spec/dcell/directory_spec.rb

@@ -5,4 +5,18 @@ describe DCell::Directory do
     DCell::Directory["foobar"] = "tcp://localhost:1870"
     DCell::Directory["foobar"].should == "tcp://localhost:1870"
   end
-end
+  it "presents all stored addresses" do
+    DCell::Directory["foo"] = "tcp://fooaddress"
+    DCell::Directory["bar"] = "tcp://baraddress"
+    DCell::Directory.all.should include("foo")
+    DCell::Directory.all.should include("bar")
+  end
+  it "clears node addresses" do
+    DCell::Directory["foo"] = "tcp://fooaddress"
+    DCell::Directory["foobar"].should == "tcp://localhost:1870"
+    ["foo", "foobar"].each do |node|
+      DCell::Directory.remove node
+    end
+    DCell::Directory["foobar"].should_not == "tcp://localhost:1870"
+  end
+end

data/spec/dcell/explorer_spec.rb

@@ -12,6 +12,6 @@ describe DCell::Explorer do
 
   it "reports the current node's status" do
     response = Net::HTTP.get URI(EXPLORER_BASE)
-    response[%r{<h1><.*?> ([\w\.\-]+)<\/h1>}, 1].should == DCell.id
+    response[%r{<a href="/nodes/(.*?)">}, 1].should == DCell.id
   end
 end

data/spec/dcell/global_spec.rb

@@ -10,7 +10,7 @@ describe DCell::Global do
     DCell::Global[:the_answer].should == 42
 
     # Double check the global value is available on all nodes
-    node = DCell::Node['test_node']
+    node = DCell::Node[TEST_NODE[:id]]
     node[:test_actor].the_answer.should == 42
   end
 

data/spec/dcell/node_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe DCell::Node do
   before do
-    @node = DCell::Node['test_node']
-    @node.id.should == 'test_node'
+    @node = DCell::Node[TEST_NODE[:id]]
+    @node.id.should == TEST_NODE[:id]
   end
 
   it "finds all available nodes" do

data/spec/dcell/registries/mongodb_adapter_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'dcell/registries/mongodb_adapter'
+
+describe DCell::Registry::MongodbAdapter, :pending => TEST_ADEPTER != 'mongodb' && "no mongodb" do
+  subject { DCell::Registry::MongodbAdapter.new TEST_DB[:mongodb] }
+  it_behaves_like "a DCell registry"
+end

data/spec/dcell/registries/redis_adapter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DCell::Registry::RedisAdapter do
-  subject { DCell::Registry::RedisAdapter.new :env => 'test' }
+describe DCell::Registry::RedisAdapter, :pending => TEST_ADEPTER != 'redis' && "no redis" do
+  subject { DCell::Registry::RedisAdapter.new TEST_DB[:redis] }
   it_behaves_like "a DCell registry"
-end
+end

data/spec/dcell/registries/zk_adapter_spec.rb

@@ -1,7 +1,28 @@
 require 'spec_helper'
 require 'dcell/registries/zk_adapter'
 
-describe DCell::Registry::ZkAdapter, :pending => ENV["CI"] && "no zookeeper" do
-  subject { DCell::Registry::ZkAdapter.new :server => 'localhost', :env => 'test' }
-  it_behaves_like "a DCell registry"
+describe DCell::Registry::ZkAdapter, :pending => TEST_ADEPTER != 'zk' && "no zookeeper" do
+  subject { DCell::Registry::ZkAdapter.new TEST_DB[:zk] }
+  it_behaves_like "a DCell registry" do
+    context "when one znode changes" do
+      it "updates a node" do
+        expect(DCell::Node).to receive(:update).with("foo")
+        subject.set_node("foo", "tcp://fooaddress")
+        # WARNING: only by calling get_node we renew the watcher
+        subject.get_node("foo").should eq("tcp://fooaddress")
+        subject.set_node("foo", "tcp://newaddress")
+        sleep 0.8 # takes some time to zookeeper watchers to take full effect
+      end
+    end
+    context "when one znode is deleted" do
+      it "deletes a node" do
+        expect(DCell::Node).to receive(:remove).with("foo")
+        subject.set_node("foo", "tcp://fooaddress")
+        # WARNING: only by calling get_node we renew the watcher
+        subject.get_node("foo").should eq("tcp://fooaddress")
+        subject.remove_node "foo"
+        sleep 0.8 # takes some time to zookeeper watchers to take full effect
+      end
+    end
+  end
 end

data/spec/options/01-options.rb

@@ -0,0 +1,10 @@
+TEST_DB = {
+  :redis => {:server => 'localhost', :env => 'test'},
+  :zk => {:server => 'localhost', :env => 'test'},
+  :mongodb => {:db => 'dcell-test'},
+}
+TEST_NODE = {
+  :id => 'test_node',
+  :addr => "127.0.0.1",
+  :port => 21264,
+}

data/spec/options/02-registry.rb

@@ -0,0 +1,13 @@
+TEST_ADEPTER = ENV['DCELL_TEST_ADAPTER'] || 'redis'
+
+require "dcell/registries/#{TEST_ADEPTER}_adapter"
+
+def test_db_options
+  options = {}
+  adapter = TEST_ADEPTER
+  if adapter
+    options[:registry] = {:adapter => adapter}
+    options[:registry].merge! TEST_DB[adapter.to_sym]
+  end
+  options
+end

data/spec/spec_helper.rb

@@ -4,12 +4,19 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'dcell'
+Dir['./spec/options/*.rb'].map { |f| require f }
 Dir['./spec/support/*.rb'].map { |f| require f }
 
 RSpec.configure do |config|
   config.before(:suite) do
-    DCell.setup
-    DCell.run!
+    options = {}
+    options.merge! test_db_options
+    begin
+      DCell.start options
+    rescue => e
+      puts e
+      raise
+    end
 
     TestNode.start
     TestNode.wait_until_ready

data/spec/support/helpers.rb

@@ -2,8 +2,6 @@
 require 'rubygems'
 
 module TestNode
-  PORT = 21264
-
   def self.start
     @pid = Process.spawn Gem.ruby, File.expand_path("../../test_node.rb", __FILE__)
     unless @pid
@@ -18,7 +16,7 @@ module TestNode
     socket = nil
     30.times do
       begin
-        socket = TCPSocket.open("127.0.0.1", PORT)
+        socket = TCPSocket.open(TEST_NODE[:addr], TEST_NODE[:port])
         break if socket
       rescue Errno::ECONNREFUSED
         STDERR.print "."

data/spec/support/registry_examples.rb

@@ -1,7 +1,7 @@
 shared_context "a DCell registry" do
   context "node registry" do
     before :each do
-      subject.clear_nodes
+      subject.clear_all_nodes
     end
 
     it "stores node addresses" do

data/spec/test_node.rb

@@ -6,7 +6,11 @@ require 'bundler'
 Bundler.setup
 
 require 'dcell'
-DCell.start :id => 'test_node', :addr => 'tcp://127.0.0.1:21264'
+Dir['./spec/options/*.rb'].map { |f| require f }
+
+options = {:id => TEST_NODE[:id], :addr => "tcp://#{TEST_NODE[:addr]}:#{TEST_NODE[:port]}"}
+options.merge! test_db_options
+DCell.start options
 
 class TestActor
   include Celluloid
@@ -31,4 +35,4 @@ class TestActor
 end
 
 TestActor.supervise_as :test_actor
-sleep
+sleep

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: dcell
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-zmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: celluloid-redis
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 description: DCell is an distributed object framework based on Celluloid built on
   0MQ and Zookeeper
 email:
@@ -155,6 +169,7 @@ files:
 - lib/dcell/node.rb
 - lib/dcell/node_manager.rb
 - lib/dcell/registries/cassandra_adapter.rb
+- lib/dcell/registries/mongodb_adapter.rb
 - lib/dcell/registries/redis_adapter.rb
 - lib/dcell/registries/zk_adapter.rb
 - lib/dcell/responses.rb
@@ -170,8 +185,11 @@ files:
 - spec/dcell/explorer_spec.rb
 - spec/dcell/global_spec.rb
 - spec/dcell/node_spec.rb
+- spec/dcell/registries/mongodb_adapter_spec.rb
 - spec/dcell/registries/redis_adapter_spec.rb
 - spec/dcell/registries/zk_adapter_spec.rb
+- spec/options/01-options.rb
+- spec/options/02-registry.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/registry_examples.rb
@@ -210,10 +228,12 @@ test_files:
 - spec/dcell/explorer_spec.rb
 - spec/dcell/global_spec.rb
 - spec/dcell/node_spec.rb
+- spec/dcell/registries/mongodb_adapter_spec.rb
 - spec/dcell/registries/redis_adapter_spec.rb
 - spec/dcell/registries/zk_adapter_spec.rb
+- spec/options/01-options.rb
+- spec/options/02-registry.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/registry_examples.rb
 - spec/test_node.rb
-has_rdoc: