xcpretty 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093859ed58db9406724d77694f6664b45e24e716
-  data.tar.gz: 1170dd4c63ab10c2d3ea785f99db697cb9b4dfdd
+  metadata.gz: 316a4833e8feac6ba8771d0d05dd592f5891392f
+  data.tar.gz: 4e26ec875ca5d4b4b0e6bafb4ddcb21fb75cf0fa
 SHA512:
-  metadata.gz: 8b632dcdfd5b2c3eb2b874a2d0a6a3500290907565a1e70d8e1a2814aa2b5958269f7d80e7f861439c2a1e0da0b7c94d57491893b441e9ea020c43a8c7db6e8b
-  data.tar.gz: c55f5c50f4e1d832ed84df1c67a07cbab241acd2aeb4046533df524862e08ef4f3b8374507064758e9f2eb387a952454386274f79f96e0e6ec1407c15e7a1806
+  metadata.gz: 2534ba94ce92988f947d9b70dd89e94a1175374878958566bb372f3f6d8b549bdfc0473cea21f3550516551862ea718e407640a9477bfead1c41f0db2846bcb7
+  data.tar.gz: e80e9f26fc78f4f07348dd049a52aac8f47d3c282cea927a6372bb86b3e703967ee9d5f17261748209b16541b9f15ebad1af44da7260c7871d42fe74298fc8bb

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.2.6
+
+* Codesigning matchers improvements
+* Screenshots parsing fixes
+
+###### Bug fixes
+
+* Fix reporers crash by default ld warning implementation
+  | [iKiKi](https://github.com/iKiKi)
+  | [#187](https://github.com/supermarin/xcpretty/pull/187)
+
 ## 0.2.1
 
 ###### Bug fixes

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Marin Usalj
+Copyright (c) 2013-2016 Marin Usalj
 
 MIT License
 

data/Rakefile

@@ -15,3 +15,4 @@ end
 task :lint do
   sh 'bundle exec rubocop'
 end
+

data/features/simple_format.feature

@@ -225,4 +225,9 @@ Feature: Showing build output in simple format
     Scenario: Showing code signing is required error
         Given the target requires code signing
         When I pipe to xcpretty with "--simple --no-color"
-        Then I should see the code signing is requried message
+        Then I should see the code signing is requried message
+
+    Scenario: Showing no profile matching error
+        Given the matching profile is missing
+        When I pipe to xcpretty with "--simple --no-color"
+        Then I should see the no profile matching message

data/features/steps/formatting_steps.rb

@@ -144,6 +144,10 @@ Given(/^the target requires code signing$/) do
   add_run_input SAMPLE_CODE_SIGNING_IS_REQUIRED_ERROR
 end
 
+Given(/^the matching profile is missing$/) do
+  add_run_input SAMPLE_NO_PROFILE_MATCHING_ERROR
+end
+
 Then(/^I should see a "(\w+)" completion message$/) do |phase|
   run_output.should start_with("▸ #{phase.capitalize} Succeeded")
 end
@@ -368,3 +372,7 @@ Then(/^I should see the code signing is requried message$/) do
   run_output.should include("Code signing is required for product type 'Application' in SDK 'iOS 10.0'")
 end
 
+Then(/^I should see the no profile matching message$/) do
+  run_output.should include("No profile matching 'TargetName' found:  Xcode couldn't find a profile matching 'TargetName'. Install the profile (by dragging and dropping it onto Xcode's dock item) or select a different one in the General tab of the target editor.")
+end
+

data/lib/xcpretty/formatters/formatter.rb

@@ -167,10 +167,11 @@ module XCPretty
 
     def format_failure(f)
       snippet = Snippet.from_filepath(f[:file_path])
+      output = "  #{f[:test_case]}, #{red(f[:reason])}"
+      output += "\n  #{cyan(f[:file_path])}"
+      return output if snippet.contents.empty?
 
-      output = "  #{f[:test_case]}, #{red(f[:reason])}\n  " \
-      "#{cyan(f[:file_path])}\n  ```\n"
-
+      output += "\n  ```\n"
       if @colorize
         output += Syntax.highlight(snippet)
       else

data/lib/xcpretty/parser.rb

@@ -60,7 +60,7 @@ module XCPretty
     # @regex Captured groups
     # $1 compiler_command
     # $2 file_path
-    COMPILE_COMMAND_MATCHER = /^\s*(.*\/usr\/bin\/clang\s.*\s\-c\s(.*\.(?:m|mm|c|cc|cpp|cxx))\s.*\.o)$/
+    COMPILE_COMMAND_MATCHER = /^\s*(.*\/bin\/clang\s.*\s\-c\s(.*\.(?:m|mm|c|cc|cpp|cxx))\s.*\.o)$/
 
     # @regex Captured groups
     # $1 file_path
@@ -224,11 +224,15 @@ module XCPretty
 
       # @regex Captured groups
       # $1 = whole error
-      CODESIGN_ERROR_MATCHER = /^(Code\s?Sign error:.*)$/
+      CHECK_DEPENDENCIES_ERRORS_MATCHER = /^(Code\s?Sign error:.*|Code signing is required for product type .* in SDK .*|No profile matching .* found:.*|Provisioning profile .* doesn't .*|Swift is unavailable on .*|.?Use Legacy Swift Language Version.*)$/
 
       # @regex Captured groups
       # $1 = whole error
-      CODE_SIGNING_REQUIRED_MATCHER = /^(Code signing is required for product type .* in SDK .*)$/
+      PROVISIONING_PROFILE_REQUIRED_MATCHER = /^(.*requires a provisioning profile.*)$/
+
+      # @regex Captured groups
+      # $1 = whole error
+      NO_CERTIFICATE_MATCHER = /^(No certificate matching.*)$/
 
       # @regex Captured groups
       # $1 = file_path
@@ -240,10 +244,6 @@ module XCPretty
       # $1 cursor (with whitespaces and tildes)
       CURSOR_MATCHER = /^([\s~]*\^[\s~]*)$/
 
-      # @regex Captured groups
-      # $1 = whole message
-      PROFILE_DOESNT_SUPPORT_OR_INCLUDE = /^(Provisioning profile .* doesn't .*)$/
-
       # @regex Captured groups
       # $1 = whole error.
       # it varies a lot, not sure if it makes sense to catch everything separately
@@ -328,9 +328,11 @@ module XCPretty
         formatter.format_codesign($1)
       when CODESIGN_MATCHER
         formatter.format_codesign($1)
-      when CODESIGN_ERROR_MATCHER
+      when CHECK_DEPENDENCIES_ERRORS_MATCHER
+        formatter.format_error($1)
+      when PROVISIONING_PROFILE_REQUIRED_MATCHER
         formatter.format_error($1)
-      when CODE_SIGNING_REQUIRED_MATCHER
+      when NO_CERTIFICATE_MATCHER
         formatter.format_error($1)
       when COMPILE_MATCHER
         formatter.format_compile($2, $1)
@@ -346,8 +348,6 @@ module XCPretty
         formatter.format_copy_plist_file($1, $2)
       when CPRESOURCE_MATCHER
         formatter.format_cpresource($1)
-      when PROFILE_DOESNT_SUPPORT_OR_INCLUDE
-        formatter.format_error($1)
       when EXECUTED_MATCHER
         format_summary_if_needed(text)
       when UI_FAILING_TEST_MATCHER

data/lib/xcpretty/reporters/html.rb

@@ -70,7 +70,10 @@ module XCPretty
       Dir.foreach(SCREENSHOT_DIR) do |item|
         next if item == '.' || item == '..' || File.extname(item) != '.png'
 
-        suite_name = find_test_suite(item)
+        suite = item.split(".")
+        next if suite.empty?
+
+        suite_name = find_test_suite(suite[0])
         next if suite_name.nil?
 
         @test_suites[suite_name][:screenshots] << item
@@ -79,7 +82,7 @@ module XCPretty
 
     def find_test_suite(image_name)
       @test_suites.each do |key, value|
-        return key if image_name.start_with?(key)
+        return key if image_name.start_with?(key.split('.').last)
       end
       nil
     end

data/lib/xcpretty/version.rb

@@ -1,4 +1,4 @@
 module XCPretty
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end
 

data/spec/fixtures/constants.rb

@@ -582,6 +582,14 @@ SAMPLE_CODESIGN_ERROR_NO_SPACES = %Q(
 CodeSign error: code signing is required for product type 'Application' in SDK 'iOS 7.0'
 )
 
+SAMPLE_REQUIRES_PROVISION = %Q(
+PROJECT_NAME requires a provisioning profile. Select a provisioning profile for the "Debug" build configuration in the project editor.
+)
+
+SAMPLE_NO_CERTIFICATE = %Q(
+No certificate matching 'iPhone Distribution: Name (B89SBB0AV9)' for team 'B89SBB0AV9':  Select a different signing certificate for CODE_SIGN_IDENTITY, a team that matches your selected certificate, or switch to automatic provisioning.
+)
+
 SAMPLE_FATAL_COMPILE_ERROR = %Q(
 In file included from /Users/musalj/code/OSS/SampleApp/Pods/SuperCoolPod/SuperAwesomeClass.m:12:
 In file included from /Users/musalj/code/OSS/SampleApp/Pods/../LessCoolPod/LessCoolClass.h:9:
@@ -641,6 +649,14 @@ SAMPLE_CODE_SIGNING_IS_REQUIRED_ERROR = %Q(
 Code signing is required for product type 'Application' in SDK 'iOS 10.0'
 )
 
+SAMPLE_NO_PROFILE_MATCHING_ERROR = %Q(
+No profile matching 'TargetName' found:  Xcode couldn't find a profile matching 'TargetName'. Install the profile (by dragging and dropping it onto Xcode's dock item) or select a different one in the General tab of the target editor.
+)
+
+SAMPLE_SWIFT_UNAVAILABLE = "Swift is unavailable on iOS earlier than 7.0; please set IPHONEOS_DEPLOYMENT_TARGET to 7.0 or later (currently it is '6.0')."
+
+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."
+
 ################################################################################
 # WARNINGS
 ################################################################################

data/spec/xcpretty/formatters/formatter_spec.rb

@@ -103,18 +103,21 @@ module XCPretty
         second_path = File.expand_path('spec/fixtures/NSStringTests.m:57')
 
         failures = {
-          'CarSpec' => [
-            {
-              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'
-              }]
+          'CarSpec' => [{
+            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'
+          }],
+          'UI spec' => [{
+            file_path: "<unknown.m>:0",
+            reason: "ui test failed",
+            test_case: 'yolo'
+          }]
         }
         @formatter.format_test_summary(SAMPLE_EXECUTED_TESTS, failures).should == %Q(
 
@@ -136,6 +139,10 @@ StringSpec
     });
   ```
 
+UI spec
+  yolo, #{@formatter.red("ui test failed")}
+  #{@formatter.cyan("<unknown.m>:0")}
+
 
 #{@formatter.red(SAMPLE_EXECUTED_TESTS)})
     end

data/spec/xcpretty/parser_spec.rb

@@ -452,6 +452,41 @@ module XCPretty
         @parser.parse(SAMPLE_CODESIGN_ERROR_NO_SPACES)
       end
 
+      it "parses No profile matching error:" do
+        @formatter.should receive(:format_error).with(
+          "No profile matching 'TargetName' found:  Xcode couldn't find a profile matching 'TargetName'. Install the profile (by dragging and dropping it onto Xcode's dock item) or select a different one in the General tab of the target editor."
+        )
+        @parser.parse(SAMPLE_NO_PROFILE_MATCHING_ERROR)
+      end
+
+      it "parses requires provision error:" do
+        @formatter.should receive(:format_error).with(
+          'PROJECT_NAME requires a provisioning profile. Select a provisioning profile for the "Debug" build configuration in the project editor.'
+        )
+        @parser.parse(SAMPLE_REQUIRES_PROVISION)
+      end
+
+      it "parses no certificate error:" do
+        @formatter.should receive(:format_error).with(
+          "No certificate matching 'iPhone Distribution: Name (B89SBB0AV9)' for team 'B89SBB0AV9':  Select a different signing certificate for CODE_SIGN_IDENTITY, a team that matches your selected certificate, or switch to automatic provisioning."
+        )
+        @parser.parse(SAMPLE_NO_CERTIFICATE)
+      end
+
+      it "parses swift unavailable error:" do
+        @formatter.should receive(:format_error).with(
+          SAMPLE_SWIFT_UNAVAILABLE
+        )
+        @parser.parse(SAMPLE_SWIFT_UNAVAILABLE)
+      end
+
+      it "parses use legacy swift error:" do
+        @formatter.should receive(:format_error).with(
+          SAMPLE_USE_LEGACY_SWIFT
+        )
+        @parser.parse(SAMPLE_USE_LEGACY_SWIFT)
+      end
+
       it "parses ld library errors" do
         @formatter.should receive(:format_error).with(
           SAMPLE_LD_LIBRARY_ERROR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.34.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.34.0
 - !ruby/object:Gem::Dependency
@@ -85,14 +85,14 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: "\n    Xcodebuild formatter designed to be piped with `xcodebuild`,\n
@@ -106,11 +106,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .kick
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".kick"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -189,17 +189,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: xcodebuild formatter done right