From b54f163d3e7c460e26dfbf5a409c6a6f308dcc2e Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 23 Aug 2011 19:49:47 -0400
Subject: [PATCH] make cleanups and color fixes

---
 Gemfile                                       |   1 +
 ext/jasmine-webkit-specrunner/ConsoleOutput.h |   2 +-
 ext/jasmine-webkit-specrunner/Runner.cpp      |   1 +
 ext/jasmine-webkit-specrunner/jhw-test        | Bin 69912 -> 69912 bytes
 ext/jasmine-webkit-specrunner/test.rb         |   9 +++++++-
 lib/qt/qmake.rb                               |  21 +++++++++++++++++-
 spec/lib/qt/qmake_spec.rb                     |  11 +++++++++
 7 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c16218b..b2a8e50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,3 +12,4 @@ gem 'guard-coffeescript'
 gem 'growl'
 gem 'rake', '0.8.7'
 gem 'mocha', '0.9.12'
+gem 'facter'
diff --git a/ext/jasmine-webkit-specrunner/ConsoleOutput.h b/ext/jasmine-webkit-specrunner/ConsoleOutput.h
index d63e3ac..0861aa3 100644
--- a/ext/jasmine-webkit-specrunner/ConsoleOutput.h
+++ b/ext/jasmine-webkit-specrunner/ConsoleOutput.h
@@ -15,8 +15,8 @@ namespace HeadlessSpecRunner {
       std::ostream *outputIO;
       QStack<QString> successes;
       QStack<QString> failures;
-    private:
       bool showColors;
+    private:
       void green();
       void clear();
       void red();
diff --git a/ext/jasmine-webkit-specrunner/Runner.cpp b/ext/jasmine-webkit-specrunner/Runner.cpp
index b5c5ee2..0c3fae2 100644
--- a/ext/jasmine-webkit-specrunner/Runner.cpp
+++ b/ext/jasmine-webkit-specrunner/Runner.cpp
@@ -66,6 +66,7 @@ namespace HeadlessSpecRunner {
   void Runner::setColors(bool colors)
   {
     showColors = colors;
+    consoleOutput.showColors = colors;
   }
 
   void Runner::reportFile(const QString &file)
diff --git a/ext/jasmine-webkit-specrunner/jhw-test b/ext/jasmine-webkit-specrunner/jhw-test
index ed6d28006ecd1772f00f68c55bd83e3da35f3b4c..347fe5ae741c42789bdafcac17441fd6dda4a8f4 100755
GIT binary patch
delta 995
zcmXw1ZAg<*6h3z!IfI=0q2(9bBGf|hE1jC+B!};GS`ijO9~z}nD=EnSR4$70Ek?7e
zWGW$I7$!P-3;iKAkrE@=DEncUIwG4Ni6ALzu+Dw=?!tTS`<&-F=bm%!ZS7LDb}1Yl
zjjkAg06?b!4KCfF*R2eXnS7zWZC%K<Mqjv`+;nS}x^_57vv4fLT|iTdV`5L$0r<jl
z062TZ+hM;yZJo2{FJ}QvEX2~9;-a{%t0?Ht76lbSL7ylX$)>f%hvV9rqCBAZJ0zvB
zii*>sA~ugHR<JHSq$Q|G5*7dGL#|9!8xO#b``*)OE?WO!KR~rwTLe(S@xP99_m)*0
zzn!-3`+*UhU71C9n~&@%$8<gu^YA7Q$A7o*D;EB@&rR=`BgtOcVoun(mC4vypDL4n
zG@nTCM6vIQ=rg%2_KTi(eq7k@8YAihgvY`!TKIVu28p!1Br(c}#4sD|LLJJ@kMs8V
zlF_x~rbkO7WtvRdV2()NIw&0_?qf^S4u^wPZ*07oYit~{Vfe(DTFZ7&Ywx2KW=hs%
zq*VA)_92{P3aw|)s7Zpbex*)MYJ}=*kK#j9%>YSu02keSwh_m!x0!<w4+pTyfl`Mo
zDu|1H!mj5Tgg9tnn}O7#%}_Su5k@+QI2&;a^>iqd3hW}B>e~xQC9P^d7YYMx0DixQ
zdb?9X6JG~VF1_29LQ;jajvf_xMW?zA#3^WA4k(F^j`kWzqOjRJPKb?;_8CZ{u-TU)
zkE)d3o=e(wSR@;nO(=Bs$fH;%3}UU~j=$oX6UduGT6~WAUu`7W(?mc4b7(=9ZmNer
z@-(z-as{l4Oy^U^J4NfFi<4ID`{cJNRYUOQXJFDWj1E?FUcxr1Dk|Y%m7gR$C-K`7
z4pyIoxmZ4<)XgOc+a&A^U}0dUN~Q_+_&Ee`7zq#6d$sAoj&G;}-Z?3BM8fPAQ4BK@
WUgd=A-hP6e>3{lVI2rx?#)1C`l{e`C

delta 980
zcmXw1Ye*DP6h3z!?kbg9C~PUZQEFkh>!aN)U*zJ9t)xUL^ui#2^wNT~{-hE@lPpZ#
zqD>`448f#TCdwaCD-vcH4n2MtVv1<%YOx?_BD9@5J9A;qo$s9Qp8I|GUT=@V+hY*r
zcv~3&0RYi~0f%j9ZqgWMxjo`+-SK#D$>p9qAG^1&P=Az2dZjAUWD%W>ileDzyOQ{N
zfWSW|0Ov_~J{%6)*EmnX^g)2}r7g6&tTZ`z4GGU81eZqWQV0W1T2pp3xt%czBaDSN
zYKt=p!>urqG8tnAwc#dh8Y4+ztk5Q|!d#OEAdCfkbb{MyZQKV?7n@QFaFP=iPH=Zu
z%$%@kUkiN36`aSIMos*2OCh!k<gtw4k~!grTlnJ^eg)oV(B`T{+Qz5H1oK$&XW(xx
zea)ZB7LglhR&p-C+jCKV7si2Z=UJgHQjpz3&@C*oWubIhSe{|AVPTk^?NU9``Sv4w
z0?C+Ko}`t>5_Kex*7FIwgSqNfIcy$Xo)$%si7&p_ls`Vo%t$lkt2%O8`cm;Bj<_W6
zxwEmvA+24l*OMlx?)v?-=wcoq(*q#WjVJ5L>_&SzFwJtfH4jD`R*^wu_DNfx<`B|N
zOFA6n7RDUoBV<+5A;cWwEGl;yj0RMlO0Atmq=D9Uo{x_6F~i|-44v!Eigvz;pnTfe
zVUz4#eP%LDr+OX4FU3Fi8HtUK^gD=C+UOr6M5H4F4&s$I2D0>)2KBMY>TE-a%Hxwt
z2K)3D=7T|0s?7MSjF3cL9ZtdbSMark9GHDTzyKkPpv!hO!f(AD<Eq{OEe}~`P>Fse
z$~5@x3c9ZTK4os!o;sd1Y{S)>nhPoxRaI2Qn#xZq4ypA`6>I7bVK3INQgw4l#iEJ_
zBUtjy)av3jj}s<<SS-v^>s(5<=J=*Lk`1X#->R71A(CN6#lTB9=3WwXW}Oe~@MNru
H>-+x$?5Q}n

diff --git a/ext/jasmine-webkit-specrunner/test.rb b/ext/jasmine-webkit-specrunner/test.rb
index 6934d3e..4585da1 100644
--- a/ext/jasmine-webkit-specrunner/test.rb
+++ b/ext/jasmine-webkit-specrunner/test.rb
@@ -1,7 +1,14 @@
 #!/usr/bin/env ruby
 
+system %{make clean}
+
 Dir['*_test.pro'].each do |test|
-  system %{make clean && qmake #{test} && make && ./jhw-test}
+  $: << File.expand_path("../../../lib", __FILE__)
+
+  require 'qt/qmake'
+  Qt::Qmake.make!('jasmine-headless-webkit', test)
+
+  system %{./jhw-test}
   if $?.exitstatus != 0
     exit 1
   end
diff --git a/lib/qt/qmake.rb b/lib/qt/qmake.rb
index ec5b951..94ec745 100644
--- a/lib/qt/qmake.rb
+++ b/lib/qt/qmake.rb
@@ -1,6 +1,12 @@
 require 'rbconfig'
 require 'rubygems/version'
 
+begin
+  require 'facter'
+rescue LoadError
+  warn 'Including Facter allows for detection of # of cpus, resulting in faster compilations.'
+end
+
 module Qt
   class NotInstalledError < StandardError; end
   class Qmake
@@ -37,7 +43,12 @@ module Qt
         check_qmake!
 
         system command(project_file)
-        system %{make}
+
+        system %{make #{make_options}}
+      end
+
+      def make_options
+        "-j#{number_of_cpus}"
       end
 
       #
@@ -83,6 +94,14 @@ module Qt
       end
 
       private
+      def number_of_cpus
+        if defined?(Facter)
+          Facter.sp_number_processors rescue Facter.processorcount
+        else
+          1
+        end
+      end
+
       def get_exe_path(command)
         path = %x{which #{command}}.strip
         path = nil if path == ''
diff --git a/spec/lib/qt/qmake_spec.rb b/spec/lib/qt/qmake_spec.rb
index 64d2dd9..4cc7016 100644
--- a/spec/lib/qt/qmake_spec.rb
+++ b/spec/lib/qt/qmake_spec.rb
@@ -136,5 +136,16 @@ describe Qt::Qmake do
       end
     end
   end
+
+  describe '.make_options' do
+    let(:cpu_count) { 3 }
+    subject { Qt::Qmake.make_options }
+
+    before do
+      Qt::Qmake.stubs(:number_of_cpus).returns(cpu_count)
+    end
+
+    it { should == "-j#{cpu_count}" }
+  end
 end