nitra 0.9.2 → 0.9.3

data/bin/nitra

@@ -6,7 +6,7 @@ require 'optparse'
 nitra = Nitra.new
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: nitra [options]"
+  opts.banner = "Usage: nitra [options] [spec_filename [...]]"
 
   opts.on("-c", "--cpus NUMBER", Integer, "Specify the number of CPUs to use, defaults to 4") do |n|
     nitra.process_count = n
@@ -24,6 +24,14 @@ OptionParser.new do |opts|
     nitra.migrate = true
   end
 
+  opts.on("-q", "--quiet", "Quiet; don't display progress bar") do
+    nitra.quiet = true
+  end
+
+  opts.on("-p", "--print-failures", "Print failures immediately when they occur") do
+    nitra.print_failures = true
+  end
+
   opts.on("--debug", "Print debug output") do
     nitra.debug = true
   end
@@ -34,4 +42,6 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+nitra.files = ARGV
+
 exit nitra.run

data/lib/nitra.rb

@@ -1,47 +1,96 @@
+require 'stringio'
+require 'tempfile'
+
 class Nitra
-  attr_accessor :load_schema, :migrate, :debug
+  attr_accessor :load_schema, :migrate, :debug, :quiet, :print_failures, :fork_for_each_file
+  attr_accessor :files
   attr_accessor :process_count, :environment
 
   def initialize
     self.process_count = 4
     self.environment = "nitra"
+    self.fork_for_each_file = true
   end
 
   def run
     start_time = Time.now
     ENV["RAILS_ENV"] = environment
 
+    initialise_database
+
+    load_rails_environment
+
+    pipes = fork_workers
+
+    self.files = Dir["spec/**/*_spec.rb"] if files.nil? || files.empty?
+    return if files.empty?
+
+    trap("SIGTERM") { $aborted = true }
+    trap("SIGINT") { $aborted = true }
+
+    return_code, result = hand_out_files_to_workers(files, pipes)
+
+    trap("SIGTERM", "DEFAULT")
+    trap("SIGINT", "DEFAULT")
+
+    print_result(result)
+    puts "\n#{$aborted ? "Aborted after" : "Finished in"} #{"%0.1f" % (Time.now-start_time)} seconds" unless quiet
+
+    $aborted ? 255 : return_code
+  end
+
+  protected
+  def print_result(result)
+    puts result.gsub(/\n\n\n+/, "\n\n")
+  end
+
+  def print_progress
+    unless quiet
+      bar_length = @columns - 50
+      progress = @files_completed / @file_count.to_f
+      length_completed = (progress * bar_length).to_i
+      length_to_go = bar_length - length_completed
+      print "[#{"X" * length_completed}#{"." * length_to_go}] #{@files_completed}/#{@file_count} (#{"%0.1f%%" % (progress*100)}) * #{@example_count} examples, #{@failure_count} failures\r"
+    end
+  end
+
+  def initialise_database
     if load_schema
       process_count.times do |index|
-        puts "initialising database #{index+1}..."
+        puts "initialising database #{index+1}..." unless quiet
         ENV["TEST_ENV_NUMBER"] = (index + 1).to_s
-        system("bundle exec rake db:schema:load")
+        system("bundle exec rake db:drop db:create db:schema:load")
       end
     end
 
     if migrate
       process_count.times do |index|
-        puts "migrating database #{index+1}..."
+        puts "migrating database #{index+1}..." unless quiet
         ENV["TEST_ENV_NUMBER"] = (index + 1).to_s
         system("bundle exec rake db:migrate")
       end
     end
+  end
 
+  def load_rails_environment
     puts "loading rails environment..." if debug
 
     ENV["TEST_ENV_NUMBER"] = "1"
 
     require 'spec/spec_helper'
-    require 'stringio'
 
     ActiveRecord::Base.connection.disconnect!
+  end
 
-    trap("SIGINT") { Process.kill("SIGKILL", Process.pid) }
-
-    pipes = (0...process_count).collect do |index|
+  def fork_workers
+    (0...process_count).collect do |index|
       server_sender_pipe = IO.pipe
       client_sender_pipe = IO.pipe
+
       fork do
+        trap("SIGTERM") { Process.kill("SIGKILL", Process.pid) }
+        trap("SIGINT") { Process.kill("SIGKILL", Process.pid) }
+
         server_sender_pipe[1].close
         client_sender_pipe[0].close
         rd = server_sender_pipe[0]
@@ -49,14 +98,38 @@ class Nitra
 
         ENV["TEST_ENV_NUMBER"] = (index + 1).to_s
 
+        # Find the database config for this TEST_ENV_NUMBER and manually initialise a connection.
         database_config = YAML.load(ERB.new(IO.read("#{Rails.root}/config/database.yml")).result)[ENV["RAILS_ENV"]]
         ActiveRecord::Base.establish_connection(database_config)
         Rails.cache.reset if Rails.cache.respond_to?(:reset)
 
+        # RSpec doesn't like it when you change the IO between invocations.  So we make one object and flush it
+        # after every invocation.
+        io = StringIO.new
+
+        # When rspec processes the first spec file, it does initialisation like loading in fixtures into the
+        # database.  If we're forking for each file, we need to initialise first so it doesn't try to initialise
+        # for every single file.
+        if fork_for_each_file
+          puts "running empty spec to make rspec run its initialisation" if debug
+          file = Tempfile.new("nitra")
+          begin
+            file.write("require 'spec_helper'; describe('nitra preloading') { it('preloads the fixtures') { 1.should == 1 } }\n")
+            file.close
+            RSpec::Core::CommandLine.new(["-f", "p", file.path]).run(io, io)
+          ensure
+            file.close unless file.closed?
+            file.unlink
+          end
+          RSpec.reset
+          io.string = ""
+        end
+
+        # OK, we're good to receive requests.  Tell our master.
         puts "announcing availability" if debug
         wr.write("0,0\n")
 
-        io = StringIO.new
+        # Loop until our master tells us we're finished.
         loop do
           puts "#{index} waiting for next job" if debug
           filename = rd.gets
@@ -64,26 +137,38 @@ class Nitra
           filename = filename.chomp
           puts "#{index} starting to process #{filename}" if debug
 
-          result = RSpec::Core::CommandLine.new(["-f", "p", filename]).run(io, io)
-          RSpec.reset
+          perform_rspec_for_filename = lambda do
+            begin
+              result = RSpec::Core::CommandLine.new(["-f", "p", filename]).run(io, io)
+            rescue LoadError
+              io << "\nCould not load file #{filename}\n\n"
+              result = 1
+            end
 
-          puts "#{index} #{filename} processed" if debug
+            wr.write("#{result.to_i},#{io.string.length}\n#{io.string}")
+          end
 
-          wr.write("#{result.to_i},#{io.string.length}\n#{io.string}")
-          io.string = ""
+          if fork_for_each_file
+            pid = fork(&perform_rspec_for_filename)
+            Process.wait(pid) if pid
+          else
+            perform_rspec_for_filename.call
+            io.string = ""
+            RSpec.reset
+          end
+
+          puts "#{index} #{filename} processed" if debug
         end
       end
+
       server_sender_pipe[0].close
       client_sender_pipe[1].close
       [client_sender_pipe[0], server_sender_pipe[1]]
     end
+  end
 
-    readers = pipes.collect(&:first)
-    files = Dir["spec/**/*_spec.rb"]
-
-    return if files.empty?
-
-    puts "Running rspec on #{files.length} files spread across #{process_count} processes\n\n"
+  def hand_out_files_to_workers(files, pipes)
+    puts "Running rspec on #{files.length} files spread across #{process_count} processes\n\n" unless quiet
 
     @columns = (ENV['COLUMNS'] || 120).to_i
     @file_count = files.length
@@ -93,27 +178,45 @@ class Nitra
 
     result = ""
     worst_return_code = 0
+    readers = pipes.collect(&:first)
 
-    while readers.length > 0
+    while !$aborted && readers.length > 0
       print_progress
       fds = IO.select(readers)
       fds.first.each do |fd|
-        return_code, length = fd.gets.split(",")
+        unless value = fd.gets
+          readers.delete(fd)
+          worst_return_code = 255
+          if readers.empty?
+            puts "Worker unexpectedly died.  No more workers to run specs - dying."
+          else
+            puts "Worker unexpectedly died.  Trying to continue with fewer workers."
+          end
+          break
+        end
 
+        return_code, length = value.split(",")
         worst_return_code = return_code.to_i if worst_return_code < return_code.to_i
 
-        if length.nil?
-          break
-        elsif length.to_i > 0
+        if length.to_i > 0
           data = fd.read(length.to_i)
 
           @files_completed += 1
+          failure_count = 0
+
           if m = data.match(/(\d+) examples?, (\d+) failure/)
             @example_count += m[1].to_i
-            @failure_count += m[2].to_i
+            failure_count += m[2].to_i
           end
 
-          result << data.gsub(/^[.FP]+$/, '').gsub(/\nFailed examples:.+/m, '').gsub(/^Finished in.+$/, '').gsub(/^\d+ example.+$/, '').gsub(/^No examples found.$/, '').gsub(/^Failures:$/, '')
+          @failure_count += failure_count
+          stripped_data = data.gsub(/^[.FP*]+$/, '').gsub(/\nFailed examples:.+/m, '').gsub(/^Finished in.+$/, '').gsub(/^\d+ example.+$/, '').gsub(/^No examples found.$/, '').gsub(/^Failures:$/, '')
+
+          if print_failures && failure_count > 0
+            print_result(stripped_data)
+          else
+            result << stripped_data
+          end
         else
           puts "ZERO LENGTH" if debug
         end
@@ -130,20 +233,8 @@ class Nitra
     end
 
     print_progress
-    puts ""
-    result = result.gsub(/\n\n\n+/, "\n\n")
-    puts result
-    puts "\nFinished in #{"%0.1f" % (Time.now-start_time)} seconds"
+    puts "" unless quiet
 
-    worst_return_code
-  end
-
-  protected
-  def print_progress
-    bar_length = @columns - 50
-    progress = @files_completed / @file_count.to_f
-    length_completed = (progress * bar_length).to_i
-    length_to_go = bar_length - length_completed
-    print "[#{"X" * length_completed}#{"." * length_to_go}] #{@files_completed}/#{@file_count} (#{"%0.1f%%" % (progress*100)}) * #{@example_count} examples, #{@failure_count} failures\r"
+    [worst_return_code, result]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nitra
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Roger Nesbitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 +13:00
+date: 2012-06-07 00:00:00 +12:00
 default_executable: 
 dependencies: []