github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

cleaned up rspec runner and remove rspec thread

Browse source
This commit is contained in:
Colin Surprenant 2014-03-19 23:59:58 -04:00
parent a31421b658
commit 52d2181a26
1 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

75
lib/logstash/runner.rb
View file

@ -53,6 +53,40 @@ I18n.load_path << File.expand_path(
File.join(File.dirname(__FILE__), "../../locales/en.yml")
)
class LogStash::RSpecsRunner
def initialize(args)
@args = args.collect do |arg|
# if the arg ends in .rb or has a "/" in it, assume it's a path.
if arg =~ /\.rb$/ || arg =~ /\//
# check if it's a file, if not, try inside the jar if we are in it.
if !File.exists?(arg) && __FILE__ =~ /file:.*\.jar!\//
# Try inside the jar.
jar_root = __FILE__.gsub(/!.*/,"!")
newpath = File.join(jar_root, arg)
# Strip leading 'jar:' path (JRUBY_6970)
newpath.gsub!(/^jar:/, "")
if File.exists?(newpath)
# Add the 'spec' dir to the load path so specs can run
specpath = File.join(jar_root, "spec")
$LOAD_PATH << specpath unless $LOAD_PATH.include?(specpath)
next newpath
end
end
end
next arg
end # args.collect
end
def run
@result = RSpec::Core::Runner.run(@args)
end
def wait
return @result
end
end
class LogStash::Runner
include LogStash::Program
@ -122,48 +156,9 @@ class LogStash::Runner
"rspec" => lambda do
require "rspec/core/runner"
require "rspec"
fixedargs = args.collect do |arg|
# if the arg ends in .rb or has a "/" in it, assume it's a path.
if arg =~ /\.rb$/ || arg =~ /\//
# check if it's a file, if not, try inside the jar if we are in it.
if !File.exists?(arg) && __FILE__ =~ /file:.*\.jar!\//
# Try inside the jar.
jar_root = __FILE__.gsub(/!.*/,"!")
newpath = File.join(jar_root, arg)
# Strip leading 'jar:' path (JRUBY_6970)
newpath.gsub!(/^jar:/, "")
if File.exists?(newpath)
# Add the 'spec' dir to the load path so specs can run
specpath = File.join(jar_root, "spec")
$LOAD_PATH << specpath unless $LOAD_PATH.include?(specpath)
next newpath
end
end
end
next arg
end # args.collect
# Hack up a runner
runner = Class.new do
def initialize(args)
@args = args
end
def run
@thread = Thread.new do
@result = RSpec::Core::Runner.run(@args)
end
end
def wait
@thread.join
return @result
end
end
$LOAD_PATH << File.expand_path("#{File.dirname(__FILE__)}/../../spec")
require "test_utils"
#p :args => fixedargs
rspec = runner.new(fixedargs)
rspec = LogStash::RSpecsRunner.new(args)
rspec.run
@runners << rspec
return []