dcell 0.13.0 → 0.14.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 57917a3592a960a4cb0276862ef2265b605018a0
+  data.tar.gz: b881c6dbafb70e2c2cf5d2cd5310c5ae1e585207
+SHA512:
+  metadata.gz: 8c37e73b4e12019a862db91488f9ee06e3e400efb9ed648b1a3a6ba623d372c640e702f37c4c7abe07a673a6420ddc2659c4c32e4ad8b6a68634b568cf2900de
+  data.tar.gz: 8e2ecb1b6901f8e946dc4dde669b31c49d7eacb30584e57ba1a14cc1b5aa5dc78cf78ab5b5055835a73b44998f3e035e8ab4391a776572e6374b71ec05b96257

data/CHANGES.md

@@ -1,3 +1,10 @@
+0.14.0 (2013-05-07)
+-------------------
+* Allow InfoService to run on linux when lsb-release is missing
+* Remove broken moneta adapter
+* Use ephemeral mode for ZK adapter
+* Add support for executing blocks over DCell
+
 0.13.0
 ------
 * First semi-stable release in nearly forever! Yay!

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 
-#gem 'celluloid',     github: 'celluloid/celluloid'
-#gem 'celluloid-io',  github: 'celluloid/celluloid-io'
-#gem 'celluloid-zmq', github: 'celluloid/celluloid-zmq'
-#gem 'reel',          github: 'celluloid/reel'
+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 'reel',          github: 'celluloid/reel',          branch: 'master'
 
 #gem 'ffi-rzmq', github: 'chuckremes/ffi-rzmq'
 
@@ -12,3 +12,5 @@ gem 'coveralls',     require: false
 
 # Specify your gem's dependencies in dcell.gemspec
 gemspec
+
+gem 'zk'

data/lib/dcell.rb

@@ -1,4 +1,5 @@
 require 'celluloid'
+require 'reel'
 require 'celluloid/zmq'
 
 Celluloid::ZMQ.init
@@ -19,7 +20,6 @@ require 'dcell/server'
 require 'dcell/info_service'
 
 require 'dcell/registries/redis_adapter'
-#require 'dcell/registries/moneta_adapter'
 
 require 'dcell/celluloid_ext'
 

data/lib/dcell/celluloid_ext.rb

@@ -73,8 +73,32 @@ module Celluloid
   class SyncCall
     def _dump(level)
       uuid = DCell::RPC::Manager.register self
-      payload = Marshal.dump([@caller,@method,@arguments,@block])
-      "#{uuid}@#{DCell.id}:#{payload}"
+      payload = Marshal.dump([@sender,@method,@arguments,@block])
+      "#{uuid}@#{DCell.id}:rpc:#{payload}"
+    end
+
+    def self._load(string)
+      DCell::RPC._load(string)
+    end
+  end
+
+  class BlockProxy
+    def _dump(level)
+      uuid = DCell::RPC::Manager.register self
+      payload = Marshal.dump([@mailbox,@execution,@arguments])
+      "#{uuid}@#{DCell.id}:rpb:#{payload}"
+    end
+
+    def self._load(string)
+      DCell::RPC._load(string)
+    end
+  end
+
+  class BlockCall
+    def _dump(level)
+      uuid = DCell::RPC::Manager.register self
+      payload = Marshal.dump([@block_proxy,@sender,@arguments])
+      "#{uuid}@#{DCell.id}:rpbc:#{payload}"
     end
 
     def self._load(string)

data/lib/dcell/info_service.rb

@@ -45,7 +45,7 @@ module DCell
 
         cores = cpu_info.scan(/core id\s+: \d+/).uniq.size
         @cpu_count = cores > 0 ? cores : 1
-        @distribution = `lsb_release -d`[/Description:\s+(.*)\s*$/, 1]
+        @distribution = discover_distribution
       else
         @cpu_type = @cpu_vendor = @cpu_speed = @cpu_count = nil
       end
@@ -90,6 +90,11 @@ module DCell
       days_string ? Integer(days_string) : 0
     end
 
+    def discover_distribution
+      `lsb_release -d`[/Description:\s+(.*)\s*$/, 1]
+    rescue Errno::ENOENT
+    end
+
     def to_hash
       uptime_string = `uptime`
 

data/lib/dcell/messages.rb

@@ -22,29 +22,29 @@ module DCell
 
     # Query a node for the address of an actor
     class Find < Message
-      attr_reader :caller, :name
+      attr_reader :sender, :name
 
-      def initialize(caller, name)
+      def initialize(sender, name)
         super()
-        @caller, @name = caller, name
+        @sender, @name = sender, name
       end
 
       def dispatch
-        @caller << SuccessResponse.new(@id, Celluloid::Actor[@name])
+        @sender << SuccessResponse.new(@id, Celluloid::Actor[@name])
       end
     end
 
     # List all registered actors
     class List < Message
-      attr_reader :caller
+      attr_reader :sender
 
-      def initialize(caller)
+      def initialize(sender)
         super()
-        @caller = caller
+        @sender = sender
       end
 
       def dispatch
-        @caller << SuccessResponse.new(@id, Celluloid::Actor.registered)
+        @sender << SuccessResponse.new(@id, Celluloid::Actor.registered)
       end
     end
 

data/lib/dcell/registries/zk_adapter.rb

@@ -36,76 +36,34 @@ module DCell
         end
 
         @zk = ZK.new(*servers)
-        @node_registry = NodeRegistry.new(@zk, @base_path)
-        @global_registry = GlobalRegistry.new(@zk, @base_path)
+        @node_registry = Registry.new(@zk, @base_path, :nodes, true)
+        @global_registry = Registry.new(@zk, @base_path, :globals, false)
       end
 
-      def clear_nodes
-        @node_registry.clear
-      end
-
-      def clear_globals
-        @global_registry.clear
-      end
-
-      class NodeRegistry
-        def initialize(zk, base_path)
-          @zk, @base_path = zk, "#{base_path}/nodes"
-          @zk.mkdir_p @base_path
-        end
-
-        def get(node_id)
-          result, _ = @zk.get("#{@base_path}/#{node_id}")
-          result
-        rescue ZK::Exceptions::NoNode
-        end
-
-        def set(node_id, addr)
-          path = "#{@base_path}/#{node_id}"
-          @zk.set path, addr
-        rescue ZK::Exceptions::NoNode
-          @zk.create path, addr
-        end
-
-        def nodes
-          @zk.children @base_path
-        end
-
-        def clear
-          @zk.rm_rf @base_path
-          @zk.mkdir_p @base_path
-        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
-
-      class GlobalRegistry
-        def initialize(zk, base_path)
-          @zk, @base_path = zk, "#{base_path}/globals"
+      class Registry
+        def initialize(zk, base_path, name, ephemeral)
+          @zk = zk
+          @base_path = File.join(base_path, name.to_s)
+          @ephemeral = ephemeral
           @zk.mkdir_p @base_path
         end
 
         def get(key)
-          value, _ = @zk.get "#{@base_path}/#{key}"
-          Marshal.load value
+          result, _ = @zk.get("#{@base_path}/#{key}")
+          Marshal.load result
         rescue ZK::Exceptions::NoNode
         end
 
-        # Set a global value
         def set(key, value)
           path = "#{@base_path}/#{key}"
           string = Marshal.dump value
-
           @zk.set path, string
         rescue ZK::Exceptions::NoNode
-          @zk.create path, string
+          @zk.create path, string, :ephemeral => @ephemeral
         end
 
-        # The keys to all globals in the system
-        def global_keys
-          @zk.children(@base_path)
+        def all
+          @zk.children @base_path
         end
 
         def clear
@@ -114,9 +72,16 @@ module DCell
         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.all 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 global_keys;            @global_registry.all end
+      def clear_globals;          @global_registry.clear end
+
     end
   end
-end
+end

data/lib/dcell/rpc.rb

@@ -1,15 +1,39 @@
 require 'weakref'
 
 module DCell
+  class RPB < Celluloid::BlockProxy
+    def initialize(id, mailbox, execution, arguments)
+      @id, @mailbox, @execution, @arguments = id, mailbox, execution, arguments
+    end
+
+    # Custom marshaller for compatibility with Celluloid::Mailbox marshalling
+    def _dump(level)
+      payload = Marshal.dump [@mailbox, @execution, @arguments]
+      "#{@id}:rpb:#{payload}"
+    end
+  end
+
+  class RPBC < Celluloid::BlockCall
+    def initialize(id, block_proxy, sender, arguments)
+      @id, @block_proxy, @sender, @arguments = id, block_proxy, sender, arguments
+    end
+
+    # Custom marshaller for compatibility with Celluloid::Mailbox marshalling
+    def _dump(level)
+      payload = Marshal.dump [@block_proxy, @sender, @arguments]
+      "#{@id}:rpbc:#{payload}"
+    end
+  end
+
   class RPC < Celluloid::SyncCall
-    def initialize(id, caller, method, arguments, block)
-      @id, @caller, @method, @arguments, @block = id, caller, method, arguments, block
+    def initialize(id, sender, method, arguments, block)
+      @id, @sender, @method, @arguments, @block = id, sender, method, arguments, block
     end
 
     # Custom marshaller for compatibility with Celluloid::Mailbox marshalling
     def _dump(level)
-      payload = Marshal.dump [@caller, @method, @arguments, @block]
-      "#{@id}:#{payload}"
+      payload = Marshal.dump [@sender, @method, @arguments, @block]
+      "#{@id}:rpc:#{payload}"
     end
 
     # Loader for custom marshal format
@@ -23,8 +47,13 @@ module DCell
       if DCell.id == node_id
         Manager.claim uuid
       else
-        caller, method, arguments, block = Marshal.load(string)
-        RPC.new("#{uuid}@#{node_id}", caller, method, arguments, block)
+        type = string.slice!(0, string.index(":") + 1)
+        types = {
+          "rpc" => RPC,
+          "rpb" => RPB,
+          "rpbc" => RPBC,
+        }
+        types.fetch(type[0..-2]).new("#{uuid}@#{node_id}", *Marshal.load(string))
       end
     end
 

data/lib/dcell/version.rb

@@ -1,3 +1,3 @@
 module DCell
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/spec/dcell/actor_proxy_spec.rb

@@ -26,6 +26,14 @@ describe DCell::ActorProxy do
     @remote_actor.value.should == 42
   end
 
+  it "handles blocks" do
+    result = nil
+    @remote_actor.win do |value|
+      result = value
+    end
+    result.should == 10000
+  end
+
   it "makes future calls to remote actors" do
     @remote_actor.future(:value).value.should == 42
   end

data/spec/dcell/registries/zk_adapter_spec.rb

@@ -1,11 +1,7 @@
-# The Zookeeper CRuby dependency is pretty annoying :(
-# Disabling until this can be spun off into a separate gem
-=begin
 require 'spec_helper'
 require 'dcell/registries/zk_adapter'
 
-describe DCell::Registry::ZkAdapter do
+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"
 end
-=end

data/spec/test_node.rb

@@ -20,6 +20,11 @@ class TestActor
     DCell::Global[:the_answer]
   end
 
+  def win(&block)
+    yield 10000
+    20000
+  end
+
   def crash
     raise "the spec purposely crashed me :("
   end

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dcell
 version: !ruby/object:Gem::Version
-  version: 0.13.0
-  prerelease: 
+  version: 0.14.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-05-08 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.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: celluloid-zmq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: reel
   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: redis
   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: redis-namespace
   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
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: DCell is an distributed object framework based on Celluloid built on
@@ -170,7 +155,6 @@ files:
 - lib/dcell/node.rb
 - lib/dcell/node_manager.rb
 - lib/dcell/registries/cassandra_adapter.rb
-- lib/dcell/registries/moneta_adapter.rb
 - lib/dcell/registries/redis_adapter.rb
 - lib/dcell/registries/zk_adapter.rb
 - lib/dcell/responses.rb
@@ -186,7 +170,6 @@ files:
 - spec/dcell/explorer_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
@@ -198,33 +181,26 @@ files:
 - tasks/zookeeper.task
 homepage: http://github.com/celluloid/dcell
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3616164111420951130
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3616164111420951130
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An asynchronous distributed object framework based on Celluloid
 test_files:
 - spec/dcell/actor_proxy_spec.rb
@@ -233,7 +209,6 @@ test_files:
 - spec/dcell/explorer_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/lib/dcell/registries/moneta_adapter.rb

@@ -1,61 +0,0 @@
-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/spec/dcell/registries/moneta_adapter_spec.rb

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