celluloid 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d074071245d3218d8e119b0bf9f12f05aab6c8f
-  data.tar.gz: 5b7fb44228ae18ed9d1d64f9a26ae82bc61acf6f
+  metadata.gz: f22a9c7d89b293484d7dcbe03cda32d7055ee42a
+  data.tar.gz: a13abc0b96f0e4931f6ff20457f9665282a4d08b
 SHA512:
-  metadata.gz: 2a006db60f84694c38e5ff90585c5890b1eed7b5b517f302d3d6e9a50552e6c5c44df07d50dce9bc6a2d87d7f91470c7d9a617d427e3f4e28426ecbb4affe3c6
-  data.tar.gz: 1969c4c6ba4fc4bdedc606b5009d5ab0aacf73d76a48c905a523f2774ca75696eb5e81b338702f07aa8da7c16bff6e5d6f1cb72ce77957258411d4cf0c94c3af
+  metadata.gz: fba64fd21b7f58cf3fab69cdcfe889b4b95478a5bcad61557b1376e3965bc73583eeaf215be7003e886cc0fdd6a239aa79dd3738cd6ad831ce1c114435da4ff0
+  data.tar.gz: fea6248e5f4e1931485673a458182ca86f380820b2e18acd7d90618203f8c6a193bdf33213161d397153dd43485bb4e1907ff65fb9efd14cc7c6a70cfcb4c309

data/lib/celluloid.rb

@@ -8,7 +8,7 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION == "1.7.3"
 end
 
 module Celluloid
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
   Error = Class.new StandardError
 
   extend self # expose all instance methods as singleton methods
@@ -116,6 +116,10 @@ module Celluloid
       Celluloid::IncidentReporter.supervise_as :default_incident_reporter, STDERR
     end
 
+    def running?
+      internal_pool
+    end
+
     def register_shutdown
       return if @shutdown_registered
       # Terminate all actors at exit
@@ -510,5 +514,8 @@ require 'celluloid/legacy' unless defined?(CELLULOID_FUTURE)
 Celluloid.task_class = Celluloid::TaskFiber
 Celluloid.logger     = Logger.new(STDERR)
 Celluloid.shutdown_timeout = 10
-Celluloid.register_shutdown
-Celluloid.init
+
+unless $CELLULOID_TEST
+  Celluloid.register_shutdown
+  Celluloid.init
+end

data/lib/celluloid/rspec.rb

@@ -8,3 +8,5 @@ module Celluloid
 end
 
 $CELLULOID_DEBUG = true
+
+require 'celluloid/test'

data/lib/celluloid/test.rb

@@ -0,0 +1,3 @@
+$CELLULOID_TEST = true
+
+require 'celluloid'

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ Coveralls.wear!
 
 require 'rubygems'
 require 'bundler/setup'
-require 'celluloid'
 require 'celluloid/rspec'
 
 logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
@@ -21,10 +20,11 @@ RSpec.configure do |config|
 
   config.before do
     Celluloid.logger = logger
-    Celluloid.shutdown
-    sleep 0.01
-
-    Celluloid.internal_pool.assert_inactive
+    if Celluloid.running?
+      Celluloid.shutdown
+      sleep 0.01
+      Celluloid.internal_pool.assert_inactive
+    end
 
     Celluloid.boot
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -134,6 +134,7 @@ files:
 - lib/celluloid/tasks/task_fiber.rb
 - lib/celluloid/tasks/task_thread.rb
 - lib/celluloid/tasks.rb
+- lib/celluloid/test.rb
 - lib/celluloid/thread.rb
 - lib/celluloid/thread_handle.rb
 - lib/celluloid/uuid.rb