dcell 0.8.0 → 0.9.0

data/.travis.yml

@@ -1,8 +1,10 @@
 rvm:
   - 1.9.2
   - 1.9.3
-#  - rbx crashing :(
-  - jruby
   - ruby-head
+  - jruby-19mode
+  - jruby-head
 
-env: "JRUBY_OPTS=--1.9"
+# Rubies I would like to support, but they deadlock
+#  - rbx-18mode
+#  - rbx-19mode

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.9.0
+-----
+* Use new Celluloid::ZMQ APIs
+
 0.8.0
 -----
 * Track calls in-flight with DCell::RPC and DCell::RPC::Manager
@@ -12,7 +16,3 @@
 0.0.1
 -----
 * Initial release
-
-0.0.0
------
-* Vapoware release to claim the "dcell" gem name >:D

data/README.md

@@ -1,5 +1,13 @@
-DCell
+![DCell](https://github.com/tarcieri/dcell/raw/master/logo.png)
 =====
+[![Build Status](http://travis-ci.org/tarcieri/dcell.png)](http://travis-ci.org/tarcieri/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,
+> and you don't have to worry about finding them, and you don't have to
+> worry about anything. It's just as if you messaged an object that's
+> right next door."
+> _--Steve Jobs describing the NeXT Portable Distributed Object system_
 
 DCell is a simple and easy way to build distributed applications in Ruby.
 Somewhat similar to DRb, DCell lets you easily expose Ruby objects as network
@@ -30,9 +38,9 @@ Not entirely, but eager early adopters are welcome!
 Supported Platforms
 -------------------
 
-DCell works on Ruby 1.9.2/1.9.3, JRuby 1.6 (in 1.9 mode), and Rubinius 2.0.
+DCell works on Ruby 1.9.2/1.9.3, JRuby 1.6 (in 1.9 mode), JRuby 1.7, and Rubinius 2.0.
 
-To use JRuby in 1.9 mode, you'll need to pass the "--1.9" command line
+To use JRuby 1.6 in 1.9 mode, you'll need to pass the "--1.9" command line
 option to the JRuby executable, or set the "JRUBY_OPTS=--1.9" environment
 variable:
 
@@ -41,6 +49,8 @@ variable:
 (Note: I'd recommend putting the above in your .bashrc/.zshrc/etc in
 general. 1.9 is the future, time to embrace it)
 
+To use JRuby 1.7 in 1.9 mode...just use it :)
+
 Celluloid works on Rubinius in either 1.8 or 1.9 mode.
 
 All components, including the 0MQ bindings, Redis, and Zookeeper adapters
@@ -269,4 +279,4 @@ components.
 Copyright
 ---------
 
-Copyright (c) 2011 Tony Arcieri. See LICENSE.txt for further details.
+Copyright (c) 2011 Tony Arcieri. See LICENSE.txt for further details.

data/celluloid-zmq/CHANGES.md

@@ -1,3 +1,10 @@
+0.9.0
+-----
+* New 0MQ APIs which wrap ffi-rzmq's
+* Terminate the 0MQ context at shutdown
+* Use Celluloid::IO 0.9.0's reactor injection support so we no longer have to
+  subclass Celluloid::IO::Mailbox
+
 0.8.0
 -----
 * Update to match internals of celluloid-io

data/celluloid-zmq/celluloid-zmq.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |gem|
   gem.name          = "celluloid-zmq"
   gem.version       = Celluloid::ZMQ::VERSION
 
-  gem.add_dependency "celluloid",    "~> 0.8.0"
-  gem.add_dependency "celluloid-io", "~> 0.8.0"
+  gem.add_dependency "celluloid",    "~> 0.9.0"
+  gem.add_dependency "celluloid-io", "~> 0.9.0"
   gem.add_dependency "ffi"
   gem.add_dependency "ffi-rzmq"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", ">= 2.7.0"
+  gem.add_development_dependency "rspec"
 
   # Files
   ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten

data/celluloid-zmq/lib/celluloid/zmq.rb

@@ -1,8 +1,8 @@
 require 'ffi-rzmq'
 
 require 'celluloid/io'
-require 'celluloid/zmq/mailbox'
 require 'celluloid/zmq/reactor'
+require 'celluloid/zmq/sockets'
 require 'celluloid/zmq/version'
 require 'celluloid/zmq/waker'
 
@@ -15,19 +15,22 @@ module Celluloid
       # Included hook to pull in Celluloid
       def included(klass)
         klass.send :include, ::Celluloid
-        klass.use_mailbox Celluloid::ZMQ::Mailbox
+        klass.use_mailbox { Celluloid::IO::Mailbox.new ZMQ::Reactor.new }
       end
 
       # Obtain a 0MQ context (or lazily initialize it)
-      def context
-        @context ||= ::ZMQ::Context.new(1)
+      def context(threads = 1)
+        return @context if @context
+        @context = ::ZMQ::Context.new(threads)
+        at_exit { @context.terminate }
+        @context
       end
+      alias_method :init, :context
     end
 
     extend Forwardable
 
     # Wait for the given IO object to become readable/writeable
-    def_delegators 'current_actor.mailbox.reactor',
-      :wait_readable, :wait_writeable
+    def_delegators 'current_actor.mailbox.reactor', :wait_readable, :wait_writeable
   end
 end

data/celluloid-zmq/lib/celluloid/zmq/sockets.rb

@@ -0,0 +1,130 @@
+module Celluloid
+  module ZMQ
+    class Socket
+      # Create a new socket
+      def initialize(type)
+        @socket = Celluloid::ZMQ.context.socket ::ZMQ.const_get(type.to_s.upcase)
+      end
+
+      # Connect to the given 0MQ address
+      # Address should be in the form: tcp://1.2.3.4:5678/
+      def connect(addr)
+        puts "zomg connecting"
+        unless ::ZMQ::Util.resultcode_ok? @socket.connect addr
+          raise IOError, "error connecting to #{addr}: #{::ZMQ::Util.error_string}"
+        end
+        true
+      end
+
+      # Bind to the given 0MQ address
+      # Address should be in the form: tcp://1.2.3.4:5678/
+      def bind(addr)
+        unless ::ZMQ::Util.resultcode_ok? @socket.setsockopt(::ZMQ::LINGER, 0)
+          @socket.close
+          raise IOError, "couldn't set ZMQ::LINGER: #{::ZMQ::Util.error_string}"
+        end
+
+        unless ::ZMQ::Util.resultcode_ok? @socket.bind(addr)
+          raise IOError, "couldn't bind to #{addr}: #{::ZMQ::Util.error_string}"
+        end
+      end
+
+      # Close the socket
+      def close
+        @socket.close
+      end
+
+      # Does the 0MQ socket support evented operation?
+      def evented?
+        actor = Thread.current[:actor]
+        return unless actor
+
+        mailbox = actor.mailbox
+        mailbox.is_a?(Celluloid::IO::Mailbox) && mailbox.reactor.is_a?(Celluloid::ZMQ::Reactor)
+      end
+
+      # Hide ffi-rzmq internals
+      alias_method :inspect, :to_s
+    end
+
+    # Readable 0MQ sockets have a read method
+    module ReadableSocket
+      # Read a message from the socket
+      def read(buffer = '')
+        Celluloid.current_actor.wait_readable(@socket) if evented?
+
+        unless ::ZMQ::Util.resultcode_ok? @socket.recv_string buffer
+          raise IOError, "error receiving ZMQ string: #{::ZMQ::Util.error_string}"
+        end
+        buffer
+      end
+    end
+
+    # Writable 0MQ sockets have a send method
+    module WritableSocket
+      # Send a message to the socket
+      def send(message)
+        unless ::ZMQ::Util.resultcode_ok? @socket.send_string message
+          raise IOError, "error sending 0MQ message: #{::ZMQ::Util.error_string}"
+        end
+
+        message
+      end
+      alias_method :<<, :send
+    end
+
+    # ReqSockets are the counterpart of RepSockets (REQ/REP)
+    class ReqSocket < Socket
+      include ReadableSocket
+
+      def initialize
+        super :req
+      end
+    end
+
+    # RepSockets are the counterpart of ReqSockets (REQ/REP)
+    class RepSocket < Socket
+      include WritableSocket
+
+      def initialize
+        super :rep
+      end
+    end
+
+    # PushSockets are the counterpart of PullSockets (PUSH/PULL)
+    class PushSocket < Socket
+      include WritableSocket
+
+      def initialize
+        super :push
+      end
+    end
+
+    # PullSockets are the counterpart of PushSockets (PUSH/PULL)
+    class PullSocket < Socket
+      include ReadableSocket
+
+      def initialize
+        super :pull
+      end
+    end
+
+    # PubSockets are the counterpart of SubSockets (PUB/SUB)
+    class PubSocket < Socket
+      include WritableSocket
+
+      def initialize
+        super :pub
+      end
+    end
+
+    # SubSockets are the counterpart of PubSockets (PUB/SUB)
+    class SubSocket < Socket
+      include ReadableSocket
+
+      def initialize
+        super :sub
+      end
+    end
+  end
+end

data/celluloid-zmq/lib/celluloid/zmq/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module ZMQ
-    VERSION = "0.8.0"
+    VERSION = "0.9.1"
   end
 end

data/dcell.gemspec

@@ -16,12 +16,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_dependency "celluloid", "~> 0.8.0"
-  gem.add_dependency "celluloid-zmq", "~> 0.8.0"
+  gem.add_dependency "celluloid",     "~> 0.9.0"
+  gem.add_dependency "celluloid-zmq", "~> 0.9.0"
   gem.add_dependency "redis"
   gem.add_dependency "redis-namespace"
+  gem.add_dependency "moneta"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.7.0"
+  gem.add_development_dependency "rspec"
   #gem.add_development_dependency "zk"
 end

data/lib/dcell.rb

@@ -1,7 +1,9 @@
 require 'celluloid'
 require 'celluloid/zmq'
-require 'dcell/version'
 
+Celluloid::ZMQ.init
+
+require 'dcell/version'
 require 'dcell/actor_proxy'
 require 'dcell/directory'
 require 'dcell/mailbox_proxy'
@@ -14,18 +16,17 @@ require 'dcell/rpc'
 require 'dcell/server'
 
 require 'dcell/registries/redis_adapter'
+require 'dcell/registries/moneta_adapter'
+
 require 'dcell/celluloid_ext'
 
 # Distributed Celluloid
 module DCell
   DEFAULT_PORT  = 7777 # Default DCell port
-  ZMQ_POOL_SIZE = 1 # DCell uses a fixed-size 0MQ thread pool
-
-  @zmq_context  = Celluloid::ZMQ.context = ::ZMQ::Context.new(ZMQ_POOL_SIZE)
   @config_lock  = Mutex.new
 
   class << self
-    attr_reader :me, :registry, :zmq_context
+    attr_reader :me, :registry
 
     # Configure DCell with the following options:
     #

data/lib/dcell/node.rb

@@ -84,11 +84,13 @@ module DCell
     def socket
       return @socket if @socket
 
-      @socket = DCell.zmq_context.socket(::ZMQ::PUSH)
-      unless ::ZMQ::Util.resultcode_ok? @socket.connect @addr
+      @socket = Celluloid::ZMQ::PushSocket.new
+      begin
+        @socket.connect addr
+      rescue IOError
         @socket.close
         @socket = nil
-        raise "error connecting to #{addr}: #{::ZMQ::Util.error_string}"
+        raise
       end
 
       transition :connected
@@ -126,20 +128,12 @@ module DCell
     # Send a message to another DCell node
     def send_message(message)
       begin
-        string = Marshal.dump(message)
+        message = Marshal.dump(message)
       rescue => ex
         abort ex
       end
 
-      if ::ZMQ::Util.resultcode_ok? socket.send_string string
-        # Ideally we could reset the heartbeat counter now because we've sent
-        # a message. Heartbeats could work off all messages rather than just
-        # DCell::Message::Heartbeat. Unfortunately this functionality is not
-        # yet implemented, sorry!
-        # @heartbeat.reset
-      else
-        raise "error sending 0MQ message: #{::ZMQ::Util.error_string}"
-      end
+      socket << message
     end
     alias_method :<<, :send_message
 

data/lib/dcell/registries/moneta_adapter.rb

@@ -0,0 +1,61 @@
+require 'moneta'
+require 'moneta/memory'
+
+module DCell
+  module Registry
+    class MonetaAdapter
+      def initialize(options)
+        # Convert all options to symbols :/
+        options = options.inject({}) { |h,(k,v)| h[k.to_sym] = v; h }
+
+        @env = options[:env] || 'production'
+        @namespace = options[:namespace] || "dcell_#{@env}"
+
+        # We might want to use something like a TieredCache later..
+        # Memory + BasicFile..
+        # @moneta = Moneta::TieredCache.new options
+        @moneta = Moneta::Memory.new options
+
+        @node_registry   = Registry.new(@moneta, :nodes)
+        @global_registry = Registry.new(@moneta, :globals)
+      end
+
+      class Registry
+        def initialize(moneta, name)
+          @name = name
+          @moneta = moneta
+        end
+
+        def get(key)
+          @moneta[@name][key.to_s]
+        end
+
+        def set(key, value)
+          @moneta[@name][key.to_s] = value
+        end
+
+        def all
+          @moneta[@name].keys
+        end
+
+        # DCell registry behaviors
+        alias_method :nodes, :all
+        alias_method :global_keys, :all
+
+        def clear
+          @moneta.delete(@name)
+        end
+      end
+
+      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.nodes end
+      def clear_nodes;             @node_registry.clear 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.global_keys end
+      def clear_globals;          @global_registry.clear end
+    end
+  end
+end

data/lib/dcell/rpc.rb

@@ -1,7 +1,7 @@
 require 'weakref'
 
 module DCell
-  EPOCH = Time.new(2012, 1, 1, 0, 0, 0, "+00:00") # All things begin in 2012
+  EPOCH = Time.gm(2012) # All things begin in 2012
 
   class RPC < Celluloid::SyncCall
     def initialize(id, caller, method, arguments, block)

data/lib/dcell/server.rb

@@ -6,16 +6,13 @@ module DCell
     # Bind to the given 0MQ address (in URL form ala tcp://host:port)
     def initialize
       @addr   = DCell.addr
-      @socket = DCell.zmq_context.socket(::ZMQ::PULL)
+      @socket = PullSocket.new
 
-      unless ::ZMQ::Util.resultcode_ok? @socket.setsockopt(::ZMQ::LINGER, 0)
-        @socket.close
-        raise "couldn't set ZMQ::LINGER: #{::ZMQ::Util.error_string}"
-      end
-
-      unless ::ZMQ::Util.resultcode_ok? @socket.bind(@addr)
+      begin
+        @socket.bind(@addr)
+      rescue IOError
         @socket.close
-        raise "couldn't bind to #{@addr}: #{::ZMQ::Util.error_string}"
+        raise
       end
 
       run!
@@ -23,17 +20,7 @@ module DCell
 
     # Wait for incoming 0MQ messages
     def run
-      while true
-        wait_readable @socket
-        message = ''
-
-        rc = @socket.recv_string message
-        if ::ZMQ::Util.resultcode_ok? rc
-          handle_message message
-        else
-          raise "error receiving ZMQ string: #{::ZMQ::Util.error_string}"
-        end
-      end
+      while true; handle_message @socket.read; end
     end
 
     # Shut down the server

data/lib/dcell/version.rb

@@ -1,3 +1,3 @@
 module DCell
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/dcell/registries/moneta_adapter_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcell
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70247796045460 !ruby/object:Gem::Requirement
+  requirement: &70186417956180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70247796045460
+  version_requirements: *70186417956180
 - !ruby/object:Gem::Dependency
   name: celluloid-zmq
-  requirement: &70247796044740 !ruby/object:Gem::Requirement
+  requirement: &70186417955420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70247796044740
+  version_requirements: *70186417955420
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70247796043700 !ruby/object:Gem::Requirement
+  requirement: &70186417954800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247796043700
+  version_requirements: *70186417954800
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70247796043240 !ruby/object:Gem::Requirement
+  requirement: &70186417954340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247796043240
+  version_requirements: *70186417954340
+- !ruby/object:Gem::Dependency
+  name: moneta
+  requirement: &70186418040120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70186418040120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70247796042780 !ruby/object:Gem::Requirement
+  requirement: &70186418039640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +76,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247796042780
+  version_requirements: *70186418039640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247796042200 !ruby/object:Gem::Requirement
+  requirement: &70186418039200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247796042200
+  version_requirements: *70186418039200
 description: DCell is an distributed object framework based on Celluloid built on
   0MQ and Zookeeper
 email:
@@ -103,12 +114,11 @@ files:
 - celluloid-zmq/Rakefile
 - celluloid-zmq/celluloid-zmq.gemspec
 - celluloid-zmq/lib/celluloid/zmq.rb
-- celluloid-zmq/lib/celluloid/zmq/mailbox.rb
 - celluloid-zmq/lib/celluloid/zmq/reactor.rb
+- celluloid-zmq/lib/celluloid/zmq/sockets.rb
 - celluloid-zmq/lib/celluloid/zmq/version.rb
 - celluloid-zmq/lib/celluloid/zmq/waker.rb
 - celluloid-zmq/spec/celluloid/zmq/actor_spec.rb
-- celluloid-zmq/spec/celluloid/zmq/mailbox_spec.rb
 - celluloid-zmq/spec/spec_helper.rb
 - dcell.gemspec
 - lib/dcell.rb
@@ -119,6 +129,7 @@ files:
 - lib/dcell/mailbox_proxy.rb
 - lib/dcell/messages.rb
 - lib/dcell/node.rb
+- lib/dcell/registries/moneta_adapter.rb
 - lib/dcell/registries/redis_adapter.rb
 - lib/dcell/registries/zk_adapter.rb
 - lib/dcell/responses.rb
@@ -127,11 +138,13 @@ files:
 - lib/dcell/rspec.rb
 - lib/dcell/server.rb
 - lib/dcell/version.rb
+- logo.png
 - spec/dcell/actor_proxy_spec.rb
 - spec/dcell/celluloid_ext_spec.rb
 - spec/dcell/directory_spec.rb
 - spec/dcell/global_spec.rb
 - spec/dcell/node_spec.rb
+- spec/dcell/registries/moneta_adapter_spec.rb
 - spec/dcell/registries/redis_adapter_spec.rb
 - spec/dcell/registries/zk_adapter_spec.rb
 - spec/spec_helper.rb
@@ -170,6 +183,7 @@ test_files:
 - spec/dcell/directory_spec.rb
 - spec/dcell/global_spec.rb
 - spec/dcell/node_spec.rb
+- spec/dcell/registries/moneta_adapter_spec.rb
 - spec/dcell/registries/redis_adapter_spec.rb
 - spec/dcell/registries/zk_adapter_spec.rb
 - spec/spec_helper.rb

data/celluloid-zmq/lib/celluloid/zmq/mailbox.rb

@@ -1,13 +0,0 @@
-module Celluloid
-  module ZMQ
-    # A Celluloid mailbox for Actors that wait on 0MQ sockets
-    class Mailbox < Celluloid::IO::Mailbox
-      def initialize
-        # More APIs and less monkeypatching would be useful here
-        @messages = []
-        @lock    = Mutex.new
-        @reactor = Reactor.new
-      end
-    end
-  end
-end

data/celluloid-zmq/spec/celluloid/zmq/mailbox_spec.rb

@@ -1,6 +0,0 @@
-require 'spec_helper'
-require 'celluloid/rspec'
-
-describe Celluloid::ZMQ::Mailbox do
-  it_behaves_like "a Celluloid Mailbox"
-end