xcpretty 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 312a49c2395ef4423b388d5308643954924f487f
-  data.tar.gz: 6253bca6389c6956b2fbbc1ae6919294740462b6
+  metadata.gz: 31863314278364422289e7c4779a6683d041dd24
+  data.tar.gz: f6aa3f0ec6ec0b35d5b68eda5e0b3fd4b7471a3a
 SHA512:
-  metadata.gz: e7edfc065c451e809dbda04ce749165288d2c3f1896179dd8cf98a7d9d591ec6a042e0524ba1d9ba69a7b0d40a4baded7c9ec2db3633294472d1dc9264313cdf
-  data.tar.gz: d8fac2769db30fedaa440aa23921dc2d0004ae6aab59a83fb50b42785b5230308e483b276a110be07880ddcbcbac31232a6bc6a8df9b933cbba3a96e69d7fe6e
+  metadata.gz: 758a1e2ece5183a65bd5e5a2760f64fcb9c740db4ee15d00ada137d9a5660b68e095512ff5e1eaf2f3999fbc5ed2891c4c7a97cea2b096dacd82e0666846fbb2
+  data.tar.gz: 948b4c6b735cc76abed63d14657af2e28e9137445d1c9071a8884048e8ddbb59a7bf7ddbea871349ea214e8b87a51b2552113b794f2cc70175e4a91f8f12f91f

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+## TBD
+
+- remove paint dependency
+- better test failure formatting
+
+## 0.0.3
+
+- add Ruby 1.8 support
+
+## 0.0.2
+
+- add Ruby 1.9 support
+
+## 0.0.1
+
+- initial version

data/README.md

@@ -39,7 +39,22 @@ At this point, `xcodebuild` has got improved a lot, and it's ready to be used di
 
 There are many usages of this tool. Let me give you some ideas:
 - Xcode's test tools are close to useless. Failures in a sidebar, non-dettachable console,... You can use `xcpretty` to build your next Xcode test runner plugin
-- Run tests each time you hit save. The output is minimal, so go and wire it up with [Kicker](https://github.com/alloy/kicker) or [Guard](https://github.com/guard/guard) and be a real hipster!
+- Run tests each time you hit save. Here's an example of doing so:
+
+``` ruby
+require 'listen'
+ignored = [/.git/, /xcuserdata/, /\.txt$/, /test-reports/]
+build_task = "xcodebuild -workspace Myapp.xcworkspace -scheme MyApp -sdk iphonesimulator -destination 'name=iPhone Retina (4-inch 64-bit)'"
+
+listener = Listen.to(Dir.pwd, ignore: ignored) do |modified, added, removed|
+  system 'killall "iPhone Simulator"'
+  system "#{build_task} test | xcpretty -tc"
+end
+
+listener.start
+sleep
+```
+Just add this to your Rakefile, or in a ruby script. Make sure you `gem install listen`.
 - Mine Bitcoins. You can't with this tool, but you'll be so productive that you can earn all the money and buy them!!!1!
 
 ## Roadmap

data/bin/xcpretty

@@ -22,10 +22,14 @@ OptionParser.new do |opts|
   opts.on('-c', '--color', 'Use colorized output') do
     @colorize = true
   end
+  opts.on('--no-utf', 'Disable unicode characters in output') do
+    @unicode = false
+  end
   opts.on_tail('-h', '--help', 'Show this message') { puts opts; exit }
   opts.on_tail("-v", "--version", "Show version") { puts XCPretty::VERSION; exit }
   opts.parse!
   printer.colorize = @colorize
+  printer.use_unicode = @unicode || true
 end
 
 ARGF.each_line do |line|

data/features/simple_format.feature

@@ -1,56 +1,62 @@
 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"
-Then I should see a successful compilation message
-
-Scenario: Showing precompilation
-Given I have a precompiled header
-When I pipe to xcpretty with "--simple"
-Then I should see a successful precompilation message
-
-Scenario: Showing file compilation with color
-Given I have a file to compile
-When I pipe to xcpretty with "--simple --color"
-Then I should see a green success icon
-
-Scenario: Showing precompilation
-Given I have a precompiled header
-When I pipe to xcpretty with "--simple --color"
-Then I should see a green success icon
-
-Scenario: Showing the start of a test suite
-Given I start a test suite
-When I pipe to xcpretty with "--simple"
-Then I should see that the test suite started
-
-Scenario: Showing the end of a test suite
-Given I finish a test suite
-When I pipe to xcpretty with "--simple"
-Then I should see that the test suite finished
-
-Scenario: Showing failed test output
-Given I have a failing test in my suite
-When I pipe to xcpretty with "--simple"
-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"
-Then I should see the name of a passing test
-And I should not see the path of a passing test
-
-Scenario: Showing failed test output with color
-Given I have a failing test in my suite
-And I finish a test suite
-When I pipe to xcpretty with "--simple --color"
-Then I should see a red failed test mark
-And the final execution message should be red
-
-Scenario: Showing successful test output with color
-Given I have a passing test in my suite
-And I finish a test suite
-When I pipe to xcpretty with "--simple --color"
-Then I should see a green passing test mark
+    Scenario: Showing file compilation
+        Given I have a file 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"
+        Then I should see a successful precompilation message
+
+    Scenario: Showing file compilation with color
+        Given I have a file 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"
+        Then I should see a yellow completion icon
+
+    Scenario: Showing the start of a test run
+        Given the tests have started running
+        When I pipe to xcpretty with "--simple"
+        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"
+        Then I should see the name of suite only
+
+    Scenario: Showing the end of a test suite
+        Given I finish a test suite
+        When I pipe to xcpretty with "--simple"
+        Then I should see that the test suite finished
+
+    Scenario: Showing failed test output
+        Given I have a failing test in my suite
+        When I pipe to xcpretty with "--simple"
+        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"
+        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
+
+    Scenario: Showing failed test output with color
+        Given I have a failing test in my suite
+        And I finish a test suite
+        When I pipe to xcpretty with "--simple --color"
+        Then I should see a red failed test mark
+        And the final execution message should be red
+
+    Scenario: Showing successful test output with color
+        Given I have a passing test in my suite
+        And I finish a test suite
+        When I pipe to xcpretty with "--simple --color"
+        Then I should see a green passing test mark

data/features/steps/formatting_steps.rb

@@ -19,6 +19,10 @@ Given(/^I have a passing test in my suite$/) do
   add_run_input SAMPLE_OCUNIT_TEST
 end
 
+Given(/^the tests have started running$/) do
+  add_run_input SAMPLE_OCUNIT_TEST_RUN_BEGINNING
+end
+
 Given(/^I start a test suite$/) do
   add_run_input SAMPLE_OCUNIT_SUITE_BEGINNING
 end
@@ -32,15 +36,15 @@ When(/^I pipe to xcpretty with "(.*?)"$/) do |flags|
 end
 
 Then(/^I should see a successful compilation message$/) do
-  run_output.should start_with("Compiling")
+  run_output.should start_with("▸ Compiling")
 end
 
 Then(/^I should see a successful precompilation message$/) do
-  run_output.should start_with("Precompiling")
+  run_output.should start_with("▸ Precompiling")
 end
 
-Then(/^I should see a green success icon$/) do
-  run_output.should start_with("#{GREEN_START}✓#{COLOR_END}")
+Then(/^I should see a yellow completion icon$/) do
+  run_output.should start_with(yellow("▸"))
 end
 
 Then(/^I should see a failed test icon$/) do
@@ -52,18 +56,16 @@ Then(/^I should see a passing test icon in ASCII$/) do
 end
 
 Then(/^I should see a red failed test icon$/) do
-  run_output.should include("#{RED_START}F#{COLOR_END}")
+  run_output.should include(red("F"))
 end
 
 Then(/^the final execution message should be (red|green)$/) do |color|
   last_line = run_output.lines.to_a.last
-  start_color = color == "red" ? RED_START : GREEN_START
-  last_line.should start_with(start_color)
-  last_line.strip.should end_with(COLOR_END)
+  last_line.should be_colored(color.to_sym)
 end
 
 Then(/^I should see a green passing test icon$/) do
-  run_output.should include("#{GREEN_START}.#{COLOR_END}")
+  run_output.should include(green("."))
 end
 
 Then(/^I should see the name of a failed test$/) do
@@ -82,8 +84,12 @@ Then(/^I should not see the path of a passing test$/) do
   run_output.should_not =~ TEST_PATH_MATCHER
 end
 
-Then(/^I should see that the test suite started$/) do
-  run_output.should =~ TEST_SUITE_BEGINNING_MATCHER
+Then(/^I should see that test suite has started$/) do
+  run_output.should =~ TEST_RUN_START_MATCHER
+end
+
+Then(/^I should see the name of suite only$/) do
+  run_output.should =~ TEST_SUITE_START_MATCHER
 end
 
 Then(/^I should see that the test suite finished$/) do
@@ -91,9 +97,13 @@ Then(/^I should see that the test suite finished$/) do
 end
 
 Then(/^I should see a red failed test mark$/) do
-  run_output.should include("#{RED_START}✗#{COLOR_END}")
+  run_output.should include(red("✗"))
 end
 
 Then(/^I should see a green passing test mark$/) do
-  run_output.should include("#{GREEN_START}✓#{COLOR_END}")
+  run_output.should include(green("✓"))
+end
+
+Then(/^I should not see the name of the test group$/) do
+  run_output.should_not include(SAMPLE_TEST_GROUP_NAME)
 end

data/features/support/env.rb

@@ -1,23 +1,23 @@
 $:.unshift File.expand_path('../../..', __FILE__)
 
 require "tempfile"
-require "spec/fixtures/constants.rb"
+require "spec/fixtures/constants"
+require "spec/support/matchers/colors"
+require "lib/xcpretty/ansi"
 
+include XCPretty::ANSI
+
+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_BEGINNING_MATCHER  = /Test Suite '.+' started/
+TEST_SUITE_START_MATCHER = /[\w]*(Spec|Tests)$/
 TEST_PATH_MATCHER = %r{[\w/\-\s]+:\d+}
-PASSING_TEST_NAME_MATCHER = %r{\w+\s\w+\s\(\d+\.\d+\sseconds\)}
-FAILING_TEST_NAME_MATCHER = %r{\w+\s\w+, expected:}
-
-INPUT_FILE  = "xcpretty_input"
-RED_START   = "\e[31m"
-COLOR_END   = "\e[0m"
-GREEN_START = "\e[32;1m"
+PASSING_TEST_NAME_MATCHER = %r{\w+\s\(\d+\.\d+\sseconds\)}
+FAILING_TEST_NAME_MATCHER = %r{\w+, expected:}
 
 def run_xcpretty flags
   add_run_input SAMPLE_OCUNIT_SUITE_COMPLETION
   add_run_input SAMPLE_EXECUTED_TESTS
-  input_file = Tempfile.new(INPUT_FILE)
+  input_file = Tempfile.new("xcpretty_input")
   File.open(input_file.path, 'w') do |file|
     file.print run_input
   end
@@ -37,7 +37,11 @@ def run_output
   @output ||= ""
 end
 
+Before do
+ self.colorize = true
+end
+
 After do
   @input  = ""
   @output = ""
-end
+end

data/features/test_format.feature

@@ -1,28 +1,28 @@
 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"
-Then I should see a failed test icon
+    Scenario: Showing failed tests
+        Given I have a failing test in my suite
+        When I pipe to xcpretty with "--test"
+        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"
-Then I should see a passing test icon in ASCII
+    Scenario: Showing passing tests
+        Given I have a passing test in my suite
+        When I pipe to xcpretty with "--test"
+        Then I should see a passing test icon in ASCII
 
-Scenario: Showing some tests failed with color
-Given I have a failing test in my suite
-When I pipe to xcpretty with "--test --color"
-Then I should see a red failed test icon
-And I should see the path of a failed test
-And the final execution message should be red
+    Scenario: Showing some tests failed with color
+        Given I have a failing test in my suite
+        When I pipe to xcpretty with "--test --color"
+        Then I should see a red failed test icon
+        And I should see the path of a failed test
+        And the final execution message should be red
 
-Scenario: Showing passing tests with colorization
-Given I have a passing test in my suite
-When I pipe to xcpretty with "--test --color"
-Then I should see a green passing test icon
+    Scenario: Showing passing tests with colorization
+        Given I have a passing test in my suite
+        When I pipe to xcpretty with "--test --color"
+        Then I should see a green passing 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"
-Then the final execution message should be green
+    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"
+        Then the final execution message should be green

data/lib/xcpretty/ansi.rb

@@ -0,0 +1,70 @@
+module XCPretty
+  module ANSI
+    attr_accessor :colorize
+
+    FORMATTED_MATCHER = %r{\e\[(\d+)[;]?(\d+)?m(.*)\e\[0m}
+
+    EFFECT = {
+      :reset     => '0',
+      :bold      => '1',
+      :underline => '4'
+    }
+
+    COLORS = {
+      :black  => '30',
+      :red    => '31',
+      :green  => '32',
+      :yellow => '33',
+      :blue   => '34',
+      :cyan   => '36',
+      :white  => '37',
+      :plain  => '39'
+    }
+
+    def colorize?
+      !!@colorize
+    end
+
+    def white(text)
+      ansi_parse(text, :plain, :bold)
+    end
+
+    def red(text)
+      ansi_parse(text, :red)
+    end
+
+    def green(text)
+      ansi_parse(text, :green, :bold)
+    end
+
+    def cyan(text)
+      ansi_parse(text, :cyan)
+    end
+
+    def yellow(text)
+      ansi_parse(text, :yellow)
+    end
+
+    def applied_effects(text)
+      effects = []
+      if text =~ FORMATTED_MATCHER
+        colors = COLORS.invert[$1]
+        effect = EFFECT.invert[$2]
+        effects << colors if colors
+        effects << effect if effect
+      end
+      effects
+    end
+
+    def strip(text)
+      text =~ FORMATTED_MATCHER ? $3 : text
+    end
+
+    def ansi_parse(text, color, effect=nil)
+      return text unless colorize?
+      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/printer.rb

@@ -1,36 +1,48 @@
-require "paint"
+require "xcpretty/ansi"
 
 module XCPretty
 
   module Printer
 
-    attr_accessor :colorize
-
-    # @regex Captured groups
-    # $1 = file
-    # $2 = test_case
-    # $3 = failure_message
-    FAILING_TEST_MATCHER = /(.+:\d+):\serror:\s[\+\-]\[(.*)\]\s:(?:\s'.*'\s\[FAILED\],)?\s(.*)/
-
-    # @regex Captured groups
-    # $1 = test_case
-    # $2 = time
-    PASSING_TEST_MATCHER = /Test Case\s'-\[(.*)\]'\spassed\s\((\d*\.\d{3})\sseconds\)/
+    module Matchers
+      # @regex Captured groups
+      # $1 = suite
+      # $2 = time
+      TESTS_RUN_START_MATCHER = /Test Suite '(?:.*\/)?(.*[ox]ctest.*)' started at(.*)/
+
+      # @regex Captured groups
+      # $1 = suite
+      # $2 = time
+      TESTS_RUN_COMPLETION_MATCHER = /Test Suite '(?:.*\/)?(.*[ox]ctest.*)' finished at(.*)/
+
+      # @regex Captured groups
+      # $1 = test_case
+      # $2 = time
+      PASSING_TEST_MATCHER = /Test Case\s'-\[.*\s(.*)\]'\spassed\s\((\d*\.\d{3})\sseconds\)/
+
+      # @regex Captured groups
+      # $1 = file
+      # $2 = test_suite
+      # $3 = test_case
+      # $4 = reason
+      FAILING_TEST_MATCHER = /(.+:\d+):\serror:\s[\+\-]\[(.*)\s(.*)\]\s:(?:\s'.*'\s\[FAILED\],)?\s(.*)/
+
+      # @regex Captured groups
+      # $1 test suite name
+      TEST_SUITE_START_MATCHER = /Test Suite '(.*)' started at/
+      EXECUTED_MATCHER = /^Executed/
+    end
 
-    TESTS_DONE_MATCHER = /Test Suite ('.*\.(o|x)ctest(.*)') finished at/
-    # @regex Captured groups
-    # $1 test suite name
-    TESTS_START_MATCHER = /Test Suite ('.*(\.(o|x)ctest(.*))?') started at/
-    EXECUTED_MATCHER = /^Executed/
+    include ANSI
+    include Matchers
 
-    Paint::SHORTCUTS[:printer] = {
-      :white => Paint.color(:bold),
-      :red   => Paint.color(:red),
-      :green => Paint.color(:green, :bright),
-      :link  => Paint.color(:cyan),
-    }
+    def use_unicode=(bool)
+      @use_unicode = !!bool
+    end
 
-    include Paint::Printer
+    def use_unicode?
+      !!@use_unicode
+    end
 
     def pretty_print(text)
       update_test_state(text)
@@ -42,10 +54,14 @@ module XCPretty
 
     def update_test_state(text)
       case text
-      when FAILING_TEST_MATCHER
-        store_failure($1, $2, $3)
-      when TESTS_DONE_MATCHER
+      when TESTS_RUN_START_MATCHER
+        @tests_done = false
+        @printed_summary = false
+        @failures = {}
+      when TESTS_RUN_COMPLETION_MATCHER
         @tests_done = true
+      when FAILING_TEST_MATCHER
+        store_failure($1, $2, $3, $4)
       end
     end
 
@@ -75,34 +91,34 @@ module XCPretty
     end
 
     def test_summary(executed_message)
-      formatted_failures = failures.map do |f|
-        reason = colorize? ? red(f[:failure_message]) : f[:failure_message]
-        path   = colorize? ? link(f[:file]) : f[:file]
-        "#{f[:test_case]}, #{reason}\n#{path}"
-      end.join("\n\n")
+      formatted_suites = failures_per_suite.map do |suite, failures|
+        formatted_failures = failures.map do |f|
+          "  #{f[:test_case]}, #{f[:reason]}\n  #{f[:file]}"
+        end.join("\n\n")
+
+        "#{suite}\n#{formatted_failures}"
+      end
+
       final_message = if colorize?
-                        failures.any? ? red(executed_message) : green(executed_message)
+                        formatted_suites.any? ? red(executed_message) : green(executed_message)
                       else
                         executed_message
                       end
-      text = [formatted_failures, final_message].join("\n\n\n").strip
+      text = [formatted_suites, final_message].join("\n\n\n").strip
       "\n\n#{text}"
     end
 
-    def failures
-      @failures ||= []
+    def failures_per_suite
+      @failures ||= {}
     end
 
-    def store_failure(file, test_case, failure_message)
-      failures << {
-        :file => file,
+    def store_failure(file, test_suite, test_case, reason)
+      failures_per_suite[test_suite] ||= []
+      failures_per_suite[test_suite] << {
+        :file => cyan(file),
+        :reason => red(reason),
         :test_case => test_case,
-        :failure_message => failure_message
       }
     end
-
-    def colorize?
-      !!@colorize
-    end
   end
 end

data/lib/xcpretty/printers/rspec.rb

@@ -11,9 +11,9 @@ module XCPretty
       def pretty_format(text)
         case text
         when PASSING_TEST_MATCHER
-          colorize? ? green(PASS) : PASS
+          green(PASS)
         when FAILING_TEST_MATCHER
-          colorize? ? red(FAIL) : FAIL
+          red(FAIL)
         else
           ""
         end

data/lib/xcpretty/printers/simple.rb

@@ -10,6 +10,10 @@ module XCPretty
 
       PASS = "✓"
       FAIL = "✗"
+      ASCII_PASS = "."
+      ASCII_FAIL = "x"
+      COMPLETION = "▸"
+      ASCII_COMPLETION = ">"
 
       def pretty_format(text)
         case text
@@ -42,8 +46,10 @@ module XCPretty
         when PASSING_TEST_MATCHER
           print_passing_test($1, $2)
         when FAILING_TEST_MATCHER
-          print_failing_test($2, $3)
-        when TESTS_START_MATCHER
+          print_failing_test($3, $4)
+        when TESTS_RUN_START_MATCHER
+          print_test_run_start($1)
+        when TEST_SUITE_START_MATCHER
           print_suite_start($1)
         else
           ""
@@ -55,11 +61,11 @@ module XCPretty
       end
 
       def print_failing_test(test_case, reason)
-        format("", "#{test_case}, #{reason}", false)
+        format_test("#{test_case}, #{reason}", false)
       end
 
       def print_passing_test(test_case, time)
-        format("", "#{test_case} (#{time} seconds)")
+        format_test("#{test_case} (#{time} seconds)")
       end
 
       def print_linking(text)
@@ -108,8 +114,12 @@ module XCPretty
         format("Generating DSYM file")
       end
 
+      def print_test_run_start(name)
+        heading("Test Suite", name, "started")  
+      end
+
       def print_suite_start(name)
-        heading("Test Suite", name, "started")
+        heading("", name, "")
       end
 
       def heading(prefix, text, description)
@@ -119,14 +129,21 @@ module XCPretty
 
       def format(command, argument_text="", success=true)
         command_text = colorize? ? white(command) : command
-        [status_symbol(success), command_text, argument_text].join(" ").strip
+        [status_symbol(success ? :completion : :fail), command_text, argument_text].join(" ").strip
+      end
+
+      def format_test(test_case, success=true)
+        [status_symbol(success ? :pass : :fail), test_case].join(" ").strip
       end
 
-      def status_symbol(success)
-        if success && colorize?
-          green(PASS)
-        elsif colorize?
-          red(FAIL)
+      def status_symbol(status)
+        case status
+        when :pass
+          green(use_unicode? ? PASS : ASCII_PASS)
+        when :fail
+          red(use_unicode? ? FAIL : ASCII_FAIL)
+        when :completion
+          yellow(use_unicode? ? COMPLETION : ASCII_COMPLETION)
         else
           ""
         end

data/lib/xcpretty/version.rb

@@ -1,3 +1,3 @@
 module XCPretty
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/constants.rb

@@ -1,12 +1,20 @@
 # encoding: utf-8
 KIWI = 'kiwi'
 OCUNIT = 'ocunit'
-SAMPLE_OCUNIT_SUITE_BEGINNING = "Test Suite '/path/to/a/suite.xctest(Tests)' started at 2013-12-09 05:05:58 +0000."
+SAMPLE_TEST_GROUP_NAME = "RACTupleSpec"
+SAMPLE_OCUNIT_TEST_RUN_BEGINNING = "Test Suite '/Users/musalj/Library/Developer/Xcode/DerivedData/ReactiveCocoa-eznxkbqvgfsnrvetemqloysuwagb/Build/Products/Test/ReactiveCocoaTests.octest(Tests)' started at 2013-12-10 07:04:33 +0000"
+SAMPLE_KIWI_TEST_RUN_BEGINNING = "Test Suite 'ObjectiveRecordTests.xctest' started at 2013-12-10 06:15:39 +0000"
+SAMPLE_OCUNIT_TEST_RUN_COMPLETION = "Test Suite '/Users/musalj/Library/Developer/Xcode/DerivedData/ReactiveCocoa-eznxkbqvgfsnrvetemqloysuwagb/Build/Products/Test/ReactiveCocoaTests.octest(Tests)' finished at 2013-12-10 07:03:03 +0000."
+SAMPLE_KIWI_TEST_RUN_COMPLETION = "Test Suite 'ObjectiveRecordTests.xctest' finished at 2013-12-10 06:15:42 +0000."
+
+SAMPLE_OCUNIT_SUITE_BEGINNING = "Test Suite 'RACKVOWrapperSpec' started at 2013-12-10 21:06:10 +0000"
 SAMPLE_KIWI_SUITE_COMPLETION = "Test Suite 'All tests' finished at 2013-12-08 04:26:49 +0000."
 SAMPLE_OCUNIT_SUITE_COMPLETION = "Test Suite '/Users/musalj/Library/Developer/Xcode/DerivedData/ReactiveCocoa-eznxkbqvgfsnrvetemqloysuwagb/Build/Products/Test/ReactiveCocoaTests.octest(Tests)' finished at 2013-12-08 22:09:37 +0000."
 SAMPLE_XCTEST_SUITE_COMPLETION = "Test Suite 'ObjectiveSugarTests.xctest' finished at 2013-12-09 04:42:13 +0000."
+
 SAMPLE_KIWI_FAILURE = "/Users/musalj/code/OSS/ObjectiveSugar/Example/ObjectiveSugarTests/NSNumberTests.m:49: error: -[NumberAdditions Iterators_TimesIteratesTheExactNumberOfTimes] : 'Iterators, times： iterates the exact number of times' [FAILED], expected subject to equal 4, got 5"
 SAMPLE_SPECTA_FAILURE = "/Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoaTests/RACCommandSpec.m:458: error: -[RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES] : expected: 1, got: 0"
+
 SAMPLE_BUILD = "=== BUILD TARGET The Spacer OF PROJECT Pods WITH THE DEFAULT CONFIGURATION Debug ==="
 SAMPLE_CLEAN = "=== CLEAN TARGET Pods-ObjectiveSugar OF PROJECT Pods WITH CONFIGURATION Debug ==="
 SAMPLE_ANOTHER_CLEAN = "=== CLEAN TARGET Pods OF PROJECT Pods WITH CONFIGURATION Debug ==="
@@ -16,7 +24,7 @@ Clean.Remove clean /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSu
     builtin-rm -rf /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/ObjectiveSugar.build/Debug-iphonesimulator/ObjectiveSugarTests.build
 )
 SAMPLE_EXECUTED_TESTS = "Executed 4 tests, with 0 failures (0 unexpected) in 0.003 (0.004) seconds"
-SAMPLE_OCUNIT_TEST = "Test Case '-[RACTupleSpec _tupleByAddingObject__should_add_a_non_nil_object]' passed (0.001 seconds)."
+SAMPLE_OCUNIT_TEST = "Test Case '-[#{SAMPLE_TEST_GROUP_NAME} _tupleByAddingObject__should_add_a_non_nil_object]' passed (0.001 seconds)."
 SAMPLE_COMPILE = %Q(
 CompileC /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/Pods.build/Debug-iphonesimulator/Pods-ObjectiveSugar.build/Objects-normal/i386/NSMutableArray+ObjectiveSugar.o /Users/musalj/code/OSS/ObjectiveSugar/Classes/NSMutableArray+ObjectiveSugar.m normal i386 objective-c com.apple.compilers.llvm.clang.1_0.compiler
     cd /Users/musalj/code/OSS/ObjectiveSugar/Example/Pods

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+$:.unshift('.', __FILE__)
+require "lib/xcpretty/ansi"
+require "support/matchers/colors"
+require "fixtures/constants"
+
+include XCPretty::ANSI

data/spec/support/matchers/colors.rb

@@ -0,0 +1,18 @@
+RSpec::Matchers.define :be_colored do |expected|
+
+  def effects_string(actual)
+    effects = applied_effects(actual).join(' and ')
+    effects.length > 0 ? effects : "unformatted"
+  end
+
+  match do |actual|
+    applied_effects(actual).include? expected.to_sym
+  end
+
+  failure_message_for_should do |actual|
+    "expected that '#{strip(actual)}' would be colored #{expected}, but was #{effects_string(actual)}"
+  end
+  failure_message_for_should_not do |actual|
+    "expected that #{strip(actual)} would not be colored #{expected}, but was #{effects_string(actual)}"
+  end
+end

data/spec/xcpretty/ansi_spec.rb

@@ -0,0 +1,46 @@
+require "xcpretty/ansi"
+
+module XCPretty
+  describe ANSI do
+    include ANSI
+
+    before do
+      self.colorize = true
+      @text = "This is the PARTY"
+    end
+
+    describe "color helpers" do
+      it "colors text red" do
+        red(@text).should == "\e[31m#{@text}\e[0m"
+      end
+
+      it "formats text bold" do
+        white(@text).should == "\e[39;1m#{@text}\e[0m"
+      end
+
+      it "colors text green" do
+        green(@text).should == "\e[32;1m#{@text}\e[0m"
+      end
+
+      it "colors text cyan" do
+        cyan(@text).should == "\e[36m#{@text}\e[0m"
+      end
+    end
+
+    describe "custom color mixing" do
+      it "can mix random known colors" do
+        ansi_parse(@text, :yellow, :underline).should == "\e[33;4m#{@text}\e[0m"
+      end
+    end
+
+    describe "debug helpers" do
+      it "can remove formatting from text" do
+        strip("\e[33;4m#{@text}\e[0m").should == @text
+      end
+
+      it "can list known applied effects" do
+        applied_effects("\e[33;1m#{@text}\e[0m").should == [:yellow, :bold]
+      end
+    end
+  end
+end

data/spec/xcpretty/printer_spec.rb

@@ -0,0 +1,88 @@
+require "spec_helper"
+require "xcpretty/printer"
+
+module XCPretty
+
+  module Printer
+
+    describe Printer do
+
+      include Printer
+
+      def pretty_format(text)
+        ""
+      end
+
+      def executed_tests_message
+        format_test_summary(SAMPLE_EXECUTED_TESTS)
+      end
+
+      def given_tests_are_done(reporter = SAMPLE_XCTEST_SUITE_COMPLETION)
+        pretty_print(reporter)
+      end
+
+      def given_kiwi_tests_are_done
+        pretty_print(SAMPLE_XCTEST_SUITE_COMPLETION)
+        pretty_print(SAMPLE_EXECUTED_TESTS)
+        pretty_print(SAMPLE_KIWI_SUITE_COMPLETION)
+      end
+
+      before(:each) do
+        STDOUT.stub(:print) { |text| text }
+      end
+
+      it "knows when the test suite is done for OCunit / Specta" do
+        executed_tests_message.should == ""
+
+        given_tests_are_done
+        executed_tests_message.should ==  "\n\n#{SAMPLE_EXECUTED_TESTS}"
+      end
+
+      it "knows when the test suite is done for XCtest" do
+        executed_tests_message.should == ""
+
+        given_tests_are_done
+        executed_tests_message.should ==  "\n\n#{SAMPLE_EXECUTED_TESTS}"
+      end
+
+      it "prints out Kiwi failures nicely" do
+        pretty_print(SAMPLE_KIWI_FAILURE)
+        pretty_print(SAMPLE_KIWI_FAILURE)
+        given_tests_are_done
+        executed_tests_message.should include(%Q(
+NumberAdditions
+  Iterators_TimesIteratesTheExactNumberOfTimes, expected subject to equal 4, got 5
+  /Users/musalj/code/OSS/ObjectiveSugar/Example/ObjectiveSugarTests/NSNumberTests.m:49
+
+  Iterators_TimesIteratesTheExactNumberOfTimes, expected subject to equal 4, got 5
+  /Users/musalj/code/OSS/ObjectiveSugar/Example/ObjectiveSugarTests/NSNumberTests.m:49
+
+
+#{SAMPLE_EXECUTED_TESTS}))
+      end
+
+      it "prints out specta failures nicely" do
+        pretty_print(SAMPLE_SPECTA_FAILURE)
+        pretty_print(SAMPLE_SPECTA_FAILURE)
+        given_tests_are_done
+        executed_tests_message.should include(%Q(
+RACCommandSpec
+  enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0
+  /Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoaTests/RACCommandSpec.m:458
+
+  enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0
+  /Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoaTests/RACCommandSpec.m:458
+
+
+#{SAMPLE_EXECUTED_TESTS}))
+      end
+
+      it "doesn't print executed message twice for Kiwi tests" do
+        Printer.instance_variable_set(:@printed_summary, false)
+        given_kiwi_tests_are_done
+        executed_tests_message.should == ""
+      end
+
+    end
+  end
+end

data/spec/xcpretty/printers/printer_spec.rb

@@ -1,5 +1,5 @@
+require "spec_helper"
 require "xcpretty/printer"
-require "fixtures/constants"
 
 module XCPretty
 
@@ -21,8 +21,12 @@ module XCPretty
         pretty_print(reporter)
       end
 
+      def given_tests_have_started(reporter = SAMPLE_OCUNIT_TEST_RUN_BEGINNING)
+        pretty_print(reporter)  
+      end
+
       def given_kiwi_tests_are_done
-        pretty_print(SAMPLE_XCTEST_SUITE_COMPLETION)
+        pretty_print(SAMPLE_KIWI_TEST_RUN_COMPLETION)
         pretty_print(SAMPLE_EXECUTED_TESTS)
         pretty_print(SAMPLE_KIWI_SUITE_COMPLETION)
       end
@@ -47,31 +51,67 @@ module XCPretty
 
       it "prints out Kiwi failures nicely" do
         pretty_print(SAMPLE_KIWI_FAILURE)
-        given_tests_are_done
+        pretty_print(SAMPLE_KIWI_FAILURE)
+        given_tests_are_done(SAMPLE_KIWI_TEST_RUN_COMPLETION)
         executed_tests_message.should include(%Q(
-NumberAdditions Iterators_TimesIteratesTheExactNumberOfTimes, expected subject to equal 4, got 5
-/Users/musalj/code/OSS/ObjectiveSugar/Example/ObjectiveSugarTests/NSNumberTests.m:49
+NumberAdditions
+  Iterators_TimesIteratesTheExactNumberOfTimes, expected subject to equal 4, got 5
+  /Users/musalj/code/OSS/ObjectiveSugar/Example/ObjectiveSugarTests/NSNumberTests.m:49
+
+  Iterators_TimesIteratesTheExactNumberOfTimes, expected subject to equal 4, got 5
+  /Users/musalj/code/OSS/ObjectiveSugar/Example/ObjectiveSugarTests/NSNumberTests.m:49
 
 
 #{SAMPLE_EXECUTED_TESTS}))
       end
 
       it "prints out specta failures nicely" do
+        pretty_print(SAMPLE_SPECTA_FAILURE)
         pretty_print(SAMPLE_SPECTA_FAILURE)
         given_tests_are_done
         executed_tests_message.should include(%Q(
-RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0
-/Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoaTests/RACCommandSpec.m:458
+RACCommandSpec
+  enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0
+  /Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoaTests/RACCommandSpec.m:458
+
+  enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0
+  /Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoaTests/RACCommandSpec.m:458
 
 
 #{SAMPLE_EXECUTED_TESTS}))
       end
 
       it "doesn't print executed message twice for Kiwi tests" do
-        Printer.instance_variable_set(:@printed_summary, false)
-        given_kiwi_tests_are_done
-        executed_tests_message.should == ""
+          given_tests_have_started(SAMPLE_KIWI_TEST_RUN_BEGINNING)
+          given_tests_are_done(SAMPLE_KIWI_TEST_RUN_COMPLETION)
+          executed_tests_message.should ==  "\n\n#{SAMPLE_EXECUTED_TESTS}"
+
+          given_tests_are_done(SAMPLE_KIWI_SUITE_COMPLETION)
+          executed_tests_message.should ==  ""
+      end
+
+      it "prints OCunit / XCTest summary twice if tests executed twice" do
+        2.times do
+          given_tests_have_started
+          given_tests_are_done
+          executed_tests_message.should ==  "\n\n#{SAMPLE_EXECUTED_TESTS}"
+
+          given_tests_are_done(SAMPLE_XCTEST_SUITE_COMPLETION)
+          executed_tests_message.should ==  ""
+        end
       end
+
+      it "prints Kiwi summary twice if tests executed twice" do
+        2.times do
+          given_tests_have_started(SAMPLE_KIWI_TEST_RUN_BEGINNING)
+          given_tests_are_done(SAMPLE_KIWI_TEST_RUN_COMPLETION)
+          executed_tests_message.should ==  "\n\n#{SAMPLE_EXECUTED_TESTS}"
+
+          given_tests_are_done(SAMPLE_KIWI_SUITE_COMPLETION)
+          executed_tests_message.should ==  ""
+        end
+      end
+
     end
   end
 end

data/spec/xcpretty/printers/rspec_spec.rb

@@ -1,6 +1,6 @@
+require "spec_helper"
 require "xcpretty/printer"
 require "xcpretty/printers/rspec"
-require "fixtures/constants"
 
 module XCPretty
 
@@ -13,12 +13,28 @@ module XCPretty
         subject.pretty_print(SAMPLE_OCUNIT_TEST)
       end
 
-      it "prints dots for passing tests" do
-        subject.pretty_format(SAMPLE_OCUNIT_TEST).should == "."
+      context "without colors" do
+
+        it "prints green dots for passing tests" do
+          subject.pretty_format(SAMPLE_OCUNIT_TEST).should == "."
+        end
+
+        it "prints F for failing tests" do
+          subject.pretty_format(SAMPLE_KIWI_FAILURE).should == "F"
+        end
       end
 
-      it "prints F for failing tests" do
-        subject.pretty_format(SAMPLE_KIWI_FAILURE).should == "F"
+      context "with colors" do
+
+        before { subject.colorize = true }
+
+        it "prints green for passing tests" do
+          subject.pretty_format(SAMPLE_OCUNIT_TEST).should be_colored :green
+        end
+
+        it "prints red for failing tests" do
+          subject.pretty_format(SAMPLE_KIWI_FAILURE).should be_colored :red
+        end
       end
 
       describe "doesn't output any compiling output" do

data/spec/xcpretty/printers/simple_spec.rb

@@ -20,22 +20,22 @@ module XCPretty
 
       it "parses compiling output" do
         subject.pretty_format(SAMPLE_COMPILE).should ==
-        "Compiling NSMutableArray+ObjectiveSugar.m"
+        "> Compiling NSMutableArray+ObjectiveSugar.m"
       end
 
       it "parses another compiling output" do
         subject.pretty_format(SAMPLE_ANOTHER_COMPILE).should ==
-        "Compiling KWNull.m"
+        "> Compiling KWNull.m"
       end
 
       it "parses precompiling output" do
         subject.pretty_format(SAMPLE_PRECOMPILE).should ==
-        "Precompiling Pods-CocoaLumberjack-prefix.pch"
+        "> Precompiling Pods-CocoaLumberjack-prefix.pch"
       end
 
       it "parses another precompiling output" do
         subject.pretty_format(SAMPLE_ANOTHER_PRECOMPILE).should ==
-        "Precompiling Pods-CrittercismSDK-prefix.pch"
+        "> Precompiling Pods-CrittercismSDK-prefix.pch"
       end
 
       it "parses clean remove output" do
@@ -48,69 +48,78 @@ module XCPretty
 
       it "parses clean target/project/configuration" do
         subject.pretty_format(SAMPLE_CLEAN).should ==
-        "Cleaning Pods/ObjectiveSugar [Debug]"
+        "> Cleaning Pods/ObjectiveSugar [Debug]"
       end
 
       it "parses another clean target/project/configuration" do
         subject.pretty_format(SAMPLE_ANOTHER_CLEAN).should ==
-        "Cleaning Pods/Pods [Debug]"
+        "> Cleaning Pods/Pods [Debug]"
       end
 
       it "parses build target/project/configuration with target" do
         subject.pretty_format(SAMPLE_BUILD).should ==
-        "Building Pods/The Spacer [Debug]"
+        "> Building Pods/The Spacer [Debug]"
       end
 
       it "parses clean target/project/configuration with nested pods" do
         subject.pretty_format(SAMPLE_CLEAN_NESTED_PODS).should ==
-        "Cleaning Pods/Kiwi [Debug]"
+        "> Cleaning Pods/Kiwi [Debug]"
       end
 
       it "parses PhaseScriptExecution" do
         subject.pretty_format(SAMPLE_RUN_SCRIPT).should ==
-        "Running script 'Check Pods Manifest.lock'"
+        "> Running script 'Check Pods Manifest.lock'"
       end
 
       it "parses Libtool" do
         subject.pretty_format(SAMPLE_LIBTOOL).should ==
-        "Building library libPods-ObjectiveSugarTests-Kiwi.a"
+        "> Building library libPods-ObjectiveSugarTests-Kiwi.a"
       end
 
       it "parses CpResource" do
         subject.pretty_format(SAMPLE_CPRESOURCE).should ==
-        "Copying ObjectiveSugar/Default-568h@2x.png"
+        "> Copying ObjectiveSugar/Default-568h@2x.png"
       end
 
       it "parses CopyStringsFile" do
         subject.pretty_format(SAMPLE_COPYSTRINGS).should ==
-        "Copying InfoPlist.strings"
+        "> Copying InfoPlist.strings"
       end
 
       it "parses GenerateDSYMFile" do
         subject.pretty_format(SAMPLE_DSYM).should ==
-        "Generating DSYM file"
+        "> Generating DSYM file"
       end
 
       it "parses info.plist processing" do
         subject.pretty_format(SAMPLE_PROCESS_INFOPLIST).should ==
-        "Processing The Spacer-Info.plist"
+        "> Processing The Spacer-Info.plist"
       end
 
       it "parses Ld" do
         subject.pretty_format(SAMPLE_LD).should ==
-        "Linking ObjectiveSugar"
+        "> Linking ObjectiveSugar"
       end
 
       it "parses passing tests" do
         subject.pretty_format(SAMPLE_OCUNIT_TEST).should ==
-        "RACTupleSpec _tupleByAddingObject__should_add_a_non_nil_object (0.001 seconds)"
+        ". _tupleByAddingObject__should_add_a_non_nil_object (0.001 seconds)"
       end
 
       it "parses failing tests" do
         subject.pretty_format(SAMPLE_SPECTA_FAILURE).should ==
-        "RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0"
+        "x enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES, expected: 1, got: 0"
       end
 
+      it "parses test run started" do
+        subject.pretty_format(SAMPLE_OCUNIT_TEST_RUN_BEGINNING).should ==
+        "Test Suite ReactiveCocoaTests.octest(Tests) started"
+      end
+
+      it "parses test suite started" do
+        subject.pretty_format(SAMPLE_OCUNIT_SUITE_BEGINNING).should ==
+        "RACKVOWrapperSpec"
+      end
     end
   end
 end

data/xcpretty.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "paint"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: paint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +81,7 @@ files:
 - .gitignore
 - .kick
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -105,11 +92,16 @@ files:
 - features/support/env.rb
 - features/test_format.feature
 - lib/xcpretty.rb
+- lib/xcpretty/ansi.rb
 - lib/xcpretty/printer.rb
 - lib/xcpretty/printers/rspec.rb
 - lib/xcpretty/printers/simple.rb
 - lib/xcpretty/version.rb
 - spec/fixtures/constants.rb
+- spec/spec_helper.rb
+- spec/support/matchers/colors.rb
+- spec/xcpretty/ansi_spec.rb
+- spec/xcpretty/printer_spec.rb
 - spec/xcpretty/printers/printer_spec.rb
 - spec/xcpretty/printers/rspec_spec.rb
 - spec/xcpretty/printers/simple_spec.rb
@@ -144,6 +136,10 @@ test_files:
 - features/support/env.rb
 - features/test_format.feature
 - spec/fixtures/constants.rb
+- spec/spec_helper.rb
+- spec/support/matchers/colors.rb
+- spec/xcpretty/ansi_spec.rb
+- spec/xcpretty/printer_spec.rb
 - spec/xcpretty/printers/printer_spec.rb
 - spec/xcpretty/printers/rspec_spec.rb
 - spec/xcpretty/printers/simple_spec.rb