Remove Spork dependency.
This commit is contained in:
parent
c3051b89c0
commit
1c079bec33
1
Gemfile
1
Gemfile
|
@ -138,7 +138,6 @@ group :test, :development do
|
||||||
gem 'rspec-rails', require: false
|
gem 'rspec-rails', require: false
|
||||||
gem 'shoulda', require: false
|
gem 'shoulda', require: false
|
||||||
gem 'rspec-html-matchers'
|
gem 'rspec-html-matchers'
|
||||||
gem 'spork-rails'
|
|
||||||
gem 'pry-nav'
|
gem 'pry-nav'
|
||||||
gem 'byebug', require: ENV['RM_INFO'].nil?
|
gem 'byebug', require: ENV['RM_INFO'].nil?
|
||||||
end
|
end
|
||||||
|
|
|
@ -362,10 +362,6 @@ GEM
|
||||||
redis (~> 3.3, >= 3.3.3)
|
redis (~> 3.3, >= 3.3.3)
|
||||||
simple-rss (1.3.1)
|
simple-rss (1.3.1)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spork (1.0.0rc4)
|
|
||||||
spork-rails (4.0.0)
|
|
||||||
rails (>= 3.0.0, < 5)
|
|
||||||
spork (>= 1.0rc0)
|
|
||||||
sprockets (3.7.1)
|
sprockets (3.7.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
|
@ -488,7 +484,6 @@ DEPENDENCIES
|
||||||
shoulda
|
shoulda
|
||||||
sidekiq
|
sidekiq
|
||||||
simple-rss
|
simple-rss
|
||||||
spork-rails
|
|
||||||
stackprof
|
stackprof
|
||||||
test_after_commit
|
test_after_commit
|
||||||
thor
|
thor
|
||||||
|
|
|
@ -52,14 +52,9 @@ class Autospec::Manager
|
||||||
private
|
private
|
||||||
|
|
||||||
def ruby_runner
|
def ruby_runner
|
||||||
if ENV["SPORK"]
|
|
||||||
require "autospec/spork_runner"
|
|
||||||
Autospec::SporkRunner.new
|
|
||||||
else
|
|
||||||
require "autospec/simple_runner"
|
require "autospec/simple_runner"
|
||||||
Autospec::SimpleRunner.new
|
Autospec::SimpleRunner.new
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
def javascript_runner
|
def javascript_runner
|
||||||
require "autospec/qunit_runner"
|
require "autospec/qunit_runner"
|
||||||
|
|
|
@ -1,115 +0,0 @@
|
||||||
require "drb/drb"
|
|
||||||
require "autospec/rspec_runner"
|
|
||||||
|
|
||||||
module Autospec
|
|
||||||
|
|
||||||
class SporkRunner < RspecRunner
|
|
||||||
|
|
||||||
def start
|
|
||||||
if already_running?(pid_file)
|
|
||||||
puts "autospec appears to be running, it is possible the pid file is old"
|
|
||||||
puts "if you are sure it is not running, delete #{pid_file}"
|
|
||||||
return
|
|
||||||
end
|
|
||||||
write_pid_file(pid_file, Process.pid)
|
|
||||||
start_spork
|
|
||||||
@spork_running = true
|
|
||||||
end
|
|
||||||
|
|
||||||
def running?
|
|
||||||
# launch a thread that will wait for spork to die
|
|
||||||
@monitor_thread ||=
|
|
||||||
Thread.new do
|
|
||||||
Process.wait(@spork_pid)
|
|
||||||
@spork_running = false
|
|
||||||
end
|
|
||||||
|
|
||||||
@spork_running
|
|
||||||
end
|
|
||||||
|
|
||||||
def run(specs)
|
|
||||||
args = ["-r", "#{File.dirname(__FILE__)}/formatter.rb",
|
|
||||||
"-f", "Autospec::Formatter", specs.split].flatten
|
|
||||||
spork_service.run(args, $stderr, $stdout)
|
|
||||||
end
|
|
||||||
|
|
||||||
def reload
|
|
||||||
stop_spork
|
|
||||||
sleep 1
|
|
||||||
start_spork
|
|
||||||
end
|
|
||||||
|
|
||||||
def abort
|
|
||||||
spork_service.abort
|
|
||||||
end
|
|
||||||
|
|
||||||
def stop
|
|
||||||
stop_spork
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def spork_pid_file
|
|
||||||
Rails.root + "tmp/pids/spork.pid"
|
|
||||||
end
|
|
||||||
|
|
||||||
def pid_file
|
|
||||||
Rails.root + "tmp/pids/autospec.pid"
|
|
||||||
end
|
|
||||||
|
|
||||||
def already_running?(pid_file)
|
|
||||||
if File.exists? pid_file
|
|
||||||
pid = File.read(pid_file).to_i
|
|
||||||
Process.getpgid(pid) rescue nil
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def write_pid_file(file, pid)
|
|
||||||
FileUtils.mkdir_p(Rails.root + "tmp/pids")
|
|
||||||
File.open(file, 'w') do |f|
|
|
||||||
f.write(pid)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def spork_running?
|
|
||||||
spork_service.port rescue nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def spork_service
|
|
||||||
unless @drb_listener_running
|
|
||||||
begin
|
|
||||||
DRb.start_service("druby://127.0.0.1:0")
|
|
||||||
rescue SocketError, Errno::EADDRNOTAVAIL
|
|
||||||
DRb.start_service("druby://:0")
|
|
||||||
end
|
|
||||||
@drb_listener_running = true
|
|
||||||
end
|
|
||||||
|
|
||||||
@spork_service ||= DRbObject.new_with_uri("druby://127.0.0.1:8989")
|
|
||||||
end
|
|
||||||
|
|
||||||
def start_spork
|
|
||||||
if already_running?(spork_pid_file)
|
|
||||||
puts "Killing old orphan spork instance"
|
|
||||||
stop_spork
|
|
||||||
sleep 1
|
|
||||||
end
|
|
||||||
|
|
||||||
@spork_pid = Process.spawn({ 'RAILS_ENV' => 'test' }, "bundle exec spork")
|
|
||||||
write_pid_file(spork_pid_file, @spork_pid)
|
|
||||||
|
|
||||||
running = false
|
|
||||||
while !running
|
|
||||||
running = spork_running?
|
|
||||||
sleep 0.01
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def stop_spork
|
|
||||||
pid = File.read(spork_pid_file).to_i
|
|
||||||
Process.kill("SIGTERM", pid) rescue nil
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
|
@ -4,12 +4,8 @@ if ENV['COVERAGE']
|
||||||
end
|
end
|
||||||
|
|
||||||
require 'rubygems'
|
require 'rubygems'
|
||||||
require 'spork'
|
|
||||||
require 'rbtrace'
|
require 'rbtrace'
|
||||||
#uncomment the following line to use spork with the debugger
|
|
||||||
#require 'spork/ext/ruby-debug'
|
|
||||||
|
|
||||||
Spork.prefork do
|
|
||||||
# Loading more in this block will cause your tests to run faster. However,
|
# Loading more in this block will cause your tests to run faster. However,
|
||||||
# if you change any configuration or code from libraries loaded here, you'll
|
# if you change any configuration or code from libraries loaded here, you'll
|
||||||
# need to restart spork for it take effect.
|
# need to restart spork for it take effect.
|
||||||
|
@ -183,38 +179,3 @@ Spork.prefork do
|
||||||
FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}")
|
FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}")
|
||||||
File.new("#{Rails.root}/tmp/spec/#{filename}")
|
File.new("#{Rails.root}/tmp/spec/#{filename}")
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
Spork.each_run do
|
|
||||||
# This code will be run each time you run your specs.
|
|
||||||
Discourse.after_fork
|
|
||||||
end
|
|
||||||
|
|
||||||
# --- Instructions ---
|
|
||||||
# Sort the contents of this file into a Spork.prefork and a Spork.each_run
|
|
||||||
# block.
|
|
||||||
#
|
|
||||||
# The Spork.prefork block is run only once when the spork server is started.
|
|
||||||
# You typically want to place most of your (slow) initializer code in here, in
|
|
||||||
# particular, require'ing any 3rd-party gems that you don't normally modify
|
|
||||||
# during development.
|
|
||||||
#
|
|
||||||
# The Spork.each_run block is run each time you run your specs. In case you
|
|
||||||
# need to load files that tend to change during development, require them here.
|
|
||||||
# With Rails, your application modules are loaded automatically, so sometimes
|
|
||||||
# this block can remain empty.
|
|
||||||
#
|
|
||||||
# Note: You can modify files loaded *from* the Spork.each_run block without
|
|
||||||
# restarting the spork server. However, this file itself will not be reloaded,
|
|
||||||
# so if you change any of the code inside the each_run block, you still need to
|
|
||||||
# restart the server. In general, if you have non-trivial code in this file,
|
|
||||||
# it's advisable to move it into a separate file so you can easily edit it
|
|
||||||
# without restarting spork. (For example, with RSpec, you could move
|
|
||||||
# non-trivial code into a file spec/support/my_helper.rb, making sure that the
|
|
||||||
# spec/support/* files are require'd from inside the each_run block.)
|
|
||||||
#
|
|
||||||
# Any code that is left outside the two blocks will be run during preforking
|
|
||||||
# *and* during each_run -- that's probably not what you want.
|
|
||||||
#
|
|
||||||
# These instructions should self-destruct in 10 seconds. If they don't, feel
|
|
||||||
# free to delete them.
|
|
||||||
|
|
Loading…
Reference in New Issue