dcell 0.12.0.pre → 0.13.0.pre

data/.travis.yml

@@ -1,13 +1,14 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - ruby-head
   - jruby-19mode
   - jruby-head
+  - rbx-19mode
 
-# https://github.com/rubinius/rubinius/issues/1628
-#  - rbx-18mode
-#  - rbx-19mode
+matrix:
+  allow_failures:
+    # rbx seems to be losing exception messages o_O
+    - rvm: rbx-19mode
 
 notifications:
   irc: "irc.freenode.org#celluloid"

data/CHANGES.md

@@ -1,5 +1,9 @@
-HEAD
-----
+0.13.0.pre
+----------
+* First semi-stable release in nearly forever! Yay!
+* Rip out the unstable gossip system, replace the original Zookeeper and
+  Redis adapters.
+* Compatibility fixes with newer versions of the Celluloid suite
 * Switch default port to 7890 (7777 is heavily used by other programs)
 
 0.10.0

data/Gemfile

@@ -1,9 +1,11 @@
 source "http://rubygems.org"
 
-gem 'celluloid',     :git => 'git://github.com/celluloid/celluloid'
-gem 'celluloid-io',  :git => 'git://github.com/celluloid/celluloid-io'
-gem 'celluloid-zmq', :git => 'git://github.com/celluloid/celluloid-zmq'
-gem 'reel',          :git => 'git://github.com/celluloid/reel'
+#gem 'celluloid',     :git => 'git://github.com/celluloid/celluloid'
+#gem 'celluloid-io',  :git => 'git://github.com/celluloid/celluloid-io'
+#gem 'celluloid-zmq', :git => 'git://github.com/celluloid/celluloid-zmq'
+#gem 'reel',          :git => 'git://github.com/celluloid/reel'
+
+#gem 'ffi-rzmq', :git => 'git://github.com/chuckremes/ffi-rzmq.git'
 
 gem 'jruby-openssl', :platform => :jruby
 

data/README.md

@@ -2,6 +2,7 @@
 =====
 [![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/badge.png)](https://codeclimate.com/github/celluloid/dcell)
 
 > "Objects can message objects transparently that live on other machines
 > over the network, and you don't have to worry about the networking gunk,
@@ -73,51 +74,70 @@ Inside of your Ruby program do:
 Example
 -------
 
-Create a ruby script with the following contents:
+Copy and paste this into `itchy.rb` (or run `bundle exec examples/itchy.rb`):
 
-    # node1.rb
+```ruby
+require 'dcell'
 
-    require 'dcell'
+DCell.start :id => "itchy", :addr => "tcp://127.0.0.1:9001"
 
-    class Duck
-      include Celluloid
+class Itchy
+  include Celluloid
 
-      def quack
-        puts "Quack!"
-      end
-    end
+  def initialize
+    puts "Ready for mayhem!"
+    @n = 0
+  end
 
-    Duck.supervise_as :duck_actor
+  def fight
+    @n = (@n % 6) + 1
+    if @n <= 3
+      puts "Bite!"
+    else
+      puts "Fight!"
+    end
+  end
+end
 
-    DCell.start :id => "node1", :addr => "tcp://127.0.0.1:4000"
+Itchy.supervise_as :itchy
+sleep
+```
 
-    sleep
+You can now launch itchy with:
 
-Now save and run the script via the command line and open a new shell. In there, create another ruby script:
+```
+ruby itchy.rb
+```
 
-    # node2.rb
+Now copy and paste the following into `scratchy.rb` (also in examples)
 
-    require 'dcell'
+```ruby
+require 'dcell'
 
-    DCell.start :id => "node2", :addr => "tcp://127.0.0.1:4001", :directory => {:id => "node1", :addr => "tcp://127.0.0.1:4000"}
+DCell.start :id => "scratchy", :addr => "tcp://127.0.0.1:9002"
+itchy_node = DCell::Node["itchy"]
 
-    loop {
-      node = DCell::Node["node1"]
-      duck = node[:duck_actor]
-      duck.quack
-      sleep 3
-    }
+puts "Fighting itchy! (check itchy's output)"
 
-When you run the second script in the second shell, you will see the following output in your first shell:
+6.times do
+  itchy_node[:itchy].fight
+  sleep 1
+end
+```
 
-    $ ruby node1.rb
-    I, [2012-08-30T20:00:00.759342 #26124]  INFO -- : Connected to node1
-    I, [2012-08-30T20:00:04.454006 #26124]  INFO -- : Connected to node2
-    Quack!
-    Quack!
-    Quack!
+Now run scratchy side-by-side with itchy. You should see this on itchy:
 
-The loop in the second script looks up the node we registered in the first script, takes the registered Duck actor and calls the `quack` method every three seconds.
+```
+$ bundle exec examples/itchy.rb
+Ready for mayhem!
+I, [2012-12-25T22:52:45.362355 #74272]  INFO -- : Connected to scratchy
+Bite!
+Bite!
+Bite!
+Fight!
+Fight!
+Fight!
+```
 
 This is a basic example how individual DCell::Nodes have registered Celluloid actors which can be accessed remotely by other DCell::Nodes.
 

data/dcell.gemspec

@@ -16,12 +16,11 @@ 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.12.0"
-  gem.add_runtime_dependency "celluloid-zmq", "~> 0.12.0"
+  gem.add_runtime_dependency "celluloid",     ">= 0.13.0.pre"
+  gem.add_runtime_dependency "celluloid-zmq", ">= 0.13.0.pre"
   gem.add_runtime_dependency "reel"
   gem.add_runtime_dependency "redis"
   gem.add_runtime_dependency "redis-namespace"
-  gem.add_runtime_dependency "moneta"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

data/examples/itchy.rb

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

data/examples/scratchy.rb

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

data/lib/dcell.rb

@@ -19,7 +19,7 @@ require 'dcell/server'
 require 'dcell/info_service'
 
 require 'dcell/registries/redis_adapter'
-require 'dcell/registries/moneta_adapter'
+#require 'dcell/registries/moneta_adapter'
 
 require 'dcell/celluloid_ext'
 

data/lib/dcell/celluloid_ext.rb

@@ -14,10 +14,10 @@ module Celluloid
     # unfortunately we have to monkeypatch in _dump support as the proxy
     # itself normally jacks respond_to? and proxies to the actor
     alias_method :__respond_to?, :respond_to?
-    def respond_to?(meth)
+    def respond_to?(meth, check_private = false)
       return false if meth == :marshal_dump
       return true  if meth == :_dump
-      __respond_to? meth
+      __respond_to?(meth, check_private)
     end
 
     # Dump an actor proxy via its mailbox
@@ -43,7 +43,7 @@ module Celluloid
 
     def self.find_actor(mailbox)
       ::Thread.list.each do |t|
-        if actor = t[:actor]
+        if actor = t[:celluloid_actor]
           return actor if actor.mailbox == mailbox
         end
       end
@@ -52,11 +52,15 @@ module Celluloid
   end
 
   class Mailbox
+    def address
+      "#{@address}@#{DCell.id}"
+    end
+
     # This custom dumper registers actors with the DCell registry so they can
     # be reached remotely.
     def _dump(level)
-      mailbox_id = DCell::Router.register self
-      "#{mailbox_id}@#{DCell.id}"
+      DCell::Router.register self
+      address
     end
 
     # Create a mailbox proxy object which routes messages over DCell's overlay

data/lib/dcell/explorer.rb

@@ -7,7 +7,6 @@ module DCell
   # Web UI for DCell
   # TODO: rewrite this entire thing with less hax
   class Explorer < Reel::Server
-    include Celluloid::IO # FIXME: this should really be unnecessary
     ASSET_ROOT = Pathname.new File.expand_path("../../../explorer", __FILE__)
 
     def initialize(host = "127.0.0.1", port = 7778)

data/lib/dcell/future_proxy.rb

@@ -9,7 +9,7 @@ module DCell
     def <<(message)
       node = Node[@node_id]
       node = Node.new(@node_id, @node_addr) unless node
-      node.send_message! Message::Relay.new(self, message)
+      node.async.send_message Message::Relay.new(self, message)
     end
 
     def _dump(level)

data/lib/dcell/mailbox_proxy.rb

@@ -4,7 +4,10 @@ module DCell
   class MailboxProxy
     class InvalidNodeError < StandardError; end
 
-    def initialize(node_id, mailbox_id)
+    def initialize(address)
+      mailbox_id, node_id = address.split("@")
+
+      # Create a proxy to the mailbox on the remote node
       raise ArgumentError, "no mailbox_id given" unless mailbox_id
      
       @node_id = node_id
@@ -25,7 +28,7 @@ module DCell
 
     # Send a message to the mailbox
     def <<(message)
-      @node.send_message! Message::Relay.new(self, message)
+      @node.async.send_message Message::Relay.new(self, message)
     end
 
     # Is the remote mailbox still alive?
@@ -39,17 +42,11 @@ module DCell
     end
 
     # Loader for custom marshal format
-    def self._load(string)
-      mailbox_id, node_id = string.split("@")
-
-      if DCell.id == node_id
-        # If we're on the local node, find the real mailbox
-        mailbox = DCell::Router.find mailbox_id
-        raise "tried to unmarshal dead Celluloid::Mailbox: #{mailbox_id}" unless mailbox
+    def self._load(address)
+      if mailbox = DCell::Router.find(address)
         mailbox
       else
-        # Create a proxy to the mailbox on the remote node
-        DCell::MailboxProxy.new(node_id, mailbox_id)
+        DCell::MailboxProxy.new(address)
       end
     end
   end

data/lib/dcell/node.rb

@@ -5,6 +5,8 @@ module DCell
     include Celluloid::FSM
     attr_reader :id, :addr
 
+    finalizer :shutdown
+
     # FSM
     default_state :disconnected
     state :shutdown
@@ -41,7 +43,7 @@ module DCell
       attach self
     end
 
-    def finalize
+    def shutdown
       transition :shutdown
       @socket.close if @socket
     end

data/lib/dcell/router.rb

@@ -4,42 +4,32 @@ module DCell
   # Route incoming messages to their recipient actors
   class Router
     @mutex     = Mutex.new
-    @addresses = {}
     @mailboxes = {}
 
     class << self
       # Enter a mailbox into the registry
       def register(mailbox)
-        @mutex.lock
-        begin
-          address = @addresses[mailbox.object_id]
-          unless address
-            address = Celluloid.uuid
-            @addresses[mailbox.object_id] = address
-          end
-
+        @mutex.synchronize do
+          address = mailbox.address
           ref = @mailboxes[address]
           @mailboxes[address] = WeakRef.new(mailbox) unless ref && ref.weakref_alive?
 
           address
-        ensure
-          @mutex.unlock rescue nil
         end
       end
 
       # Find a mailbox by its address
       def find(mailbox_address)
-        @mutex.lock
-        begin
-          ref = @mailboxes[mailbox_address]
-          return unless ref
-          ref.__getobj__
-        rescue WeakRef::RefError
-          # The referenced actor is dead, so prune the registry
-          @mailboxes.delete mailbox_address
-          nil
-        ensure
-          @mutex.unlock rescue nil
+        @mutex.synchronize do
+          begin
+            ref = @mailboxes[mailbox_address]
+            return unless ref
+            ref.__getobj__
+          rescue WeakRef::RefError
+            # The referenced actor is dead, so prune the registry
+            @mailboxes.delete mailbox_address
+            nil
+          end
         end
       end
 

data/lib/dcell/server.rb

@@ -3,6 +3,8 @@ module DCell
   class Server
     include Celluloid::ZMQ
 
+    finalizer :close
+
     # Bind to the given 0MQ address (in URL form ala tcp://host:port)
     def initialize
       # The gossip protocol is dependent on the node manager
@@ -18,16 +20,15 @@ module DCell
         raise
       end
 
-      run!
+      async.run
     end
 
     # Wait for incoming 0MQ messages
     def run
-      while true; handle_message! @socket.read; end
+      while true; async.handle_message @socket.read; end
     end
 
-    # Shut down the server
-    def finalize
+    def close
       @socket.close if @socket
     end
 
@@ -36,14 +37,14 @@ module DCell
       begin
         message = decode_message message
       rescue InvalidMessageError => ex
-        Celluloid::Logger.warn("couldn't decode message: #{ex.class}: #{ex}")
+        Logger.crash("couldn't decode message", ex)
         return
       end
 
       begin
         message.dispatch
       rescue => ex
-        Celluloid::Logger.crash("DCell::Server: message dispatch failed", ex)
+        Logger.crash("DCell::Server: message dispatch failed", ex)
       end
     end
 

data/lib/dcell/version.rb

@@ -1,3 +1,3 @@
 module DCell
-  VERSION = "0.12.0.pre"
+  VERSION = "0.13.0.pre"
 end

data/spec/dcell/actor_proxy_spec.rb

@@ -58,7 +58,7 @@ describe DCell::ActorProxy do
 
       sleep 0.1 # hax to prevent a race between exit handling and the next call
       @local_actor.crash_reason.should be_a(RuntimeError)
-      @local_actor.crash_reason.to_s.should == "the spec purposely crashed me :("
+      @local_actor.crash_reason.message.should == "the spec purposely crashed me :("
     end
   end
 end

data/spec/dcell/registries/moneta_adapter_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
+=begin
 describe DCell::Registry::MonetaAdapter do
   subject { DCell::Registry::MonetaAdapter.new :env => "test" }
   it_behaves_like "a DCell registry"
 end
+=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcell
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre
+  version: 0.13.0.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0.pre
 - !ruby/object:Gem::Dependency
   name: celluloid-zmq
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0.pre
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: moneta
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +142,8 @@ files:
 - benchmarks/messaging.rb
 - benchmarks/receiver.rb
 - dcell.gemspec
+- examples/itchy.rb
+- examples/scratchy.rb
 - explorer/css/bootstrap-responsive.css
 - explorer/css/bootstrap-responsive.min.css
 - explorer/css/bootstrap.css
@@ -221,6 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1249899003760905439
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -229,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An asynchronous distributed object framework based on Celluloid