celluloid 0.18.0.pre → 0.18.0.pre2

data/lib/celluloid/supervision/deprecate/validation.rb

@@ -0,0 +1,54 @@
+module Celluloid
+  module Supervision
+    class Configuration
+      class << self
+        # argument scenarios:
+        #   * only class ( becomes :type )
+        #   * class ( becomes :type ), hash*
+        #   * hash ( *with :type, and perhaps :as, :size, :args, :block, :registry )
+        #          ( any keys expected are pulled out: may want to check on arity? )
+        #          ( the pulling out of keys is where danger mentioned above comes )
+        undef parse rescue nil
+        def parse(args)
+          return args if args.is_a? Configuration::Instance
+          options = { args: [] }
+          return { type: args } if args.is_a? Class
+          if args.is_a? Hash
+            return args
+          elsif args.is_a? Array
+            if args.length == 1
+              return args[0] if args.first.is_a? Configuration::Instance
+              return { type: args.first } if args.first.is_a? Class
+              if args.first.is_a?(Hash) && args = args.pop
+                return args
+              end
+              options[:args] = args if args.any?
+            elsif args.length > 1
+              # TODO: don't use each
+              options.merge! args.pop if args.last.is_a? Hash
+              options[:type] = args.shift if args.first.is_a? Class
+              options[:args] += args if args.any?
+            end
+          end
+          options
+        end
+
+        # This is dangerous. It is temporary, until `Supervision::Configuration` is entrenched.
+        # Since :type, :as, etc are used by the supervision group/member to initialize,
+        # those will not appear in the resulting actor's initialize call.
+        undef options rescue nil
+        def options(args, options = {})
+          return args.merge!(options) if args.is_a? Configuration::Instance
+          # Not a Supervision:Configuration?
+          # Try to guess its structure and build one:
+          options = parse(args).merge(options)
+          options[:configuration] = Container::Behavior.configure(options)
+          options[:args].compact! if options[:args].is_a? Array
+          options.reject! { |_k, v| v.nil? }
+          Configuration.valid? options, true
+          options
+        end
+      end
+    end
+  end
+end

data/lib/celluloid/supervision/service.rb

@@ -0,0 +1,27 @@
+module Celluloid
+  module Supervision
+    module Service
+      class Root < Container
+        class << self
+          def define
+            super({
+              supervise: Celluloid.actor_system.root_configuration,
+              as: :root_supervisor,
+              accessors: [:root],
+              branch: :root,
+              type: self
+            })
+          end
+
+          def deploy(instances)
+            super(supervise: instances, branch: :root, as: :root, type: self)
+          end
+        end
+        def provider
+          Celluloid.root_services
+        end
+      end
+      class Public < Container; end
+    end
+  end
+end

data/lib/celluloid/supervision/supervise.rb

@@ -0,0 +1,34 @@
+# collect together all instances of the `supervise` method
+module Celluloid
+  class << self
+    def supervise(config = {}, &block)
+      supervisor = Supervision.router(config)
+      supervisor.supervise(config, &block)
+    end
+  end
+  module ClassMethods
+    def supervise(config = {}, &block)
+      Celluloid.supervise(config.merge(type: self), &block)
+    end
+  end
+  module Supervision
+    class << self
+      def router(_config = {})
+        # TODO: Actually route.
+        Celluloid.services # for now, hardcode .services
+      end
+    end
+    class Container
+      class << self
+        def supervise(config, &block)
+          blocks << lambda do |container|
+            container.add(config, &block)
+          end
+        end
+      end
+      def supervise(config, &block)
+        add(Configuration.options(config, block: block))
+      end
+    end
+  end
+end

data/lib/celluloid/supervision/validation.rb

@@ -0,0 +1,40 @@
+module Celluloid
+  module Supervision
+    class Configuration
+      class << self
+        def valid?(configuration, fails = false)
+          parameters(:mandatory).each do |k|
+            unless configuration.key? k
+              if fails
+                raise Error::Incomplete, "Missing `:#{k}` in supervision configuration."
+              else
+                return false
+              end
+            end
+          end
+          arity.each do |klass, args|
+            next if configuration[args].is_a? Proc
+            __a = configuration[args] && configuration[args].count || 0
+            __arity = configuration[klass].allocate.method(:initialize).arity
+            unless (__arity < 0 && __a >= __arity.abs - 1) || __a == __arity.abs
+              if fails
+                raise ArgumentError, "#{__a} vs. #{__arity}"
+              else
+                return false
+              end
+            end
+          end
+          true
+        end
+
+        def options(config = {}, options = {})
+          configuration = config.merge(options)
+          return configuration if configuration.is_a? Configuration
+          configuration[:configuration] = Container::Behavior.configure(configuration)
+          valid?(configuration, true)
+          configuration
+        end
+      end
+    end
+  end
+end

data/lib/celluloid/supervision/version.rb

@@ -0,0 +1,5 @@
+module Celluloid
+  module Supervision
+    VERSION = "0.20.6".freeze
+  end
+end

data/lib/celluloid/system_events.rb

@@ -5,7 +5,10 @@ module Celluloid
       if handler = SystemEvent.handle(event.class)
         send(handler, event)
       else
+        # !!! DO NOT INTRODUCE ADDITIONAL GLOBAL VARIABLES !!!
+        # rubocop:disable Style/GlobalVars
         Internals::Logger.debug "Discarded message (unhandled): #{message}" if $CELLULOID_DEBUG
+        # rubocop:enable Style/GlobalVars
       end
     end
   end
@@ -18,7 +21,7 @@ module Celluloid
       end
 
       def handler(&block)
-        fail ArgumentError, "SystemEvent handlers must be defined with a block." unless block
+        raise ArgumentError, "SystemEvent handlers must be defined with a block." unless block
         method = begin
           handler = name
                     .split("::").last
@@ -38,7 +41,7 @@ module Celluloid
       def initialize(actor, type)
         @actor = actor
         @type = type.to_sym
-        fail ArgumentError, "type must be link or unlink" unless [:link, :unlink].include?(@type)
+        raise ArgumentError, "type must be link or unlink" unless %i[link unlink].include?(@type)
       end
     end
   end
@@ -87,7 +90,11 @@ module Celluloid
 
     handler do |event|
       @name = event.name
+
+      # !!! DO NOT INTRODUCE ADDITIONAL GLOBAL VARIABLES !!!
+      # rubocop:disable Style/GlobalVars
       Celluloid::Probe.actor_named(self) if $CELLULOID_MONITORING
+      # rubocop:enable Style/GlobalVars
     end
 
     def initialize(name)
@@ -97,7 +104,7 @@ module Celluloid
 
   # Request for an actor to terminate
   class TerminationRequest < SystemEvent
-    handler do |event|
+    handler do |_event|
       terminate
     end
   end
@@ -110,9 +117,7 @@ module Celluloid
     end
     attr_reader :task, :value
 
-    handler do |event|
-      event.call
-    end
+    handler(&:call)
 
     def call
       @task.resume(@value)

data/lib/celluloid/task.rb

@@ -3,7 +3,7 @@ module Celluloid
   class Task
     # Obtain the current task
     def self.current
-      Thread.current[:celluloid_task] || fail(NotTaskError, "not within a task context")
+      Thread.current[:celluloid_task] || raise(NotTaskError, "not within a task context")
     end
 
     # Suspend the running task, deferring to the scheduler
@@ -27,7 +27,7 @@ module Celluloid
       actor     = Thread.current[:celluloid_actor]
       @chain_id = Internals::CallChain.current_id
 
-      fail NotActorError, "can't create tasks outside of actors" unless actor
+      raise NotActorError, "can't create tasks outside of actors" unless actor
       guard "can't create tasks inside of tasks" if Thread.current[:celluloid_task]
 
       create do
@@ -53,26 +53,29 @@ module Celluloid
     end
 
     def create(&_block)
-      fail "Implement #{self.class}#create"
+      raise "Implement #{self.class}#create"
     end
 
     # Suspend the current task, changing the status to the given argument
     def suspend(status)
-      fail "Cannot suspend while in exclusive mode" if exclusive?
-      fail "Cannot suspend a task from outside of itself" unless Task.current == self
+      raise "Cannot suspend while in exclusive mode" if exclusive?
+      raise "Cannot suspend a task from outside of itself" unless Task.current == self
 
       @status = status
 
+      # !!! DO NOT INTRODUCE ADDITIONAL GLOBAL VARIABLES !!!
+      # rubocop:disable Style/GlobalVars
       if $CELLULOID_DEBUG && @dangerous_suspend
         Internals::Logger.with_backtrace(caller[2...8]) do |logger|
           logger.warn "Dangerously suspending task: type=#{@type.inspect}, meta=#{@meta.inspect}, status=#{@status.inspect}"
         end
       end
+      # rubocop:enable Style/GlobalVars
 
       value = signal
 
       @status = :running
-      fail value if value.is_a?(Celluloid::Interruption)
+      raise value if value.is_a?(Celluloid::Interruption)
       value
     end
 
@@ -82,7 +85,9 @@ module Celluloid
       if running?
         deliver(value)
       else
+        # rubocop:disable Metrics/LineLength
         Internals::Logger.warn "Attempted to resume a dead task: type=#{@type.inspect}, meta=#{@meta.inspect}, status=#{@status.inspect}"
+        # rubocop:enable Metrics/LineLength
       end
       nil
     end
@@ -103,20 +108,24 @@ module Celluloid
 
     # Terminate this task
     def terminate
-      fail "Cannot terminate an exclusive task" if exclusive?
+      raise "Cannot terminate an exclusive task" if exclusive?
 
       if running?
+        # !!! DO NOT INTRODUCE ADDITIONAL GLOBAL VARIABLES !!!
+        # rubocop:disable Style/GlobalVars
         if $CELLULOID_DEBUG
           Internals::Logger.with_backtrace(backtrace) do |logger|
             type = @dangerous_suspend ? :warn : :debug
             logger.send(type, "Terminating task: type=#{@type.inspect}, meta=#{@meta.inspect}, status=#{@status.inspect}")
           end
         end
+        # rubocop:enable Style/GlobalVars
+
         exception = TaskTerminated.new("task was terminated")
         exception.set_backtrace(caller)
         resume exception
       else
-        fail DeadTaskError, "task is already dead"
+        raise DeadTaskError, "task is already dead"
       end
     end
 
@@ -125,8 +134,7 @@ module Celluloid
       @exclusive
     end
 
-    def backtrace
-    end
+    def backtrace; end
 
     # Is the current task still running?
     def running?
@@ -139,11 +147,14 @@ module Celluloid
     end
 
     def guard(message)
+      # !!! DO NOT INTRODUCE ADDITIONAL GLOBAL VARIABLES !!!
+      # rubocop:disable Style/GlobalVars
       if @guard_warnings
         Internals::Logger.warn message if $CELLULOID_DEBUG
       else
-        fail message if $CELLULOID_DEBUG
+        raise message if $CELLULOID_DEBUG
       end
+      # rubocop:enable Style/GlobalVars
     end
 
     private
@@ -161,7 +172,9 @@ module Celluloid
 
     def thread_metadata
       method = @meta && @meta[:method_name] || "<no method>"
-      klass = Thread.current[:celluloid_actor] && Thread.current[:celluloid_actor].behavior.subject.bare_object.class || "<no actor>"
+      klass = Thread.current[:celluloid_actor] &&
+              Thread.current[:celluloid_actor].behavior.subject.bare_object.class ||
+              "<no actor>"
       format("[Celluloid] %s#%s", klass, method)
     end
   end

data/lib/celluloid/task/fibered.rb

@@ -40,7 +40,9 @@ module Celluloid
       end
 
       def backtrace
+        # rubocop:disable Metrics/LineLength
         ["#{self.class} backtrace unavailable. Please try `Celluloid.task_class = Celluloid::Task::Threaded` if you need backtraces here."]
+        # rubocop:enable Metrics/LineLength
       end
     end
   end

data/lib/celluloid/task/threaded.rb

@@ -18,7 +18,7 @@ module Celluloid
         thread = Internals::ThreadHandle.new(Thread.current[:celluloid_actor_system], :task) do
           begin
             ex = @resume_queue.pop
-            fail ex if ex.is_a?(TaskTerminated)
+            raise ex if ex.is_a?(TaskTerminated)
 
             yield
           rescue ::Exception => ex
@@ -40,12 +40,12 @@ module Celluloid
       end
 
       def deliver(value)
-        fail DeadTaskError, "cannot resume a dead task" unless @thread.alive?
+        raise DeadTaskError, "cannot resume a dead task" unless @thread.alive?
 
         @yield_mutex.synchronize do
           @resume_queue.push(value)
           @yield_cond.wait(@yield_mutex)
-          fail @exception_queue.pop while @exception_queue.size > 0
+          raise @exception_queue.pop until @exception_queue.empty?
         end
       rescue ThreadError
         raise DeadTaskError, "cannot resume a dead task"

data/lib/celluloid/test.rb

@@ -1,3 +1,6 @@
+# !!! DO NOT INTRODUCE ADDITIONAL GLOBAL VARIABLES !!!
+# rubocop:disable Style/GlobalVars
 $CELLULOID_TEST = true
-
-require "celluloid"
+# rubocop:enable Style/GlobalVars
+#
+require "celluloid/autostart"

data/lib/celluloid/thread.rb

@@ -1,5 +1,3 @@
-require "celluloid/fiber"
-
 module Celluloid
   class Thread < ::Thread
     def celluloid?

data/lib/celluloid/version.rb

@@ -1,3 +1,3 @@
 module Celluloid
-  VERSION = "0.18.0.pre"
+  VERSION = "0.18.0.pre2".freeze
 end

data/spec/celluloid/block_spec.rb

@@ -2,19 +2,20 @@ RSpec.describe "Blocks", actor_system: :global do
   class MyBlockActor
     include Celluloid
 
-    def initialize(name)
+    def initialize(name, data)
       @name = name
+      @data = data
     end
     attr_reader :name
 
     def ask_for_something(other)
       sender_actor = current_actor
-      $data << [:outside, @name, current_actor.name]
-      other.do_something_and_callback do |value|
-        $data << [:yielded, @name, current_actor.name]
-        $data << receive_result(:self)
-        $data << current_actor.receive_result(:current_actor)
-        $data << sender_actor.receive_result(:sender)
+      @data << [:outside, @name, current_actor.name]
+      other.do_something_and_callback do |_value|
+        @data << [:yielded, @name, current_actor.name]
+        @data << receive_result(:self)
+        @data << current_actor.receive_result(:current_actor)
+        @data << sender_actor.receive_result(:sender)
         :pete_the_polyglot_alien
       end
     end
@@ -34,20 +35,20 @@ RSpec.describe "Blocks", actor_system: :global do
     def defer_for_something(other, &_block)
       sender_actor = current_actor
       defer do
-        $data << [:outside, @name, current_actor.name]
-        other.do_something_and_callback do |value|
-          $data << [:yielded, @name, current_actor.name]
-          $data << receive_result(:self)
-          $data << current_actor.receive_result(:current_actor)
-          $data << sender_actor.receive_result(:sender)
+        @data << [:outside, @name, current_actor.name]
+        other.do_something_and_callback do |_value|
+          @data << [:yielded, @name, current_actor.name]
+          @data << receive_result(:self)
+          @data << current_actor.receive_result(:current_actor)
+          @data << sender_actor.receive_result(:sender)
           :pete_the_polyglot_alien
         end
       end
     end
 
     def do_something_and_callback
-      $data << [:something, @name, current_actor.name]
-      $data << yield(:foo)
+      @data << [:something, @name, current_actor.name]
+      @data << yield(:foo)
     end
 
     def receive_result(result)
@@ -56,10 +57,10 @@ RSpec.describe "Blocks", actor_system: :global do
   end
 
   it "work between actors" do
-    $data = []
+    data = []
 
-    a1 = MyBlockActor.new("one")
-    a2 = MyBlockActor.new("two")
+    a1 = MyBlockActor.new("one", data)
+    a2 = MyBlockActor.new("two", data)
 
     a1.ask_for_something a2
 
@@ -70,33 +71,29 @@ RSpec.describe "Blocks", actor_system: :global do
       [:self, "one", "one"],
       [:current_actor, "one", "one"],
       [:sender, "one", "one"],
-      :pete_the_polyglot_alien,
+      :pete_the_polyglot_alien
     ]
 
-    expect($data).to eq(expected)
+    expect(data).to eq(expected)
   end
 
   execute_deferred = proc do
-    a1 = MyBlockActor.new("one")
+    a1 = MyBlockActor.new("one", [])
     expect(a1.deferred_excecution(:pete_the_polyglot_alien) { |v| v })
-    .to eq(:pete_the_polyglot_alien)
+      .to eq(:pete_the_polyglot_alien)
   end
 
-  # unless RUBY_ENGINE == 'jruby'
   xit("can be deferred", &execute_deferred)
-  # else
-  #   it("can be deferred", &execute_deferred)
-  # end
 
   xit "can execute deferred blocks referencing current_actor" do
-    a1 = MyBlockActor.new("one")
+    a1 = MyBlockActor.new("one", [])
     expect(a1.deferred_current_actor { |v| v }).to be("one")
   end
 
   xit "can execute deferred blocks with another actor" do
-    $data = []
-    a1 = MyBlockActor.new("one")
-    a2 = MyBlockActor.new("two")
+    data = []
+    a1 = MyBlockActor.new("one", data)
+    a2 = MyBlockActor.new("two", data)
     a1.defer_for_something a2
     expected = [
       [:outside, "one", "one"],
@@ -105,9 +102,9 @@ RSpec.describe "Blocks", actor_system: :global do
       [:self, "one", "one"],
       [:current_actor, "one", "one"],
       [:sender, "one", "one"],
-      :pete_the_polyglot_alien,
+      :pete_the_polyglot_alien
     ]
 
-    expect($data).to eq(expected)
+    expect(data).to eq(expected)
   end
 end