ocrunner 0.3.2 → 0.4.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Jim Benton"]
     gem.add_dependency('trollop')
     gem.add_dependency('fssm')
+    gem.add_dependency('oniguruma')
     gem.executables = ['ocrunner']
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/ocrunner.rb

@@ -3,4 +3,6 @@ require File.dirname(__FILE__) + '/ocrunner/cli'
 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/parse_machine'
+require File.dirname(__FILE__) + '/ocrunner/output_processor'
 require File.dirname(__FILE__) + '/ocrunner/test_runner'

data/lib/ocrunner/cli.rb

@@ -31,7 +31,6 @@ module OCRunner
         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
-        opt :oclog, "Display OCLog log messages", :type => :boolean, :default => true
         opt :oclog_help, "Print OCLog code example and exit", :type => :boolean, :default => false
       end
       

data/lib/ocrunner/console.rb

@@ -2,6 +2,9 @@
 
 module OCRunner
   module Console
+    
+    attr :output
+    
     def colorize(text, color_code)
       "#{color_code}#{text.to_s}\033[0m"
     end
@@ -10,13 +13,51 @@ module OCRunner
     def green(text); colorize(text, "\033[32m"); end
     def blue(text); colorize(text, "\033[34m"); end
     
-    def indent(text='')
-      "  " + text.to_s
+    def indent(*args)
+      if args.first.is_a? Numeric
+        indents = args.first
+        text = args.last
+      else
+        indents = 1
+        text = args.first
+      end
+      "  " * indents + text.to_s
+    end
+    
+    def execute(cmd, &block)
+      IO.popen("#{cmd} 2>&1") do |f| 
+        while line = f.gets do 
+          yield line
+        end
+      end
     end
+    
     def present(&block)
       puts
       yield
       puts
     end
+   
+    def clean_path(path)
+      return 'unknown' if path.nil?
+      @current_directory = Dir.pwd
+      path.gsub(@current_directory + '/', '')
+    end
+    
+    def out(line = '')
+      @output ||= []
+      @output << line.rstrip
+    end
+    
+    def growl(message)
+      if @options[:growl]
+        execute "growlnotify -i \"xcodeproj\" -m \"#{message}\"" do |error|
+          if error =~ /command not found/
+            out red('You must have growl and growl notify installed to enable growl support. See http://growl.info.')
+          end
+        end
+      end
+    end
+    
   end
 end

data/lib/ocrunner/output_processor.rb

@@ -0,0 +1,213 @@
+module OCRunner
+  class OutputProcessor < ParseMachine
+
+    include Console
+  
+    def initialize(out, options)
+      initialize_state
+      @passed = true
+      @suites = []
+      @log = ''
+      @out = out
+      @options = options
+      @compilation_error_occurred = false
+    end
+  
+    def process_line(line)
+      @log << line unless line =~ /setenv/
+      process_console_output(line)
+      @out.flush
+    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 display_results
+      @suites.each do |suite|
+        suite.failed_cases.each do |kase|
+          out indent red("[#{suite.name} #{kase.name}] FAILED")
+          kase.errors.each do |error|
+            out indent 2, "on line #{error.line} of #{clean_path(error.path)}:"
+            error.message.each_line do |line|
+              out indent 2, red(line.strip)
+            end
+          end
+        end
+        out if suite.failures?
+      end
+      
+      @suites.each do |suite|
+        number = suite.failed_cases.size
+        out "Suite '#{suite.name}': #{suite.cases.size - number} passes and #{number} failures in #{suite.time} seconds."
+      end
+      
+      out
+      
+      if @passed
+        build_succeeded
+      else
+        build_failed
+      end
+      
+      puts @log if @options[:verbose] || (@compilation_error_occurred && @options[:loud_compilation])
+      puts red "A compilation error occurred" if @compilation_error_occurred
+      puts @output.join("\n")
+      puts
+    end
+
+    def process_console_output(line)
+      process_input(line)
+    end
+    
+    def compilation_error_occurred!
+      @compilation_error_occurred = true
+    end
+    
+    default_state :ready
+    
+    state :ready, {
+      :start_suite => :suite_running,
+      :fail_build => :build_failed,
+      :fail_without_project => :build_failed
+    }
+    
+    state :suite_running, {
+      :start_case => :case_running,
+      :end_suite => :ready
+    }
+    
+    state :case_running, {
+      :fail_case => :suite_running,
+      :pass_case => :suite_running,
+      :start_error => :recording_error,
+      :start_log => :recording_log,
+      :log_line => :case_running
+    }
+    
+    state :recording_error, {
+      :fail_case => :suite_running,
+      :record_error => :recording_error,
+      :start_error => :recording_error
+    }
+    
+    state :recording_log, {
+      :record_log => :recording_log,
+      :end_log => :case_running
+    }
+    
+    state :build_failed, {
+      :record_build_log => :build_failed
+    }
+
+
+    # log a single entire line
+    match "[\\-|\\+](\\[.+\\]):(\\d+):(.+):(\033\\[35m.+\033\\[0m)"
+    event :log_line do |line, signature, line_number, file, log|
+      out
+      out indent blue("#{signature} logged on line #{line_number} of #{clean_path(file)}:")
+      out indent 2, log
+    end
+
+    # multiline log begin
+    match "[\\-|\\+](\\[.+\\]):(\\d+):(.+):(\033\\[35m.+)"
+    event :start_log do |line, signature, line_number, file, log|
+      out
+      out indent blue("#{signature} logged on line #{line_number} of #{clean_path(file)}:")
+      out indent 2, log
+    end
+
+    # multiline log end
+    match "\033\\[0m"
+    event :end_log do |line|
+      out indent 2, line
+      out
+    end
+    
+    # multiline log body
+    match /.+/
+    event :record_log do |line|
+      out indent 2, line
+    end
+    
+    match /Test Case '-\[.+ (.+)\]' started/
+    event :start_case do |line, case_name|
+      @current_case = TestCase.new(case_name)
+      @current_suite.cases << @current_case
+    end
+    
+    match /Test Case .+ passed/
+    event :pass_case do
+      @current_case = nil
+      print(green('.'))      
+    end
+    
+    match /Test Case .+ failed/
+    event :fail_case do 
+      print(red('.'))
+      @current_case.fail!
+      @passed = false
+      @current_case = nil
+    end
+    
+    match /(.+\.m):(\d+): error: -\[(.+) (.+)\] :(?: (.+):?)?/
+    event :start_error do |line, file, line_number, klass, method, message|
+      @current_case.errors << TestError.new(file, line_number, message)
+    end
+
+    match /(.+)/
+    event :record_error do |line, message|
+      @current_case.errors.last.message << message + "\n"
+    end
+
+    match /Test Suite '([^\/]+)' started/
+    event :start_suite do |line, suite_name|
+      @current_suite = TestSuite.new(suite_name)
+      @suites << @current_suite
+      print "#{suite_name} "
+    end
+    
+    match /^Executed.+\(([\d\.]+)\) seconds/
+    event :end_suite do |line, seconds|
+      @current_suite.time = seconds
+      print "\n" # clear console line      
+    end
+    
+    match /The executable for the test bundle at (.+\.octest) could not be found/
+    event :executable_not_found do |line, test_path|
+      build_error("Test executable #{clean_path(text_path)} could not be found")
+    end
+
+    match /.+\.m:\d+: error: .*/
+    match /".+", referenced from:/
+    match /-\[\w+ \w+\] in .+\.o/
+    match /Bus error/
+    match /Segmentation fault/
+    event :fail_build do |line|
+      compilation_error_occurred!
+      build_error(line)
+    end
+
+    match /does not contain an Xcode project/
+    event :fail_without_project do |line|
+      build_error('No Xcode project was found.')
+    end
+
+    match /.+/
+    event :record_build_log do |line|
+      @log << line
+    end
+  
+  end
+end

data/lib/ocrunner/parse_machine.rb

@@ -0,0 +1,72 @@
+require 'oniguruma'
+
+module OCRunner
+  class ParseMachine
+    
+    include Oniguruma
+    
+    class << self
+      attr_accessor :events, :states
+      def match(regex)
+        @next_event ||= {}
+        @next_event[:regexes] ||= []
+        @next_event[:regexes] << regex
+      end
+      def event(name, options={}, &block)
+        @events ||= []
+        @events << @next_event.merge(
+          :name => name,
+          :options => options,
+          :callback => block
+        )
+        @next_event = nil
+      end
+      def state(name, transitions={})
+        @states ||= {}
+        @states[name] ||= {}
+        @states[name][:transitions] = transitions
+      end
+      def default_state(default_state)
+        @states ||= {}
+        @states[default_state] ||= {}
+        @states[default_state][:default] = true
+      end
+    end
+    
+    def initialize_state
+      @state = default_state
+      raise "Default state not defined" if @state.nil?
+    end
+    
+    def default_state
+      self.class.states.each_pair do |state_name, state_definition|
+        return state_name if state_definition[:default] == true
+      end
+    end    
+    
+    def event(name)
+      self.class.events.find do |event|
+        event[:name] == name
+      end
+    end
+   
+   def process_input(line)
+     self.class.events.each do |event|
+       if self.class.states[@state][:transitions].has_key?(event[:name])
+         event[:regexes].each do |regex|
+           if regex.is_a?(String)
+             regex = ORegexp.new(regex) 
+           end
+           if (match = regex.match(line))
+             args = [line] + match[1..-1]
+             self.instance_exec(*args, &event[:callback]) if event[:callback]
+             @state = self.class.states[@state][:transitions][event[:name]]
+             return
+           end
+         end
+       end
+     end
+   end
+    
+  end
+end

data/lib/ocrunner/test_error.rb

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

data/lib/ocrunner/test_runner.rb

@@ -3,28 +3,14 @@ module OCRunner
     include Console
     
     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 = []
+      @processor = OutputProcessor.new($stdout, @options)
       
       build_command
       setup
       run_tests
-      summarize
-      display_results
-    end
-  
-    def setup
-      puts "-"*80
-      puts
     end
   
     def build_command
@@ -37,195 +23,18 @@ module OCRunner
        exit
      end
     end
-  
-    def run_tests
-      
-      puts "ocrunner started. control-c to exit, control-\\ to toggle verbosity\n\n"
-      
-      execute @command do |line|
-        @log << line unless line =~ /setenv/
-        process_console_output(line)
-        $stdout.flush
-      end
-    end
-  
-    def summarize
-      
-      @suites.each do |suite|
-        suite.failed_cases.each do |kase|
-          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
-        out if suite.failures?
-      end
-      
-      @suites.each do |suite|
-        number = suite.failed_cases.size
-        out "Suite '#{suite.name}': #{suite.cases.size - number} passes and #{number} failures in #{suite.time} seconds."
-      end
-      
-      out
-      
-      if @passed
-        build_succeeded
-      else
-        build_failed
-      end
-    end
     
-    def display_results
-      puts @log if @options[:verbose] || (compilation_error_occurred && @options[:loud_compilation])
-      puts @output.join("\n")
+    def setup
+      puts "-"*80
       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)
-      
-      if @options[:oclog]
-        if line.include?("\033\[35m")
-          line =~ /[\-|\+](\[.+\]):(\d+):(.+):/
-          out blue("#{$1} on line #{$2} of #{clean_path($3)}:")
-          out line.slice(line.index("\033\[35m")..-1)
-          @debug_output = true unless line.include?("\033[0m")
-          return
-        end
-
-        if line.include?("\033[0m")
-          @debug_output = false
-          out line
-          out
-          return
-        end
-      
-        if @debug_output
-          out line
-          return
-        end 
-      end
-
-      # test case started
-      if line =~ /Test Case '-\[.+ (.+)\]' started/
-        @current_case = TestCase.new($1)
-        @current_suite.cases << @current_case
-      end
-    
-      # test case passed
-      if line =~ /Test Case .+ passed/
-        @current_case = nil
-        print(green('.'))
-      end
-      
-      # test failure
-      if line =~ /(.+\.m):(\d+): error: -\[(.+) (.+)\] :(?: (.+):?)?/
-        @current_case.errors << TestError.new($1, $2, $5)
-        test_failure_occurred!
-      end
-
-      # 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
-        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 errors
-      if !@current_case && 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
-      
-      # bus error
-      if line =~ /Bus error/
-        build_error('Bus error while running tests.')        
-      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.')
-      end
-      
-    end
-   
-    def compilation_error_occurred!
-      @compilation_error_occurred = true
-    end
-   
-    def test_failure_occurred!
-      print red('.') if @current_case.passed? # only print a dot for the case's first failure
-      @current_case.fail!
-      @passed = false
-    end
-   
-    def out(line = '')
-      @output << line.rstrip
-    end
-    
-    def clean_path(path)
-      return 'unknown' if path.nil?
-      path.gsub(@current_directory + '/', '')
-    end
-  
-    def growl(message)
-      if @options[:growl]
-        execute "growlnotify -i \"xcodeproj\" -m \"#{message}\"" do |error|
-          if error =~ /command not found/
-            out red('You must have growl and growl notify installed to enable growl support. See http://growl.info.')
-          end
-        end
-      end
+      puts "ocrunner started. control-c to exit, control-\\ to toggle verbosity\n\n"
     end
   
-    def execute(cmd, &block)
-      IO.popen("#{cmd} 2>&1") do |f| 
-        while line = f.gets do 
-          yield line
-        end
+    def run_tests
+      execute @command do |line|
+        @processor.process_line(line)
       end
+      @processor.display_results
     end
   
   end

data/ocrunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ocrunner}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Benton"]
-  s.date = %q{2010-04-23}
+  s.date = %q{2010-05-06}
   s.default_executable = %q{ocrunner}
   s.description = %q{Provides pretty console output for running OCUnit tests with xcodebuilder from the command line}
   s.email = %q{jim@autonomousmachine.com}
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
      "lib/ocrunner.rb",
      "lib/ocrunner/cli.rb",
      "lib/ocrunner/console.rb",
+     "lib/ocrunner/output_processor.rb",
+     "lib/ocrunner/parse_machine.rb",
      "lib/ocrunner/test_case.rb",
      "lib/ocrunner/test_error.rb",
      "lib/ocrunner/test_runner.rb",
@@ -54,13 +56,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<trollop>, [">= 0"])
       s.add_runtime_dependency(%q<fssm>, [">= 0"])
+      s.add_runtime_dependency(%q<oniguruma>, [">= 0"])
     else
       s.add_dependency(%q<trollop>, [">= 0"])
       s.add_dependency(%q<fssm>, [">= 0"])
+      s.add_dependency(%q<oniguruma>, [">= 0"])
     end
   else
     s.add_dependency(%q<trollop>, [">= 0"])
     s.add_dependency(%q<fssm>, [">= 0"])
+    s.add_dependency(%q<oniguruma>, [">= 0"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jim Benton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -05:00
+date: 2010-05-06 00:00:00 -05:00
 default_executable: ocrunner
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: oniguruma
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Provides pretty console output for running OCUnit tests with xcodebuilder from the command line
 email: jim@autonomousmachine.com
 executables: 
@@ -61,6 +73,8 @@ files:
 - lib/ocrunner.rb
 - lib/ocrunner/cli.rb
 - lib/ocrunner/console.rb
+- lib/ocrunner/output_processor.rb
+- lib/ocrunner/parse_machine.rb
 - lib/ocrunner/test_case.rb
 - lib/ocrunner/test_error.rb
 - lib/ocrunner/test_runner.rb