From 84d98720de3c2a55ddef656de1bb7de792bbcb8d Mon Sep 17 00:00:00 2001
From: Jeremy Wells <jemmyw@gmail.com>
Date: Thu, 10 May 2012 14:03:30 +1200
Subject: [PATCH] Add compact option for single line progress

---
 bin/nitra    |  4 ++++
 lib/nitra.rb | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/nitra b/bin/nitra
index 70ff02a..1613578 100755
--- a/bin/nitra
+++ b/bin/nitra
@@ -32,6 +32,10 @@ OptionParser.new do |opts|
     nitra.print_failures = true
   end
 
+  opts.on("--compact", "Compact output") do
+    nitra.compact = true
+  end
+
   opts.on("--debug", "Print debug output") do
     nitra.debug = true
   end
diff --git a/lib/nitra.rb b/lib/nitra.rb
index 8af92f4..a082e06 100644
--- a/lib/nitra.rb
+++ b/lib/nitra.rb
@@ -1,7 +1,7 @@
 require 'stringio'
 
 class Nitra
-  attr_accessor :load_schema, :migrate, :debug, :quiet, :print_failures
+  attr_accessor :load_schema, :migrate, :debug, :quiet, :print_failures, :compact
   attr_accessor :files
   attr_accessor :process_count, :environment
 
@@ -48,7 +48,12 @@ def print_progress
       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"
+
+      if compact
+        print "\r  #{@files_completed}/#{@file_count} (#{"%0.1f%%" % (progress*100)}) * #{@example_count} examples, #{@failure_count} failures\r"
+      else
+        print "[#{"X" * length_completed}#{"." * length_to_go}] #{@files_completed}/#{@file_count} (#{"%0.1f%%" % (progress*100)}) * #{@example_count} examples, #{@failure_count} failures\r"
+      end
     end
   end
 
@@ -198,7 +203,7 @@ def hand_out_files_to_workers(files, pipes)
     end
 
     print_progress
-    puts "" unless quiet
+    puts "" unless quiet || compact
 
     [worst_return_code, result]
   end