@@ -1,53 +1,58 @@ #!/usr/bin/env jruby require "pathname" -puts "Watching for changes.. type 'r' + enter to re-run all tests" last_run = nil +interrupted = false require "io/wait" -begin - loop do - start_time = Time.now +Signal.trap("INT") do + if interrupted + puts "Shutting down..." + exit + else + puts "Re-running all tests..." + last_run = nil + interrupted = true + end +end - lib_files = Dir["lib/**/*.rb"] - test_files = Dir["tests/**/*_test.rb"] +loop do + interrupted = false + start_time = Time.now - last_run = nil if $stdin.ready? && $stdin.gets.chomp == "r" + lib_files = Dir["lib/**/*.rb"] + test_files = Dir["tests/**/*_test.rb"] - files = lib_files + test_files + files = lib_files + test_files - changed_files = files.select do |file| - last_run ? (File.mtime(file) > last_run) : true - end + changed_files = files.select do |file| + last_run ? (File.mtime(file) > last_run) : true + end - unless changed_files.empty? + unless changed_files.empty? - test_files_to_run = [] + test_files_to_run = [] - changed_files.each do |file| - if file =~ /lib\// - test_files_to_run |= test_files.select { |f| "#{File.basename(file, ".rb")}_test.rb" == File.basename(f) } - elsif file =~ /tests\// - test_files_to_run |= [file] - end + changed_files.each do |file| + if file =~ /lib\// + test_files_to_run |= test_files.select { |f| "#{File.basename(file, ".rb")}_test.rb" == File.basename(f) } + elsif file =~ /tests\// + test_files_to_run |= [file] end + end - puts "Testing: #{test_files_to_run.join(", ")}" - IO.popen("jruby -e 'ARGV.each{|f| load f}' #{test_files_to_run.join(" ")}", "r") do |stream| - while (d = stream.read(1)) - STDOUT.print d - STDOUT.flush - end + puts "Testing: #{test_files_to_run.join(", ")}" + IO.popen("jruby -e 'ARGV.each{|f| load f}' #{test_files_to_run.join(" ")}", "r") do |stream| + while (d = stream.read(1)) + STDOUT.print d + STDOUT.flush end - end - last_run = start_time - - sleep 2 end -rescue Interrupt - puts "Shutting down..." -end + + last_run = start_time + sleep 2 +end \ No newline at end of file script/autotest 331841763540198052b571fd170ee95966ee3040 Sam Smoot sam@mx2.wieck.com http://github.com/wiecklabs/clipper/commit/bfe33b96c95e26ce75c88046d2db90c3788f2632 bfe33b96c95e26ce75c88046d2db90c3788f2632 2009-07-16T08:13:13-07:00 2009-07-16T08:13:13-07:00 script/autotest now re-runs tests after one interrupt, and quits after two. 0019bb0c8799460f4ddfa3bb323f1965ed2f333a Sam Smoot sam@mx2.wieck.com