xcpretty 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccb8da9a9faceb76048904874841b998c79fd79
-  data.tar.gz: e8e041e96f12c775f041d272c8a0fc91b7ef0ce3
+  metadata.gz: 2bb4b65256b40fe5bee3a81340f8eaec2e6d89e9
+  data.tar.gz: a3a15b2b03d76a11c779b068ca4f1f8b6e042102
 SHA512:
-  metadata.gz: f5effe020578c7d62747e014de2db8ab576c00e25e4bd8ea589d0b76412a76177d94129b0c7a52f7219771f63127f31ae8e3fa4501f74740f05617ecee7067c4
-  data.tar.gz: d922a8c4090687f3548f9a7ddec00a5482cf2c5661403a2b9888f166c5bc1ab5941fecd43d661a3c0f149e6dafe44684f631591ff14b3a80222e5fa22f840198
+  metadata.gz: 9b6ef025667ea71cf6fcce726772b9823c58375cad4dd8bed8b81c5017cfef56ae1f0efda5ea5d13b08bff3c46b7c32469f5f0739de32918db9801ec2c9bdf7d
+  data.tar.gz: f087e6b8297c96076647c43bc6a6b224c62c2ab8a9a6784c8b7bdd81ffece61a74095016a567a1684cb51274e2f9e306f059035e6b0b40b582d474e735a86d78

data/assets/report.html.erb

@@ -30,7 +30,8 @@
       .test.passing { background-color: #CAF59F;}
       .test.failing.odd { background-color: #EEC7CC;}
       .test.passing.odd { background-color: #E5FBCF;}
-      .details { background-color: #F4DDE0; border: 1px solid #C84F5E;}
+      .details.failing { background-color: #F4DDE0; border: 1px solid #C84F5E;}
+      .details.passing { background-color: #E5F4DC; border: 1px solid #A1D761;}
       .test .test-detail:last-child { padding-bottom: 8px;}
       .test .title { float: left; font-size: 0.9em; margin-top: 8px; font-family: Menlo, Monaco, monospace;}
       .test .time { float: left;margin: 4px 10px 0 20px;}
@@ -127,15 +128,6 @@
             <h3 class="title"><%= name %></h3>
           </section>
           <section class="tests">
-            <% unless info[:screenshots].empty? %>
-            <div class="screenshots <%= info[:failing] ? 'failing' : 'passing'%>">
-              <% info[:screenshots].each_with_index do |screenshot, index| %>
-                  <a href="javascript:toggleScreenshot('<%=name %>', <%=index %>)">
-                    <img class="screenshot" id="screenshot-<%=name %>-<%=index %>" src="<%=screenshot %>" />
-                  </a>
-              <% end %>
-            </div>
-            <% end %>
             <table>
             <% info[:tests].each_with_index do |test, index| %>
               <% detail_class = test[:name].gsub(/\s/,'') %>
@@ -147,8 +139,8 @@
                 </td>
                 <td><h3 class="title"><%= test[:name] %></h3></td>
               </tr>
-              <% if test[:reason] || test[:snippet] %>
-                <tr class="details <%= detail_class %>">
+              <% if test[:reason] || test[:snippet] || !test[:screenshots].empty? %>
+                <tr class="details <%= test[:failing] ? 'failing' : 'passing'%> <%= detail_class %>">
                   <td></td>
                   <td>
                     <% if test[:reason] %>
@@ -158,6 +150,15 @@
                       <section class="test-detail snippet"><%= test[:snippet] %></section>
                       <section class="test-detail"><%= test[:file] %></section>
                     <% end %>
+                    <% if !test[:screenshots].empty? %>
+                      <section class="test-detail">
+                        <% test[:screenshots].each_with_index do |screenshot, idx| %>
+                          <a href="javascript:toggleScreenshot('<%=test[:name] %>', <%=index %>)">
+                            <img class="screenshot" id="screenshot-<%=test[:name] %>-<%=index %>" src="<%=screenshot %>" />
+                          </a>
+                        <% end %>
+                      </section>
+                    <% end %>
                   </td>
                 </tr>
               <% end %>

data/lib/xcpretty/parser.rb

@@ -254,6 +254,7 @@ module XCPretty
       # $2 = file path
       FILE_MISSING_ERROR_MATCHER = /^<unknown>:0:\s(error:\s.*)\s'(\/.+\/.*\..*)'$/
 
+      # @regex Captured groups
       # $1 = whole error
       LD_ERROR_MATCHER = /^(ld:.*)/
 
@@ -280,6 +281,10 @@ module XCPretty
       # @regex Captured groups
       # $1 = reference
       SYMBOL_REFERENCED_FROM_MATCHER = /\s+"(.*)", referenced from:$/
+
+      # @regex Captured groups
+      # $1 = error reason
+      MODULE_INCLUDES_ERROR_MATCHER = /^\<module-includes\>:.*?:.*?:\s(?:fatal\s)?(error:\s.*)$/
     end
   end
 
@@ -368,6 +373,8 @@ module XCPretty
         formatter.format_libtool($1)
       when LINKING_MATCHER
         formatter.format_linking($1, $2, $3)
+      when MODULE_INCLUDES_ERROR_MATCHER
+        formatter.format_error($1)
       when TEST_CASE_MEASURED_MATCHER
         formatter.format_measuring_test($1, $2, $3)
       when TEST_CASE_PENDING_MATCHER

data/lib/xcpretty/reporters/html.rb

@@ -27,11 +27,12 @@ module XCPretty
     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))
+                      snippet: formatted_snippet(file),
+                      screenshots: [])
     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, screenshots: [])
     end
 
     private
@@ -41,10 +42,9 @@ module XCPretty
       Syntax.highlight_html(snippet)
     end
 
-
     def add_test(suite_name, data)
       @test_count += 1
-      @test_suites[suite_name] ||= {tests: [], screenshots: []}
+      @test_suites[suite_name] ||= {tests: []}
       @test_suites[suite_name][:tests] << data
       if data[:failing]
         @test_suites[suite_name][:failing] = true
@@ -70,19 +70,21 @@ module XCPretty
       Dir.foreach(SCREENSHOT_DIR) do |item|
         next if item == '.' || item == '..' || File.extname(item) != '.png'
 
-        suite = item.split(".")
-        next if suite.empty?
-
-        suite_name = find_test_suite(suite[0])
-        next if suite_name.nil?
+        test = find_test(item)
+        next if test.nil?
 
-        @test_suites[suite_name][:screenshots] << item
+        test[:screenshots] << item
       end
     end
 
-    def find_test_suite(image_name)
-      @test_suites.each do |key, value|
-        return key if image_name.start_with?(key.split('.').last)
+    def find_test(image_name)
+      @test_suites.each do |name, info|
+        info[:tests].each do |test, index|
+          combined_name = name + '_' + test[:name]
+          test_name_matches = image_name.start_with?(test[:name])
+          combined_name_matches = image_name.start_with?(combined_name)
+          return test if test_name_matches || combined_name_matches
+        end
       end
       nil
     end

data/lib/xcpretty/version.rb

@@ -1,4 +1,4 @@
 module XCPretty
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end
 

data/spec/fixtures/constants.rb

@@ -64,7 +64,7 @@ Clean.Remove clean /Users/musalj/Library/Developer/Xcode/DerivedData/ObjectiveSu
 )
 SAMPLE_EXECUTED_TESTS = "Executed 4 tests, with 0 failures (0 unexpected) in 0.003 (0.004) seconds"
 SAMPLE_SPECTA_EXECUTED_TESTS = "       Executed 4 tests, with 0 failures (0 unexpected) in 10.192 (10.193) seconds"
-SAMPLE_OCUNIT_TEST = "Test Case '-[RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES]' passed (0.001 seconds)."
+SAMPLE_OCUNIT_TEST = "Test Case '-[RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES]' passed (0.001 seconds)."
 SAMPLE_SPECTA_TEST = "         Test Case '-[SKWelcomeActivationViewControllerSpecSpec SKWelcomeActivationViewController_When_a_user_enters_their_details_lets_them_enter_a_valid_manager_code]' passed (0.725 seconds)."
 SAMPLE_SLOWISH_TEST = "Test Case '-[RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES]' passed (0.026 seconds)."
 SAMPLE_SLOW_TEST = "Test Case '-[RACCommandSpec enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES]' passed (0.101 seconds)."
@@ -555,7 +555,7 @@ PBXCp build/Release/CocoaChipCore.framework build/Release/CocoaChip.app/Contents
 warning: skipping copy phase strip, binary is code signed: /Users/dustin/Source/CocoaChip/build/Release/CocoaChipCore.framework/Versions/A/CocoaChipCore
 )
 
-SAMPLE_SCREENSHOT_FILE = 'RACCommandSpec, line 80, hello xcpretty.png'
+SAMPLE_SCREENSHOT_FILE = 'RACCommandSpec_enabled_signal_should_send_YES_while_executing_is_YES.png'
 SAMPLE_UNRELATED_IMAGE_FILE = 'apple_raw.png'
 
 ################################################################################
@@ -657,6 +657,8 @@ SAMPLE_SWIFT_UNAVAILABLE = "Swift is unavailable on iOS earlier than 7.0; please
 
 SAMPLE_USE_LEGACY_SWIFT = "“Use Legacy Swift Language Version” (SWIFT_VERSION) is required to be configured correctly for targets which use Swift. Use the [Edit > Convert > To Current Swift Syntax…] menu to choose a Swift version or use the Build Settings editor to configure the build setting directly."
 
+SAMPLE_MODULE_INCLUDES_ERROR = "<module-includes>:1:1: error: umbrella header for module 'ModuleName' does not include header 'Header.h'"
+
 ################################################################################
 # WARNINGS
 ################################################################################

data/spec/xcpretty/parser_spec.rb

@@ -201,7 +201,7 @@ module XCPretty
 
     it "parses passing ocunit tests" do
       @formatter.should receive(:format_passing_test).with('RACCommandSpec',
-                                                           'enabled_signal_should_send_YES_while_executing_is_YES_and_allowsConcurrentExecution_is_YES',
+                                                           'enabled_signal_should_send_YES_while_executing_is_YES',
                                                            '0.001')
       @parser.parse(SAMPLE_OCUNIT_TEST)
     end
@@ -523,6 +523,13 @@ module XCPretty
         @formatter.should receive(:format_error)
         @parser.parse(SAMPLE_CODE_SIGNING_IS_REQUIRED_ERROR)
       end
+
+      it "parses module includes error" do
+        @formatter.should receive(:format_error).with(
+          "error: umbrella header for module 'ModuleName' does not include header 'Header.h'"
+        )
+        @parser.parse(SAMPLE_MODULE_INCLUDES_ERROR)
+      end
     end
 
     context "warnings" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
@@ -119,7 +119,7 @@ files:
 - Rakefile
 - assets/report.html.erb
 - bin/xcpretty
-- features/assets/RACCommandSpec, line 80, hello xcpretty.png
+- features/assets/RACCommandSpec_enabled_signal_should_send_YES_while_executing_is_YES.png
 - features/assets/apple_raw.png
 - features/custom_formatter.feature
 - features/custom_reporter.feature
@@ -204,7 +204,7 @@ signing_key:
 specification_version: 4
 summary: xcodebuild formatter done right
 test_files:
-- features/assets/RACCommandSpec, line 80, hello xcpretty.png
+- features/assets/RACCommandSpec_enabled_signal_should_send_YES_while_executing_is_YES.png
 - features/assets/apple_raw.png
 - features/custom_formatter.feature
 - features/custom_reporter.feature