celluloid-supervision 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23fdf38a81deae26b5dc2662f61121649736c0e2
-  data.tar.gz: 853b6aa1d716a24fa41659446926413b9e24153c
+  metadata.gz: f62d1faacdaed9f8d51985b20263c17ba4363d59
+  data.tar.gz: 6b79a9a5ab4eb25bdf49c47723489a8d1259a0f5
 SHA512:
-  metadata.gz: f064277afe5f405701058ae5a4a2db673be12aba830484aecae2777c01168d7db0f3768c9c92d2f94946f13d82d7abaea8879dd44a593eabc405ea6ec87867b0
-  data.tar.gz: 2baa6fbf05a6836419bc08c710de9e4f1791dd16eccfbdf97fb0d4c78d8d230134184f8329ac5260846625fe0ce49b9a9fecca31a33f6c0c4014fc086c40f5d1
+  metadata.gz: 17b27060543bd2eff8a4498c1ac39bcbeafac54ae75246b83cac8101f9fa6fb073f4d024553c21cdff6735da2820dbe4a0c46c505fe01203d36f8afee149b506
+  data.tar.gz: f8dccac2e2c8db22deb98c39d66108b60fcdea649149c7107439711ec753ba82865f8f07c676b8bbfccaabe63484b013db3e4c42a299c1cb7c0278706eb66d70

data/CHANGES.md

@@ -0,0 +1,12 @@
+0.20.1 (2015-08-06)
+-----
+* Fixed arity checking
+* Added usage examples to README
+* Change reference to `Actor::System` ( was `ActorSystem` )
+
+0.20.0 (2015-07-04)
+-----
+* Extracted from Celluloid
+* Re-added Supervision Trees
+* Added Configuration object
+* Added injections and behaviors

data/README.md

@@ -1 +1,102 @@
-Supervisors, Supervision Groups, and Supervision Trees for Celluloid.
+![Celluloid Supervision](https://raw.github.com/celluloid/celluloid-logos/master/celluloid-supervision/celluloid-supervision.png)
+
+[![Gem Version](https://badge.fury.io/rb/celluloid-supervision.svg)](http://rubygems.org/gems/celluloid-supervision)
+[![Build Status](https://secure.travis-ci.org/celluloid/celluloid-supervision.svg?branch=master)](http://travis-ci.org/celluloid/celluloid-supervision)
+[![Code Climate](https://codeclimate.com/github/celluloid/celluloid-supervision.svg)](https://codeclimate.com/github/celluloid/celluloid-supervision)
+[![Coverage Status](https://coveralls.io/repos/celluloid/celluloid-supervision/badge.svg?branch=master)](https://coveralls.io/r/celluloid/celluloid-supervision)
+
+Supervisors; with Supervision Containers (Groups), Configurations, and Trees for [Celluloid](https://github.com/celluloid/celluloid).
+
+
+To supervise actors, you have many options:
+
+
+
+# Using supervisors.
+
+### Directly
+
+```ruby
+MyActor.supervise as: :my_actor # Without arguments.
+MyActor.supervise as: :my_actor, args: [:one_arg, :two_args]
+```
+
+### Indirectly
+
+```ruby
+Celluloid.supervise as: :my_actor, type: MyActor # Without arguments.
+Celluloid.supervise as: :my_actor, type: MyActor, args: [:one_arg, :two_args]
+```
+
+
+# Using containers.
+
+```ruby
+container = Celluloid::Supervision::Container.new {
+  supervise type: MyActor, as: :my_actor
+  supervise type: MyActor, as: :my_actor_with_args, args: [:one_arg, :two_args]
+}
+container.run!
+```
+
+# Using configuration objects:
+
+```ruby
+config = Celluloid::Supervision::Configuration.define([
+  {
+    type: MyActor,
+    as: :my_actor
+  },
+  {
+    type: MyActor,
+    as: :my_actor_with_args,
+    args: [
+      :one_arg,
+      :two_args
+    ]
+  },
+])
+
+# Whenever you would like to deploy the actors:
+config.deploy
+
+# Whenver you would like to shut them down:
+config.shutdown
+
+# Reuse the same configuration if you like!
+config.deploy
+```
+
+### By on-going configuration object:
+
+```ruby
+config = Celluloid::Supervision::Configuration.new
+config.define type: MyActor, as: :my_actor
+config.define type: MyActor, as: :my_actor_with_args, args: [:one_arg, :two_args]
+config deploy
+
+# Now add actors to the already running configuration.
+config.add type: MyActor, as: :my_actor_deployed_immediately
+config.shutdown
+```
+
+
+# Documentation coming:
+
+* Supervision Trees
+* Supervised Pools
+* Supervised Supervisors
+
+
+
+## Contributing
+
+* Fork this repository on github.
+* Make your changes and send us a pull request.
+* If we like them we'll merge them.
+* If we've accepted a patch, feel free to ask for commit access.
+
+## License
+
+Copyright (c) 2011-2015 Tony Arcieri, Donovan Keme.
+Distributed under the MIT License. See LICENSE.txt for further details.

data/celluloid-supervision.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.description  = "Supervisors, Supervision Groups, and Supervision Trees for Celluloid."
   gem.licenses     = ["MIT"]
 
-  gem.authors      = ["digitalextremist //", "Tony Arcieri", "Tim Carey-Smith"]
+  gem.authors      = ["Donovan Keme", "Tony Arcieri", "Tim Carey-Smith"]
   gem.email        = ["code@extremist.digital", "tony.arcieri@gmail.com"]
   gem.homepage     = "https://github.com/celluloid/"
 

data/lib/celluloid/supervision/configuration.rb

@@ -164,7 +164,7 @@ module Celluloid
       end
 
       def invoke_injection(_point)
-        # de puts "injection? #{point}"
+        #de puts "injection? #{point}"
       end
     end
   end

data/lib/celluloid/supervision/configuration/instance.rb

@@ -8,7 +8,7 @@ module Celluloid
           @state = :initializing # :ready
           resync_accessors
           @configuration = configuration
-          define configuration if configuration.any?
+          define(configuration) if configuration.any?
         end
 
         def export

data/lib/celluloid/supervision/constants.rb

@@ -5,16 +5,16 @@ module Celluloid
     INSTANCE_RETRY_LIMIT = 5
 
     module Error
-      class NoPublicService < StandardError; end
+      class NoPublicService < Celluloid::Error; end
     end
 
     class Configuration
       module Error
-        class AlreadyDefined < StandardError; end
-        class InvalidSupervisor < StandardError; end
-        class InvalidValues < StandardError; end
-        class Incomplete < StandardError; end
-        class Invalid < StandardError; end
+        class AlreadyDefined < Celluloid::Error; end
+        class InvalidSupervisor < Celluloid::Error; end
+        class InvalidValues < Celluloid::Error; end
+        class Incomplete < Celluloid::Error; end
+        class Invalid < Celluloid::Error; end
       end
 
       # Using class variable so that parameters can be added by plugins.

data/lib/celluloid/supervision/container/behavior.rb

@@ -6,7 +6,7 @@ module Celluloid
         @@behaviors = {}   # Hash of identifying symbol parameter => Class
 
         module Error
-          class Mutant < StandardError; end
+          class Mutant < Celluloid::Error; end
         end
 
         class << self

data/lib/celluloid/supervision/container/behavior/tree.rb

@@ -20,6 +20,7 @@ module Celluloid
             @branch = @configuration.fetch(:branch, @configuration[:as])
             @configuration.delete(Behavior.parameter(:supervise, @configuration))
           else
+            puts "#{@configuration[:supervise].class.name} ... #{@configuration[:supervise]}"
             fail ArgumentError.new("No actors given to Tree to supervise.")
           end
         end

data/lib/celluloid/supervision/container/instance.rb

@@ -34,14 +34,14 @@ module Celluloid
           @actor = @type.send(@method, *@args, &@block)
           @registry.add(@name, @actor, @branch) if @name
           invoke_injection(:after_start)
-        rescue Celluloid::TimeoutError => ex
-          Internals::Logger.error("TimeoutError at start of supervised instance of #{@type}")
+        rescue Celluloid::TaskTimeout => ex
+          Internals::Logger.error("TaskTimeout at start of supervised instance of #{@type}")
           raise ex
           #           TODO: Implement timeout/retry.
           #           unless ( @retry += 1 ) <= INSTANCE_RETRY_LIMIT
           #             raise ex
           #           end
-          #           Internals::Logger.warn("TimeoutError at start of supervised actor. Retrying in #{INSTANCE_RETRY_WAIT} seconds. ( Attempt #{@retry} of #{INSTANCE_RETRY_LIMIT} )")
+          #           Internals::Logger.warn("TaskTimeout at start of supervised actor. Retrying in #{INSTANCE_RETRY_WAIT} seconds. ( Attempt #{@retry} of #{INSTANCE_RETRY_LIMIT} )")
           #           sleep INSTANCE_RETRY_WAIT
           #           retry
         rescue => ex
@@ -82,7 +82,7 @@ module Celluloid
                   Celluloid.actor_system[actor]
                 end
               end
-              Celluloid::ActorSystem.instance_exec(@configuration[:as], name) do |actor, where|
+              Celluloid::Actor::System.instance_exec(@configuration[:as], name) do |actor, where|
                 define_method(name) do
                   Celluloid.actor_system[actor]
                 end
@@ -97,7 +97,7 @@ module Celluloid
               Celluloid.instance_eval do
                 remove_method(name) rescue nil # avoid warnings in tests
               end
-              Celluloid::ActorSystem.instance_eval do
+              Celluloid::Actor::System.instance_eval do
                 remove_method(name) rescue nil # avoid warnings in tests
               end
             end

data/lib/celluloid/supervision/validation.rb

@@ -2,10 +2,10 @@ module Celluloid
   module Supervision
     class Configuration
       class << self
-        def valid?(configuration, fail=false)
+        def valid?(configuration, fails=false)
           parameters(:mandatory).each do |k|
             unless configuration.key? k
-              if fail
+              if fails
                 fail Error::Incomplete, "Missing `:#{k}` in supervision configuration."
               else
                 return false
@@ -16,8 +16,8 @@ module Celluloid
             unless configuration[args].is_a? Proc
               __a = configuration[args] && configuration[args].count || 0
               __arity = configuration[klass].allocate.method(:initialize).arity
-              unless __arity == -1 || __a == __arity
-                if fail
+              unless (__arity < 0 && __a >= __arity.abs-1) || __a == __arity.abs
+                if fails
                   fail ArgumentError.new("#{__a} vs. #{__arity}")
                 else
                   return false

data/lib/celluloid/supervision/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module Supervision
-    VERSION = "0.20.0"
+    VERSION = "0.20.1"
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-supervision
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
-- digitalextremist //
+- Donovan Keme
 - Tony Arcieri
 - Tim Carey-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: transpec
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -313,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Celluloid Supervision