ocrunner 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/ocrunner/cli.rb

@@ -25,6 +25,7 @@ module OCRunner
         opt :growl, "Report results using Growl", :type => :boolean, :default => false
         opt :debug_command, "Print xcodebuild command and exit", :type => :boolean, :default => false
         opt :verbose, "Display all xcodebuild output after summary", :type => :boolean, :default => false
+        opt :loud_compilation, "Always show verbose output when a compilation or linking error occurs", :type => :boolean, :default => true
       end
       
       execute = Proc.new{ OCRunner::TestRunner.new(opts) }

data/lib/ocrunner/test_case.rb

@@ -10,6 +10,15 @@ module OCRunner
     def initialize(name)
       @name = name
       @errors = []
+      @passed = true
+    end
+    
+    def fail!
+      @passed = false
+    end
+    
+    def passed?
+      @passed
     end
   end
 end

data/lib/ocrunner/test_runner.rb

@@ -23,7 +23,7 @@ module OCRunner
     end
   
     def setup
-      puts "="*80
+      puts "-"*80
       puts
     end
   
@@ -49,7 +49,7 @@ module OCRunner
     def summarize
       
       @suites.each do |suite|
-        suite.cases.reject {|kase| kase.passed}.each do |kase|
+        suite.cases.reject {|kase| kase.passed?}.each do |kase|
           out
           out '  ' + red("[#{suite.name} #{kase.name}] FAIL")
           kase.errors.each do |error|
@@ -60,7 +60,7 @@ module OCRunner
       end
       
       @suites.each do |suite|
-        failed = suite.cases.reject {|c| c.passed}
+        failed = suite.cases.reject {|kase| kase.passed?}
         out "Suite '#{suite.name}': #{suite.cases.size - failed.size} passes and #{failed.size} failures in #{suite.time} seconds."
       end
       
@@ -74,7 +74,8 @@ module OCRunner
     end
     
     def display_results
-      puts @log if @options[:verbose] || compilation_error_occurred
+      puts
+      puts @log if @options[:verbose] || (compilation_error_occurred && @options[:loud_compilation])
       puts @output.join("\n")
       puts
     end
@@ -104,15 +105,13 @@ module OCRunner
     
       # test case passed
       if line =~ /Test Case .+ passed/
-        @current_case.passed = true
-        @current_suite.cases << @current_case
         @current_case = nil
         print(green('.'))
       end
       
       # test failure
-      if line =~ /(.+\.m):(\d+): error: -\[(.+) (.+)\] :(?: (.+):?)? /
-        @current_case.passed = false
+      if line =~ /(.+\.m):(\d+): error: -\[(.+) (.+)\] :(?: (.+):?)?/
+        @current_case.fail!
         @current_case.errors << TestError.new($1, $2, $5)
         @passed = false
         print red('.')
@@ -121,14 +120,13 @@ module OCRunner
       # start test suite
       if line =~ /Test Suite '([^\/]+)' started/
         @current_suite = TestSuite.new($1)
+        @suites << @current_suite
         print "#{$1} "
       end
 
       # finish test suite
       if @current_suite && line =~ /^Executed/ && line =~ /\(([\d\.]+)\) seconds/
         @current_suite.time = $1
-        @suites << @current_suite
-        @current_suite = nil
         print "\n" # clear console line
       end
 
@@ -137,16 +135,29 @@ module OCRunner
         build_error("Test executable #{clean_path($1)} could not be found")
       end
       
+      # compilation errors
+      if line =~ /(.+\.m):(\d+): error: (.*)/
+        compilation_error_occurred!
+        build_error($&)      
+      end
+      
       # compilation reference error
       if line =~ /"(.+)", referenced from:/
         compilation_error_occurred!
         build_error($&)
       end
+      
+      # linking error
       if line =~ /-\[\w+ \w+\] in .+\.o/
         compilation_error_occurred!
         build_error($&)
       end
       
+      # segfault
+      if line =~ /Segmentation fault/
+        build_error('Segmentation fault while running tests.')        
+      end
+      
       # no Xcode project found
       if line =~ /does not contain an Xcode project/
         build_error('No Xcode project was found.')

data/ocrunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ocrunner}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Benton"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jim Benton