spawnling 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1547c27e7ec97c65047ba3205a96e310128950a0
-  data.tar.gz: 63635512ba55d8f1a6b842c50202ef5a0b1f82a1
+  metadata.gz: 26aa7286ca5e508bb9bec2971336151f68d64225
+  data.tar.gz: e70bf1b0865d216b5d3a197268eff1af8021e70f
 SHA512:
-  metadata.gz: 6ee4fd92e0b597bc3710a3bd0059f9fea5abee7970b802c4b7b105891a357c261ecf139fd3c07a77035c2a93714d9878ddade53ba2678ea2095843bd57abeac7
-  data.tar.gz: 871dc470a875cf7586d5e286f13028c0eaf800bc97a19e7688ee2bcc2d20d8bbe51c6731d235bac54cdd44977d1d200f0b3ef2bc73991b5692112e22ed30a4cb
+  metadata.gz: 01315192fee03920aba467775e9f59801340dce832a3ba6c32b2a3643b7b0f730a8ac58a92b674b11a22ea09ee748688539d43f008cb9da0f6c55bd1a9a15814
+  data.tar.gz: e03db92b7c3c476190a89b032160928541c31f15d9068578b19c421bf8669e50d99c40ced3cbe97621270fc4165d021929af381002a878ab739f6122c55747c6

data/README.md

@@ -1,7 +1,7 @@
 Spawnling
 =========
 
-[![Gem Version](https://badge.fury.io/rb/geokit.png)](http://badge.fury.io/rb/geokit)
+[![Gem Version](https://badge.fury.io/rb/spawnling.png)](http://badge.fury.io/rb/spawnling)
 [![Build Status](https://travis-ci.org/tra/spawnling.png?branch=master)](https://travis-ci.org/tra/spawnling)
 [![Coverage Status](https://coveralls.io/repos/tra/spawnling/badge.png)](https://coveralls.io/r/tra/spawnling)
 [![Dependency Status](https://gemnasium.com/tra/spawnling.png)](https://gemnasium.com/tra/spawnling)

data/lib/spawnling.rb

@@ -28,6 +28,10 @@ class Spawnling
   # in some environments, logger isn't defined
   @@logger = defined?(::Rails) ? ::Rails.logger : ::Logger.new(STDERR)
 
+  def self.logger=(logger)
+    @@logger = logger
+  end
+
   attr_accessor :type
   attr_accessor :handle
 
@@ -104,8 +108,7 @@ class Spawnling
       options[:method].call(proc { yield })
     elsif options[:method] == :thread
       # for versions before 2.2, check for allow_concurrency
-     if RAILS_2_2 || (defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:allow_concurrency)) ?
-          ActiveRecord::Base.allow_concurrency :  Rails.application.config.allow_concurrency
+     if allow_concurrency?
        @type = :thread
        @handle = thread_it(options) { yield }
       else
@@ -118,6 +121,17 @@ class Spawnling
     end
   end
 
+  def self.allow_concurrency?
+    return true if RAILS_2_2
+    if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:allow_concurrency)
+      ActiveRecord::Base.allow_concurrency
+    elsif defined?(Rails)
+      Rails.application.config.allow_concurrency
+    else
+      true # assume user knows what they are doing
+    end
+  end
+
   def self.wait(sids = [])
     # wait for all threads and/or forks (if a single sid passed in, convert to array first)
     Array(sids).each do |sid|
@@ -137,7 +151,7 @@ class Spawnling
 
   protected
 
-  def fork_it(options)
+  def self.fork_it(options)
     # The problem with rails is that it only has one connection (per class),
     # so when we fork a new process, we need to reconnect.
     @@logger.debug "spawn> parent PID = #{Process.pid}" if @@logger
@@ -202,12 +216,16 @@ class Spawnling
     return child
   end
 
-  def thread_it(options)
+  def self.thread_it(options)
     # clean up stale connections from previous threads
     ActiveRecord::Base.verify_active_connections!() if defined?(ActiveRecord)
     thr = Thread.new do
       # run the long-running code block
-      ActiveRecord::Base.connection_pool.with_connection { yield  } if defined?(ActiveRecord)
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.connection_pool.with_connection { yield  }
+      else
+        yield
+      end
     end
     thr.priority = -options[:nice] if options[:nice]
     return thr

data/lib/spawnling/version.rb

@@ -1,3 +1,3 @@
 class Spawnling
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

data/spawnling.gemspec

@@ -28,7 +28,7 @@ threads (see lib/patches.rb).}
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rails'
 end

data/spec/spawn/spawn_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Spawnling do
 
@@ -43,13 +43,46 @@ describe Spawnling do
     it "should be able to return a proc" do
       spawn!.call.should == "hello"
     end
-    
+  end
+
+  describe "thread it" do
+    before(:each) do
+      Store.reset!
+      Spawnling::default_options :method => :thread
+    end
+
+    it "should be able to return a proc" do
+      Store.flag.should be_falsey
+      spawn_flag!
+      sleep(0.1) # wait for file to finish writing
+      Store.flag.should be_truthy
+    end
   end
   
+  describe "fork it" do
+    before(:each) do
+      Store.reset!
+      Spawnling::default_options :method => :fork
+    end
+
+    it "should be able to return a proc" do
+      Store.flag.should be_falsey
+      spawn_flag!
+      sleep(0.1) # wait for file to finish writing
+      Store.flag.should be_truthy
+    end
+  end
+
   def spawn!
     Spawnling.run do
       "hello"
     end
   end
+
+  def spawn_flag!
+    Spawnling.new do
+      Store.flag!
+    end
+  end
   
 end

data/spec/spawn/store_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Store do
+  it 'should flag/unflag' do
+    Store.reset!
+    Store.flag.should be_falsey
+    Store.flag!
+    Store.flag.should be_truthy
+    Store.reset!
+    Store.flag.should be_falsey
+  end
+end

data/spec/spec_helper.rb

@@ -4,7 +4,9 @@ require 'rspec'
 
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
 
-MINIMUM_COVERAGE = 28
+require 'store'
+
+MINIMUM_COVERAGE = 40
 
 if ENV['COVERAGE']
   require 'simplecov'
@@ -28,6 +30,5 @@ if ENV['COVERAGE']
 end
 
 require 'spawnling'
-Spec::Runner.configure do |config|
 
-end
+Spawnling.logger = nil

data/spec/store.rb

@@ -0,0 +1,19 @@
+class Store
+  def self.flag!
+    write('true')
+  end
+
+  def self.flag
+    File.read('foo') == 'true'
+  end
+
+  def self.reset!
+    write('')
+  end
+
+  def self.write(message)
+    f = File.new('foo', "w+")
+    f.write(message)
+    f.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spawnling
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Tom Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,9 @@ files:
 - lib/spawnling/version.rb
 - spawnling.gemspec
 - spec/spawn/spawn_spec.rb
+- spec/spawn/store_spec.rb
 - spec/spec_helper.rb
+- spec/store.rb
 homepage: http://github.com/tra/spawnling
 licenses:
 - MIT
@@ -138,4 +140,6 @@ specification_version: 4
 summary: Easily fork OR thread long-running sections of code in Ruby
 test_files:
 - spec/spawn/spawn_spec.rb
+- spec/spawn/store_spec.rb
 - spec/spec_helper.rb
+- spec/store.rb