Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: sporkrb/spork
...
head fork: sporkrb/spork
compare: master
Commits on Sep 14, 2009
@timcharper timcharper regression fix: abort calls on server wasn't being forwarded to run s…
…trategy
c10bc88
@timcharper timcharper fix sigint trap
For some reason, if you don't flush the output buffer during a sigint trap, it seems the signal doesn't really get trapped.  I don't know why, do you?
0d4c54d
@timcharper timcharper release 0.6.1 3d6ba77
Commits on Sep 16, 2009
@timcharper timcharper fixes regression where entry point was not being loaded 28f6da0
@timcharper timcharper prevent the client from listening for drb calls 8dfa296
@timcharper timcharper 0.6.2 release 97d3a01
Commits on Sep 17, 2009
@timcharper timcharper implements Spork#using_spork? 6213e8c
@timcharper timcharper Revert "fixes regression where entry point was not being loaded"
This reverts commit 28f6da0.
b5786ff
@timcharper timcharper 0.6.3 release 907d8c2
Commits on Sep 23, 2009
@timcharper timcharper Use BackgroundJob
squash with background job
58959e1
@timcharper timcharper extract localized_command method 959593f
@timcharper timcharper add missing $ and ^ on step a82c5b0
@timcharper timcharper add background runner step. last_stdout and last_stderr read from it'…
…s streams if not set
5905946
@timcharper timcharper experimental spork debugger (with tests) 08bc198
@timcharper timcharper Release 0.7.0 7dcc02e
@timcharper timcharper allow normal debugger to operate if tests not run within spork 8aebb46
@timcharper timcharper rdoc task for rubyforge 129a9c8
@timcharper timcharper release 0.7.1 b630818
Commits on Sep 24, 2009
@timcharper timcharper Prevent Connection reset errors from breaking debug listener loop 3ccbd19
@timcharper timcharper use geminstaller to manage gems needed for specs / cucumber features 0904e9b
@timcharper timcharper fix lock on second encounter of 'debugger' statement 81888fb
@timcharper timcharper prevent more connection errors from destroying the debug client liste…
…ner loop
2dba658
@timcharper timcharper Release 0.7.2 72c5863
Commits on Sep 25, 2009
@timcharper timcharper move fix from 81888fb from the Kernel#debugger hook to the current Sp…
…orkDebugger strategy.
c78bf32
@timcharper timcharper test that debugger is able to continue and stop at the next debugger …
…line
3b3153d
@timcharper timcharper also make sure the debugger works when Debugger.start already called 5ec7a1d
Commits on Oct 11, 2009
@aslakhellesoy aslakhellesoy Upgraded gem dependencies, Removed require 'test-unit' 1dfbc86
Commits on Oct 13, 2009
@timcharper timcharper update History.txt
added cred and fixed release numbers
bab090b
@timcharper timcharper release 0.7.3 a04e402
Commits on Nov 04, 2009
@timcharper timcharper simplify dependency loading with autoload de9c6c1
@timcharper timcharper bugfix: don't load app/test frameworks from other versions of spork f485df8
@timcharper timcharper include ruby-debug in list of gems needed to run features / specs a3c2150
@timcharper timcharper cleanup 9be9aa7
@timcharper timcharper more descriptive LoadError for spork/ext/ruby-debug
if ruby-debug not installed and the project loads spork/ext/ruby-debug, then it shows an error saying 'ruby-debug' not installed.

This can confuse the user, as they required 'spork/ext/ruby-debug' in the project, not ruby-debug.  Why didn't spork install ruby-debug for me?

Well, the answer is because spork/ext/ruby-debug is optional.  This new error should make that clear.
41f7897
Commits on Dec 04, 2009
@timcharper timcharper ruby-debug fixes
Don't activate the spork debugger until inside of a forked process (ie: allow debugger to be used during the preload phase)
I can't spell
e5139b8
@timcharper timcharper fixes regression introduced by 0c733e1
spork immediately quit with cucumber
1108ac9
@timcharper timcharper feature to demonstrate failure to include all helper modules when hel…
…per :all used in ApplicationController
ec5679e
@timcharper timcharper Reapply the rails inherited magic for controllers
There is way too much pushing rails around already to achieve what rails is setting out to achieve. Hopefully interfaces and magic is cleaned up in rails 3.0 so that this is less difficult.

When a class inherits from ApplicationController, it gets a brand new master_helper_module, which then copies all the helper methods from it's parent (ApplicationController).  Since at that point, what it was pointing to was the stubbed ApplicationController, it didn't get all the helper methods that would've been in the real ApplicationController. Therefore, reapplying inheritance causes the latest copy of the master_helper_module in ApplicationController to propagate through all subclasses.

Change was made in response to this issue: http://github.com/timcharper/spork/issues#issue/17
df53edb
@timcharper timcharper fix brittle spec that failed if other frameworks happened to be insta…
…lled
00a88f3
@timcharper timcharper document the test all rails versions testing task 15074bc
@timcharper timcharper Webrat is not needed to test cucumber integration
And... latest version doesn't work w/Rails 2.2... so makes rails version compatibility testing a pain
f5cb8f7
@timcharper timcharper output tested rails versions to TESTED_RAILS_VERSIONS.txt 861beb8
@timcharper timcharper 0.7.4 release d6cee81
Commits on Dec 08, 2009
@marcandre marcandre Update obsolete README 5489e8e
@marcandre marcandre Fix obvious bug 9907841
Commits on Dec 24, 2009
Joe Lind Fix Rils stub of application controller to work for controllers that …
…are not direct descendants of ApplicationController
b1cb88b
Commits on Dec 28, 2009
@timcharper timcharper bumped to 0.7.5 cb185bc
Commits on Feb 02, 2010
@timcharper timcharper prevents Spork from bailing if the child process dies unexpectedly 3e93f51
Commits on Feb 12, 2010
@pk pk Ignore VIM project files. ef2ef20
@garygreyling garygreyling only intialize SUPPORTED_FRAMEWORKS if isn't defined to prevent 'alre…
…ady initialized constant' warning
a050171
Commits on Feb 18, 2010
@Milhouse Milhouse Magazine strategy files to replace forking strategy for Win32.
Will not work with JRuby, since requires native win32-process gem.
Uses Rinda with distributed ruby to provide and take processes from
a tuplespace.
58d7adc
@Milhouse Milhouse Use magazine strategy if forking not available.
TODO: add check for JRuby. It will NOT work with magazine.
b131596
@Milhouse Milhouse Don't shut down DRb server between runs.
TODO: find cleaner way of doing this.
bd90fab
Donald Parish Modified rakefile with my fork, and ran: rake gemspec 03ca483
Donald Parish Fix choice of magazine strategy for ms-win platforms. 6146f4d
Commits on Feb 23, 2010
Donald Parish Work with mingw compiled versions of Windows. a72520a
Donald Parish Update gemspec for milhouse-spork. da8e2d8
Commits on Feb 24, 2010
@Milhouse Milhouse Allow magazine strategy to be required on non-Windows machines.
Allows Windows magazine run strategy to be included in same code
base as regular forking strategy.
9585f1c
@Milhouse Milhouse Revert changes to Rakefile and update gemspec for fork instead.
Fork could be pulled back to the master fork.
b88fee9
Donald Parish Change wording of Rinda Ring server start. e6bce1c
Commits on Mar 02, 2010
Donald Parish Reformat spork server runtime print statements. d8ca693
Donald Parish Ensure slave is restarted even if test fails.
Keeps the slave count at the maximum.
9ed0377
Donald Parish Update gemspec for 0.7.5.3, and point RubyGems.org to milhouse-spork …
…wiki.
db835c3
Donald Parish Update gemspec to current date. b292f86
Commits on Mar 03, 2010
@timcharper timcharper ensure Kernel#at_exit defined during a run get called after specs are…
… run
03c1f74
@timcharper timcharper release 0.7.6 4abb539
@timcharper timcharper process at_exit hooks trapped inside of an each_run in reverse order,…
… similar to Kernel#at_exit
77ad484
@timcharper timcharper prevent exceptions not caught from invoking Prefork at_exit hooks 00f02a2
@timcharper timcharper release 0.7.7 6d8d1eb
@timcharper timcharper introduces rails reloader snippet. this will probably become a defaul…
…t when rails is used.
4985a65
@timcharper timcharper release 0.7.8 5b198b4
Commits on Mar 04, 2010
Donald Parish Tell how to quit Spork on Windows. ec6d399
@Milhouse Milhouse Merge branch 'master' of git://github.com/timcharper/spork 69e455a
Donald Parish Remove unneccessary gemspec of a fork. 2d365f8
Commits on Mar 05, 2010
@timcharper timcharper Release 0.8.0 37e0773
Commits on Mar 08, 2010
@timcharper timcharper bugfix: prevent double run functionality didn't work on Windows. 2ec9a62
@timcharper timcharper adds file to automatically install Windows dependencies if using Windows 64dedb0
@timcharper timcharper release 0.8.1 80cf9fb
@timcharper timcharper updated readme to reflect reality b74c989
Commits on Mar 23, 2010
@Milhouse Milhouse Handle paths with spaces for Windows support. 75b1f78
Commits on Mar 24, 2010
@Milhouse Milhouse Merge branch 'master' of git://github.com/timcharper/spork f336fe0
@Milhouse Milhouse Support Ruby 1.9 on Windows
- If using Ruby 1.9 in Windows, use Process.spawn instead of Process.create (win32-process gem)
- Don't install nor require win32-process gem if using Ruby 1.9
5d73a03
Commits on Mar 25, 2010
@timcharper timcharper release 0.8.2 f63b35d
Commits on Mar 30, 2010
@timcharper timcharper stripped whitespace 9b08a1b
@e2 e2 ruby 1.9 fixes in NinjaPatcher fa78e25
Commits on Apr 02, 2010
@timcharper timcharper addresses an issue where spork conditional dependency installation wo…
…uld unnecesarily fail
83936a7
@timcharper timcharper 0.8.3 4bf7955
Commits on Apr 19, 2010
@timcharper timcharper show verbose error when failing to install win32-process gem de047ca
Commits on Apr 21, 2010
@mcmire mcmire Fix the diagnoser so that when it overrides Kernel#require it doesn't…
… step on Bundler's toes
6c34207
Commits on May 21, 2010
@mcmire mcmire Add adapter for Padrino ee13934
Commits on Jun 22, 2010
@rdp rdp windows: strip off drive and colon 9cd5fd7
Commits on Jun 23, 2010
@rdp rdp add some jruby on windows compatibility 13dc5b8
@rdp rdp disable some specs on windows b7d5d36
Commits on Jul 07, 2010
@MSch MSch Require stringio for MRI 1.9.2 ed92408
Commits on Jul 09, 2010
@timcharper timcharper Release 0.8.4 a7b944f
@timcharper timcharper ignore ext/Rakefile f6dfcac
@timcharper timcharper Use bundler to manage dependencies 9e70852
@timcharper timcharper trap_method passes block 3802a06
@timcharper timcharper WIP 4000ad9
@timcharper timcharper WIP f3fed1f
@timcharper timcharper note about rails3 3da3668
Commits on Jul 16, 2010
@rdp rdp jruby friendlier 7ebdd81
Commits on Sep 11, 2010
@timcharper timcharper use bundler 1.0.0. Upgrade to latest rails/rspec 6dd8435
@timcharper timcharper rspec_rails integration and rails_delayed_loading_workarounds feature…
…s are passing!
2e45273
@timcharper timcharper fixes 'code appears in file after /.../ step definition
regex wouldn't accept \'s
66b25a6
Commits on Sep 12, 2010
@timcharper timcharper It's alive!!! (all integration tests passing with rails 3) d08fee3
@timcharper timcharper 0.9.0.rc release 0106dcf
@timcharper timcharper Merge branch 'rails3' 9421aac
Commits on Sep 13, 2010
@timcharper timcharper ignore TAGS 35095fd
@timcharper timcharper ignore errors raised by ActiveRecord establish_connection 03fb3b2
@timcharper timcharper bundler 1.0.0 doesn't accept the --relock arg 080168e
@timcharper timcharper cucumber_rails integration features pass ea6a103
@timcharper timcharper 0.9.0 RC2 release 9c7ddd4
@timcharper timcharper prunes unused rails_stub_files/ e41423a
@timcharper timcharper show output each time spork is invoked
closes #29
df20847
Commits on Sep 14, 2010
@mattwynne mattwynne Report failures cbd844a
@mattwynne mattwynne Ready for Cucumber 0.9.0 cf9aeb1
Commits on Sep 16, 2010
@timcharper timcharper Merge remote branch 'rdp/master' 4f58237
Commits on Sep 29, 2010
@timcharper timcharper spelling fix (thanks for pointing it out, Reactor5) 729d6c0
@timcharper timcharper Workaround Emacs syntax highlighting anomalies df9d142
Commits on Oct 17, 2010
@bcardarella bcardarella Cucumber::StepMother has been deprecated. Now using Cucumber::Runtime 9cd96ed
Commits on Nov 10, 2010
@timcharper timcharper require date for Date.today as some instances are found without it lo…
…aded
6789317
Commits on Dec 09, 2010
@edendevelopment edendevelopment Remove random 'spookie' line 0a437df
Commits on Jan 27, 2011
@joliss joliss Minor documentation fixes. bb92611
Commits on Feb 01, 2011
@joliss joliss longer instructions in the bootstrap file 6abdfbd
Commits on Feb 06, 2011
@timcharper timcharper Release 0.9.0.rc3 bb5f17a
@timcharper timcharper update readme bc20b92
@timcharper timcharper fixes 'no such file to load -- magazine_slave' error many were encoun…
…tering (Thanks, Máté Solymosi)
196e05e
Commits on Feb 09, 2011
@timcharper timcharper Fixes bug String#match? is not a method (thanks, Adam Anderson) 23ca927
Commits on Feb 11, 2011
@timcharper timcharper fixes README to clarify the need of spork 0.9.0.rc 659382c
Commits on Feb 17, 2011
@timcharper timcharper Merge branch 'master' of https://github.com/mattwynne/spork 38c0236
@timcharper timcharper Merge branch 'master' of https://github.com/bcardarella/spork bda4911
Commits on Feb 25, 2011
@timcharper timcharper Windows spork servers do not need to load the application environment
(since the actual run occurs in the magazine slaves)
3849eac
@timcharper timcharper version 0.9.0.rc4 1d14893
Commits on Apr 11, 2011
@dblock dblock Never expire slaves. 3e1c9ad
@kjbekkelund kjbekkelund Fixes URL to the Cucumber wiki page on Spork. 03723d5
@timcharper timcharper release 0.9.0.rc5 e194501
Commits on Apr 12, 2011
@timcharper timcharper updates readme, documenting USR2 4567537
Commits on Apr 15, 2011
@duff duff Remove default_executable= call from gemspec.
It's deprecated.
b589c59
Commits on Apr 28, 2011
@schneems schneems documentation update b8e1b57
Commits on May 06, 2011
@timcharper timcharper conditionally use ruby-debug19 for ruby19 9edce6c
@timcharper timcharper remove default_executable setting in gemspec... it's deprecated 7b8b5ca
@timcharper timcharper update rails3.0 gemfile to rails 3.0.7. Re-lock. 4b836e6
@timcharper timcharper use latest cucumber / rspec 9e76b89
@timcharper timcharper Merge pull request #106 from Schneems/master
Update docs
52992b5
@timcharper timcharper Merge pull request #104 from duff/master
default_executable= is deprecated
b17da65
@timcharper timcharper prove that config.autoload_paths works 680809f
@timcharper timcharper remove usage of deprecated rubygems method #latest_load_paths 2dac9b2
@timcharper timcharper Fixes issue running features with ruby 1.9.2 93beaa0
@timcharper timcharper fixes spec issue
Spork.remove_hook! failed because Kernel.private_instance_methods
returns symbols rather than strings in 1.9.2
0dc9ce3
@timcharper timcharper more spec fixes for 1.9.2
* String#map was removed and was being used previously (unintentionally)
* require no longer uses Dir.pwd as a LOAD_PATH. Apparently you must
  qualify relative requires with a ./
27f07fb
@timcharper timcharper Roll our own Gem#latest_load_paths and use it when Bundler not active 50c670d
@timcharper timcharper Release 0.9.0.rc6 f29c433
@timcharper timcharper Alternative, backwards compatible Gem discovery mechanism implemented
It seems like it was broken before... too... was positive that I tested
it.  Hmm
ddb6783
@timcharper timcharper release 0.9.0.rc7 3bba7f0
Commits on May 18, 2011
@franckverrot franckverrot Fixed the link to the Spork-DRb support wiki page. 9125062
@timcharper timcharper Merge pull request #116 from cesario/patch-1
Fixed the link to the Spork-DRb support wiki page.
5e0b55e
Commits on May 26, 2011
@timcharper timcharper remove conditional dependency installation code, and consequently, th…
…e rake dependency
c3669b1
@timcharper timcharper release 0.9.0.rc8 198ce03
@timcharper timcharper exit if win32/process required and not available 5941726
Commits on May 27, 2011
@timcharper timcharper fixes rake spec task 5aecd06
@tenderlove tenderlove adding a task to generate gems, and a conditional to the gemspec for …
…windows machines
d8a9a42
Commits on May 28, 2011
@dchelimsky dchelimsky upgrade to rspec-2.6 and update specs to newer conventions
- RSpec adds lib and spec to load path, so require 'spec_helper' works
  and you don't need to add lib yourself
  - this also means spec_helper need not be wrapped in a condittional -
    it won't be loaded more than once
- take advantage of the described class in the shared groups
- use new be_within matcher instead of deprecated be_close matcher
107589c
@dchelimsky dchelimsky support rspec versions 1.x and >= 2 c4a3819
@timcharper timcharper Merge pull request #121 from dchelimsky/support-rspec2
Support rspec2
b15cfd2
Commits on Jun 28, 2011
@stepheneb stepheneb pass string to require -- fix for RubyGems bug
SPORK_ROOT is a pathname object and the result of adding 
a string to it is a Pathname object.

RubyGems 1.6.0 through 1.8.5 pass the require path to
Regexp.escape(). In Ruby 1.9.2 passing a Pathname to
Regex.escape() throws this error:

  "can't convert Pathname to String (TypeError)"

This RubyGems bug is fixed but not yet in a release.

This bug does not show up when using bundler exec to run
cucumber feature tests -- only when using cucumber directly.
bbc59e4
@timcharper timcharper Merge pull request #124 from stepheneb/fix_for_rubygems_1_6_0-to-1_8_…
…5_and_ruby_1_9_2

pass string to require -- fix for RubyGems bug
817e8ad
@stepheneb stepheneb fix cucumber-rails integration and feature test
See: https://github.com/timcharper/spork/issues/122

I did not commit the Gemfile.lock file used for generated rails3
application used for the cucumber-rails integration feature test.

This file does not affect the operation of spork and
will be re-generated whenever the Gemfile is updated and
the feature is run. 

FYI: the following feature/scenarios fail on the master 
branch both before and after this commit:

  features/diagnostic_mode.feature:6 
  # Scenario: Running spork --diagnose
  
  features/rails_delayed_loading_workarounds.feature:70 
  # Scenario: respecting custom autoload paths
e72c77b
Commits on Jun 29, 2011
@timcharper timcharper Merge pull request #127 from stepheneb/fix-cucumber-rails-integration
fix cucumber-rails integration and feature test
40c5962
Commits on Jun 30, 2011
@timcharper timcharper fixes spork plugin discovery when not using Bundler ce760ae
@timcharper timcharper update lock files 6832ccd
@timcharper timcharper release 0.9.0rc9
rc9
897f52a
@timcharper timcharper Gem rake task tweaks 25e8424
Commits on Aug 21, 2011
Mark Burns Added helpful message for getting spork to work with a debugger 9ee5643
@timcharper timcharper Merge pull request #136 from markburns/patch-1
Added helpful message for getting spork to work with a debugger
2bb3143
Commits on Sep 08, 2011
@lstoldt lstoldt Kill all processes under jruby/windows 0606ae8
Commits on Nov 01, 2011
@fabrikagency fabrikagency Fix links to new repo. From timcharper to sporkrb 96790b7
@timcharper timcharper Merge pull request #155 from fabrikagency/patch-1
Fix links to new repo. From timcharper to sporkrb
94265c6
Commits on Nov 08, 2011
@timcharper timcharper Merge pull request #139 from lstoldt/master
Kill all processes under JRuby/Windows
5119287
Commits on Dec 15, 2011
@debreczeni debreczeni quiet option for spork server e910c1c
Commits on Jan 22, 2012
@timcharper timcharper release 0.9.0 ff24425
@timcharper timcharper extract rails support to spork-rails 9dfc1d9
@timcharper timcharper fixes versions sited in README 23d61ce
@timcharper timcharper Release 1.0.0rc0 be0f443
@timcharper timcharper Update History.txt b3fcb6e
Commits on Jan 28, 2012
@timcharper timcharper bugfix: include assets in gem 6e6b5b6
@timcharper timcharper release 1.0.0rc1 a2ceea0
@timcharper timcharper fix rake gem:build bcc9c1d
Commits on Feb 03, 2012
@southgate southgate Fixes issue #174 bf4348c
Commits on Feb 08, 2012
@timcharper timcharper in shared stes, support spec for testing integration with rspec 1.x 8c25530
@timcharper timcharper bugfix: Spork.detect_and_require was requiring files from all version…
…s of gems

Only when Bundler not used: Gem.find_files finds files for all versions
of gem.
63b89c5
@timcharper timcharper release rc2 5b550b3
Commits on Mar 16, 2012
@timcharper timcharper Clarify Forker#result becc3e4
Commits on May 04, 2012
@timcharper timcharper Merge commit 'bf4348cf1a39125d85be333099002a2a00105df0' 86ced2b
@southgate southgate Fixes issue #174 000441f
@timcharper timcharper Merge branch 'v0.9.x'
Conflicts:
	README.rdoc
d23295f
@timcharper timcharper release 1.0.0.rc3 c79cdb8
@timcharper timcharper release 0.9.1 d8f2cc8
@timcharper timcharper Merge branch 'v0.9.x'
Conflicts:
	History.txt
	spork.gemspec
d9f1d49
@timcharper timcharper updates history 17aaa55
@timcharper timcharper Merge pull request #163 from debreczeni/quiet_option
quiet option for spork server
055b32f
Commits on May 18, 2012
@timcharper timcharper fixes executable permissions on library files a07c59d
Commits on Oct 11, 2012
@jarmo jarmo Add patch for Rinda::RingFinger which is broken in Ruby 1.9. c87c86a
Commits on Oct 27, 2012
@jarmo jarmo Load rinda ring finger patch for sub processes too. e9b3f7c
@jarmo jarmo Wait until magazine slave is loaded when running instead of bailing out. 05ab3c6
Commits on Oct 28, 2012
@timcharper timcharper Merge pull request #217 from jarmo/slaves_loaded
Wait until magazine slave is loaded when running instead of bailing out.
935bb62
@timcharper timcharper Merge pull request #214 from jarmo/ruby193_rinda_patch
Patch for Rinda::RingFinger in Ruby 1.9.
8ac9854
Commits on Jul 02, 2013
@sahilm sahilm Support bundler 1.3 and ruby 2.0 in feature helpers
All specs and features pass with ruby 2.0 and bundler 1.3.5
289e966
@sahilm sahilm Add travis-ci support ae2022e
Commits on Jul 06, 2013
@sahilm sahilm Support cucumber 1.3.2 and rspec 2.13.0 38ab44f
Commits on Jul 08, 2013
@aslakhellesoy aslakhellesoy Fix my name b0fec8b
Commits on Sep 14, 2013
@sahilm sahilm Prepare for Spork 1.0.0rc4 release 2ec6f52
@sahilm sahilm Yank support for ruby 1.8.7 63944fd
@sahilm sahilm Merge pull request #233 from aslakhellesoy/patch-1
Fix my name
a94412c
Commits on May 24, 2014
@manafire manafire replace CommandLine with Runner for RSpec 3.0.0.rc1 38c79dc
@manafire manafire remove unnecessary require e1c5ac9
Commits on Dec 01, 2014
@timcharper timcharper Merge pull request #255 from manafire/rspec3_runner
Uninitialized constant RSpec::Core::CommandLine
224df49