xcpretty 0.1.12 → 0.2.0

data/lib/xcpretty/parser.rb

@@ -61,6 +61,11 @@ module XCPretty
     # $2 file_name (e.g. MainMenu.xib)
     COMPILE_XIB_MATCHER = /^CompileXIB\s(.*\/(.*\.xib))/
 
+    # @regex Captured groups
+    # $1 file_path
+    # $2 file_name (e.g. Main.storyboard)
+    COMPILE_STORYBOARD_MATCHER = /^CompileStoryboard\s(.*\/([^\/].*\.storyboard))/
+
     # @regex Captured groups
     # $1 source file
     # $2 target file
@@ -120,6 +125,8 @@ module XCPretty
     # $3 = time
     MEASURING_TEST_MATCHER = /^[^:]*:[^:]*:\sTest Case\s'-\[(.*)\s(.*)\]'\smeasured\s\[Time,\sseconds\]\saverage:\s(\d*\.\d{3}),/
 
+    PHASE_SUCCESS_MATCHER = /^\*\*\s(.*)\sSUCCEEDED\s\*\*/
+
     # @regex Captured groups
     # $1 = script_name
     PHASE_SCRIPT_EXECUTION_MATCHER = /^PhaseScriptExecution\s(.*)\s\//
@@ -165,7 +172,7 @@ module XCPretty
     # @regex Captured groups
     # $1 file_path
     # $2 file_name
-    TOUCH_MATCHER = /^Touch\s(.*\/([\w+\.]+))/
+    TOUCH_MATCHER = /^Touch\s(.*\/(.+))/
 
     # @regex Captured groups
     # $1 file_path
@@ -180,6 +187,10 @@ module XCPretty
       # $3 = reason
       COMPILE_WARNING_MATCHER = /^(\/.+\/(.*):.*:.*):\swarning:\s(.*)$/
 
+      # $1 = ld prefix
+      # $2 = warning message
+      LD_WARNING_MATCHER = /^(ld: )warning: (.*)/
+
       # @regex Captured groups
       # $1 = whole warning
       GENERIC_WARNING_MATCHER = /^warning:\s(.*)$/
@@ -206,9 +217,14 @@ module XCPretty
 
       # @regex Captured groups
       # $1 = whole error.
-      #      it varies a lot, not sure if it makes sense to catch everything separately
+      # 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.
+      # $2 = file path
+      FILE_MISSING_ERROR_MATCHER = /^<unknown>:0:\s(error:\s.*)\s'(\/.+\/.*\..*)'$/
+
       # $1 = whole error
       LD_ERROR_MATCHER = /^(ld:.*)/
 
@@ -229,7 +245,8 @@ module XCPretty
       LINKER_UNDEFINED_SYMBOLS_MATCHER = /^(Undefined symbols for architecture .*):$/
 
       # @regex Captured groups
-      PODS_ERROR_MATCHER = /^error:\s(.*)/
+      # $1 reason
+      PODS_ERROR_MATCHER = /^(error:\s.*)/
 
       # @regex Captured groups
       # $1 = reference
@@ -288,6 +305,8 @@ module XCPretty
         formatter.format_compile_command($1, $2)
       when COMPILE_XIB_MATCHER
         formatter.format_compile_xib($2, $1)
+      when COMPILE_STORYBOARD_MATCHER
+        formatter.format_compile_storyboard($2, $1)
       when COPY_HEADER_MATCHER
         formatter.format_copy_header_file($1, $2)
       when COPY_PLIST_MATCHER
@@ -300,8 +319,12 @@ module XCPretty
         formatter.format_failing_test($2, $3, $4, $1)
       when FATAL_ERROR_MATCHER
         formatter.format_error($1)
+      when FILE_MISSING_ERROR_MATCHER
+        formatter.format_file_missing_error($1, $2)
       when GENERATE_DSYM_MATCHER
         formatter.format_generate_dsym($1)
+      when LD_WARNING_MATCHER
+        formatter.format_ld_warning($1 + $2)
       when LD_ERROR_MATCHER
         formatter.format_error($1)
       when LIBTOOL_MATCHER
@@ -320,10 +343,12 @@ module XCPretty
         formatter.format_process_info_plist(*unescaped($2, $1))
       when PHASE_SCRIPT_EXECUTION_MATCHER
         formatter.format_phase_script_execution(*unescaped($1))
+      when PHASE_SUCCESS_MATCHER
+        formatter.format_phase_success($1)
       when PROCESS_PCH_MATCHER
         formatter.format_process_pch($1)
-        when PROCESS_PCH_COMMAND_MATCHER
-          formatter.format_process_pch_command($1)
+      when PROCESS_PCH_COMMAND_MATCHER
+        formatter.format_process_pch_command($1)
       when PREPROCESS_MATCHER
         formatter.format_preprocess($1)
       when PBXCP_MATCHER
@@ -419,14 +444,11 @@ module XCPretty
     end
 
     def should_format_undefined_symbols?
-      current_linker_failure[:message]     &&
-      current_linker_failure[:symbol]      &&
-      current_linker_failure[:reference]
+      current_linker_failure[:message] && current_linker_failure[:symbol] && current_linker_failure[:reference]
     end
 
     def should_format_duplicate_symbols?
-      current_linker_failure[:message]     &&
-      current_linker_failure[:files].count > 1
+      current_linker_failure[:message] && current_linker_failure[:files].count > 1
     end
 
     def current_issue
@@ -434,7 +456,7 @@ module XCPretty
     end
 
     def current_linker_failure
-      @linker_failure ||= { :files => [] }
+      @linker_failure ||= {files: []}
     end
 
     def format_compile_error
@@ -486,9 +508,9 @@ module XCPretty
     def store_failure(file, test_suite, test_case, reason)
       failures_per_suite[test_suite] ||= []
       failures_per_suite[test_suite] << {
-        :file_path => file,
-        :reason => reason,
-        :test_case => test_case
+        file_path: file,
+        reason: reason,
+        test_case: test_case
       }
     end
 
@@ -508,8 +530,9 @@ module XCPretty
     end
 
     def unescaped(*escaped_values)
-      escaped_values.map { |v| v.gsub('\\', '') }
+      escaped_values.map { |v| v.delete('\\') }
     end
 
   end
 end
+

data/lib/xcpretty/printer.rb

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

data/lib/xcpretty/reporters/html.rb

@@ -30,12 +30,13 @@ module XCPretty
     end
 
     def format_failing_test(suite, test_case, reason, file)
-      add_test(suite, {:name => test_case, :failing => true,
-        :reason => reason, :file => file, :snippet => formatted_snippet(file)})
+      add_test(suite, name: test_case, failing: true,
+                      reason: reason, file: file,
+                      snippet: formatted_snippet(file))
     end
 
     def format_passing_test(suite, test_case, time)
-      add_test(suite, {:name => test_case, :time => time})
+      add_test(suite, name: test_case, time: time)
     end
 
     def finish
@@ -47,13 +48,13 @@ module XCPretty
 
     def formatted_snippet(filepath)
       snippet = Snippet.from_filepath(filepath)
-      Syntax.highlight(snippet, "-f html -O style=colorful -O noclasses")
+      Syntax.highlight(snippet)
     end
 
 
     def add_test(suite_name, data)
       @test_count += 1
-      @test_suites[suite_name] ||= {:tests => [], :screenshots => []}
+      @test_suites[suite_name] ||= {tests: [], screenshots: []}
       @test_suites[suite_name][:tests] << data
       if data[:failing]
         @test_suites[suite_name][:failing] = true
@@ -94,3 +95,4 @@ module XCPretty
     end
   end
 end
+

data/lib/xcpretty/reporters/json_compilation_database.rb

@@ -8,13 +8,7 @@ module XCPretty
       unless @@loaded ||= false
         require 'fileutils'
         require 'pathname'
-        unless Object.const_defined?(:JSON)
-          begin
-            require 'json'
-          rescue LoadError
-            require File.expand_path(File.join(File.dirname(__FILE__), '../../../vendor/json_pure/generator'))
-          end
-        end
+        require 'json'
         @@loaded = true
       end
     end
@@ -45,9 +39,10 @@ module XCPretty
     def format_compile_command(compiler_command, file_path)
       directory = file_path.gsub("#{@current_path}", '').gsub(/\/$/, '')
       directory = '/' if directory.empty?
-      @compilation_units << {:command => compiler_command.gsub(/(\-include)\s.*\.pch/, "\\1 #{@pch_path}"),
-                             :file => @current_path,
-                             :directory => directory}
+      cmd = compiler_command.gsub(/(\-include)\s.*\.pch/, "\\1 #{@pch_path}")
+      @compilation_units << {command: cmd,
+                             file: @current_path,
+                             directory: directory}
     end
 
     def finish
@@ -64,3 +59,4 @@ module XCPretty
     end
   end
 end
+

data/lib/xcpretty/reporters/junit.rb

@@ -19,9 +19,9 @@ module XCPretty
       @filepath  = options[:path] || FILEPATH
       @directory = `pwd`.strip
       @document  = REXML::Document.new
-      @document << REXML::XMLDecl.new('1.0','UTF-8')
+      @document << REXML::XMLDecl.new('1.0', 'UTF-8')
       @document.add_element('testsuites')
-      @parser    = Parser.new(self)
+      @parser = Parser.new(self)
       @total_tests = 0
       @total_fails = 0
     end
@@ -77,7 +77,9 @@ module XCPretty
     end
 
     def suite(classname)
-      return @last_suite if @last_suite && @last_suite.attributes['name'] == classname
+      if @last_suite && @last_suite.attributes['name'] == classname
+        return @last_suite
+      end
 
       set_test_counters
       @last_suite = @document.root.add_element('testsuite')
@@ -97,3 +99,4 @@ module XCPretty
     end
   end
 end
+

data/lib/xcpretty/snippet.rb

@@ -20,8 +20,6 @@ module XCPretty
     end
 
 
-    private
-
     def self.read_snippet(file, around_line)
       text = ''
       starting_position = around_line.to_i - 2

data/lib/xcpretty/syntax.rb

@@ -1,44 +1,51 @@
+begin
+  require 'rouge'
+rescue LoadError
+  # rubocop:disable Style/ConstantName
+  Rouge = nil
+  # rubocop:enable Style/ConstantName
+end
+
 require 'xcpretty/snippet'
 
 module XCPretty
-  class Syntax
-    def self.register_filetype(type, extensions)
-      @filetypes ||= {}
-      extensions.each { |ext| @filetypes[ext] = type }
-    end
+  module Syntax
+    def self.highlight(snippet)
+      return snippet.contents unless Rouge
 
-    register_filetype 'c++',    ['.cpp', '.hpp', '.c++', '.cxx', '.cc']
-    register_filetype 'objc',   ['.m', '.h']
-    register_filetype 'objc++', ['.mm', '.hh']
-    register_filetype 'swift',  ['.swift']
-    register_filetype 'dylan',  ['.dyl', '.dylan']
-    register_filetype 'ruby',   ['.ruby', '.rb']
+      if snippet.file_path.include?(':')
+        filename = snippet.file_path.rpartition(':').first
+      else
+        filename = snippet.file_path
+      end
 
-    def self.highlight(snippet, options = '')
-      if Pygments.available?
-        language = file_language(File.basename(snippet.file_path))
-        Pygments.pygmentize(snippet.contents, language, options)
+      lexer = find_lexer(filename, snippet.contents)
+      if lexer
+        formatter = Rouge::Formatters::Terminal256.new
+        formatter.format(lexer.lex(snippet.contents))
       else
         snippet.contents
       end
     end
 
-    private
-
-    def self.file_language(filename)
-      ext = File.extname(filename)
-      @filetypes[ext] || 'objc'
-    end
-  end
-
-  class Pygments
-    def self.pygmentize(code, language, options)
-      `echo '#{code}' | pygmentize -f 256 -l #{language} #{options if options}`
-    end
-
-    def self.available?
-      @available = system('which pygmentize > /dev/null') if @available.nil?
-      @available
+    # @param [String] filename The filename
+    # @param [String] contents The contents of the file
+    # @return [Rouge::Lexer]
+    def self.find_lexer(filename, contents)
+      case File.extname(filename)
+      when '.cpp', '.cc', '.c++', '.cxx', '.hpp', '.h++', '.hxx'
+        Rouge::Lexers::Cpp
+      when '.m', '.h' then Rouge::Lexers::ObjectiveC
+      when '.swift' then Rouge::Lexers::Swift
+      when '.ruby', '.rb' then Rouge::Lexers::Ruby
+      else
+        options = {
+          filename: File.basename(filename),
+          source: contents
+        }
+        Rouge::Lexer.guesses(options).first
+      end
     end
   end
 end
+

data/lib/xcpretty/term.rb

@@ -0,0 +1,14 @@
+
+module XCPretty
+  module Term
+
+    def self.unicode?
+      Encoding.default_external == Encoding::UTF_8
+    end
+
+    def self.color?
+      STDOUT.tty?
+    end
+  end
+end
+

data/lib/xcpretty/version.rb

@@ -1,3 +1,4 @@
 module XCPretty
-  VERSION = "0.1.12"
+  VERSION = "0.2.0"
 end
+

data/lib/xcpretty.rb

@@ -2,6 +2,7 @@ require 'xcpretty/version'
 require 'xcpretty/printer'
 require 'xcpretty/syntax'
 require 'xcpretty/snippet'
+require 'xcpretty/term'
 require 'xcpretty/formatters/formatter'
 require 'xcpretty/formatters/simple'
 require 'xcpretty/formatters/rspec'
@@ -21,12 +22,10 @@ module XCPretty
   end
 
   def self.load_custom_formatter(path)
-    begin
-      $:.unshift File.dirname(path)
-      class_from_path(path)
-    rescue SyntaxError => e
-      exit_with_error("Expected formatter source file to return a class. #{e}")
-    end
+    $LOAD_PATH.unshift File.dirname(path)
+    class_from_path(path)
+  rescue SyntaxError => e
+    exit_with_error("Expected formatter source file to return a class. #{e}")
   end
 
   def self.exit_with_error(message)

data/spec/fixtures/constants.rb

@@ -25,6 +25,8 @@ SAMPLE_BUILD = "=== BUILD TARGET The Spacer OF PROJECT Pods WITH THE DEFAULT CON
 SAMPLE_ANALYZE_TARGET = "=== ANALYZE 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 ==="
+SAMPLE_BUILD_SUCCEEDED = "** BUILD SUCCEEDED **"
+SAMPLE_CLEAN_SUCCEEDED = "** CLEAN SUCCEEDED **"
 SAMPLE_CLEAN_REMOVE = %Q(
 Clean.Remove clean /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/ObjectiveSugar.build/Debug-iphonesimulator/ObjectiveSugarTests.build
     builtin-rm -rf /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/ObjectiveSugar.build/Debug-iphonesimulator/ObjectiveSugarTests.build
@@ -109,9 +111,9 @@ GenerateDSYMFile /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSuga
     /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Products/Debug-iphonesimulator/ObjectiveSugarTests.octest/ObjectiveSugarTests -o /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Products/Debug-iphonesimulator/ObjectiveSugarTests.octest.dSYM
 )
 SAMPLE_TOUCH = %Q(
-Touch /Users/musalj/Library/Developer/Xcode/DerivedData/Alcatraz-aobuxcinaqyzjugrnxjjhfzgwaou/Build/Products/Debug/AlcatrazTests.octest
+Touch /Users/musalj/Library/Developer/Xcode/DerivedData/Alcatraz-aobuxcinaqyzjugrnxjjhfzgwaou/Build/Products/Debug/Alcatraz\ Tests.octest
     cd /Users/musalj/code/OSS/Alcatraz
-    /usr/bin/touch -c /Users/musalj/Library/Developer/Xcode/DerivedData/Alcatraz-aobuxcinaqyzjugrnxjjhfzgwaou/Build/Products/Debug/AlcatrazTests.octest
+    /usr/bin/touch -c /Users/musalj/Library/Developer/Xcode/DerivedData/Alcatraz-aobuxcinaqyzjugrnxjjhfzgwaou/Build/Products/Debug/Alcatraz\ Tests.octest
 )
 
 SAMPLE_WRITE_FILE = %Q(
@@ -477,6 +479,12 @@ CompileXIB CocoaChip/en.lproj/MainMenu.xib
     setenv XCODE_DEVELOPER_USR_PATH /Applications/Xcode.app/Contents/Developer/usr/bin/..
     /Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --errors --warnings --notices --minimum-deployment-target 10.7 --output-format human-readable-text --compile /Users/dustin/Source/CocoaChip/build/Release/CocoaChip.app/Contents/Resources/en.lproj/MainMenu.nib /Users/dustin/Source/CocoaChip/CocoaChip/en.lproj/MainMenu.xib
 )
+SAMPLE_COMPILE_STORYBOARD = %Q(
+CompileStoryboard sample/Main.storyboard
+    cd /Users/chipp/Developer/sample
+    export XCODE_DEVELOPER_USR_PATH=/Applications/Xcode.app/Contents/Developer/usr/bin/..
+    /Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --target-device iphone --target-device ipad --errors --warnings --notices --module sample --minimum-deployment-target 7.0 --output-partial-info-plist /Users/chipp/Library/Developer/Xcode/DerivedData/sample-etjztiverddwaddrudeteewjzfxw/Build/Intermediates/ArchiveIntermediates/sample/IntermediateBuildFilesPath/sample.build/Release-iphoneos/sample.build/SJMetroPickerStoryboard-SBPartialInfo.plist --auto-activate-custom-fonts --output-format human-readable-text --compilation-directory /Users/chipp/Library/Developer/Xcode/DerivedData/sample-etjztiverddwaddrudeteewjzfxw/Build/Intermediates/ArchiveIntermediates/sample/InstallationBuildProductsLocation/Applications/sample.app /Users/chipp/Developer/sample/sample/Main.storyboard
+)
 SAMPLE_CODESIGN = %Q(
 CodeSign build/Release/CocoaChip.app
     cd /Users/dustin/Source/CocoaChip
@@ -518,6 +526,10 @@ SAMPLE_COMPILE_ERROR = %Q(
                                                           ^
 )
 
+SAMPLE_FILE_MISSING_ERROR = %Q(
+<unknown>:0: error: no such file or directory: '/Users/travis/build/supermarin/project/Classes/Class + Category/Two Words/MissingViewController.swift'
+)
+
 SAMPLE_CODESIGN_ERROR = %Q(
 Code Sign error: No code signing identites found: No valid signing identities (i.e. certificate and private key pair) matching the team ID “CAT6HF57NJ” were found.
 )
@@ -585,3 +597,4 @@ SAMPLE_FORMAT_WARNING = %Q(
                          %d
 1 warning generated.
 )
+

data/spec/fixtures/custom_formatter.rb

@@ -14,4 +14,5 @@ class EmojiFormatter < XCPretty::Formatter
   end
 end
 
-EmojiFormatter
+EmojiFormatter
+

data/spec/spec_helper.rb

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

data/spec/support/matchers/colors.rb

@@ -18,3 +18,4 @@ RSpec::Matchers.define :be_colored do |expected|
     "expected that #{strip(actual)} would not be colored #{expected}, but was #{effects_string(actual)}"
   end
 end
+

data/spec/xcpretty/ansi_spec.rb

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

data/spec/xcpretty/formatters/formatter_spec.rb

@@ -25,7 +25,7 @@ module XCPretty
 
     it "formats cocoapods errors" do
       @formatter.format_error("The sandbox is not in sync...").should ==
-      "\n#{@formatter.red("⌦  The sandbox is not in sync...")}\n\n"
+      "\n#{@formatter.red("❌  The sandbox is not in sync...")}\n\n"
     end
 
     it "formats compiling errors" do
@@ -33,7 +33,7 @@ module XCPretty
                                       "[a should",
                                       "         ^").should ==
 %Q(
-#{@formatter.red('⌦  ')}path/to/file: #{@formatter.red("expected valid syntax")}
+#{@formatter.red('❌  ')}path/to/file: #{@formatter.red("expected valid syntax")}
 
 [a should
 #{@formatter.cyan("         ^")}
@@ -41,10 +41,18 @@ module XCPretty
 )
     end
 
+    it "formats file missing errors" do
+      @formatter.format_file_missing_error("error: no such file or directory:",
+                                           "/path/to/file.swift").should ==
+        "\n#{@formatter.red(
+          '❌  error: no such file or directory:'
+        )} /path/to/file.swift\n\n"
+    end
+
     it "formats compiling warnings" do
       reason = "format specifies type 'id' but the argument has type 'int' [-Wformat]"
 
-      @formatter.format_compile_warning( "file", "path/to/file", reason,
+      @formatter.format_compile_warning("file", "path/to/file", reason,
 %Q(    NSLog(@"alsdkflsakdj %@", 1);),
 %Q(                         ~~   ^)).should ==
 
@@ -57,11 +65,16 @@ module XCPretty
 )
     end
 
+    it "formats linker warnings" do
+      @formatter.format_ld_warning("ld: embedded dylibs/frameworks only run on iOS 8 or later").should ==
+      "#{@formatter.yellow("⚠️  ld: embedded dylibs/frameworks only run on iOS 8 or later")}"
+    end
+
     it "formats linker undefined symbols by default" do
       @formatter.format_undefined_symbols("Undefined symbols for architecture x86_64",
                                           '_OBJC_CLASS_$_CABasicAnimation',
                                           'objc-class-ref in ATZRadialProgressControl.o').should == %Q(
-#{@formatter.red("⌦  Undefined symbols for architecture x86_64")}
+#{@formatter.red("❌  Undefined symbols for architecture x86_64")}
 > Symbol: _OBJC_CLASS_$_CABasicAnimation
 > Referenced from: objc-class-ref in ATZRadialProgressControl.o
 
@@ -72,15 +85,14 @@ module XCPretty
       @formatter.format_duplicate_symbols("duplicate symbol _OBJC_IVAR_$ClassName._ivarName in",
         ['/Users/username/Library/Developer/Xcode/DerivedData/App-arcyyktezaigixbocjwfhsjllojz/Build/Intermediates/App.build/Debug-iphonesimulator/App.build/Objects-normal/i386/ClassName.o',
          '/Users/username/Library/Developer/Xcode/DerivedData/App-arcyyktezaigixbocjwfhsjllojz/Build/Products/Debug-iphonesimulator/libPods.a(DuplicateClassName.o)']).should == %Q(
-#{@formatter.red("⌦  duplicate symbol _OBJC_IVAR_$ClassName._ivarName in")}
+#{@formatter.red("❌  duplicate symbol _OBJC_IVAR_$ClassName._ivarName in")}
 > ClassName.o
 > libPods.a(DuplicateClassName.o)
 )
     end
 
 
-    if RUBY_VERSION > '1.8.7'
-      it "formats failures per suite" do
+    it "formats failures per suite" do
         Syntax.stub(:highlight) { |snippet| snippet.contents }
 
         first_path = File.expand_path('spec/fixtures/NSStringTests.m:46')
@@ -89,15 +101,15 @@ module XCPretty
         failures = {
           'CarSpec' => [
             {
-              :file_path => first_path,
-              :reason => "just doesn't work",
-              :test_case => 'Starting the car'
+              file_path: first_path,
+              reason: "just doesn't work",
+              test_case: 'Starting the car'
             }],
             'StringSpec' => [
               {
-                :file_path => second_path,
-                :reason => "doesn't split",
-                :test_case => 'Splitting the string'
+                file_path: second_path,
+                reason: "doesn't split",
+                test_case: 'Splitting the string'
               }]
         }
         @formatter.format_test_summary(SAMPLE_EXECUTED_TESTS, failures).should == %Q(
@@ -122,8 +134,7 @@ StringSpec
 
 
 #{@formatter.red(SAMPLE_EXECUTED_TESTS)})
-      end
-    end # only ruby 1.9 above because of ordered hashes
-
+    end
   end
 end
+

data/spec/xcpretty/formatters/rspec_spec.rb

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

data/spec/xcpretty/formatters/simple_spec.rb

@@ -45,14 +45,19 @@ module XCPretty
         "> Compiling MainMenu.xib"
       end
 
+      it "formats compiling storyboard output" do
+        @formatter.format_compile_xib("Main.storyboard", 'path/to/file').should ==
+        "> Compiling Main.storyboard"
+      end
+
       it 'formats copying header files' do
         @formatter.format_copy_header_file('Source.h',
-          'dir/Destination.h').should == '> Copying Source.h'
+                                           'dir/Destination.h').should == '> Copying Source.h'
       end
 
       it 'formats copying plist files' do
         @formatter.format_copy_plist_file("Source.plist",
-          'dir/Destination.plist').should == '> Copying Source.plist'
+                                          'dir/Destination.plist').should == '> Copying Source.plist'
       end
 
       it "formats copy resource" do
@@ -105,6 +110,14 @@ module XCPretty
         "    T _tupleByAddingObject__should_add_a_non_nil_object measured (0.001 seconds)"
       end
 
+      it "formats build success output" do
+        @formatter.format_phase_success("BUILD").should == "> Build Succeeded"
+      end
+
+      it "formats clean success output" do
+        @formatter.format_phase_success("CLEAN").should == "> Clean Succeeded"
+      end
+
       it "formats Phase Script Execution" do
         @formatter.format_phase_script_execution("Check Pods Manifest.lock").should ==
         "> Running script 'Check Pods Manifest.lock'"
@@ -141,7 +154,7 @@ module XCPretty
       end
 
       it "formats Touch" do
-        @formatter.format_touch("/path/to/SomeFile.txt","SomeFile.txt").should ==
+        @formatter.format_touch("/path/to/SomeFile.txt", "SomeFile.txt").should ==
         "> Touching SomeFile.txt"
       end
 
@@ -150,5 +163,11 @@ module XCPretty
         "> Validating unbelievable.tiff"
       end
 
+      it 'formats Check Dependencies' do
+        @formatter.format_check_dependencies.should ==
+          '> Check Dependencies'
+      end
+
     end
 end
+