xcpretty 0.1.12 → 0.2.0

data/features/simple_format.feature

@@ -2,19 +2,29 @@ Feature: Showing build output in simple format
 
     Scenario: Showing file compilation
         Given I have a file to compile
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful compilation message
 
     Scenario: Showing xib compilation
         Given I have a xib to compile
+        When I pipe to xcpretty with "--simple --no-color"
+        Then I should see a successful compilation message
+
+    Scenario: Showing storyboard compilation
+        Given I have a storyboard to compile
         When I pipe to xcpretty with "--simple"
         Then I should see a successful compilation message
 
     Scenario: Showing precompilation
         Given I have a precompiled header
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful precompilation message
 
+    Scenario: Showing phase success
+        Given I have completed a build
+        When I pipe to xcpretty with "--simple"
+        Then I should see a "build" completion message
+
     Scenario: Showing file compilation with color
         Given I have a file to compile
         When I pipe to xcpretty with "--simple --color"
@@ -25,6 +35,11 @@ Feature: Showing build output in simple format
         When I pipe to xcpretty with "--simple --color"
         Then I should see a yellow completion icon
 
+    Scenario: Showing storyboard compilation with color
+        Given I have a storyboard to compile
+        When I pipe to xcpretty with "--simple --color"
+        Then I should see a yellow completion icon
+
     Scenario: Showing precompilation
         Given I have a precompiled header
         When I pipe to xcpretty with "--simple --color"
@@ -32,22 +47,22 @@ Feature: Showing build output in simple format
 
     Scenario: Showing analyze
         Given I have a file to analyze
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful analyze message
 
     Scenario: Showing shallow analyze
         Given I have a file to shallow analyze
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful analyze message
 
     Scenario: Showing tiff file validation
         Given I have a tiff file to validate
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful tiff validation message
 
     Scenario: Showing touch file
         Given I have a file to touch
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful touch message
 
     Scenario: Showing analyze with color
@@ -72,29 +87,29 @@ Feature: Showing build output in simple format
 
     Scenario: Showing the start of a test run
         Given the tests have started running
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see that test suite has started
 
     Scenario: Showing the start of a test suite
         Given I start a test suite
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see the name of suite only
 
     Scenario: Showing the end of a test suite
         Given the test suite has finished
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see that the test suite finished
 
     Scenario: Showing failed test output
         Given I have a failing test in my suite
         And the test suite has finished
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see the name of a failed test
         And I should see the path of a failed test
 
     Scenario: Showing successful test output
         Given I have a passing test in my suite
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see the name of a passing test
         And I should not see the name of the test group
         And I should not see the path of a passing test
@@ -111,12 +126,12 @@ Feature: Showing build output in simple format
 
     Scenario: Showing pending test output
         Given I have a pending test in my suite
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         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"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see the name of a measuring test
 
     Scenario: Showing failed test output with color
@@ -139,28 +154,35 @@ Feature: Showing build output in simple format
 
     Scenario: Showing code signing
         Given I have a file to code sign
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful code signing message
 
     Scenario: Showing code signing a framework
         Given I have a framework to code sign
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful code signing message
 
     Scenario: Showing preprocess
         Given I have a file to preprocess
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful preprocessing message
 
     Scenario: Showing a PBXCp copy
         Given I have a file to copy with PBXCp
-        When I pipe to xcpretty with "--simple"
+        When I pipe to xcpretty with "--simple --no-color"
         Then I should see a successful copying message
 
     Scenario: Build fails when Pod install hasn't been run
         Given podfile.lock wasn't in sync
         When I pipe to xcpretty with "--simple --color"
         Then I should see a red error message
+        And I should see that sandbox is not in sync with Podfile.lock
+
+    Scenario: Compilation fails because missing files in the project
+        Given there was a missing file
+        When I pipe to xcpretty with "--simple --color"
+        Then I should see a red error message
+        And I should see which file is missing
 
     Scenario: Compilation fails because of syntax errors
         Given there was a syntax error

data/features/steps/formatting_steps.rb

@@ -7,6 +7,10 @@ Given(/^I have a xib to compile$/) do
   add_run_input SAMPLE_COMPILE_XIB
 end
 
+Given(/^I have a storyboard to compile$/) do
+  add_run_input SAMPLE_COMPILE_STORYBOARD
+end
+
 Given(/^I have a precompiled header$/) do
   add_run_input SAMPLE_PRECOMPILE
 end
@@ -76,6 +80,10 @@ Given(/^there was a syntax error$/) do
   add_run_input SAMPLE_COMPILE_ERROR
 end
 
+Given(/^there was a missing file$/) do
+  add_run_input SAMPLE_FILE_MISSING_ERROR
+end
+
 Given(/^there were warnings in the code$/) do
   add_run_input SAMPLE_FORMAT_WARNING
 end
@@ -108,12 +116,24 @@ Given(/^I have an unrelated image in the output folder/) do
   copy_file_to_screenshot_dir(SAMPLE_UNRELATED_IMAGE_FILE)
 end
 
+Given(/^I have completed a build$/) do
+  add_run_input SAMPLE_BUILD_SUCCEEDED
+end
+
+Given(/^I have completed a clean$/) do
+  add_run_input SAMPLE_CLEAN_SUCCEEDED
+end
+
+Then(/^I should see a "(\w+)" completion message$/) do |phase|
+  run_output.should start_with("▸ #{phase.capitalize} Succeeded")
+end
+
 Then(/^I should see text beginning with "(.*?)"$/) do |text|
-  run_output.lines.to_a.detect {|line| line.start_with? text }.should_not be_nil
+  run_output.lines.to_a.detect { |line| line.start_with? text }.should_not be_nil
 end
 
 Then(/^I should see text containing "(.*?)" and beginning with "(.*?)"$/) do |inner, start|
-  run_output.lines.to_a.detect {|line| line.start_with?(start) && line.include?(inner)}.should_not be_nil
+  run_output.lines.to_a.detect { |line| line.start_with?(start) && line.include?(inner) }.should_not be_nil
 end
 
 Then(/^I should (green|red) text beginning with "(.*?)"$/) do |color, text|
@@ -251,7 +271,15 @@ 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("❌  error: ")[0..-5]) # trim \e[0m
+end
+
+Then(/^I should see that sandbox is not in sync with Podfile.lock$/) do
+  run_output.should include("The sandbox is not in sync with the Podfile.lock")
+end
+
+Then(/^I should see which file is missing$/) do
+  run_output.should include(SAMPLE_FILE_MISSING_ERROR.split('directory: ')[1].delete("'"))
 end
 
 Then(/^I should see a yellow warning message$/) do
@@ -272,7 +300,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
@@ -299,3 +327,4 @@ end
 Then(/^I should see text matching "(.*?)"$/) do |text|
   run_output.lines.to_a.last.strip.should == text
 end
+

data/features/steps/html_steps.rb

@@ -29,3 +29,4 @@ end
 Then(/^I should not see a screenshot in HTML$/) do
   html_report_body.get_elements("//*[contains(@class, 'screenshot')]/").to_a.size.should == 0
 end
+

data/features/steps/json_steps.rb

@@ -31,6 +31,7 @@ Then(/^the JSON compilation database should contain an entry with a directory$/)
 end
 
 Then(/^the JSON compilation database should be complete$/) do
-  entries = json_db.select {|entry| entry['command'] && entry['file'] && entry['directory']}
+  entries = json_db.select { |entry| entry['command'] && entry['file'] && entry['directory'] }
   entries.length.should == JSON_DB_FIXTURE_COMMAND_COUNT
 end
+

data/features/steps/junit_steps.rb

@@ -13,7 +13,7 @@ end
 
 Then(/^I should see a pending test node in my report$/) do
   junit_report_root.elements.to_a.detect do |node|
-    node.elements.to_a.detect {|child| child.name == 'skipped'}
+    node.elements.to_a.detect { |child| child.name == 'skipped' }
   end.should_not be_nil
 end
 
@@ -23,16 +23,17 @@ end
 
 Then(/^I should see (\d+) tests in my report$/) do |test_count|
   junit_report_root.attributes["tests"].should == test_count
-  junit_report_root.elements.to_a.count.should == test_count.to_i
+  junit_report_root.elements.to_a.size.should == test_count.to_i
 end
 
 Then(/^I should see (\d+) test suites$/) do |count|
   suites = junit_report.root.elements.to_a
   suites.size.should == count.to_i
-  suites.select {|s| s.name == 'testsuite' }.size.should == count.to_i
+  suites.count { |s| s.name == 'testsuite' }.should == count.to_i
 end
 
 Then(/^I should have a test report at "(.*?)"$/) do |path|
   doc = REXML::Document.new(File.open(path, 'r').read)
   doc.root.should_not be_nil
 end
+

data/features/steps/report_steps.rb

@@ -19,3 +19,4 @@ end
 Then(/^I should have a test report in a custom path$/) do
   step("I should have a test report at \"#{custom_report_path}\"")
 end
+

data/features/support/env.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../../..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../..', __FILE__)
 
 require 'tempfile'
 require 'spec/fixtures/constants'
@@ -20,7 +20,7 @@ end
 
 include XCPretty::ANSI
 
-TEST_RUN_START_MATCHER  = /Test Suite .+ started/
+TEST_RUN_START_MATCHER = /Test Suite .+ started/
 TEST_SUITE_COMPLETION_MATCHER = /Executed \d+ tests, with \d+ failures \(\d+ unexpected\) in \d+\.\d+ \(\d+\.\d+\) seconds/
 TEST_SUITE_START_MATCHER = /[\w]*(Spec|Tests)$/
 TEST_PATH_MATCHER = %r{[\w/\-\s]+:\d+}
@@ -53,7 +53,7 @@ def run_output
 end
 
 def html_report
-  @html_report ||= REXML::Document.new(File.open(XCPretty::HTML::FILEPATH, 'r').read.sub("<!DOCTYPE html>",""))
+  @html_report ||= REXML::Document.new(File.open(XCPretty::HTML::FILEPATH, 'r').read.sub("<!DOCTYPE html>", ""))
 end
 
 def html_report_body
@@ -114,3 +114,4 @@ After do
   FileUtils.rm_rf(XCPretty::JSONCompilationDatabase::FILE_PATH)
   File.delete(@screenshot_file_path) if @screenshot_file_path
 end
+

data/features/test_format.feature

@@ -2,22 +2,22 @@ Feature: Showing RSpec-style test output
 
     Scenario: Showing failed tests
         Given I have a failing test in my suite
-        When I pipe to xcpretty with "--test"
+        When I pipe to xcpretty with "--test --no-color"
         Then I should see a failed test icon
 
     Scenario: Showing passing tests
         Given I have a passing test in my suite
-        When I pipe to xcpretty with "--test"
+        When I pipe to xcpretty with "--test --no-color"
         Then I should see a passing test icon in ASCII
 
     Scenario: Showing pending tests
         Given I have a pending test in my suite
-        When I pipe to xcpretty with "--test"
+        When I pipe to xcpretty with "--test --no-color"
         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"
+        When I pipe to xcpretty with "--test --no-color"
         Then I should see a measuring test icon in ASCII
 
     Scenario: Showing some tests failed with color

data/lib/xcpretty/ansi.rb

@@ -1,25 +1,25 @@
 module XCPretty
   module ANSI
-    
+
     attr_accessor :colorize
 
     FORMATTED_MATCHER = %r{\e\[(\d+)[;]?(\d+)?m(.*)\e\[0m}
 
     EFFECT = {
-      :reset     => '0',
-      :bold      => '1',
-      :underline => '4'
+      reset: '0',
+      bold: '1',
+      underline: '4'
     }
 
     COLORS = {
-      :black  => '30',
-      :red    => '31',
-      :green  => '32',
-      :yellow => '33',
-      :blue   => '34',
-      :cyan   => '36',
-      :white  => '37',
-      :plain  => '39'
+      black: '30',
+      red: '31',
+      green: '32',
+      yellow: '33',
+      blue: '34',
+      cyan: '36',
+      white: '37',
+      plain: '39'
     }
 
     def colorize?
@@ -63,9 +63,10 @@ module XCPretty
 
     def ansi_parse(text, color, effect=nil)
       return text unless colorize?
-      colors_code = COLORS[color]  || ''
+      colors_code = COLORS[color] || ''
       effect_code = EFFECT[effect] ? ';' + EFFECT[effect] : ''
       "\e[#{colors_code}#{effect_code}m#{text}\e[#{EFFECT[:reset]}m"
     end
   end
 end
+

data/lib/xcpretty/formatters/formatter.rb

@@ -18,6 +18,7 @@ module XCPretty
     def format_clean_remove;                                   EMPTY; end
     def format_compile(file_name, file_path);                  EMPTY; end
     def format_compile_command(compiler_command, file_path);   EMPTY; end
+    def format_compile_storyboard(file_name, 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
@@ -32,6 +33,7 @@ module XCPretty
     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_success(phase_name);                      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
@@ -51,6 +53,7 @@ module XCPretty
     def format_compile_error(file_name, file_path, reason,
                              line, cursor);                    EMPTY; end
     def format_error(message);                                 EMPTY; end
+    def format_file_missing_error(error, file_path);           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
@@ -91,13 +94,17 @@ module XCPretty
     # Will be printed by default. Override with '' if you don't want summary
     def format_test_summary(executed_message, failures_per_suite)
       failures = format_failures(failures_per_suite)
-      final_message = failures.empty? ? green(executed_message) : red(executed_message)
+      if failures.empty?
+        final_message = green(executed_message)
+      else
+        final_message = red(executed_message)
+      end
 
       text = [failures, final_message].join("\n\n\n").strip
       "\n\n#{text}"
     end
 
-    ERROR = '⌦ '
+    ERROR = '❌ '
     ASCII_ERROR = '[x]'
 
     WARNING = '⚠️ '
@@ -108,23 +115,31 @@ module XCPretty
     end
 
     def format_compile_error(file, file_path, reason, line, cursor)
-      "\n#{red(error_symbol + " ")}#{file_path}: #{red(reason)}\n\n" +
+      "\n#{red(error_symbol + " ")}#{file_path}: #{red(reason)}\n\n" \
         "#{line}\n#{cyan(cursor)}\n\n"
     end
 
+    def format_file_missing_error(reason, file_path)
+      "\n#{red(error_symbol + " " + reason)} #{file_path}\n\n"
+    end
+
     def format_compile_warning(file, file_path, reason, line, cursor)
-      "\n#{yellow(warning_symbol + ' ')}#{file_path}: #{yellow(reason)}\n\n" +
+      "\n#{yellow(warning_symbol + ' ')}#{file_path}: #{yellow(reason)}\n\n" \
         "#{line}\n#{cyan(cursor)}\n\n"
     end
 
+    def format_ld_warning(reason)
+      "#{yellow(warning_symbol + ' ' + reason)}"
+    end
+
     def format_undefined_symbols(message, symbol, reference)
-      "\n#{red(error_symbol + " " + message)}\n" +
-        "> Symbol: #{symbol}\n" +
+      "\n#{red(error_symbol + " " + message)}\n" \
+        "> Symbol: #{symbol}\n" \
         "> Referenced from: #{reference}\n\n"
     end
 
     def format_duplicate_symbols(message, file_paths)
-      "\n#{red(error_symbol + " " + message)}\n" +
+      "\n#{red(error_symbol + " " + message)}\n" \
         "> #{file_paths.map { |path| path.split('/').last }.join("\n> ")}\n"
     end
 
@@ -142,7 +157,7 @@ module XCPretty
     end
 
     def format_failure(f)
-      "  #{f[:test_case]}, #{red(f[:reason])}\n  #{cyan(f[:file_path])}\n" +
+      "  #{f[:test_case]}, #{red(f[:reason])}\n  #{cyan(f[:file_path])}\n" \
       "  ```\n" +
       Syntax.highlight(Snippet.from_filepath(f[:file_path])) +
       "  ```"
@@ -158,3 +173,4 @@ module XCPretty
 
   end
 end
+

data/lib/xcpretty/formatters/knock.rb

@@ -31,4 +31,5 @@ module XCPretty
 
   end
 
-end
+end
+

data/lib/xcpretty/formatters/rspec.rb

@@ -30,3 +30,4 @@ module XCPretty
   end
 
 end
+

data/lib/xcpretty/formatters/simple.rb

@@ -8,11 +8,11 @@ module XCPretty
     PASS = "✓"
     FAIL = "✗"
     PENDING = "⧖"
+    COMPLETION = "▸"
     MEASURE = '◷'
 
     ASCII_PASS = "."
     ASCII_FAIL = "x"
-    COMPLETION = "▸"
     ASCII_PENDING = "P"
     ASCII_COMPLETION = ">"
     ASCII_MEASURE = 'T'
@@ -43,6 +43,10 @@ module XCPretty
       format("Compiling", file_name)
     end
 
+    def format_compile_storyboard(file_name, file_path)
+      format("Compiling", file_name)
+    end
+
     def format_copy_header_file(source, target)
       format("Copying", File.basename(source))
     end
@@ -76,7 +80,8 @@ module XCPretty
     end
 
     def format_passing_test(suite, test_case, time)
-      INDENT + format_test("#{test_case} (#{colored_time(time)} seconds)", :pass)
+      INDENT + format_test("#{test_case} (#{colored_time(time)} seconds)",
+                           :pass)
     end
 
     def format_pending_test(suite, test_case)
@@ -89,6 +94,10 @@ module XCPretty
       )
     end
 
+    def format_phase_success(phase_name)
+      format(phase_name.capitalize, "Succeeded")
+    end
+
     def format_phase_script_execution(script_name)
       format("Running script", "'#{script_name}'")
     end
@@ -133,6 +142,10 @@ module XCPretty
       INDENT + yellow(message)
     end
 
+    def format_check_dependencies
+      format('Check Dependencies')
+    end
+
     private
 
     def heading(prefix, text, description)
@@ -140,7 +153,8 @@ module XCPretty
     end
 
     def format(command, argument_text="", success=true)
-      [status_symbol(success ? :completion : :fail), white(command), argument_text].join(" ").strip
+      symbol = status_symbol(success ? :completion : :fail)
+      [symbol, white(command), argument_text].join(" ").strip
     end
 
     def format_test(test_case, status)
@@ -179,3 +193,4 @@ module XCPretty
 
   end
 end
+

data/lib/xcpretty/formatters/tap.rb

@@ -4,7 +4,7 @@ module XCPretty
 
     attr_reader :counter
 
-    def initialize unicode, color
+    def initialize(unicode, color)
       super
       @counter = 0
     end
@@ -36,4 +36,5 @@ module XCPretty
     end
   end
 
-end
+end
+