xcpretty-bb 0.1.12.bb2 → 0.1.12.bb3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e98c1acf957464113bd8b0ae61271f4492bb28e
-  data.tar.gz: 9c171a85da32af6e2ec0cde275c9f70ce74bfe3b
+  metadata.gz: a478924a7e77d955cfd050a439f93afd9914d9a0
+  data.tar.gz: 156e3a474b751c146144b76adf4c9b2463410679
 SHA512:
-  metadata.gz: b2597b9f5417e55c412f76ec8267e066e5164bd50079f337180a7c5c2e06e0037265ee999efa1e4c973de89a3b2df6ea7ad4ebbc66078a153320c0275d888033
-  data.tar.gz: eef643c76640e9c010bb50bdff14318f16e0d3d1396ea512697b8f18e20361ed0b18e90d634dfb81888bd72d1eb9c525c2e21c746f560250d6b62d7d56c3f0f8
+  metadata.gz: 60a8cdad35465d760fd91d5b883e52fc33b50bf2f956d4e8450f238b9ae4863617f4b380fbba00449271c3d892f2b10b17608fcaa47d756b9b762be9c13c9eec
+  data.tar.gz: 596ca0fdd3d232105ffc1681db794bfb150376bf1fb6dbdb9cdc084dae75f38aae43deff27595125fb25a471f1b2096111a0e09a72519c834bd915f5b367a6e1

data/lib/xcpretty/formatters/formatter.rb

@@ -35,7 +35,7 @@ module XCPretty
     def format_process_pch_command(file_path);                 EMPTY; end
     def format_phase_success(phase_name);                      EMPTY; end
     def format_phase_script_execution(phase_name);             EMPTY; end
-    def format_phase_script_error(error, text);                EMPTY; end
+    def format_phase_script_error(error, output)               EMPTY; end
     def format_process_info_plist(file_name, file_path);       EMPTY; end
     def format_codesign(file);                                 EMPTY; end
     def format_preprocess(file);                               EMPTY; end
@@ -115,8 +115,9 @@ module XCPretty
       "\n#{red(error_symbol + " " + message)}\n\n"
     end
 
-    def format_phase_script_error(error, text)
-      "\n#{red(error_symbol + " ")}#{error}: #{red(text)}\n\n"
+    def format_phase_script_error(error, output)
+      indentedOutput = output.join("    ");
+      "\n#{red(error_symbol + " ")}#{error}: #{red(indentedOutput)}\n\n"
     end
 
     def format_compile_error(file, file_path, reason, line, cursor)

data/lib/xcpretty/parser.rb

@@ -395,16 +395,16 @@ module XCPretty
     def update_phase_script_state(text)
       case text
         when PHASE_SCRIPT_EXECUTION_MATCHER
-          @current_phase_script_text = text
+          @current_phase_script_output = [text]
         when PHASE_SCRIPT_COMMAND_FAILED_MATCHER, PHASE_SCRIPT_NO_SUCH_FILE_OR_DIRECTORY_MATCHER
-          unless @current_phase_script_text.nil?
-            @current_phase_script_text += text
-            current_phase_script_failure[:text] = @current_phase_script_text
+          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_text.nil?
-            @current_phase_script_text += text
+          unless @current_phase_script_output.nil?
+            @current_phase_script_output << text
           end
       end
     end
@@ -483,7 +483,7 @@ module XCPretty
     end
 
     def should_format_phase_script_error?
-      current_phase_script_failure[:error] && current_phase_script_failure[:text]
+      current_phase_script_failure[:error] && current_phase_script_failure[:output]
     end
 
     def current_issue
@@ -541,7 +541,7 @@ module XCPretty
 
     def format_phase_script_error
       result = formatter.format_phase_script_error(current_phase_script_failure[:error],
-                                                   current_phase_script_failure[:text]
+                                                   current_phase_script_failure[:output]
       )
 
       reset_phase_script_state
@@ -550,7 +550,7 @@ module XCPretty
 
     def reset_phase_script_state
       @phase_script_failure = nil
-      @current_phase_script_text = nil
+      @current_phase_script_output = nil
     end
 
     def reset_linker_format_state

data/lib/xcpretty/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty-bb
 version: !ruby/object:Gem::Version
-  version: 0.1.12.bb2
+  version: 0.1.12.bb3
 platform: ruby
 authors:
 - Marin Usalj