celluloid-supervision 0.20.0.pre4 → 0.20.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e6c43f5246d66e3f01af4f49ab4b8cb369b2a0
-  data.tar.gz: 2a42933006fca99bb2496044958fe9adfc3aba0c
+  metadata.gz: bffa45907a8bf3f413b8c39488eeadac5584b3ae
+  data.tar.gz: 7e401351b571791554d6a202e4f53109dfd5dd71
 SHA512:
-  metadata.gz: 3087bc856c7ae83ad4a6fa9b0b1bcdd86f3382171877b83030659d6dd221544117dc33b9eb39d3775131ab6b78e0b96f915a6900df25ea7e49a58054069c5486
-  data.tar.gz: c3b3b788967d055e93dc4a1f88fba65f9bd1b3188e188cbbf90068ec612a9231086f3c9ff1508e9754a94773ae03c35eb651836a6c8d63d70358e22c14128372
+  metadata.gz: 17032cd58a828ffae320b6cc03d1a3949245c89a6a403a4101d76f79537c9b040c7a13bff16c6c296ba4253f55bda4b2f7488e34b53a6c84c9fa3f9d7a98f288
+  data.tar.gz: 63de1444dd3fa7468090085d9e1b8015cceae45c245737532e6f05fa96d631c8f138cd1b65b0cd360f0f1547b7e6fa75ce4c73746289c9bb1edfd2ebbdcc25ba

data/.travis.yml

@@ -14,6 +14,7 @@ rvm:
 # For right now the imporant thing is to test BACKPORTED mode:
 
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: rbx-2
     - rvm: ruby-head
@@ -29,4 +30,4 @@ notifications:
   irc: "irc.freenode.org#celluloid"
 
 sudo: false
-install: bundle install --retry=3 --without=development
+install: bundle install --without=development

data/Gemfile

@@ -1,24 +1,2 @@
 require File.expand_path("../culture/sync", __FILE__)
-source "https://rubygems.org"
-
-gemspec # de development_group: :gem_build_tools
-
-group :development do
-  gem "pry"
-  # de gem 'guard'
-  # de gem 'guard-rspec'
-  # de gem 'rb-fsevent', '~> 0.9.1' if RUBY_PLATFORM =~ /darwin/
-end
-
-group :test do
-  gem "dotenv", "~> 2.0"
-  gem "nenv"
-  gem "benchmark_suite"
-  gem "rspec", "~> 3.2"
-end
-
-group :gem_build_tools do
-  gem "rake"
-end
-
-Celluloid::Sync.gems(self)
+Celluloid::Sync::Gemfile[self]

data/celluloid-supervision.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
   gem.files        = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|examples|spec|features)/}) }
   gem.require_path = "lib"
 
-  Celluloid::Sync.gems(self)
+  Celluloid::Sync::Gemspec[gem]
 end

data/lib/celluloid/supervision.rb

@@ -1,6 +1,7 @@
 require "celluloid" unless defined? Celluloid
 
 require "celluloid/supervision/constants"
+require "celluloid/supervision/supervise"
 
 require "celluloid/supervision/container"
 require "celluloid/supervision/container/instance"
@@ -9,20 +10,10 @@ require "celluloid/supervision/container/injections"
 
 require "celluloid/supervision/container/behavior/tree"
 
+require "celluloid/supervision/validation"
 require "celluloid/supervision/configuration"
 require "celluloid/supervision/configuration/instance"
 
 require "celluloid/supervision/service"
 
-module Celluloid
-  module ClassMethods
-    def supervise(config={}, &block)
-      Celluloid.services.supervise(config.merge(type: self, block: block))
-    rescue NoMethodError
-      Internals::Logger.warn("No public supervision service was found. Supervising #{self} a la carte.")
-      Supervision::Container.supervise(config.merge(type: self, block: block))
-    end
-  end
-end
-
 require "celluloid/supervision/deprecate" unless $CELLULOID_BACKPORTED == false

data/lib/celluloid/supervision/configuration.rb

@@ -9,40 +9,6 @@ module Celluloid
         def define(options={})
           new(options)
         end
-
-        def valid?(configuration, fail=false)
-          parameters(:mandatory).each do |k|
-            unless configuration.key? k
-              if fail
-                fail Error::Incomplete, "Missing `:#{k}` in supervision configuration."
-              else
-                return false
-              end
-            end
-          end
-          arity.each do |klass, args|
-            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
-                  fail ArgumentError.new("#{__a} vs. #{__arity}")
-                else
-                  return false
-                end
-              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
 
       extend Forwardable
@@ -65,13 +31,13 @@ module Celluloid
         @i = 0 # incrementer of instances in this branch
         resync_accessors
         @configuration = options
-        @supervisor ||= :"Celluloid.services"
 
         if options.is_a? Hash
           options[:configuration] ||= Container::Behavior.configure(options)
           @configuration = instance_eval(&options[:configuration])
           @supervisor ||= @configuration.fetch(:supervisor, :"Celluloid.services")
         end
+        @supervisor ||= :"Celluloid.services"
 
         if (@configuration.is_a?(Hash) || @configuration.is_a?(Array)) && @configuration.any?
           define(@configuration)
@@ -80,7 +46,7 @@ module Celluloid
 
       def provider
         @provider ||= if @supervisor.is_a? Hash
-                        @supervisor[:type].run!(as: @supervisor[:as])
+                        @supervisor[:type].run!(@supervisor)
                       elsif @supervisor.is_a? Symbol
                         @supervisor = Object.module_eval(@supervisor.to_s)
                         provider
@@ -90,13 +56,13 @@ module Celluloid
                         @supervisor
                       else
                         fail Error::InvalidSupervisor
-        end
+                      end
       end
 
       def deploy(options={})
         define(options) if options.any?
         @instances.each do |instance|
-          provider.supervise instance.merge(branch: @branch)
+          provider.add instance.merge(branch: @branch)
         end
         provider
       end

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

@@ -99,7 +99,7 @@ module Celluloid
         alias_method :[], :get
 
         def delete(k)
-          current_instance.delete(k)
+          @configuration.delete(k)
         end
 
         private

data/lib/celluloid/supervision/constants.rb

@@ -79,7 +79,7 @@ module Celluloid
           @@parameters[key] << value unless @@parameters[key].include? value
         end
 
-        def arity(*_args)
+        def arity
           @@arity
         end
 
@@ -107,7 +107,7 @@ module Celluloid
       ################ These are applied inside Supervision::Member ################
 
       REMOVE_AT_EXPORT = [
-        :initialize,
+        :configuration,
         :behavior,
       ]
 

data/lib/celluloid/supervision/container.rb

@@ -18,8 +18,8 @@ module Celluloid
         def top(options)
           {
             as: (options.delete(:as)),
-            branch: (options.delete(:branch) || :services),
             type: (options.delete(:type) || self),
+            branch: (options.delete(:branch) || :services),
             supervise: options.delete(:supervise) || [],
           }
         end
@@ -40,9 +40,9 @@ module Celluloid
         end
 
         # Run the application in the foreground with a simple watchdog
-        def run(_options)
+        def run(options={})
           loop do
-            supervisor = run!(options = {})
+            supervisor = run!(options)
 
             # Take five, toplevel supervisor
             sleep 5 while supervisor.alive? # Why 5?
@@ -50,17 +50,6 @@ module Celluloid
             Internals::Logger.error "!!! Celluloid::Supervision::Container #{self} crashed. Restarting..."
           end
         end
-
-        # Register one or more actors to be launched and supervised
-        def supervise(config, &block)
-          blocks << lambda do |container|
-            container.add(Configuration.options(config, block: block))
-          end
-        end
-      end
-
-      def supervise(config, &block)
-        add(Configuration.options(config, block: block))
       end
 
       finalizer :finalize
@@ -69,7 +58,6 @@ module Celluloid
 
       # Start the container.
       def initialize(options={})
-        options ||= {}
         options = {registry: options} if options.is_a? Internals::Registry
         @state = :initializing
         @actors = [] # instances in the container
@@ -78,13 +66,10 @@ module Celluloid
         yield current_actor if block_given?
       end
 
-      execute_block_on_receiver :initialize, :supervise # DEPRECIATED: , :supervise_as
+      execute_block_on_receiver :initialize, :supervise, :supervise_as
 
       def add(configuration)
-        unless configuration.is_a? Configuration::Instance
-          configuration = Configuration.options(configuration)
-        end
-        Configuration.valid? configuration, true
+        Configuration.valid?(configuration, true)
         @actors << Instance.new(configuration.merge(registry: @registry, branch: @branch))
         @state = :running
         add_accessors configuration

data/lib/celluloid/supervision/deprecate.rb

@@ -5,6 +5,5 @@ module Celluloid
   Supervision::Member = Supervision::Container::Instance
 end
 
-require "celluloid/supervision/deprecate/supervision"
-# de require 'celluloid/supervision/deprecate/supervisor'
-require "celluloid/supervision/deprecate/configuration"
+require "celluloid/supervision/deprecate/supervise"
+require "celluloid/supervision/deprecate/validation"

data/lib/celluloid/supervision/deprecate/{supervision.rb → supervise.rb}

@@ -1,20 +1,27 @@
 # TODO: Remove at 0.19.0
 module Celluloid
+  class << self
+    undef supervise rescue nil
+    def supervise(*args, &block)
+      supervisor = Supervision.router(*args)
+      supervisor.supervise(*args, &block)
+    end
+    undef supervise_as rescue nil
+    def supervise_as(name, *args, &block)
+      supervisor = Supervision.router(*args)
+      supervisor.supervise_as(name, *args, &block)
+    end
+  end
   module ClassMethods
     undef supervise rescue nil
     def supervise(*args, &block)
-      Celluloid.services.supervise(*args, type: self, block: block)
-    rescue
-      raise ActorSystem::Uninitialized unless Celluloid.services
-      raise
+      args.unshift(self)
+      Celluloid.supervise(*args, &block)
     end
     undef supervise_as rescue nil
     def supervise_as(name, *args, &block)
-      args.unshift self
-      Celluloid.services.supervise_as(name, *args, &block)
-    rescue
-      raise ActorSystem::Uninitialized unless Celluloid.services
-      raise
+      args.unshift(self)
+      Celluloid.supervise_as(name, *args, &block)
     end
   end
 
@@ -26,29 +33,32 @@ module Celluloid
       attr_accessor :root
 
       undef supervise rescue nil
-      def supervise(*args, &block)
-        Celluloid.services.supervise(Supervision::Configuration.options(args, block: block))
-      rescue
-        raise ActorSystem::Uninitialized unless Celluloid.services
-        raise
+      def supervise(klass, *args, &block)
+        args.unshift(klass)
+        Celluloid.supervise(*args, &block)
       end
 
       undef supervise_as rescue nil
-      def supervise_as(name, *args, &block)
-        Celluloid.services.supervise(Supervision::Configuration.options(args, as: name, block: block))
-      rescue
-        raise ActorSystem::Uninitialized unless Celluloid.services
-        raise
+      def supervise_as(name, klass, *args, &block)
+        args.unshift(klass)
+        Celluloid.supervise_as(name, *args, &block)
       end
     end
   end
 
   module Supervision
+    class << self
+      undef router rescue nil
+      def router(*args)
+        # TODO: Actually route, based on :branch, if present; or else:
+        Celluloid.services
+      end
+    end
     class Container
       class << self
         undef run! rescue nil
         def run!(*args)
-          container = new(Supervision::Configuration.options(args)) do |g|
+          container = new(*args) do |g|
             blocks.each do |block|
               block.call(g)
             end
@@ -59,27 +69,24 @@ module Celluloid
         undef run rescue nil
         def run(*args)
           loop do
-            supervisor = run!(Supervision::Configuration.options(args))
-
+            supervisor = run!(*args)
             # Take five, toplevel supervisor
             sleep 5 while supervisor.alive? # Why 5?
-
             Internals::Logger.error "!!! Celluloid::Supervision::Container #{self} crashed. Restarting..."
           end
         end
 
-        undef
-         supervise rescue nil
+        undef supervise rescue nil
         def supervise(*args, &block)
-          blocks << lambda do |group|
-            group.add(Configuration.options(args, block: block))
+          blocks << lambda do |container|
+            container.supervise(*args, &block)
           end
         end
 
         undef supervise_as rescue nil
-        def supervise_as(name, klass, *args, &block)
-          blocks << lambda do |group|
-            group.add(Configuration.options(args, block: block, type: klass, as: name))
+        def supervise_as(name, *args, &block)
+          blocks << lambda do |container|
+            container.supervise_as(name, *args, &block)
           end
         end
       end

data/lib/celluloid/supervision/deprecate/{configuration.rb → validation.rb}

@@ -10,7 +10,6 @@ module Celluloid
         #          ( the pulling out of keys is where danger mentioned above comes )
         undef parse rescue nil
         def parse(args)
-          puts "PARSING@args: #{args} #{caller[0]}"
           return args if args.is_a? Configuration::Instance
           options = {args: []}
           return {type: args} if args.is_a? Class
@@ -21,8 +20,6 @@ module Celluloid
               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
-                Configuration.valid? args, true
-                puts "PARSED@args: #{args}"
                 return args
               end
               options[:args] = args if args.any?
@@ -33,7 +30,6 @@ module Celluloid
               options[:args] += args if args.any?
             end
           end
-          puts "PARSED@end: #{options}"
           options
         end
 
@@ -42,14 +38,14 @@ module Celluloid
         # 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
+          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.select! { |k, v| !v.nil? }
           Configuration.valid? options, true
-          puts "USING: #{options}"
           options
         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, fail=false)
+          parameters(:mandatory).each do |k|
+            unless configuration.key? k
+              if fail
+                fail Error::Incomplete, "Missing `:#{k}` in supervision configuration."
+              else
+                return false
+              end
+            end
+          end
+          arity.each do |klass, args|
+            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
+                  fail ArgumentError.new("#{__a} vs. #{__arity}")
+                else
+                  return false
+                end
+              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

@@ -1,5 +1,5 @@
 module Celluloid
   module Supervision
-    VERSION = "0.20.0.pre4"
+    VERSION = "0.20.0.pre5"
   end
 end

metadata

@@ -1,17 +1,241 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-supervision
 version: !ruby/object:Gem::Version
-  version: 0.20.0.pre4
+  version: 0.20.0.pre5
 platform: ruby
 authors:
 - digitalextremist //
 - Tony Arcieri
 - Tim Carey-Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
-dependencies: []
+date: 2015-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: bundler
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: nenv
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: dotenv
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: benchmark_suite
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rubocop
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: pry
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: coveralls
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: celluloid
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: celluloid-essentials
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: celluloid-pool
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: celluloid-fsm
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: celluloid-extras
+  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:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: timers
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec-logsplit
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Supervisors, Supervision Groups, and Supervision Trees for Celluloid.
 email:
 - code@extremist.digital
@@ -20,16 +244,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".env-ci"
-- ".env-dev"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .coveralls.yml
+- .env-ci
+- .env-dev
+- .gitignore
+- .gitmodules
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - CHANGES.md
-- CONDUCT.md
 - Gemfile
 - LICENSE
 - README.md
@@ -47,9 +270,11 @@ files:
 - lib/celluloid/supervision/container/instance.rb
 - lib/celluloid/supervision/container/tree.rb
 - lib/celluloid/supervision/deprecate.rb
-- lib/celluloid/supervision/deprecate/configuration.rb
-- lib/celluloid/supervision/deprecate/supervision.rb
+- lib/celluloid/supervision/deprecate/supervise.rb
+- lib/celluloid/supervision/deprecate/validation.rb
 - lib/celluloid/supervision/service.rb
+- lib/celluloid/supervision/supervise.rb
+- lib/celluloid/supervision/validation.rb
 - lib/celluloid/supervision/version.rb
 - tasks/benchmarks.rake
 - tasks/rspec.rake
@@ -58,24 +283,24 @@ homepage: https://github.com/celluloid/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Celluloid Supervision
 test_files: []

data/CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)