xcpretty-bb 0.1.12.bb3 → 0.1.12.bb4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a478924a7e77d955cfd050a439f93afd9914d9a0
-  data.tar.gz: 156e3a474b751c146144b76adf4c9b2463410679
+  metadata.gz: 48165ab74fa10573e1ab84d4e9130f13f8f6940d
+  data.tar.gz: 7d24fe784c594f4d86ba1289a1bae7982a72ef0a
 SHA512:
-  metadata.gz: 60a8cdad35465d760fd91d5b883e52fc33b50bf2f956d4e8450f238b9ae4863617f4b380fbba00449271c3d892f2b10b17608fcaa47d756b9b762be9c13c9eec
-  data.tar.gz: 596ca0fdd3d232105ffc1681db794bfb150376bf1fb6dbdb9cdc084dae75f38aae43deff27595125fb25a471f1b2096111a0e09a72519c834bd915f5b367a6e1
+  metadata.gz: 82ca034935f7dbd1ea470d3b02a81bf0b1b2f225ca189ec0114f85344be4db09ff6a96df4538e13c047f3860ed483cbf4a76f256a6fbea0f40c425eb03211658
+  data.tar.gz: 7c9d978b128d66c22a4d7b9524a55bdcbffd0add6dfa98c4b37953dede44f4a348253c80bfc8a325a0d3dfa99133d82d3c3430f53ad459c250613c6dacf5a7b9

data/lib/xcpretty/formatters/formatter.rb

@@ -19,6 +19,7 @@ module XCPretty
     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_storyboard_error(file_name, error);     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
@@ -116,8 +117,8 @@ module XCPretty
     end
 
     def format_phase_script_error(error, output)
-      indentedOutput = output.join("    ");
-      "\n#{red(error_symbol + " ")}#{error}: #{red(indentedOutput)}\n\n"
+      indented_output = output.join("    ")
+      "\n#{red(error_symbol + " ")}#{error}: #{red(indented_output)}\n\n"
     end
 
     def format_compile_error(file, file_path, reason, line, cursor)
@@ -125,6 +126,10 @@ module XCPretty
         "#{line}\n#{cyan(cursor)}\n\n"
     end
 
+    def format_compile_storyboard_error(file_name, error)
+      format_error(file_name + ": " + error)
+    end
+
     def format_file_missing_error(reason, file_path)
       "\n#{red(error_symbol + " " + reason)} #{file_path}\n\n"
     end

data/lib/xcpretty/parser.rb

@@ -180,7 +180,7 @@ module XCPretty
     module PhaseScript
       # @regex Captured groups
       # $1 = phase_details
-      PHASE_SCRIPT_EXECUTION_MATCHER = /^PhaseScriptExecution\s(.*)\s/
+      PHASE_SCRIPT_EXECUTION_MATCHER = /^PhaseScriptExecution\s(.*)/
 
       # @regex Captured groups
       # $1 = file not found
@@ -255,6 +255,11 @@ module XCPretty
       # $1 reason
       LINKER_UNDEFINED_SYMBOLS_MATCHER = /^(Undefined symbols for architecture .*):$/
 
+      # @regex Captured groups
+      # $1 storyboard
+      # $2 error
+      COMPILE_STORYBOARD_ERROR_MATCHER = /([^\/]*\.storyboard).*:\serror:\s(.*)$/
+
       # @regex Captured groups
       # $1 reason
       PODS_ERROR_MATCHER = /^(error:\s.*)/
@@ -262,6 +267,9 @@ module XCPretty
       # @regex Captured groups
       # $1 = reference
       SYMBOL_REFERENCED_FROM_MATCHER = /\s+"(.*)", referenced from:$/
+
+      # @regex Captured groups
+      GENERIC_ERROR_MATCHER = /error:\s(.*)$/
     end
   end
 
@@ -321,6 +329,8 @@ module XCPretty
         formatter.format_compile_xib($2, $1)
       when COMPILE_STORYBOARD_MATCHER
         formatter.format_compile_storyboard($2, $1)
+      when COMPILE_STORYBOARD_ERROR_MATCHER
+        formatter.format_compile_storyboard_error($1, $2)
       when COPY_HEADER_MATCHER
         formatter.format_copy_header_file($1, $2)
       when COPY_PLIST_MATCHER
@@ -385,6 +395,8 @@ module XCPretty
         formatter.format_shell_command($1, $2)
       when GENERIC_WARNING_MATCHER
         formatter.format_warning($1)
+      when GENERIC_ERROR_MATCHER
+        formatter.format_error($1)
       else
         ""
       end
@@ -394,18 +406,18 @@ module XCPretty
 
     def update_phase_script_state(text)
       case text
-        when PHASE_SCRIPT_EXECUTION_MATCHER
-          @current_phase_script_output = [text]
-        when PHASE_SCRIPT_COMMAND_FAILED_MATCHER, PHASE_SCRIPT_NO_SUCH_FILE_OR_DIRECTORY_MATCHER
-          unless @current_phase_script_output.nil?
-            @current_phase_script_output << text
-            current_phase_script_failure[:output] = @current_phase_script_output
-            current_phase_script_failure[:error] = text
-          end
-        else
-          unless @current_phase_script_output.nil?
-            @current_phase_script_output << text
-          end
+      when PHASE_SCRIPT_EXECUTION_MATCHER
+        @current_phase_script_output = [text]
+      when PHASE_SCRIPT_COMMAND_FAILED_MATCHER, PHASE_SCRIPT_NO_SUCH_FILE_OR_DIRECTORY_MATCHER
+        unless @current_phase_script_output.nil?
+          @current_phase_script_output << text
+          current_phase_script_failure[:output] = @current_phase_script_output
+          current_phase_script_failure[:error] = text
+        end
+      else
+        unless @current_phase_script_output.nil?
+          @current_phase_script_output << text
+        end
       end
     end
 

data/lib/xcpretty/version.rb

@@ -1,4 +1,4 @@
 module XCPretty
-  VERSION = "0.1.12.bb3"
+  VERSION = "0.1.12.bb4"
 end
 

data/spec/fixtures/constants.rb

@@ -127,6 +127,12 @@ TiffUtil eye_icon.tiff
     cd /Users/musalj/code/OSS/Alcatraz
     /usr/bin/tiffutil -cathidpicheck /Users/musalj/code/OSS/Alcatraz/Alcatraz/eye_icon@2x.png /Users/musalj/code/OSS/Alcatraz/Alcatraz/eye_icon.png -out /Users/musalj/Library/Application\ Support/Developer/Shared/Xcode/Plug-ins/Alcatraz.xcplugin/Contents/Resources/eye_icon.tiff
 )
+SAMPLE_RUN_SCRIPT_ERROR = %Q(
+PhaseScriptExecution Run\\ Script DerivedData/Build/Intermediates/Blah.build/Debug-iphonesimulator/Blah.build/Script-F07128051BCF177900851764.sh
+cd /Users/blah/iosapps/test/iOS
+/bin/sh -c /Users/blah/iosapps/test/iOS/DerivedData/Build/Intermediates/Blah.build/Debug-iphonesimulator/Blah.build/Script-F07128051BCF177900851764.sh
+/bin/sh: blah: No such file or directory
+)
 SAMPLE_RUN_SCRIPT = %Q(
 PhaseScriptExecution Check\\ Pods\\ Manifest.lock /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/ObjectiveSugar.build/Debug-iphonesimulator/ObjectiveSugar.build/Script-468DABF301EC4EC1A00CC4C2.sh
     cd /Users/musalj/code/OSS/ObjectiveSugar/Example
@@ -461,6 +467,7 @@ PhaseScriptExecution Check\\ Pods\\ Manifest.lock /Users/musalj/Library/Develope
     setenv variant normal
     /bin/sh -c /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/ObjectiveSugar.build/Debug-iphonesimulator/ObjectiveSugar.build/Script-468DABF301EC4EC1A00CC4C2.sh
 )
+
 SAMPLE_ANALYZE = %Q(
 Analyze CocoaChip/CCChip8DisplayView.m
     cd /Users/dustin/Source/CocoaChip
@@ -485,6 +492,9 @@ CompileStoryboard sample/Main.storyboard
     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_COMPILE_STORYBOARD_ERROR = %Q(
+/Users/blah/iosapps/test/blah-Blah-ios/Blah/Resources/Views/LaunchScreen.storyboard: error: Line 11: error parsing attribute name
+)
 SAMPLE_CODESIGN = %Q(
 CodeSign build/Release/CocoaChip.app
     cd /Users/dustin/Source/CocoaChip

data/spec/xcpretty/formatters/simple_spec.rb

@@ -120,7 +120,7 @@ module XCPretty
 
       it "formats Phase Script Execution" do
         @formatter.format_phase_script_execution("Check Pods Manifest.lock").should ==
-        "> Running script 'Check Pods Manifest.lock'"
+        "> Running phase 'Check Pods Manifest.lock'"
       end
 
       it "formats precompiling output" do

data/spec/xcpretty/parser_spec.rb

@@ -111,6 +111,11 @@ module XCPretty
       @parser.parse(SAMPLE_COMPILE_STORYBOARD)
     end
 
+    it "parses compiling storyboard errors" do
+      @formatter.should receive(:format_compile_storyboard_error).with("LaunchScreen.storyboard", "Line 11: error parsing attribute name")
+      @parser.parse(SAMPLE_COMPILE_STORYBOARD_ERROR)
+    end
+
     it 'parses CopyPlistFile' do
       @formatter.should receive(:format_copy_plist_file).with(
         '/path/to/Some.plist', '/some other/File.plist')
@@ -214,10 +219,23 @@ module XCPretty
     end
 
     it "parses PhaseScriptExecution" do
-      @formatter.should receive(:format_phase_script_execution).with('Check Pods Manifest.lock')
+      @formatter.should receive(:format_phase_script_execution).with('Check Pods Manifest.lock /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSugar-ayzdhqmmwtqgysdpznmovjlupqjy/Build/Intermediates/ObjectiveSugar.build/Debug-iphonesimulator/ObjectiveSugar.build/Script-468DABF301EC4EC1A00CC4C2.sh')
       @parser.parse(SAMPLE_RUN_SCRIPT)
     end
 
+    it "parses PhaseScriptExecution Error" do
+      @formatter.should receive(:format_phase_script_execution).with('Run Script DerivedData/Build/Intermediates/Blah.build/Debug-iphonesimulator/Blah.build/Script-F07128051BCF177900851764.sh')
+      @formatter.should receive(:format_phase_script_error).with('/bin/sh: blah: No such file or directory',
+                                                                 ['PhaseScriptExecution Run\\ Script DerivedData/Build/Intermediates/Blah.build/Debug-iphonesimulator/Blah.build/Script-F07128051BCF177900851764.sh',
+                                                                  'cd /Users/blah/iosapps/test/iOS',
+                                                                  '/bin/sh -c /Users/blah/iosapps/test/iOS/DerivedData/Build/Intermediates/Blah.build/Debug-iphonesimulator/Blah.build/Script-F07128051BCF177900851764.sh',
+                                                                  '/bin/sh: blah: No such file or directory'])
+
+      SAMPLE_RUN_SCRIPT_ERROR.each_line do |line|
+        @parser.parse(line.chomp)
+      end
+    end
+
     it "parses process PCH" do
       @formatter.should receive(:format_process_pch).with("Pods-CocoaLumberjack-prefix.pch")
       @parser.parse(SAMPLE_PRECOMPILE)
@@ -448,6 +466,11 @@ module XCPretty
         @formatter.should_not receive(:format_compile_error)
         @parser.parse("hohohoooo")
       end
+
+      it 'parses generic errors' do
+        @formatter.should receive(:format_error).with("Hi there. I'm a really nasty error. Can you fix me")
+        @parser.parse("   error: Hi there. I'm a really nasty error. Can you fix me")
+      end
     end
 
     context "warnings" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty-bb
 version: !ruby/object:Gem::Version
-  version: 0.1.12.bb3
+  version: 0.1.12.bb4
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge