celluloid 0.17.1.2 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f410e14db4441077b7642b2912ecd009652a3c7a
-  data.tar.gz: 11a6583dceb546cb9302ab5257a2feb1095b415f
+  metadata.gz: 7e4fef1274946e44231177bcac481a79c785e496
+  data.tar.gz: ddabf286ed4d0ac58f7f58f6ae9f843fd5b82a62
 SHA512:
-  metadata.gz: a5c31f45caf8b91ee7a10a20ab3a858f4d3101e7f8e597d6c4434104a226d0c437b299895e67b1fbd67f1396e1481057560cec216aedf448fa4c3efd93d7e101
-  data.tar.gz: 65c78e6b525fc3b54659db9a0a47feacf00abd0f2f1d0b23d1581551b62e8d6bb5027e51116c770c12f92c602688a8e6d9f48ad418946dba5e7ab7ed7b572539
+  metadata.gz: 8864299ee4256cc2fbe2f5cd32bd59f49f80033f6352a65ae76ac4381c9903835b563147d66ef19585d836e5a1bac92801269276dca003a093dc2c845c91c04d
+  data.tar.gz: fc79f37cf47fd47111cf2304c977c64d0d1e1e37b5c07f9d863e4975f1dd901ab2f43692a0cb656a36c98a93d9811bcdbcf10edecb027444ced46f916b19685d

data/CHANGES.md

@@ -1,4 +1,19 @@
-0.17.5 (HEAD)
+0.17.2 (2015-09-30)
+-----
+* Revamped test suite, using shared RSpec configuration layer provided by Celluloid itself.
+* Updated gem dependencies provided by Celluloid::Sync... extraneous gems removed, or marked as development dependencies.
+- Clean up deprecation notes.
+
+0.17.1.2 (2015-08-21)
+-----
+- Fixes to posted markdown content.
+- Pull in new gem dependencies.
+
+0.17.1.1 (2015-08-07)
+-----
+- Revert "no task to suspend" code from #232.
+
+0.17.1 (2015-08-06)
 -----
 * `Celluloid::ActorSystem` moved to `Celluloid::Actor::System`, and from `celluloid/actor_system.rb` to `celluloid/actor/system.rb`
 * Added extensible API for defining new SystemEvents, and having them handled... without everyone changing `Actor#handle_system_event`.

data/culture/celluloid-culture.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "celluloid-culture"
-  spec.version       = "0.1.2"
+  spec.version       = "0.2"
   spec.authors       = ["Tony Arcieri", "Donovan Keme"]
   spec.email         = ["bascule@gmail.com", "code@extremist.digital"]
 

data/culture/gems/dependencies.yml

@@ -1,6 +1,11 @@
 bundler:
+  dependency: development
+
 nenv:
+  dependency: development
+
 dotenv:
+  dependency: development
 
 benchmark_suite:
   dependency: development
@@ -23,6 +28,9 @@ rspec:
 guard-rspec:
   dependency: development
 
+rspec-retry:
+  dependency: development
+
 coveralls:
   dependency: development
   gemfile:
@@ -30,7 +38,7 @@ coveralls:
 
 celluloid:
   dependency: core
-  version: ">= 0.17.1.1"
+  version: ">= 0.17.2"
   gemfile:
     github: celluloid/celluloid
     branch: master
@@ -75,10 +83,3 @@ timers:
   version: ">= 4.1.1"
   gemfile:
     github: celluloid/timers
-
-rspec-logsplit:
-  version: ">= 0.1.2"
-  gemfile:
-    github: "abstractive/rspec-logsplit"
-    branch: "master"
-    require: false

data/culture/rubocop/rubocop.yml

@@ -2,3 +2,4 @@ inherit_from:
     - lint.yml
     - metrics.yml
     - style.yml
+    - perf.yml

data/culture/rubocop/style.yml

@@ -46,3 +46,12 @@ Style/RescueModifier:
 
 Style/GlobalVars:
   Enabled: false
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false

data/lib/celluloid.rb

@@ -24,7 +24,7 @@ module Celluloid
   BARE_OBJECT_WARNING_MESSAGE = "WARNING: BARE CELLULOID OBJECT "
 
   class << self
-    attr_writer :actor_system         # Default Actor System
+    attr_writer :actor_system # Default Actor System
     attr_accessor :logger               # Thread-safe logger class
     attr_accessor :log_actor_crashes
     attr_accessor :group_class          # Default internal thread group to use
@@ -165,7 +165,7 @@ module Celluloid
       # Terminate all actors at exit
       at_exit do
         sleep 0.126 # hax grace period for unnaturally terminating actors
-                    # allows "reason" in exit_handler to resolve before being destroyed
+        # allows "reason" in exit_handler to resolve before being destroyed
         if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION >= "1.9"
           # workaround for MRI bug losing exit status in at_exit block
           # http://bugs.ruby-lang.org/issues/5218

data/lib/celluloid/exceptions.rb

@@ -18,6 +18,7 @@ module Celluloid
       super "caused by #{cause.inspect}: #{cause}"
     end
   end
+  class ThreadLeak < Celluloid::Error; end
   module Feature
     module Requires
       class RubiniusOrJRuby < Celluloid::Error; end

data/lib/celluloid/group/spawner.rb

@@ -17,48 +17,46 @@ module Celluloid
 
       def shutdown
         @running = false
+        queue = []
         @mutex.synchronize do
-          queue = Queue.new
           loop do
             break if @group.empty?
             th = @group.shift
             th.kill
             queue << th
           end
-          loop do
-            break if queue.empty?
-            queue.pop.join
-          end
+        end
+        Thread.pass unless queue.empty?
+        loop do
+          break if queue.empty?
+          queue.pop.join
         end
       end
 
       def idle?
-        to_a.select { |t| t[:celluloid_meta] && t[:celluloid_meta][:state] == :running }.empty?
+        to_a.select { |t| t[:celluloid_thread_state] == :running }.empty?
       end
 
       def busy?
-        to_a.select { |t| t[:celluloid_meta] && t[:celluloid_meta][:state] == :running }.any?
+        to_a.select { |t| t[:celluloid_thread_state] == :running }.any?
       end
 
       private
 
       def instantiate(proc)
         thread = Thread.new do
-          Thread.current[:celluloid_meta] = {
-            started: Time.now,
-            state: :running,
-          }
-
+          Thread.current[:celluloid_thread_state] = :running
           begin
             proc.call
           rescue ::Exception => ex
             Internals::Logger.crash("thread crashed", ex)
-            Thread.current[:celluloid_meta][:state] = :error
+            Thread.current[:celluloid_thread_state] = :error
           ensure
-            unless Thread.current[:celluloid_meta][:state] == :error
-              Thread.current[:celluloid_meta][:state] = :finished
+            unless Thread.current[:celluloid_thread_state] == :error
+              Thread.current[:celluloid_thread_state] = :finished
             end
-            Thread.current[:celluloid_meta][:finished] = Time.now
+            @mutex.synchronize { @group.delete Thread.current }
+            Thread.exit
           end
         end
 

data/lib/celluloid/rspec.rb

@@ -1,12 +1,72 @@
+require "dotenv"
+require "nenv"
+
 require "celluloid/test"
 
+# To help produce better bug reports in Rubinius
+if RUBY_ENGINE == "rbx"
+  # $DEBUG = true # would be nice if this didn't fail ... :(
+  require "rspec/matchers"
+  require "rspec/matchers/built_in/be"
+end
+
+require "rspec/retry"
+
+module Specs
+
+  CHECK_LOOSE_THREADS = !Nenv.ci? unless defined? CHECK_LOOSE_THREADS
+  ALLOW_RETRIES = 3 unless defined? ALLOW_RETRIES
+  ALLOW_SLOW_MAILBOXES = false unless defined? ALLOW_SLOW_MAILBOXES
+
+  INCLUDE_SUPPORT = [
+    "env",
+    "logging",
+    "sleep_and_wait",
+    "reset_class_variables",
+    "crash_checking",
+    "loose_threads",
+    "stubbing",
+    "coverage",
+    "includer",
+    "configure_rspec"
+  ]
+
+  INCLUDE_PATHS = [
+    "./spec/support/*.rb",
+    "./spec/support/examples/*.rb",
+    "./spec/shared/*.rb"
+  ]
+
+  MAX_EXECUTION = 13
+  MAX_ATTEMPTS = 20
+
+  TIMER_QUANTUM = 0.05 # Timer accuracy enforced by the tests (50ms)
+
+  BACKTRACE_OMITTED = [
+    "rspec-expectations",
+    "rspec-core",
+    "rspec-mocks",
+    "rspec-retry",
+    "rubysl-thread",
+    "rubysl-timeout"
+  ]
+end
+
 $CELLULOID_DEBUG = true
 
+# Require but disable, so it has to be explicitly enabled in tests
+require "celluloid/probe"
+$CELLULOID_MONITORING = false
+
+Celluloid.shutdown_timeout = 1
+
 # Load shared examples and test support code for other gems to use.
 
-%w(env logging split_logs sleep_and_wait reset_class_variables crash_checking stubbing coverage includer).each { |f|
+Specs::INCLUDE_SUPPORT.each { |f|
   require "#{File.expand_path('../../../spec/support', __FILE__)}/#{f}.rb"
 }
 
+Specs.reset_probe(nil)
+
 Dir["#{File.expand_path('../../../spec/support/examples', __FILE__)}/*.rb"].map { |f| require f }
 Dir["#{File.expand_path('../../../spec/shared', __FILE__)}/*.rb"].map { |f| require f }

data/lib/celluloid/version.rb

@@ -1,3 +1,3 @@
 module Celluloid
-  VERSION = "0.17.1.2"
+  VERSION = "0.17.2"
 end

data/spec/celluloid/block_spec.rb

@@ -19,21 +19,21 @@ RSpec.describe "Blocks", actor_system: :global do
       end
     end
 
-    def deferred_excecution(value, &block)
-      defer {
+    def deferred_excecution(value, &_block)
+      defer do
         yield(value)
-      }
+      end
     end
 
-    def deferred_current_actor(&block)
-      defer {
+    def deferred_current_actor(&_block)
+      defer do
         yield(current_actor.name)
-      }
+      end
     end
 
-    def defer_for_something(other, &block)
+    def defer_for_something(other, &_block)
       sender_actor = current_actor
-      defer {
+      defer do
         $data << [:outside, @name, current_actor.name]
         other.do_something_and_callback do |value|
           $data << [:yielded, @name, current_actor.name]
@@ -42,7 +42,7 @@ RSpec.describe "Blocks", actor_system: :global do
           $data << sender_actor.receive_result(:sender)
           :pete_the_polyglot_alien
         end
-      }
+      end
     end
 
     def do_something_and_callback
@@ -76,14 +76,14 @@ RSpec.describe "Blocks", actor_system: :global do
     expect($data).to eq(expected)
   end
 
-  execute_deferred = Proc.new {
+  execute_deferred = proc do
     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)
+  xit("can be deferred", &execute_deferred)
   # else
   #   it("can be deferred", &execute_deferred)
   # end

data/spec/celluloid/calls_spec.rb

@@ -1,22 +1,5 @@
 RSpec.describe Celluloid::Call::Sync, actor_system: :global do
   # TODO: these should be Call::Sync unit tests (without working on actual actors)
-  class CallExampleActor
-    include Celluloid
-
-    def initialize(next_actor = nil)
-      @next = next_actor
-    end
-
-    def actual_method; end
-
-    def inspect
-      fail "Don't call!"
-    end
-
-    def chained_call_ids
-      [call_chain_id, @next.call_chain_id]
-    end
-  end
 
   let(:actor) { CallExampleActor.new }
   let(:logger) { Specs::FakeLogger.current }

data/spec/celluloid/condition_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Celluloid::Condition, actor_system: :global do
     def initialize
       @condition = Condition.new
 
-      @waiting  = false
+      @waiting = false
       @signaled_times = 0
     end
 

data/spec/celluloid/group/spawner_spec.rb

@@ -4,5 +4,14 @@ require "celluloid/internals/logger"
 if Celluloid.group_class == Celluloid::Group::Spawner
   RSpec.describe Celluloid::Group::Spawner do
     it_behaves_like "a Celluloid Group"
+
+    it "does not leak finished threads" do
+      queue = Queue.new
+      th = subject.get { queue.pop }
+      expect do
+        queue << nil
+        th.join
+      end.to change { subject.group.length }.by(-1)
+    end
   end
 end

data/spec/celluloid/mailbox/evented_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Celluloid::Mailbox::Evented do
   #
   unless RUBY_ENGINE == "rbx"
     it "recovers from timeout exceeded to process mailbox message" do
-      timeout_interval = CelluloidSpecs::TIMER_QUANTUM + 0.1
+      timeout_interval = Specs::TIMER_QUANTUM + 0.1
       started_at = Time.now
       expect do
         Kernel.send(:timeout, timeout_interval) do
@@ -21,7 +21,7 @@ RSpec.describe Celluloid::Mailbox::Evented do
         end
       end.to raise_exception(Timeout::Error)
 
-      expect(Time.now - started_at).to be_within(CelluloidSpecs::TIMER_QUANTUM).of timeout_interval
+      expect(Time.now - started_at).to be_within(Specs::TIMER_QUANTUM).of timeout_interval
     end
   end
 end

data/spec/deprecate/calls_spec.rb

@@ -1,24 +1,6 @@
 RSpec.describe "Deprecated Celluloid::SyncCall", actor_system: :global do
   subject { Celluloid::SyncCall.new }
 
-  class DeprecatedCallExampleActor
-    include Celluloid
-
-    def initialize(next_actor = nil)
-      @next = next_actor
-    end
-
-    def actual_method; end
-
-    def inspect
-      fail "Please don't call me! I'm not ready yet!"
-    end
-
-    def chained_call_ids
-      [call_chain_id, @next.call_chain_id]
-    end
-  end
-
   let(:actor) { DeprecatedCallExampleActor.new }
 
   context "when obj does not respond to a method" do

data/spec/deprecate/future_spec.rb

@@ -19,9 +19,9 @@ RSpec.describe "Deprecated Celluloid::Future", actor_system: :global do
   end
 
   it "knows if it's got a value yet" do
-    future = Celluloid::Future.new { sleep CelluloidSpecs::TIMER_QUANTUM * 5 }
+    future = Celluloid::Future.new { sleep Specs::TIMER_QUANTUM * 5 }
     expect(future).not_to be_ready
-    sleep CelluloidSpecs::TIMER_QUANTUM * 6
+    sleep Specs::TIMER_QUANTUM * 6
     expect(future).to be_ready
   end
 

data/spec/shared/actor_examples.rb

@@ -1,9 +1,4 @@
 RSpec.shared_examples "a Celluloid Actor" do
-  before(:each) do |example|
-    @fake_logger = Specs::FakeLogger.new(Celluloid.logger, example.description)
-    stub_const("Celluloid::Internals::Logger", @fake_logger)
-  end
-
   around do |ex|
     Celluloid.boot
     ex.run
@@ -766,13 +761,13 @@ RSpec.shared_examples "a Celluloid Actor" do
 
         def exclusive_with_block_log_task(task)
           exclusive do
-            sleep CelluloidSpecs::TIMER_QUANTUM
+            sleep Specs::TIMER_QUANTUM
             log_task(task)
           end
         end
 
         def exclusive_log_task(task)
-          sleep CelluloidSpecs::TIMER_QUANTUM
+          sleep Specs::TIMER_QUANTUM
           log_task(task)
         end
         exclusive :exclusive_log_task
@@ -794,14 +789,14 @@ RSpec.shared_examples "a Celluloid Actor" do
     it "executes methods in the proper order with block form" do
       subject.async.exclusive_with_block_log_task(:one)
       subject.async.log_task(:two)
-      sleep CelluloidSpecs::TIMER_QUANTUM * 2
+      sleep Specs::TIMER_QUANTUM * 2
       expect(subject.tasks).to eq([:one, :two])
     end
 
     it "executes methods in the proper order with a class-level annotation" do
       subject.async.exclusive_log_task :one
       subject.async.log_task :two
-      sleep CelluloidSpecs::TIMER_QUANTUM * 2
+      sleep Specs::TIMER_QUANTUM * 2
       expect(subject.tasks).to eq([:one, :two])
     end
 
@@ -828,7 +823,7 @@ RSpec.shared_examples "a Celluloid Actor" do
         end
 
         def eat_donuts
-          sleep CelluloidSpecs::TIMER_QUANTUM
+          sleep Specs::TIMER_QUANTUM
           @tasks << "donuts"
         end
 
@@ -844,7 +839,7 @@ RSpec.shared_examples "a Celluloid Actor" do
       before do
         actor.async.eat_donuts
         actor.async.drink_coffee
-        sleep CelluloidSpecs::TIMER_QUANTUM * 2
+        sleep Specs::TIMER_QUANTUM * 2
       end
 
       it "executes in an exclusive order" do
@@ -888,7 +883,7 @@ RSpec.shared_examples "a Celluloid Actor" do
         ended_at = Time.now - started_at
 
         expect(result).to_not be
-        expect(ended_at).to be_within(CelluloidSpecs::TIMER_QUANTUM).of interval
+        expect(ended_at).to be_within(Specs::TIMER_QUANTUM).of interval
       end
     end
   end
@@ -930,8 +925,8 @@ RSpec.shared_examples "a Celluloid Actor" do
       end.new
     end
 
-    let(:interval) { CelluloidSpecs::TIMER_QUANTUM * 10 }
-    let(:sleep_interval) { interval + CelluloidSpecs::TIMER_QUANTUM } # wonky! #/
+    let(:interval) { Specs::TIMER_QUANTUM * 10 }
+    let(:sleep_interval) { interval + Specs::TIMER_QUANTUM } # wonky! #/
 
     it "suspends execution of a method (but not the actor) for a given time" do
       # Sleep long enough to ensure we're actually seeing behavior when asleep
@@ -944,7 +939,7 @@ RSpec.shared_examples "a Celluloid Actor" do
 
       future.value
       # I got 0.558 (in a slighly busy MRI) which is outside 0.05 of 0.5, so let's use (0.05 * 2)
-      expect(Time.now - started_at).to be_within(CelluloidSpecs::TIMER_QUANTUM * 2).of interval
+      expect(Time.now - started_at).to be_within(Specs::TIMER_QUANTUM * 2).of interval
     end
 
     it "schedules timers which fire in the future" do
@@ -1247,7 +1242,7 @@ RSpec.shared_examples "a Celluloid Actor" do
     it "logs on unhandled messages" do
       expect(logger).to receive(:debug).with("Discarded message (unhandled): first")
       actor.mailbox << :first
-      sleep CelluloidSpecs::TIMER_QUANTUM
+      sleep Specs::TIMER_QUANTUM
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,100 +1,7 @@
 require "rubygems"
 require "bundler/setup"
 
-# To help produce better bug reports in Rubinius
-if RUBY_ENGINE == "rbx"
-  # $DEBUG = true # would be nice if this didn't fail ... :(
-  require "rspec/matchers"
-  require "rspec/matchers/built_in/be"
-end
-
-# Require in order, so both CELLULOID_TEST and CELLULOID_DEBUG are true
 require "celluloid/rspec"
 require "celluloid/essentials"
 
-$CELLULOID_DEBUG = true
-
-# Require but disable, so it has to be explicitly enabled in tests
-require "celluloid/probe"
-$CELLULOID_MONITORING = false
-Specs.reset_probe(nil)
-
-Celluloid.shutdown_timeout = 1
-
-Dir["./spec/support/*.rb", "./spec/shared/*.rb"].map { |f| require f }
-
-RSpec.configure do |config|
-  config.filter_run focus: true unless Nenv.ci?
-
-  config.run_all_when_everything_filtered = true
-  config.disable_monkey_patching!
-  config.profile_examples = 3
-
-  Specs.configure(config)
-
-  config.before(:suite) do
-    Specs.stub_out_class_method(Celluloid::Internals::Logger, :crash) do |*args|
-      _name, ex = *args
-      fail "Unstubbed Logger.crash() was called:\n  crash(\n    #{args.map(&:inspect).join(",\n    ")})"\
-        "\nException backtrace: \n  (#{ex.class}) #{ex.backtrace * "\n  (#{ex.class}) "}"
-    end
-  end
-
-  config.before(:each) do |example|
-    @fake_logger = Specs::FakeLogger.new(Celluloid.logger, example.description)
-    stub_const("Celluloid::Internals::Logger", @fake_logger)
-  end
-
-  config.around do |ex|
-    ex.run
-    if @fake_logger.crashes?
-      crashes = @fake_logger.crashes.map do |args, call_stack|
-        msg, ex = *args
-        "\n** Crash: #{msg.inspect}(#{ex.inspect})\n  Backtrace:\n    (crash) #{call_stack * "\n    (crash) "}"\
-          "\n** Crash: \"Actor crashed!\"(#{ex.inspect})\n  Backtrace:\n    (crash) #{call_stack * "\n    (crash) "}"\
-          "\n  Exception Backtrace (#{ex.inspect}):\n    (ex) #{ex.backtrace * "\n    (ex) "}"
-      end.join("\n")
-
-      fail "Actor crashes occurred (please stub/mock if these are expected): #{crashes}"
-    end
-    @fake_logger = nil
-  end
-
-  config.around do |ex|
-    Celluloid.actor_system = nil
-
-    Specs.assert_no_loose_threads(ex.description) do
-      Specs.reset_class_variables(ex.description) do
-        ex.run
-      end
-    end
-  end
-
-  config.around actor_system: :global do |ex|
-    # Needed because some specs mock/stub/expect on the logger
-    Celluloid.logger = Specs.logger
-
-    Celluloid.boot
-    ex.run
-    Celluloid.shutdown
-  end
-
-  config.around actor_system: :within do |ex|
-    Celluloid::Actor::System.new.within do
-      ex.run
-    end
-  end
-
-  config.filter_gems_from_backtrace(*%w(rspec-expectations rspec-core rspec-mocks rspec-logsplit rubysl-thread rubysl-timeout))
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_doubled_constant_names = true
-    mocks.verify_partial_doubles = true
-  end
-
-  config.around(:each) do |example|
-    # Needed because some specs mock/stub/expect on the logger
-    Celluloid.logger = Specs.logger
-    example.run
-  end
-end
+Dir[*Specs::INCLUDE_PATHS].map { |f| require f }

data/spec/support/configure_rspec.rb

@@ -0,0 +1,77 @@
+RSpec.configure do |config|
+  config.filter_run focus: true unless Nenv.ci?
+  config.run_all_when_everything_filtered = true
+  config.disable_monkey_patching!
+  config.profile_examples = 3
+  config.filter_gems_from_backtrace(*Specs::BACKTRACE_OMITTED)
+
+  config.verbose_retry = true
+  config.default_retry_count = Specs::ALLOW_RETRIES
+  config.display_try_failure_messages = true
+  config.default_sleep_interval = 1
+  config.exceptions_to_retry = [Timeout::Error, Celluloid::ThreadLeak]
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_doubled_constant_names = true
+    mocks.verify_partial_doubles = true
+  end
+
+  config.before(:suite) do
+    Specs.stub_out_class_method(Celluloid::Internals::Logger, :crash) do |*args|
+      _name, ex = *args
+      fail "Unstubbed Logger.crash() was called:\n  crash(\n    #{args.map(&:inspect).join(",\n    ")})"\
+        "\nException backtrace: \n  (#{ex.class}) #{ex.backtrace * "\n  (#{ex.class}) "}"
+    end
+  end
+
+  config.before(:each) do |example|
+    @fake_logger = Specs::FakeLogger.new(Celluloid.logger, example.description)
+    stub_const("Celluloid::Internals::Logger", @fake_logger)
+  end
+
+  config.around do |ex|
+    # Needed because some specs mock/stub/expect on the logger
+    Celluloid.logger = Specs.logger
+    Celluloid.actor_system = nil
+    Specs.reset_class_variables(ex.description) do
+      Timeout.timeout(Specs::MAX_EXECUTION) { ex.run }
+    end
+    if @fake_logger.crashes?
+      crashes = @fake_logger.crashes.map do |args, call_stack|
+        msg, ex = *args
+        "\n** Crash: #{msg.inspect}(#{ex.inspect})\n  Backtrace:\n    (crash) #{call_stack * "\n    (crash) "}"\
+          "\n  Exception Backtrace (#{ex.inspect}):\n    (ex) #{ex.backtrace * "\n    (ex) "}"
+      end.join("\n")
+      fail "Actor crashes occured (please stub/mock if these are expected): #{crashes}"
+    end
+    @fake_logger = nil
+    Specs.assert_no_loose_threads!("after example: #{ex.description}") if Specs::CHECK_LOOSE_THREADS
+  end
+
+  config.around :each, library: :IO do |ex|
+    Celluloid.boot
+    FileUtils.rm("/tmp/cell_sock") if File.exist?("/tmp/cell_sock")
+    ex.run
+    Celluloid.shutdown
+  end
+
+  config.around :each, library: :ZMQ do |ex|
+    Celluloid::ZMQ.init(1) unless ex.metadata[:no_init]
+    Celluloid.boot
+    ex.run
+    Celluloid.shutdown
+    Celluloid::ZMQ.terminate
+  end
+
+  config.around :each, actor_system: :global do |ex|
+    Celluloid.boot
+    ex.run
+    Celluloid.shutdown
+  end
+
+  config.around :each, actor_system: :within do |ex|
+    Celluloid::Actor::System.new.within do
+      ex.run
+    end
+  end
+end

data/spec/support/env.rb

@@ -1,16 +1,21 @@
 require "nenv"
 require "dotenv"
-Dotenv.load!(Nenv("celluloid").config_file || (Nenv.ci? ? ".env-ci" : ".env-dev"))
 
-module Specs
-  def self.env
-    @env ||= Nenv("celluloid_specs")
+# Default to `pwd`/.env-* ( whatever is in the current directory )
+# Otherwise take the `.env-*` from the gem itself.
+unless env = Nenv("celluloid").config_file
+  env = Nenv.ci? ? ".env-ci" : ".env-dev"
+  unless File.exist?(env)
+    env = File.expand_path("../../../#{env}", __FILE__)
   end
+end
 
-  def self.configure(config)
-    if Specs.split_logs?
-      config.log_split_dir = File.expand_path("../../log/#{DateTime.now.iso8601}", __FILE__)
-      config.log_split_module = Specs
+Dotenv.load!(env) rescue nil # If for some reason no .env-* files are available at all, use defaults.
+
+module Specs
+  class << self
+    def env
+      @env ||= Nenv("celluloid_specs")
     end
   end
 end

data/spec/support/examples/actor_class.rb

@@ -1,4 +1,4 @@
-class ExampleCrash < StandardError
+class ExampleCrash < Celluloid::Error
   attr_accessor :foo
 end
 

data/spec/support/examples/call_class.rb

@@ -0,0 +1,37 @@
+class CallExampleActor
+  include Celluloid
+
+  def initialize(next_actor = nil)
+    @next = next_actor
+  end
+
+  def actual_method; end
+
+  def inspect
+    fail "Don't call!"
+  end
+
+  def chained_call_ids
+    [call_chain_id, @next.call_chain_id]
+  end
+end
+
+# de DEPRECATE:
+
+class DeprecatedCallExampleActor
+  include Celluloid
+
+  def initialize(next_actor = nil)
+    @next = next_actor
+  end
+
+  def actual_method; end
+
+  def inspect
+    fail "Please don't call me! I'm not ready yet!"
+  end
+
+  def chained_call_ids
+    [call_chain_id, @next.call_chain_id]
+  end
+end

data/spec/support/includer.rb

@@ -1,9 +1,6 @@
 module CelluloidSpecs
   def self.included_module
     # Celluloid::IO implements this with with 'Celluloid::IO'
-    Celluloid
+    (defined? INCLUDED_MODULE) ? INCLUDED_MODULE : Celluloid
   end
-
-  # Timer accuracy enforced by the tests (50ms)
-  TIMER_QUANTUM = 0.05
 end

data/spec/support/logging.rb

@@ -14,10 +14,6 @@ module Specs
       end
     end
 
-    def split_logs?
-      log.strategy == "split"
-    end
-
     def logger
       @logger ||= default_logger.tap { |logger| logger.level = log.level }
     end
@@ -32,13 +28,9 @@ module Specs
         Logger.new(STDERR)
       when "single"
         Logger.new(open_logfile(log.file, log.sync?))
-      when "split"
-        # Use Celluloid in case there's logging in a before/after handle
-        # (is that a bug in rspec-log_split?)
-        Celluloid.logger
       else
         fail "Unknown logger strategy: #{strategy.inspect}."\
-          " Expected 'split', 'single' or 'stderr'."
+          " Expected 'single' or 'stderr'."
       end
     end
 
@@ -51,7 +43,7 @@ module Specs
     end
 
     def default_strategy
-      (Nenv.ci? ? "stderr" : "split")
+      (Nenv.ci? ? "stderr" : "single")
     end
 
     def default_level_for(env, level)

data/spec/support/loose_threads.rb

@@ -4,6 +4,11 @@ module Specs
       Thread.list.map do |thread|
         next unless thread
         next if thread == Thread.current
+
+        # TODO: Remove Specs::ALLOW_SLOW_MAILBOXES hax.
+        #       Allows slow shutdown of mailboxes.
+        #       Find more graceful way to do shutdown.
+
         if RUBY_PLATFORM == "java"
           # Avoid disrupting jRuby's "fiber" threads.
           name = thread.to_java.getNativeThread.get_name
@@ -16,25 +21,31 @@ module Specs
 
         if RUBY_ENGINE == "rbx"
           # Avoid disrupting Rubinious thread
-          next if thread.backtrace.empty?
           next if thread.backtrace.first =~ %r{rubysl/timeout/timeout\.rb}
+
+          if Specs::ALLOW_SLOW_MAILBOXES
+            if thread.backtrace.first =~ /wait/
+              next if thread.backtrace[1] =~ /mailbox\.rb/ && thread.backtrace[1] =~ /check/
+            end
+          end
         end
 
         if RUBY_ENGINE == "ruby"
           # Sometimes stays
-          next if thread.backtrace.first =~ %r{/timeout\.rb}
+          next if thread.backtrace.nil?
+          next unless thread.backtrace.is_a?(Array)
+          next if thread.backtrace.empty?
+          next if thread.backtrace.first =~ /timeout\.rb/
+
+          if Specs::ALLOW_SLOW_MAILBOXES
+            next if thread.backtrace[1] =~ /mailbox\.rb/ && thread.backtrace[1] =~ /sleep/
+          end
         end
 
         thread
       end.compact
     end
 
-    def assert_no_loose_threads(location)
-      Specs.assert_no_loose_threads!("before example: #{location}")
-      yield
-      Specs.assert_no_loose_threads!("after example: #{location}")
-    end
-
     def thread_name(thread)
       (RUBY_PLATFORM == "java") ? thread.to_java.getNativeThread.get_name : ""
     end
@@ -58,7 +69,7 @@ module Specs
         sleep
       end
 
-      fail "Aborted due to runaway threads (#{location})\n"\
+      fail Celluloid::ThreadLeak, "Aborted due to runaway threads (#{location})\n"\
         "List: (#{loose.map(&:inspect)})\n:#{backtraces.join("\n")}"
     end
   end

data/spec/support/sleep_and_wait.rb

@@ -6,7 +6,7 @@ module Specs
     end
 
     diff = Time.now.to_f - t1
-    STDERR.puts "wait took a bit long: #{diff} seconds" if diff > 0.4
+    STDERR.puts "wait took a bit long: #{diff} seconds" if diff > Specs::TIMER_QUANTUM
   rescue Timeout::Error
     t2 = Time.now.to_f
     raise "Timeout after: #{t2 - t1} seconds"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.17.1.2
+  version: 0.17.2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
-  type: :runtime
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -26,13 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: nenv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: nenv
-  type: :runtime
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -40,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: dotenv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: dotenv
-  type: :runtime
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -54,12 +54,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: benchmark_suite
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: benchmark_suite
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +68,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rubocop
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -82,12 +82,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: transpec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: transpec
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -96,12 +96,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -110,12 +110,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -124,12 +124,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -138,12 +138,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard-rspec
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -152,12 +152,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-retry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: coveralls
   type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -166,13 +166,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: coveralls
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: celluloid-essentials
-  type: :runtime
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -180,12 +180,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: celluloid-essentials
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: celluloid-supervision
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -194,12 +194,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: celluloid-supervision
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: celluloid-pool
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -208,12 +208,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: celluloid-pool
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: celluloid-fsm
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -222,12 +222,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: celluloid-fsm
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: celluloid-extras
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -236,33 +236,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: celluloid-extras
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
-  name: timers
+        version: '0'
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: timers
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  name: rspec-logsplit
+        version: 4.1.1
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 4.1.1
 description: Celluloid enables people to build concurrent programs out of concurrent
   objects just as easily as they build sequential programs out of sequential objects
 email:
@@ -275,7 +275,7 @@ files:
 - CHANGES.md
 - LICENSE.txt
 - README.md
-- culture/CODE_OF_CONDUCT.md
+- culture/CONDUCT.md
 - culture/Gemfile
 - culture/LICENSE.txt
 - culture/README.md
@@ -288,6 +288,7 @@ files:
 - culture/rubocop/README.md
 - culture/rubocop/lint.yml
 - culture/rubocop/metrics.yml
+- culture/rubocop/perf.yml
 - culture/rubocop/rubocop.yml
 - culture/rubocop/style.yml
 - culture/spec/gems_spec.rb
@@ -373,18 +374,19 @@ files:
 - spec/shared/mailbox_examples.rb
 - spec/shared/task_examples.rb
 - spec/spec_helper.rb
+- spec/support/configure_rspec.rb
 - spec/support/coverage.rb
 - spec/support/crash_checking.rb
 - spec/support/debugging.rb
 - spec/support/env.rb
 - spec/support/examples/actor_class.rb
+- spec/support/examples/call_class.rb
 - spec/support/examples/evented_mailbox_class.rb
 - spec/support/includer.rb
 - spec/support/logging.rb
 - spec/support/loose_threads.rb
 - spec/support/reset_class_variables.rb
 - spec/support/sleep_and_wait.rb
-- spec/support/split_logs.rb
 - spec/support/stubbing.rb
 homepage: https://github.com/celluloid/celluloid
 licenses:
@@ -398,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/spec/support/split_logs.rb

@@ -1 +0,0 @@
-require "rspec/log_split" if Specs.split_logs?