ocrunner 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/ocrunner/cli.rb

@@ -5,7 +5,7 @@ module OCRunner
   module CLI
     def self.run
       
-      Kernel.trap('INT') { exit }
+      Kernel.trap('INT') { puts; exit }
       
       opts = Trollop::options do
         version_number = File.read(File.join(File.dirname(__FILE__), '../../VERSION')).strip

data/lib/ocrunner/test_case.rb

@@ -1,10 +1,15 @@
 module OCRunner
   class TestCase
-    attr :name
-    attr_accessor :passed, :path, :line, :message
     
+    # Container for test case info
+
+    attr :name
+    attr_accessor :passed
+    attr_accessor :errors
+        
     def initialize(name)
       @name = name
+      @errors = []
     end
   end
 end

data/lib/ocrunner/test_error.rb

@@ -0,0 +1,8 @@
+module OCRunner
+  
+  # Container for test failures info
+  
+  class TestError < Struct.new(:path, :line, :message)
+  end
+  
+end

data/lib/ocrunner/test_runner.rb

@@ -1,19 +1,30 @@
 module OCRunner
   class TestRunner
     include Console
-  
-    attr_reader :suites, :current_directory, :options, :log, :command
+    
+    class BuildFailure < StandardError; end
+
+    attr_reader :compilation_error_occurred
     
     def initialize(options)
       @suites = []
       @log = ''
       @current_directory = Dir.pwd
       @options = options
+      @passed = true
+      @compilation_error_occurred = false
+      @output = []
       
+      setup
       build_command
       run_tests
-      display_summary
-      display_log
+      summarize
+      display_results
+    end
+  
+    def setup
+      puts "="*80
+      puts
     end
   
     def build_command
@@ -35,44 +46,60 @@ module OCRunner
       end
     end
   
-    def display_summary
-      passed = true
+    def summarize
+      
       @suites.each do |suite|
-        failed = suite.cases.reject {|c| c.passed}
-        failed.each do |c|
-          passed = false
-          puts
-          puts '  ' + red("[#{suite.name} #{c.name}] FAIL") + " on line #{c.line} of #{clean_path(c.path)}"
-          puts '  ' + c.message unless c.message.nil?
+        suite.cases.reject {|kase| kase.passed}.each do |kase|
+          out
+          out '  ' + red("[#{suite.name} #{kase.name}] FAIL")
+          kase.errors.each do |error|
+            out '    ' + red(error.message) + " line #{error.line} of #{clean_path(error.path)}"
+          end
         end
-        puts
+        out
       end
       
       @suites.each do |suite|
         failed = suite.cases.reject {|c| c.passed}
-        puts "Suite '#{suite.name}': #{suite.cases.size - failed.size} passes and #{failed.size} failures in #{suite.time} seconds."
+        out "Suite '#{suite.name}': #{suite.cases.size - failed.size} passes and #{failed.size} failures in #{suite.time} seconds."
       end
       
-      puts
+      out
       
-      if passed
-        growl('Build succeeded.')
-        puts green('*** BUILD SUCCEEDED ***')
+      if @passed
+        build_succeeded
       else
-        growl('BUILD FAILED!')
-        puts red('*** BUILD FAILED ***')
+        build_failed
       end
     end
-  
-    def display_log
-      puts @log if @options[:verbose]
+    
+    def display_results
+      puts @log if @options[:verbose] || compilation_error_occurred
+      puts @output.join("\n")
+      puts
     end
-  
+    
+    def build_error(message)
+      out red(message)
+      @passed = false
+    end
+
+    def build_failed
+      growl('BUILD FAILED!')
+      out red('*** BUILD FAILED ***')
+    end
+    
+    def build_succeeded
+      growl('Build succeeded.')
+      out green('*** BUILD SUCCEEDED ***')
+    end
+
     def process_console_output(line)
 
       # test case started
-      if line =~ /Test Case '-\[\w+ (.+)\]' started/
+      if line =~ /Test Case '-\[.+ (.+)\]' started/
         @current_case = TestCase.new($1)
+        @current_suite.cases << @current_case
       end
     
       # test case passed
@@ -84,13 +111,10 @@ module OCRunner
       end
       
       # test failure
-      if line =~ /(.+\.m):(\d+): error: -\[(.+) (.+)\] :(?: (.+):)? /
+      if line =~ /(.+\.m):(\d+): error: -\[(.+) (.+)\] :(?: (.+):?)? /
         @current_case.passed = false
-        @current_case.path = $1
-        @current_case.line = $2
-        @current_case.message = $5
-        @current_suite.cases << @current_case
-        @current_case = nil
+        @current_case.errors << TestError.new($1, $2, $5)
+        @passed = false
         print red('.')
       end
 
@@ -107,12 +131,35 @@ module OCRunner
         @current_suite = nil
         print "\n" # clear console line
       end
+
+      # test executable not found
+      if line =~ /The executable for the test bundle at (.+\.octest) could not be found/
+        build_error("Test executable #{clean_path($1)} could not be found")
+      end
+      
+      # compilation reference error
+      if line =~ /"(.+)", referenced from:/
+        compilation_error_occurred!
+        build_error($&)
+      end
+      if line =~ /-\[\w+ \w+\] in .+\.o/
+        compilation_error_occurred!
+        build_error($&)
+      end
       
       # no Xcode project found
       if line =~ /does not contain an Xcode project/
-        puts red('No Xcode project was found.')
-        exit
+        build_error('No Xcode project was found.')
       end
+      
+    end
+   
+    def compilation_error_occurred!
+      @compilation_error_occurred = true
+    end
+   
+    def out(line = '')
+      @output << line
     end
     
     def clean_path(path)

data/lib/ocrunner/test_suite.rb

@@ -1,5 +1,8 @@
 module OCRunner
   class TestSuite
+    
+    # Container for test suite info
+    
     attr :name
     attr_accessor :cases, :time
     

data/lib/ocrunner.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/ocrunner/cli'
 require File.dirname(__FILE__) + '/ocrunner/console'
 require File.dirname(__FILE__) + '/ocrunner/test_case'
+require File.dirname(__FILE__) + '/ocrunner/test_error'
 require File.dirname(__FILE__) + '/ocrunner/test_suite'
 require File.dirname(__FILE__) + '/ocrunner/test_runner'

data/ocrunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ocrunner}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Benton"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/ocrunner/cli.rb",
      "lib/ocrunner/console.rb",
      "lib/ocrunner/test_case.rb",
+     "lib/ocrunner/test_error.rb",
      "lib/ocrunner/test_runner.rb",
      "lib/ocrunner/test_suite.rb",
      "ocrunner.gemspec",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jim Benton
@@ -62,6 +62,7 @@ files:
 - lib/ocrunner/cli.rb
 - lib/ocrunner/console.rb
 - lib/ocrunner/test_case.rb
+- lib/ocrunner/test_error.rb
 - lib/ocrunner/test_runner.rb
 - lib/ocrunner/test_suite.rb
 - ocrunner.gemspec