xcpretty 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e084a768e8bdb1ad4aa794fedee1f0fc9291a7bf
-  data.tar.gz: 07a8e0dd6f3c33f475c482a28566d97646076180
+  metadata.gz: 6174a374d362e6eef62f59962119eb7b6aaf384e
+  data.tar.gz: 14df3e40231cf38544095c3385b327375eaa4759
 SHA512:
-  metadata.gz: c388ec2fc909a8c727e1b55eaeb71418e9dc71a36a2a7bb040e3b44148fc194688238feaea4dbf923448ff4bedb52ee4b387b91bf345ca82a5ccb4aeb2c0b0b3
-  data.tar.gz: 6dfc01779231c43d29c25bd17db25f6abaa614794b568c67e4ac5b492b10e83c376b8c4b8c9f546210c6a97d0eb84b9ada9a737646264e50468b5e7786e4ba7b
+  metadata.gz: 9216ed7953d333dc50fee64448f7c768c0e5779a8e37c8a574d8760ebe39465c17d0639dd95218d5b8c5ccccc3c02d1417122b73547fb451e0ffe29fbd0d72ff
+  data.tar.gz: f2bcf82f2de77686c8fac0b01cc26a14c39938ba619fbfcae0634dab5607eb8d7db2dc8979044740ef48f990fb7df7ce180d28d829e23b2e117dc1c67b62b56c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.2.1
+
+###### 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.0
 
 ###### Enhancements
@@ -78,7 +87,7 @@
   | [Piet Brauer](https://github.com/pietbrauer)
   | [#128](https://github.com/supermarin/xcpretty/pull/128)
 * Support for `oclint v0.9dev` json-compilation-database
-  | [KiKi](https://github.com/iKiKi)
+  | [iKiKi](https://github.com/iKiKi)
   | [#121](https://github.com/supermarin/xcpretty/pull/121)
 * Syntax highlighting for other languages than Objc (Swift, C++, Objc++, Dylan, Ruby)
   | [#110](https://github.com/supermarin/xcpretty/pull/110)

data/README.md

@@ -14,7 +14,7 @@ $ gem install xcpretty
 
 ## Usage
 ``` bash
-$ xcodebuild [flags] | xcpretty -c
+$ xcodebuild [flags] | xcpretty
 ```
 `xcpretty` is designed to be piped with `xcodebuild` and thus keeping 100%
 compatibility with it. It's even a bit faster than `xcodebuild` itself, since
@@ -25,11 +25,11 @@ may want to exit with same status code as `xcodebuild`.
 CI systems usually use status codes to determine if the build has failed.
 
 ``` bash
-$ set -o pipefail && xcodebuild [flags] | xcpretty -c
+$ set -o pipefail && xcodebuild [flags] | xcpretty
 #
 # OR
 #
-$ xcodebuild [flags] | xcpretty -c && exit ${PIPESTATUS[0]}
+$ xcodebuild [flags] | xcpretty && exit ${PIPESTATUS[0]}
 ```
 
 ## Raw xcodebuild output
@@ -40,16 +40,11 @@ output.
 
 Here's a way of doing it:
 ``` bash
-$ xcodebuild [flags] | tee xcodebuild.log | xcpretty -c
+$ xcodebuild [flags] | tee xcodebuild.log | xcpretty
 ```
 
 ## Formats
 
-- `--[no-]color`: Show build icons in color. (you can add it to `--simple` or `--test` format).
-  Defaults to auto-detecting color availability.
-- `--[no-]utf`: Use unicode characters in build output or only ASCII.
-  Defaults to auto-detecting the current locale
-
 - `--simple`, `-s` (default)
 ![xcpretty --simple](http://i.imgur.com/LdmozBS.gif)
 
@@ -58,6 +53,12 @@ $ xcodebuild [flags] | tee xcodebuild.log | xcpretty -c
 - `--tap` ([Test Anything Protocol](http://testanything.org)-compatible output)
 - `--knock`, `-k` (a [simplified version](https://github.com/chneukirchen/knock) of the Test Anything Protocol)
 
+## ANSI / UTF-8
+
+- `--[no-]color`: Show build icons in color. (you can add it to `--simple` or `--test` format).
+  Defaults to auto-detecting color availability.
+- `--[no-]utf`: Use unicode characters in build output or only ASCII.
+  Defaults to auto-detecting the current locale.
 
 ## Reporters
 

data/Rakefile

@@ -23,4 +23,3 @@ task :ci do
   Rake::Task[:cucumber].invoke
   Rake::Task[:lint].invoke
 end
-

data/features/json_compilation_database_report.feature

@@ -18,4 +18,9 @@ Feature: Create a JSON compilation database
 
     Scenario: Writing to multiple custom file paths
         When I pipe to xcpretty with two custom "json-compilation-database" report paths
-        Then I should have JSON compilation databases in two custom paths
+        Then I should have JSON compilation databases in two custom paths
+
+    Scenario: A project with dependencies with no .pch file
+        Given some big input
+        When I pipe to xcpretty with "--report json-compilation-database" and specify a custom path
+        Then entries with a command shouldn't have malformed "-include" directives

data/features/steps/json_steps.rb

@@ -35,3 +35,7 @@ Then(/^the JSON compilation database should be complete$/) do
   entries.length.should == JSON_DB_FIXTURE_COMMAND_COUNT
 end
 
+Then(/^entries with a command shouldn't have malformed "-include" directives$/) do
+  entries = json_db.select { |entry| entry['command'].match(/-include\s+-/) }
+  entries.length.should == 0
+end

data/lib/xcpretty/parser.rb

@@ -129,7 +129,7 @@ module XCPretty
 
     # @regex Captured groups
     # $1 = script_name
-    PHASE_SCRIPT_EXECUTION_MATCHER = /^PhaseScriptExecution\s(.*)\s\//
+    PHASE_SCRIPT_EXECUTION_MATCHER = /^PhaseScriptExecution\s((\\\ |\S)*)\s/
 
     # @regex Captured groups
     # $1 = file

data/lib/xcpretty/reporters/json_compilation_database.rb

@@ -39,7 +39,10 @@ module XCPretty
     def format_compile_command(compiler_command, file_path)
       directory = file_path.gsub("#{@current_path}", '').gsub(/\/$/, '')
       directory = '/' if directory.empty?
-      cmd = compiler_command.gsub(/(\-include)\s.*\.pch/, "\\1 #{@pch_path}")
+
+      cmd = compiler_command
+      cmd = cmd.gsub(/(\-include)\s.*\.pch/, "\\1 #{@pch_path}") if @pch_path
+
       @compilation_units << {command: cmd,
                              file: @current_path,
                              directory: directory}

data/lib/xcpretty/version.rb

@@ -1,4 +1,4 @@
 module XCPretty
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge