xcpretty 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb8fbc6280ad5d7fdfba29fe7f9b69d0e079133
-  data.tar.gz: 394e1ef6f6f488b659e0364c15c2f554b4dccc61
+  metadata.gz: 6059730a79aa8637f3e4125e42d048f480439450
+  data.tar.gz: ed84469a746cef435bd094a967e5462d9f7c17ad
 SHA512:
-  metadata.gz: 9004708350e44edb04f20797ceb471541e737e4ecb480cf38639c7fb1eb56841c877d46e6752e4e8dfd663460ec73d59211ce456c11e3650974d59107fa13c11
-  data.tar.gz: f37ddf3eac02d7f87f0c41070232a1448edde7b973834f4930ed50ecc6fa424f4442775416481ad179689edfa466281216bcfff190df3f11ff1b4a4338d4beaa
+  metadata.gz: 43cf2b910a3e9c0b59e4b28e6d16a297962ba8dc50e52c58beae023604970e5b9d9be8e58eeac6840e8d8532c41710e9e5b6869b0b192b4f01dfad9d118a9f6e
+  data.tar.gz: c87cc661a69527f62b1e3aec2fc47fdc84f1fc0fbb4ac566239d01f50e35be2ba52a6d41587befe12f2020e9dd6bb903464fc633ae8fe22182e5a1243e41824b

data/.hound.yml

@@ -4,3 +4,7 @@ StringLiterals:
 Lint/UnusedMethodArgument:
   Description: 'Checks for unused method arguments.'
   Enabled: false
+
+Style/HashSyntax:
+  Description: 'Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax { :a => 1, :b => 2 }.'
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## master
+
+###### Enhancements
+
+* Added support for Analyzing target output
+  | [Cédric Luthi](https://github.com/0xced)
+  | [#146](https://github.com/supermarin/xcpretty/pull/146)
+
+* Improved logging of `ld` error messages
+  | [Felix Krause](https://github.com/KrauseFx)
+  | [#153](https://github.com/supermarin/xcpretty/pull/153)
+
 ## 0.1.10
 
 ###### Enhancements

data/lib/xcpretty/formatters/formatter.rb

@@ -9,55 +9,56 @@ module XCPretty
   module FormatMethods
     EMPTY = ''.freeze
 
-    def format_analyze(file_name, file_path);                 EMPTY; end
-    def format_build_target(target, project, configuration);  EMPTY; end
-    def format_check_dependencies;                            EMPTY; end
-    def format_clean(project, target, configuration);         EMPTY; end
-    def format_clean_target(target, project, configuration);  EMPTY; end
-    def format_clean_remove;                                  EMPTY; end
-    def format_compile(file_name, file_path);                 EMPTY; end
-    def format_compile_command(compiler_command, file_path);  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
-    def format_copy_strings_file(file_name);                  EMPTY; end
-    def format_cpresource(file);                              EMPTY; end
-    def format_generate_dsym(dsym);                           EMPTY; end
-    def format_linking(file, build_variant, arch);            EMPTY; end
-    def format_libtool(library);                              EMPTY; end
-    def format_passing_test(suite, test, time);               EMPTY; end
-    def format_pending_test(suite, test);                     EMPTY; end
-    def format_measuring_test(suite, test, time);             EMPTY; end
-    def format_failing_test(suite, test, time, file_path);    EMPTY; end
-    def format_process_pch(file);                             EMPTY; end
-    def format_process_pch_command(file_path);                EMPTY; end
-    def format_phase_script_execution(script_name);           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
-    def format_pbxcp(file);                                   EMPTY; end
-    def format_shell_command(command, arguments);             EMPTY; end
-    def format_test_run_started(name);                        EMPTY; end
-    def format_test_run_finished(name, time);                 EMPTY; end
-    def format_test_suite_started(name);                      EMPTY; end
-    def format_test_summary(message, failures_per_suite);     EMPTY; end
-    def format_touch(file_path, file_name);                   EMPTY; end
-    def format_tiffutil(file);                                EMPTY; end
-    def format_write_file(file);                              EMPTY; end
-    def format_write_auxiliary_files;                         EMPTY; end
+    def format_analyze(file_name, file_path);                  EMPTY; end
+    def format_build_target(target, project, configuration);   EMPTY; end
+    def format_analyze_target(target, project, configuration); EMPTY; end
+    def format_check_dependencies;                             EMPTY; end
+    def format_clean(project, target, configuration);          EMPTY; end
+    def format_clean_target(target, project, configuration);   EMPTY; end
+    def format_clean_remove;                                   EMPTY; end
+    def format_compile(file_name, file_path);                  EMPTY; end
+    def format_compile_command(compiler_command, file_path);   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
+    def format_copy_strings_file(file_name);                   EMPTY; end
+    def format_cpresource(file);                               EMPTY; end
+    def format_generate_dsym(dsym);                            EMPTY; end
+    def format_linking(file, build_variant, arch);             EMPTY; end
+    def format_libtool(library);                               EMPTY; end
+    def format_passing_test(suite, test, time);                EMPTY; end
+    def format_pending_test(suite, test);                      EMPTY; end
+    def format_measuring_test(suite, test, time);              EMPTY; end
+    def format_failing_test(suite, test, time, file_path);     EMPTY; end
+    def format_process_pch(file);                              EMPTY; end
+    def format_process_pch_command(file_path);                 EMPTY; end
+    def format_phase_script_execution(script_name);            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
+    def format_pbxcp(file);                                    EMPTY; end
+    def format_shell_command(command, arguments);              EMPTY; end
+    def format_test_run_started(name);                         EMPTY; end
+    def format_test_run_finished(name, time);                  EMPTY; end
+    def format_test_suite_started(name);                       EMPTY; end
+    def format_test_summary(message, failures_per_suite);      EMPTY; end
+    def format_touch(file_path, file_name);                    EMPTY; end
+    def format_tiffutil(file);                                 EMPTY; end
+    def format_write_file(file);                               EMPTY; end
+    def format_write_auxiliary_files;                          EMPTY; end
 
     # COMPILER / LINKER ERRORS AND WARNINGS
     def format_compile_error(file_name, file_path, reason,
-                             line, cursor);                   EMPTY; end
-    def format_error(message);                                EMPTY; end
-    def format_undefined_symbols(message, symbol, reference); EMPTY; end
-    def format_duplicate_symbols(message, file_paths);        EMPTY; end
-    def format_warning(message);                            message; end
+                             line, cursor);                    EMPTY; end
+    def format_error(message);                                 EMPTY; end
+    def format_undefined_symbols(message, symbol, reference);  EMPTY; end
+    def format_duplicate_symbols(message, file_paths);         EMPTY; end
+    def format_warning(message);                             message; end
 
     # TODO: see how we can unify format_error and format_compile_error,
     #       the same for warnings
     def format_compile_warning(file_name, file_path, reason,
-                               line, cursor);                 EMPTY; end
+                               line, cursor);                  EMPTY; end
   end
 
   class Formatter

data/lib/xcpretty/formatters/simple.rb

@@ -27,6 +27,10 @@ module XCPretty
       format("Building", "#{project}/#{target} [#{configuration}]")
     end
 
+    def format_analyze_target(target, project, configuration)
+      format("Analyzing", "#{project}/#{target} [#{configuration}]")
+    end
+
     def format_clean_target(target, project, configuration)
       format("Cleaning", "#{project}/#{target} [#{configuration}]")
     end

data/lib/xcpretty/parser.rb

@@ -15,6 +15,12 @@ module XCPretty
     # $3 configuration
     BUILD_TARGET_MATCHER = /^=== BUILD TARGET\s(.*)\sOF PROJECT\s(.*)\sWITH.*CONFIGURATION\s(.*)\s===/
 
+    # @regex Captured groups
+    # $1 target
+    # $2 project
+    # $3 configuration
+    ANALYZE_TARGET_MATCHER = /^=== ANALYZE TARGET\s(.*)\sOF PROJECT\s(.*)\sWITH.*CONFIGURATION\s(.*)\s===/
+
     # @regex Nothing returned here for now
     CHECK_DEPENDENCIES_MATCHER = /^Check dependencies/
 
@@ -43,7 +49,7 @@ module XCPretty
     # @regex Captured groups
     # $1 file_path
     # $2 file_name (e.g. KWNull.m)
-    COMPILE_MATCHER = /^CompileC\s.+?\s((?:\\.|[^ ])+\/((?:\\.|[^ ])+\.(?:m|mm|c|cc|cpp|cxx)))\s.*/
+    COMPILE_MATCHER = /^CompileC\s.+?\s((?:\\.|[^ ])+\/((?:\\.|[^ ])+\.(?:m|mm|c|cc|cpp|cxx|swift)))\s.*/
 
     # @regex Captured groups
     # $1 compiler_command
@@ -204,7 +210,7 @@ module XCPretty
       FATAL_ERROR_MATCHER = /^(fatal error:.*)$/
 
       # $1 = whole error
-      LD_ERROR_MATCHER = /^(ld:.*not found for.*)/
+      LD_ERROR_MATCHER = /^(ld:.*)/
 
       # @regex Captured groups
       # $1 file path
@@ -258,6 +264,8 @@ module XCPretty
         formatter.format_analyze($2, $1)
       when BUILD_TARGET_MATCHER
         formatter.format_build_target($1, $2, $3)
+      when ANALYZE_TARGET_MATCHER
+        formatter.format_analyze_target($1, $2, $3)
       when CLEAN_REMOVE_MATCHER
         formatter.format_clean_remove
       when CLEAN_TARGET_MATCHER

data/lib/xcpretty/version.rb

@@ -1,3 +1,3 @@
 module XCPretty
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/spec/fixtures/constants.rb

@@ -22,6 +22,7 @@ SAMPLE_OLD_SPECTA_FAILURE = "/Users/musalj/code/OSS/ReactiveCocoa/ReactiveCocoaF
 SAMPLE_SPECTA_FAILURE = "         Test Case '-[SKWelcomeViewControllerSpecSpec SKWelcomeViewController_When_a_user_opens_the_app_from_a_clean_installation_displays_the_welcome_screen]' started. \n/Users/vickeryj/Code/ipad-register/KIFTests/Specs/SKWelcomeViewControllerSpec.m:11: error: -[SKWelcomeViewControllerSpecSpec SKWelcomeViewController_When_a_user_opens_the_app_from_a_clean_installation_displays_the_welcome_screen] : The step timed out after 2.00 seconds: Failed to find accessibility element with the label \"The asimplest way to make smarter business decisions\""
 
 SAMPLE_BUILD = "=== BUILD TARGET The Spacer OF PROJECT Pods WITH THE DEFAULT CONFIGURATION Debug ==="
+SAMPLE_ANALYZE_TARGET = "=== ANALYZE TARGET The Spacer OF PROJECT Pods WITH THE DEFAULT CONFIGURATION Debug ==="
 SAMPLE_CLEAN = "=== CLEAN TARGET Pods-ObjectiveSugar OF PROJECT Pods WITH CONFIGURATION Debug ==="
 SAMPLE_ANOTHER_CLEAN = "=== CLEAN TARGET Pods OF PROJECT Pods WITH CONFIGURATION Debug ==="
 SAMPLE_CLEAN_REMOVE = %Q(
@@ -552,6 +553,10 @@ ld: 1 duplicate symbol for architecture i386
 clang: error: linker command failed with exit code 1 (use -v to see invocation)
 )
 
+SAMPLE_BITCODE_LD = %Q(
+ld: '/Users/.../GoogleAnalytics-iOS-SDK/libGoogleAnalyticsServices.a(TAGHit.o)' does not contain bitcode. You must rebuild it with bitcode enabled (Xcode setting ENABLE_BITCODE), obtain an updated library from the vendor, or disable bitcode for this target. for architecture armv7
+)
+
 SAMPLE_LD_SYMBOLS_ERROR = 'ld: symbol(s) not found for architecture x86_64'
 SAMPLE_LD_LIBRARY_ERROR = 'ld: library not found for -lPods-Yammer'
 

data/spec/xcpretty/formatters/simple_spec.rb

@@ -20,6 +20,11 @@ module XCPretty
         "> Building Pods/The Spacer [Debug]"
       end
 
+      it "formats analyze target/project/configuration with target" do
+        @formatter.format_analyze_target("The Spacer", "Pods", "Debug").should ==
+        "> Analyzing Pods/The Spacer [Debug]"
+      end
+
       it "formats clean target/project/configuration" do
         @formatter.format_clean_target("Pods-ObjectiveSugar", "Pods", "Debug").should ==
         "> Cleaning Pods/Pods-ObjectiveSugar [Debug]"

data/spec/xcpretty/parser_spec.rb

@@ -28,6 +28,11 @@ module XCPretty
       @parser.parse(SAMPLE_BUILD)
     end
 
+    it "parses analyze target" do
+      @formatter.should receive(:format_analyze_target).with("The Spacer", "Pods", "Debug")
+      @parser.parse(SAMPLE_ANALYZE_TARGET)
+    end
+
     it "parses clean remove" do
       @formatter.should receive(:format_clean_remove)
       @parser.parse(SAMPLE_CLEAN_REMOVE)
@@ -84,6 +89,11 @@ module XCPretty
       @parser.parse(SAMPLE_ANOTHER_COMPILE.sub('.m', '.mm'))
     end
 
+    it 'parses compiling Swift source files' do
+      @formatter.should receive(:format_compile).with("KWNull.swift", "Classes/Core/KWNull.swift")
+      @parser.parse(SAMPLE_ANOTHER_COMPILE.sub('.m', '.swift'))
+    end
+
     it "parses compiling C and C++ files" do
       ['.c', '.cc', '.cpp', '.cxx'].each do |file_extension|
         @formatter.should receive(:format_compile).with("KWNull" + file_extension, "Classes/Core/KWNull" + file_extension)
@@ -154,6 +164,11 @@ module XCPretty
       @parser.parse(SAMPLE_OLD_SPECTA_FAILURE)
     end
 
+    it "parses ld bitcode errors" do
+      @formatter.should receive(:format_error).with(SAMPLE_BITCODE_LD.strip)
+      @parser.parse(SAMPLE_BITCODE_LD)
+    end
+
     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',

data/xcpretty.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2"
-  spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "cucumber", "~> 1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcpretty
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Marin Usalj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,16 +57,16 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: "\n  Xcodebuild formatter designed to be piped with `xcodebuild`,\n  and
   thus keeping 100% compatibility.\n\n  It has modes for CI, running tests (RSpec
   dot-style),\n  and it can also mine Bitcoins.\n  "