xcoder 0.1.11 → 0.1.12

data/Rakefile

@@ -4,10 +4,12 @@ require "yard/rake/yardoc_task"
 
 task :default => [:specs, :build]
 
+desc "Run specs"
 task :specs do
   system "rspec --color --format d --tag ~integration"
 end
 
+desc "Run integration tests"
 task :integration do
   system "rspec --color --format d --tag integration"
 end

data/lib/xcode/builder.rb

@@ -1,6 +1,6 @@
 require 'xcode/shell'
 require 'xcode/provisioning_profile'
-require 'xcode/test/ocunit_report_parser.rb'
+require 'xcode/test/parsers/ocunit_parser.rb'
 require 'xcode/testflight'
 
 module Xcode
@@ -10,7 +10,7 @@ module Xcode
   # project build tasks.
   #
   class Builder
-    attr_accessor :profile, :identity, :build_path, :keychain, :sdk
+    attr_accessor :profile, :identity, :build_path, :keychain, :sdk, :objroot, :symroot
     
     def initialize(config)
       if config.is_a? Xcode::Scheme
@@ -23,37 +23,49 @@ module Xcode
       @sdk = @target.project.sdk
       @config = config
       @build_path = "#{File.dirname(@target.project.path)}/build/"
+      @objroot = @build_path
+      @symroot = @build_path
     end
     
     
-    def build(sdk=@sdk)    
-      cmd = build_command(@sdk)
+    def build(options = {:sdk => @sdk})    
+      cmd = build_command(options)
       with_keychain do
         Xcode::Shell.execute(cmd)
       end
       self
     end
-    
-    def test
-      cmd = build_command('iphonesimulator')
+     
+    # 
+    # Invoke the configuration's test target and parse the resulting output
+    #
+    # If a block is provided, the report is yielded for configuration before the test is run
+    #
+    def test(options = {:sdk => 'iphonesimulator'}) #, :parser => :OCUnit })
+      cmd = build_command(options)
       cmd << "TEST_AFTER_BUILD=YES"
-      cmd << "TEST_HOST=''"
       
-      parser = Xcode::Test::OCUnitReportParser.new
-      yield(parser) if block_given?
+      report = Xcode::Test::Report.new
+      if block_given?
+        yield(report)
+      else
+        report.add_formatter :stdout
+        report.add_formatter :junit, 'test-reports'
+      end
+      
+      parser = Xcode::Test::Parsers::OCUnitParser.new report
       
       begin
         Xcode::Shell.execute(cmd, false) do |line|
           parser << line
         end
-      rescue => e
+      rescue Xcode::Shell::ExecutionError => e
+        puts "Test platform exited: #{e.message}"
+      ensure
         parser.flush
-        # Let the failure bubble up unless parser has got an error from the output
-        raise e unless parser.failed?
       end
-      exit 1 if parser.failed?
       
-      self
+      report
     end
     
     def testflight(api_token, team_token)
@@ -202,11 +214,12 @@ module Xcode
       p
     end
     
-    def build_command(sdk=@sdk)
+    def build_command(options = {})
+      options = {:sdk => @sdk}.merge options
       profile = install_profile
       cmd = []
       cmd << "xcodebuild"
-      cmd << "-sdk #{sdk}" unless sdk.nil?
+      cmd << "-sdk #{options[:sdk]}" unless options[:sdk].nil?
       cmd << "-project \"#{@target.project.path}\""
       
       cmd << "-scheme \"#{@scheme.name}\"" unless @scheme.nil?
@@ -215,8 +228,8 @@ module Xcode
       
       cmd << "OTHER_CODE_SIGN_FLAGS='--keychain #{@keychain.path}'" unless @keychain.nil?
       cmd << "CODE_SIGN_IDENTITY=\"#{@identity}\"" unless @identity.nil?
-      cmd << "OBJROOT=\"#{@build_path}\""
-      cmd << "SYMROOT=\"#{@build_path}\""
+      cmd << "OBJROOT=\"#{@objroot}\""
+      cmd << "SYMROOT=\"#{@symroot}\""
       cmd << "PROVISIONING_PROFILE=#{profile.uuid}" unless profile.nil?
       cmd
     end

data/lib/xcode/shell.rb

@@ -1,6 +1,8 @@
 module Xcode
   module Shell
     
+    class ExecutionError < StandardError; end
+    
     def self.execute(bits, show_output=true)
       out = []
       cmd = bits.is_a?(Array) ? bits.join(' ') : bits
@@ -14,7 +16,7 @@ module Xcode
         end 
       end
       #Process.wait
-      raise "Error (#{$?.exitstatus}) executing '#{cmd}'\n\n  #{out.join("  ")}" if $?.exitstatus>0
+      raise ExecutionError.new("Error (#{$?.exitstatus}) executing '#{cmd}'\n\n  #{out.join("  ")}") if $?.exitstatus>0
       #puts "RETURN: #{out.inspect}"
       out
     end

data/lib/xcode/test/parsers/ocunit_parser.rb

@@ -0,0 +1,94 @@
+require 'xcode/test/report'
+require 'time'
+
+module Xcode
+  module Test    
+    module Parsers
+      
+      class OCUnitParser
+        attr_accessor :report, :builder
+        
+        def initialize(report = Xcode::Test::Report.new)
+          @report = report          
+          yield self if block_given?
+        end
+    
+        def flush
+          @report.finish
+        end
+    
+        def <<(piped_row)
+          case piped_row.force_encoding("UTF-8")
+    
+            when /Test Suite '(\S+)'.*started at\s+(.*)/
+              name = $1
+              time = Time.parse($2)
+              if name=~/\//
+                @report.start
+              else
+                @report.add_suite name, time
+              end
+            
+            when /Test Suite '(\S+)'.*finished at\s+(.*)./
+              time = Time.parse($2)
+              name = $1
+              if name=~/\//
+                @report.finish
+              else
+                @report.in_current_suite do |suite|
+                  suite.finish(time)
+                end
+              end
+
+            when /Test Case '-\[\S+\s+(\S+)\]' started./
+              name = $1
+              @report.in_current_suite do |suite|
+                suite.add_test_case name
+              end
+
+            when /Test Case '-\[\S+\s+(\S+)\]' passed \((.*) seconds\)/
+              duration = $2.to_f
+              @report.in_current_test do |test|
+                test.passed(duration)
+              end
+
+            when /(.*): error: -\[(\S+) (\S+)\] : (.*)/
+              message = $4
+              location = $1
+              @report.in_current_test do |test|
+                test.add_error(message, location)
+              end
+            
+            when /Test Case '-\[\S+ (\S+)\]' failed \((\S+) seconds\)/
+              duration = $2.to_f
+              @report.in_current_test do |test|
+                test.failed(duration)
+              end
+            
+            # when /failed with exit code (\d+)/, 
+            when /BUILD FAILED/
+              @report.finish
+            
+            when /Segmentation fault/
+              @report.abort
+            
+            when /Run test case (\w+)/
+              # ignore
+            when /Run test suite (\w+)/
+              # ignore
+            when /Executed (\d+) test, with (\d+) failures \((\d+) unexpected\) in (\S+) \((\S+)\) seconds/
+              # ignore
+            when /the iPhoneSimulator platform does not currently support application-hosted tests/
+              raise "Application tests are not currently supported by the iphone simulator.  If these are logic tests, try unsetting TEST_HOST in your project config"
+            else
+              @report.in_current_test do |test|
+                test << piped_row
+              end
+          end # case
+        
+        end # <<
+      
+      end # OCUnitParser
+    end # Parsers
+  end # Test
+end # Xcode

data/lib/xcode/test/report.rb

@@ -0,0 +1,121 @@
+require 'xcode/test/report/suite_result'
+require 'xcode/test/report/test_result'
+
+module Xcode
+  module Test    
+    
+    module Formatters
+    end
+    
+        
+    # The report is the abstract representation of a collection of suites of tests.  Formatters can be attached to write output
+    # in real time
+    class Report
+      attr_reader :suites, :observers
+      attr_accessor :start_time, :end_time, :exit_code, :unexpected
+      
+      
+      class InvalidStateException < StandardError; end
+  
+      def initialize
+        @debug = false
+        @exit_code = 0
+        @suites = []
+        @formatters = []
+        @start_time = nil
+        @end_time = nil
+        @unexpected = false
+        @observers = []
+      
+        yield self if block_given?
+      end
+      
+      def add_formatter(format, *args)
+        require "xcode/test/formatters/#{format.to_s}_formatter"
+        formatter = Xcode::Test::Formatters.const_get("#{format.to_s.capitalize}Formatter").new(*args)
+        @observers << formatter
+      end
+      
+      def unexpected?
+        @unexpected
+      end
+      
+      def succeed?
+        !self.failed?
+      end
+      
+      def failed?
+        return true if unexpected?
+        
+        @suites.each do |suite|
+          suite.tests.each do |test|
+            return true if test.failed?
+          end
+        end
+
+        false
+      end
+      
+      def start
+        @start_time = Time.now
+        notify_observers :before, self
+      end
+      
+      def add_suite(name, time=Time.now)
+        suite = Xcode::Test::Report::SuiteResult.new(self, name, time)
+        @suites << suite
+      end
+      
+      def finished?
+        !@end_time.nil?
+      end
+      
+      def duration
+        return 0 if @start_time.nil?
+        return Time.now - @start_time if @end_time.nil?
+        @end_time - @start_time
+      end
+      
+      def in_current_suite
+        # raise InvalidStateException.new("There is no active suite")
+        return if @suites.size==0 or !@suites.last.end_time.nil?
+        yield @suites.last
+      end
+    
+      def in_current_test
+        in_current_suite do |suite|
+          # raise InvalidStateException.new("There is no active test case")
+          return if suite.tests.size==0
+          yield suite.tests.last
+        end
+      end
+       
+      def finish
+        return if finished?
+      
+        # if there is a current suite which isnt finished - finish it
+        in_current_suite do |suite|
+          unless suite.finished? 
+            @unexpected = true
+            suite.finish
+          end
+        end
+        
+        @end_time = Time.now
+        notify_observers :after, self
+      end
+      
+      def abort
+        @report.unexpected=true
+        finish
+      end
+    
+      def notify_observers(event, obj=nil)
+        @observers.each do |f|
+          f.send event, obj if f.respond_to? event
+        end
+      end
+      
+    end # Report
+  end # Test
+end # Xcode

data/lib/xcode/test/report/suite_result.rb

@@ -0,0 +1,67 @@
+module Xcode
+  module Test
+    class Report
+      class SuiteResult
+        attr_accessor :tests, :name, :start_time, :end_time, :report
+  
+        def initialize(report, name, start_time)
+          @report = report
+          @name = name
+          @start_time = start_time
+          @tests = []
+          
+          @report.notify_observers :before_suite, self
+        end
+
+        def finish(time=Time.now)
+          raise "Time is nil" if time.nil?
+    
+          # Fail any lingering test
+          finish_current_test
+      
+          @end_time = time
+          @report.notify_observers :after_suite, self
+        end
+        
+        def add_test_case(name)
+          finish_current_test
+          
+          test = Xcode::Test::Report::TestResult.new self, name
+          @tests << test
+          yield(test) if block_given?
+          test
+        end
+      
+        def finished?
+          !@end_time.nil?
+        end
+      
+        def total_errors
+          errors = 0
+          @tests.each do |t| 
+            errors = errors + t.errors.count if t.failed?
+          end
+          errors
+        end
+
+        def total_passed_tests
+          @tests.select {|t| t.passed? }.count
+        end
+
+        def total_failed_tests
+          @tests.select {|t| t.failed? }.count
+        end
+        
+        private
+        
+        def finish_current_test
+          # Fail any lingering test
+          unless @tests.size==0 or @tests.last.passed?
+            @tests.last.failed(0) 
+          end
+        end
+  
+      end
+    end
+  end
+end

data/lib/xcode/test/report/test_result.rb

@@ -0,0 +1,49 @@
+module Xcode
+  module Test
+    class Report
+      class TestResult
+        attr_reader :name, :time, :errors, :suite, :data
+    
+        def initialize(suite, name)
+          @name = name
+          @data = []
+          @suite = suite
+          @errors = []  
+          
+          @suite.report.notify_observers :before_test, self
+        end
+    
+        def passed?
+          @passed
+        end
+    
+        def failed?
+          !@passed
+        end
+    
+        def passed(time)
+          @passed = true
+          @time = time
+          @suite.report.notify_observers :after_test, self
+        end
+    
+        def failed(time)
+          @passed = false
+          @time = time
+          @suite.report.notify_observers :after_test, self
+        end
+      
+        def << (line)
+          # puts "[#{@suite.name} #{@name}] << #{line}"
+          return if @data.count==0 and line.strip.empty?
+          @data << line
+        end
+    
+        def add_error(error_message,error_location)
+          @errors << {:message => error_message, :location => error_location, :data => @data}
+          @data = []
+        end
+      end
+    end
+  end
+end