xcpretty 0.1.7 → 0.1.8

data/features/simple_format.feature

@@ -114,6 +114,11 @@ Feature: Showing build output in simple format
         When I pipe to xcpretty with "--simple"
         Then I should see the name of a pending test
 
+    Scenario: Showing measuring test output
+        Given I have a measuring test in my suite
+        When I pipe to xcpretty with "--simple"
+        Then I should see the name of a measuring test
+
     Scenario: Showing failed test output with color
         Given I have a failing test in my suite
         And the test suite has finished
@@ -170,3 +175,8 @@ Feature: Showing build output in simple format
         Then I should see the undefined symbold message
         And I should see the symbol and reference that caused failure
 
+    Scenario: There are build warnings
+        Given there were warnings in the code
+        When I pipe to xcpretty with "--simple --color"
+        Then I should see a yellow warning message
+

data/features/steps/formatting_steps.rb

@@ -76,6 +76,10 @@ Given(/^there was a syntax error$/) do
   add_run_input SAMPLE_COMPILE_ERROR
 end
 
+Given(/^there were warnings in the code$/) do
+  add_run_input SAMPLE_FORMAT_WARNING
+end
+
 Given(/^the linker has failed with undefined symbols$/) do
   add_run_input SAMPLE_UNDEFINED_SYMBOLS
 end
@@ -84,6 +88,10 @@ Given(/^I have a pending test in my suite$/) do
   add_run_input SAMPLE_PENDING_KIWI_TEST
 end
 
+Given(/^I have a measuring test in my suite$/) do
+  add_run_input SAMPLE_MEASURING_TEST
+end
+
 Given(/^I have a tiff file to validate$/) do
   add_run_input SAMPLE_TIFFUTIL
 end
@@ -181,6 +189,14 @@ Then(/^I should see a yellow pending test icon$/) do
   run_output.should start_with(yellow("P"))
 end
 
+Then(/^I should see a measuring test icon in ASCII$/) do
+  run_output.should start_with('T')
+end
+
+Then(/^I should see a yellow measuring test icon$/) do
+  run_output.should start_with(yellow('T'))
+end
+
 Then(/^the final execution message should be (red|green)$/) do |color|
   last_line = run_output.lines.to_a.last
   last_line.should be_colored(color.to_sym)
@@ -235,7 +251,12 @@ Then(/^I should not see the name of the test group$/) do
 end
 
 Then(/^I should see a red error message$/) do
-  run_output.should include(red("⌦ " + SAMPLE_PODS_ERROR.gsub('error: ', '')))
+  run_output.should include(red("⌦  " + SAMPLE_PODS_ERROR.gsub('error: ', '')))
+end
+
+Then(/^I should see a yellow warning message$/) do
+  run_output.should include("#{yellow('⚠️  ')}/Users/supermarin/code/oss/ObjectiveSugar/Example/ObjectiveSugar/AppDelegate.m:19:31:")
+  run_output.should include(yellow("format specifies type 'id' but the argument has type 'int' [-Wformat]"))
 end
 
 Then(/^I should see a red compilation error$/) do
@@ -251,7 +272,7 @@ Then(/^I should see a cyan cursor$/) do
 end
 
 Then(/^I should see the undefined symbold message$/) do
-  run_output.should include(red("⌦ Undefined symbols for architecture x86_64"))
+  run_output.should include(red("⌦  Undefined symbols for architecture x86_64"))
 end
 
 Then(/^I should see the symbol and reference that caused failure$/) do
@@ -263,6 +284,10 @@ Then(/^I should see the name of a pending test$/) do
   run_output.should =~ PENDING_TEST_NAME_MATCHER
 end
 
+Then(/^I should see the name of a measuring test$/) do
+  run_output.should =~ MEASURING_TEST_NAME_MATCHER
+end
+
 Then(/^I should see the test time in yellow$/) do
   run_output.should include("#{yellow("0.026")}")
 end

data/features/steps/json_steps.rb

@@ -18,17 +18,16 @@ end
 
 Then(/^the JSON compilation database should contain an entry with a command$/) do
   json_db.length.should == 1
-
-  json_db[0]["command"].should start_with("/Applications/Xcode.app/Contents/Developer")
-  json_db[0]["command"].should end_with(".o")
+  json_db[0]['command'].should start_with('/Applications/Xcode.app/Contents/Developer')
+  json_db[0]['command'].should end_with('.o')
 end
 
 Then(/^the JSON compilation database should contain an entry with a file$/) do
-  json_db[0]["file"].should == "NSMutableArray+ObjectiveSugar.m"
+  json_db[0]['file'].should == '/Users/musalj/code/OSS/ObjectiveSugar/Classes/NSMutableArray+ObjectiveSugar.m'
 end
 
 Then(/^the JSON compilation database should contain an entry with a directory$/) do
-  json_db[0]["directory"].should == "/Users/musalj/code/OSS/ObjectiveSugar/Classes"
+  json_db[0]['directory'].should == '/'
 end
 
 Then(/^the JSON compilation database should be complete$/) do

data/features/support/env.rb

@@ -27,6 +27,7 @@ TEST_PATH_MATCHER = %r{[\w/\-\s]+:\d+}
 PASSING_TEST_NAME_MATCHER = %r{\w+\s\(\d+\.\d+\sseconds\)}
 PENDING_TEST_NAME_MATCHER = %r{\w+\s\[PENDING\]}
 FAILING_TEST_NAME_MATCHER = %r{\w+, expected:}
+MEASURING_TEST_NAME_MATCHER = %r{\w+\smeasured\s\(\d+\.\d+\sseconds\)}
 
 JSON_DB_FIXTURE_COMMAND_COUNT = 557
 
@@ -110,6 +111,6 @@ After do
   @json = nil
   FileUtils.rm_rf(XCPretty::JUnit::FILEPATH)
   FileUtils.rm_rf(XCPretty::HTML::FILEPATH)
-  FileUtils.rm_rf(XCPretty::JSONCompilationDatabase::FILEPATH)
+  FileUtils.rm_rf(XCPretty::JSONCompilationDatabase::FILE_PATH)
   File.delete(@screenshot_file_path) if @screenshot_file_path
 end

data/features/test_format.feature

@@ -15,6 +15,11 @@ Feature: Showing RSpec-style test output
         When I pipe to xcpretty with "--test"
         Then I should see a pending test icon in ASCII
 
+    Scenario: Showing measuring tests
+        Given I have a measuring test in my suite
+        When I pipe to xcpretty with "--test"
+        Then I should see a measuring test icon in ASCII
+
     Scenario: Showing some tests failed with color
         Given I have a failing test in my suite
         And the test suite has finished
@@ -33,6 +38,11 @@ Feature: Showing RSpec-style test output
         When I pipe to xcpretty with "--test --color"
         Then I should see a yellow pending test icon
 
+    Scenario: Showing measuring tests with color
+        Given I have a measuring test in my suite
+        When I pipe to xcpretty with "--test --color"
+        Then I should see a yellow measuring test icon
+
     Scenario: Showing that all tests passed with color
         Given all of my tests will pass in my suite
         When I pipe to xcpretty with "--test --color"

data/lib/xcpretty/formatters/formatter.rb

@@ -16,8 +16,10 @@ module XCPretty
     def format_clean_target(target, project, configuration);  EMPTY; end
     def format_clean_remove;                                  EMPTY; end
     def format_compile(file_name, file_path);                 EMPTY; end
-    def format_compile_command(compiler_command);             EMPTY; end
+    def format_compile_command(compiler_command, file_path);  EMPTY; end
     def format_compile_xib(file_name, file_path);             EMPTY; end
+    def format_copy_header_file(source, target);              EMPTY; end
+    def format_copy_plist_file(source, target);               EMPTY; end
     def format_copy_strings_file(file_name);                  EMPTY; end
     def format_cpresource(file);                              EMPTY; end
     def format_generate_dsym(dsym);                           EMPTY; end
@@ -25,26 +27,37 @@ module XCPretty
     def format_libtool(library);                              EMPTY; end
     def format_passing_test(suite, test, time);               EMPTY; end
     def format_pending_test(suite, test);                     EMPTY; end
+    def format_measuring_test(suite, test, time);             EMPTY; end
     def format_failing_test(suite, test, time, file_path);    EMPTY; end
     def format_process_pch(file);                             EMPTY; end
+    def format_process_pch_command(file_path);                EMPTY; end
     def format_phase_script_execution(script_name);           EMPTY; end
     def format_process_info_plist(file_name, file_path);      EMPTY; end
     def format_codesign(file);                                EMPTY; end
     def format_preprocess(file);                              EMPTY; end
     def format_pbxcp(file);                                   EMPTY; end
+    def format_shell_command(command, arguments);             EMPTY; end
     def format_test_run_started(name);                        EMPTY; end
     def format_test_run_finished(name, time);                 EMPTY; end
     def format_test_suite_started(name);                      EMPTY; end
     def format_test_summary(message, failures_per_suite);     EMPTY; end
     def format_touch(file_path, file_name);                   EMPTY; end
     def format_tiffutil(file);                                EMPTY; end
+    def format_write_file(file);                              EMPTY; end
+    def format_write_auxiliary_files;                         EMPTY; end
 
-    # COMPILER / LINKER ERRORS
+    # COMPILER / LINKER ERRORS AND WARNINGS
     def format_compile_error(file_name, file_path, reason,
                              line, cursor);                   EMPTY; end
     def format_error(message);                                EMPTY; end
     def format_undefined_symbols(message, symbol, reference); EMPTY; end
     def format_duplicate_symbols(message, file_paths);        EMPTY; end
+    def format_warning(message);                            message; end
+
+    # TODO: see how we can unify format_error and format_compile_error,
+    #       the same for warnings
+    def format_compile_warning(file_name, file_path, reason,
+                               line, cursor);                 EMPTY; end
   end
 
   class Formatter
@@ -83,8 +96,11 @@ module XCPretty
       "\n\n#{text}"
     end
 
-    ERROR = "⌦"
-    ASCII_ERROR = "[!]"
+    ERROR = '⌦ '
+    ASCII_ERROR = '[x]'
+
+    WARNING = '⚠️ '
+    ASCII_WARNING = '[!]'
 
     def format_error(message)
       "\n#{red(error_symbol + " " + message)}\n\n"
@@ -92,18 +108,23 @@ module XCPretty
 
     def format_compile_error(file, file_path, reason, line, cursor)
       "\n#{red(error_symbol + " ")}#{file_path}: #{red(reason)}\n\n" +
-      "#{line}\n#{cyan(cursor)}\n\n"
+        "#{line}\n#{cyan(cursor)}\n\n"
+    end
+
+    def format_compile_warning(file, file_path, reason, line, cursor)
+      "\n#{yellow(warning_symbol + ' ')}#{file_path}: #{yellow(reason)}\n\n" +
+        "#{line}\n#{cyan(cursor)}\n\n"
     end
 
     def format_undefined_symbols(message, symbol, reference)
       "\n#{red(error_symbol + " " + message)}\n" +
-      "> Symbol: #{symbol}\n" +
-      "> Referenced from: #{reference}\n\n"
+        "> Symbol: #{symbol}\n" +
+        "> Referenced from: #{reference}\n\n"
     end
 
     def format_duplicate_symbols(message, file_paths)
       "\n#{red(error_symbol + " " + message)}\n" +
-      "> #{file_paths.map { |path| path.split('/').last }.join("\n> ")}\n"
+        "> #{file_paths.map { |path| path.split('/').last }.join("\n> ")}\n"
     end
 
 
@@ -130,5 +151,9 @@ module XCPretty
       use_unicode? ? ERROR : ASCII_ERROR
     end
 
+    def warning_symbol
+      use_unicode? ? WARNING : ASCII_WARNING
+    end
+
   end
 end

data/lib/xcpretty/formatters/rspec.rb

@@ -5,6 +5,7 @@ module XCPretty
     FAIL = "F"
     PASS = "."
     PENDING = "P"
+    MEASURING = 'T'
 
     def optional_newline
       ''
@@ -22,6 +23,10 @@ module XCPretty
       yellow(PENDING)
     end
 
+    def format_measuring_test(suite, test_case, time)
+      yellow(MEASURING)
+    end
+
   end
 
 end

data/lib/xcpretty/formatters/simple.rb

@@ -8,12 +8,14 @@ module XCPretty
     PASS = "✓"
     FAIL = "✗"
     PENDING = "⧖"
+    MEASURE = '◷'
 
     ASCII_PASS = "."
     ASCII_FAIL = "x"
     COMPLETION = "▸"
     ASCII_PENDING = "P"
     ASCII_COMPLETION = ">"
+    ASCII_MEASURE = 'T'
 
     INDENT = "    "
 
@@ -37,6 +39,14 @@ module XCPretty
       format("Compiling", file_name)
     end
 
+    def format_copy_header_file(source, target)
+      format("Copying", File.basename(source))
+    end
+
+    def format_copy_plist_file(source, target)
+      format("Copying", File.basename(source))
+    end
+
     def format_copy_strings_file(file)
       format("Copying", file)
     end
@@ -69,6 +79,12 @@ module XCPretty
       INDENT + format_test("#{test_case} [PENDING]", :pending)
     end
 
+    def format_measuring_test(suite, test_case, time)
+      INDENT + format_test(
+        "#{test_case} measured (#{colored_time(time)} seconds)", :measure
+      )
+    end
+
     def format_phase_script_execution(script_name)
       format("Running script", "'#{script_name}'")
     end
@@ -109,6 +125,10 @@ module XCPretty
       format("Validating", file_name)
     end
 
+    def format_warning(message)
+      INDENT + yellow(message)
+    end
+
     private
 
     def heading(prefix, text, description)
@@ -135,6 +155,8 @@ module XCPretty
         red(use_unicode? ? ERROR : ASCII_ERROR)
       when :completion
         yellow(use_unicode? ? COMPLETION : ASCII_COMPLETION)
+      when :measure
+        yellow(use_unicode? ? MEASURE : ASCII_MEASURE)
       else
         ""
       end

data/lib/xcpretty/parser.rb

@@ -16,6 +16,11 @@ module XCPretty
     # @regex Nothing returned here for now
     CHECK_DEPENDENCIES_MATCHER = /^Check dependencies/
 
+    # @regex Captured groups
+    # $1 command path
+    # $2 arguments
+    SHELL_COMMAND_MATCHER = /^\s{4}(cd|setenv|(?:[\w\/:\\\s\-.]+?\/)?[\w\-]+)\s(.*)$/
+
     # @regex Nothing returned here for now
     CLEAN_REMOVE_MATCHER = /^Clean.Remove/
 
@@ -36,11 +41,12 @@ module XCPretty
     # @regex Captured groups
     # $1 file_path
     # $2 file_name (e.g. KWNull.m)
-    COMPILE_MATCHER = /^CompileC\s.*\s(.*\/(.*\.(?:m|mm|c|cc|cpp|cxx)))\s.*/
+    COMPILE_MATCHER = /^CompileC\s.+?\s((?:\\.|[^ ])+\/((?:\\.|[^ ])+\.(?:m|mm|c|cc|cpp|cxx)))\s.*/
 
     # @regex Captured groups
     # $1 compiler_command
-    COMPILE_COMMAND_MATCHER = /^\s*(.*\/usr\/bin\/clang\s.*\.o)$/
+    # $2 file_path
+    COMPILE_COMMAND_MATCHER = /^\s*(.*\/usr\/bin\/clang\s.*\s\-c\s(.*\.(?:m|mm|c|cc|cpp|cxx))\s.*\.o)$/
 
     # @regex Captured groups
     # $1 file_path
@@ -48,6 +54,15 @@ module XCPretty
     COMPILE_XIB_MATCHER = /^CompileXIB\s(.*\/(.*\.xib))/
 
     # @regex Captured groups
+    # $1 source file
+    # $2 target file
+    COPY_HEADER_MATCHER = /^CpHeader\s(.*\.h)\s(.*\.h)/
+
+    # @regex Captured groups
+    # $1 source file
+    # $2 target file
+    COPY_PLIST_MATCHER = /^CopyPlistFile\s(.*\.plist)\s(.*\.plist)/
+
     # $1 file
     COPY_STRINGS_MATCHER = /^CopyStringsFile.*\/(.*.strings)/
 
@@ -91,6 +106,12 @@ module XCPretty
     # $2 = test_case
     PENDING_TEST_MATCHER = /^Test Case\s'-\[(.*)\s(.*)PENDING\]'\spassed/
 
+    # @regex Captured groups
+    # $1 = suite
+    # $2 = test_case
+    # $3 = time
+    MEASURING_TEST_MATCHER = /^[^:]*:[^:]*:\sTest Case\s'-\[(.*)\s(.*)\]'\smeasured\s\[Time,\sseconds\]\saverage:\s(\d*\.\d{3}),/
+
     # @regex Captured groups
     # $1 = script_name
     PHASE_SCRIPT_EXECUTION_MATCHER = /^PhaseScriptExecution\s(.*)\s\//
@@ -99,6 +120,10 @@ module XCPretty
     # $1 = file
     PROCESS_PCH_MATCHER = /^ProcessPCH\s.*\s(.*.pch)/
 
+    # @regex Captured groups
+    # $1 file_path
+    PROCESS_PCH_COMMAND_MATCHER = /^\s*.*\/usr\/bin\/clang\s.*\s\-c\s(.*)\s\-o\s.*/
+
     # @regex Captured groups
     # $1 = file
     PREPROCESS_MATCHER = /^Preprocess\s(?:(?:\\ |[^ ])*)\s((?:\\ |[^ ])*)$/
@@ -134,6 +159,24 @@ module XCPretty
     # $2 file_name
     TOUCH_MATCHER = /^Touch\s(.*\/([\w+\.]+))/
 
+    # @regex Captured groups
+    # $1 file_path
+    WRITE_FILE_MATCHER = /^write-file\s(.*)/
+
+    # @regex Captured groups
+    WRITE_AUXILIARY_FILES = /^Write auxiliary files/
+
+    module Warnings
+      # $1 = file_path
+      # $2 = file_name
+      # $3 = reason
+      COMPILE_WARNING_MATCHER = /^(\/.+\/(.*):.*:.*):\swarning:\s(.*)$/
+
+      # @regex Captured groups
+      # $1 = whole warning
+      GENERIC_WARNING_MATCHER = /^warning:\s(.*)$/
+    end
+
     module Errors
       # @regex Captured groups
       # $1 = whole error
@@ -147,7 +190,7 @@ module XCPretty
       # $1 = file_path
       # $2 = file_name
       # $3 = reason
-      COMPILE_ERROR_MATCHER = /^(\/.+\/(.*):.*:.*):(?:\sfatal)?\serror:\s(.*)$/
+      COMPILE_ERROR_MATCHER = /^(\/.+\/(.*):.*:.*):\s(?:fatal\s)?error:\s(.*)$/
 
       # @regex Captured groups
       # $1 cursor (with whitespaces and tildes)
@@ -158,7 +201,6 @@ module XCPretty
       #      it varies a lot, not sure if it makes sense to catch everything separately
       FATAL_ERROR_MATCHER = /^(fatal error:.*)$/
 
-      # @regex Captured groups
       # $1 = whole error
       LD_ERROR_MATCHER = /^(ld:.*not found for.*)/
 
@@ -191,6 +233,7 @@ module XCPretty
 
     include Matchers
     include Matchers::Errors
+    include Matchers::Warnings
 
     attr_reader :formatter
 
@@ -204,6 +247,7 @@ module XCPretty
       update_linker_failure_state(text)
 
       return format_compile_error if should_format_error?
+      return format_compile_warning if should_format_warning?
       return format_undefined_symbols if should_format_undefined_symbols?
       return format_duplicate_symbols if should_format_duplicate_symbols?
 
@@ -231,9 +275,13 @@ module XCPretty
       when COMPILE_MATCHER
         formatter.format_compile($2, $1)
       when COMPILE_COMMAND_MATCHER
-        formatter.format_compile_command($1)
+        formatter.format_compile_command($1, $2)
       when COMPILE_XIB_MATCHER
         formatter.format_compile_xib($2, $1)
+      when COPY_HEADER_MATCHER
+        formatter.format_copy_header_file($1, $2)
+      when COPY_PLIST_MATCHER
+        formatter.format_copy_plist_file($1, $2)
       when CPRESOURCE_MATCHER
         formatter.format_cpresource($1)
       when EXECUTED_MATCHER
@@ -250,6 +298,8 @@ module XCPretty
         formatter.format_libtool($1)
       when LINKING_MATCHER
         formatter.format_linking($1, $2, $3)
+      when MEASURING_TEST_MATCHER
+        formatter.format_measuring_test($1, $2, $3)
       when PENDING_TEST_MATCHER
         formatter.format_pending_test($1, $2)
       when PASSING_TEST_MATCHER
@@ -262,6 +312,8 @@ module XCPretty
         formatter.format_phase_script_execution(*unescaped($1))
       when PROCESS_PCH_MATCHER
         formatter.format_process_pch($1)
+        when PROCESS_PCH_COMMAND_MATCHER
+          formatter.format_process_pch_command($1)
       when PREPROCESS_MATCHER
         formatter.format_preprocess($1)
       when PBXCP_MATCHER
@@ -276,6 +328,14 @@ module XCPretty
         formatter.format_tiffutil($1)
       when TOUCH_MATCHER
         formatter.format_touch($1, $2)
+      when WRITE_FILE_MATCHER
+        formatter.format_write_file($1)
+      when WRITE_AUXILIARY_FILES
+        formatter.format_write_auxiliary_files
+      when SHELL_COMMAND_MATCHER
+        formatter.format_shell_command($1, $2)
+      when GENERIC_WARNING_MATCHER
+        formatter.format_warning($1)
       else
         ""
       end
@@ -298,16 +358,21 @@ module XCPretty
 
     # @ return Hash { :file_name, :file_path, :reason, :line }
     def update_error_state(text)
+      update_error = lambda {
+        current_issue[:reason]    = $3
+        current_issue[:file_path] = $1
+        current_issue[:file_name] = $2
+      }
       if text =~ COMPILE_ERROR_MATCHER
         @formatting_error = true
-        current_error[:reason]    = $3
-        current_error[:file_path] = $1
-        current_error[:file_name] = $2
+        update_error.call
+      elsif text =~ COMPILE_WARNING_MATCHER
+        @formatting_warning = true
+        update_error.call
       elsif text =~ CURSOR_MATCHER
-        @formatting_error = false
-        current_error[:cursor]    = $1.chomp
-      elsif @formatting_error
-        current_error[:line]      = text.chomp
+        current_issue[:cursor]    = $1.chomp
+      elsif @formatting_error || @formatting_warning
+        current_issue[:line]      = text.chomp
       end
     end
 
@@ -332,7 +397,15 @@ module XCPretty
 
     # TODO: clean up the mess around all this
     def should_format_error?
-      current_error[:reason] && current_error[:cursor] && current_error[:line]
+      @formatting_error && error_or_warning_is_present
+    end
+
+    def should_format_warning?
+      @formatting_warning && error_or_warning_is_present
+    end
+
+    def error_or_warning_is_present
+      current_issue[:reason] && current_issue[:cursor] && current_issue[:line]
     end
 
     def should_format_undefined_symbols?
@@ -346,8 +419,8 @@ module XCPretty
       current_linker_failure[:files].count > 1
     end
 
-    def current_error
-      @current_error ||= {}
+    def current_issue
+      @current_issue ||= {}
     end
 
     def current_linker_failure
@@ -355,8 +428,9 @@ module XCPretty
     end
 
     def format_compile_error
-      error = current_error.dup
-      @current_error = {}
+      error = current_issue.dup
+      @current_issue = {}
+      @formatting_error = false
       formatter.format_compile_error(error[:file_name],
                                      error[:file_path],
                                      error[:reason],
@@ -364,6 +438,17 @@ module XCPretty
                                      error[:cursor])
     end
 
+    def format_compile_warning
+      warning = current_issue.dup
+      @current_issue = {}
+      @formatting_warning = false
+      formatter.format_compile_warning(warning[:file_name],
+                                       warning[:file_path],
+                                       warning[:reason],
+                                       warning[:line],
+                                       warning[:cursor])
+    end
+
     def format_undefined_symbols
       result = formatter.format_undefined_symbols(
         current_linker_failure[:message],
@@ -418,4 +503,3 @@ module XCPretty
 
   end
 end
-