danger-xcode_summary 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b206c998ed6da63ed6db8f95fba23cd5462bf647
-  data.tar.gz: 53c168e9094af71f1ffc4f56bdfb6884e9c09b5c
+  metadata.gz: fea9e12b00a58261fd0f841b76b7228395f4257f
+  data.tar.gz: 721e083c3336c8d53cdec149bf9de450fa57a439
 SHA512:
-  metadata.gz: ca7b8d6828da186b54c5d23d91af79a6022c08fc1e5b9f7854cc3ea1f71a7976c8b83af9dcfd98c6ee7ed1c8b2ed503d9099eafb193836b1b12cbcdea3c57bb0
-  data.tar.gz: 54bc8cee7c7e293a29e167ec8c875cd2b86b6a0c2f02f72236f57d880ecba354347d9cf72d10c4093cbae2ce9cab451d0a874b7f4a7c38690eb5618ca463f1fc
+  metadata.gz: 90588b0811d839b2c0a1b2d084742ff23ca4da1dc9f4a94128a18ad21f571ccc78c5a2725b0e51e84652303bbf4e67a3857741f757f6601f7b75a38deb66225a
+  data.tar.gz: 8bdb96a869ea5944cdf8e3fba78827a1f30dcd6b4eb23ef1505d573ed948f7e6d842bb586ae2b0b235c83b03331d4c58d036e2fe345d649d777f5e3e42006265

data/.rubocop.yml

@@ -80,6 +80,9 @@ Style/RedundantSelf:
 Metrics/MethodLength:
   Max: 60
 
+Metrics/ModuleLength:
+  Enabled: false
+
 # We're not there yet
 Style/Documentation:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-xcode_summary (0.1.4)
+    danger-xcode_summary (0.2.0)
       danger-plugin-api (~> 1.0)
 
 GEM
@@ -16,10 +16,9 @@ GEM
       nap
       open4 (~> 1.3)
     coderay (1.1.1)
-    colored (1.2)
     colored2 (3.1.2)
-    cork (0.2.0)
-      colored (~> 1.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
     danger (4.3.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
@@ -131,4 +130,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

data/README.md

@@ -3,6 +3,7 @@
 [![License](http://img.shields.io/badge/license-MIT-green.svg?style=flat)](LICENSE.txt)
 [![Gem Version](https://badge.fury.io/rb/danger-xcode_summary.svg)](https://badge.fury.io/rb/danger-xcode_summary)
 [![Build Status](https://travis-ci.org/diogot/danger-xcode_summary.svg?branch=master)](https://travis-ci.org/diogot/danger-xcode_summary)
+[![Dependency Status](https://dependencyci.com/github/diogot/danger-xcode_summary/badge)](https://dependencyci.com/github/diogot/danger-xcode_summary)
 
 A [Danger](http://danger.systems) plugin that shows all build errors, warnings and unit tests results generated from `xcodebuild`.
 
@@ -104,6 +105,15 @@ xcode_summary.ignored_files = '**/Pods/**'
 xcode_summary.report 'xcodebuild.json'
 ```
 
+You can use `inline_mode`.
+When this value is enabled, each warnings and errors are commented on each lines.
+
+```ruby
+# Comment on each lines
+xcode_summary.inline_mode = true
+xcode_summary.report 'xcodebuild.json'
+```
+
 ## License
 
 danger-xcode_summary is released under the MIT license. See [LICENSE.txt](LICENSE.txt) for details.

data/danger-xcode_summary.gemspec

@@ -1,5 +1,7 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
+
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'xcode_summary/gem_version.rb'
 

data/lib/xcode_summary/gem_version.rb

@@ -1,3 +1,3 @@
 module XcodeSummary
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/xcode_summary/plugin.rb

@@ -18,6 +18,9 @@ module Danger
   # @tags xcode, xcodebuild, format
   #
   class DangerXcodeSummary < Plugin
+    Location = Struct.new(:file_name, :file_path, :line)
+    Result = Struct.new(:message, :location)
+
     # The project root, which will be used to make the paths relative.
     # Defaults to `pwd`.
     # @param    [String] value
@@ -44,6 +47,12 @@ module Danger
     # @return   [Boolean]
     attr_accessor :test_summary
 
+    # Defines if using inline comment or not.
+    # Defaults to `false`.
+    # @param    [Boolean] value
+    # @return   [Boolean]
+    attr_accessor :inline_mode
+
     def project_root
       root = @project_root || Dir.pwd
       root += '/' unless root.end_with? '/'
@@ -59,7 +68,11 @@ module Danger
     end
 
     def test_summary
-      @test_summary .nil? ? true : @test_summary
+      @test_summary.nil? ? true : @test_summary
+    end
+
+    def inline_mode
+      @inline_mode || false
     end
 
     # Reads a file with JSON Xcode summary and reports it.
@@ -79,8 +92,20 @@ module Danger
 
     def format_summary(xcode_summary)
       messages(xcode_summary).each { |s| message(s, sticky: sticky_summary) }
-      warnings(xcode_summary).each { |s| warn(s, sticky: false) }
-      errors(xcode_summary).each { |s| fail(s, sticky: false) }
+      warnings(xcode_summary).each do |result|
+        if inline_mode && result.location
+          warn(result.message, sticky: false, file: result.location.file_name, line: result.location.line)
+        else
+          warn(result.message, sticky: false)
+        end
+      end
+      errors(xcode_summary).each do |result|
+        if inline_mode && result.location
+          fail(result.message, sticky: false, file: result.location.file_name, line: result.location.line)
+        else
+          fail(result.message, sticky: false)
+        end
+      end
     end
 
     def messages(xcode_summary)
@@ -95,21 +120,46 @@ module Danger
 
     def warnings(xcode_summary)
       [
-        xcode_summary[:warnings],
-        xcode_summary[:ld_warnings],
-        xcode_summary.fetch(:compile_warnings, {}).map { |s| format_compile_warning(s) }
-      ].flatten.uniq.compact
+        xcode_summary.fetch(:warnings, []).map { |message| Result.new(message, nil) },
+        xcode_summary.fetch(:ld_warnings, []).map { |message| Result.new(message, nil) },
+        xcode_summary.fetch(:compile_warnings, {}).map do |h|
+          Result.new(format_compile_warning(h), parse_location(h))
+        end
+      ].flatten.uniq.compact.reject { |result| result.message.nil? }
     end
 
     def errors(xcode_summary)
       [
         xcode_summary[:errors],
-        xcode_summary.fetch(:compile_errors, {}).map { |s| format_compile_warning(s) },
-        xcode_summary.fetch(:file_missing_errors, {}).map { |s| format_format_file_missing_error(s) },
-        xcode_summary.fetch(:undefined_symbols_errors, {}).map { |s| format_undefined_symbols(s) },
-        xcode_summary.fetch(:duplicate_symbols_errors, {}).map { |s| format_duplicate_symbols(s) },
-        xcode_summary.fetch(:tests_failures, {}).map { |k, v| format_test_failure(k, v) }.flatten
-      ].flatten.uniq.compact
+        xcode_summary.fetch(:compile_errors, {}).map do |h|
+          Result.new(format_compile_warning(h), parse_location(h))
+        end,
+        xcode_summary.fetch(:file_missing_errors, {}).map do |h|
+          Result.new(format_format_file_missing_error(h), parse_location(h))
+        end,
+        xcode_summary.fetch(:undefined_symbols_errors, {}).map do |h|
+          Result.new(format_undefined_symbols(h), nil)
+        end,
+        xcode_summary.fetch(:duplicate_symbols_errors, {}).map do |h|
+          Result.new(format_duplicate_symbols(h), nil)
+        end,
+        xcode_summary.fetch(:tests_failures, {}).map do |test_suite, failures|
+          failures.map do |failure|
+            Result.new(format_test_failure(test_suite, failure), parse_test_location(failure))
+          end
+        end
+      ].flatten.uniq.compact.reject { |result| result.message.nil? }
+    end
+
+    def parse_location(h)
+      file_path, line, _column = h[:file_path].split(':')
+      Location.new(h[:file_name], file_path, line.to_i)
+    end
+
+    def parse_test_location(failure)
+      path, line = failure[:file_path].split(':')
+      file_name = relative_path(path)
+      Location.new(file_name, path, line.to_i)
     end
 
     def format_path(path)
@@ -181,12 +231,10 @@ module Danger
         "> #{h[:file_paths].map { |path| path.split('/').last }.join('<br /> ')}"
     end
 
-    def format_test_failure(suite_name, failures)
-      failures.map do |f|
-        path = relative_path(f[:file_path])
-        path_link = format_path(path)
-        "**#{suite_name}**: #{f[:test_case]}, #{escape_reason(f[:reason])}  <br />  #{path_link}"
-      end
+    def format_test_failure(suite_name, failure)
+      path = relative_path(failure[:file_path])
+      path_link = format_path(path)
+      "**#{suite_name}**: #{failure[:test_case]}, #{escape_reason(failure[:reason])}  <br />  #{path_link}"
     end
   end
 end

data/spec/xcode_summary_spec.rb

@@ -93,6 +93,40 @@ module Danger
             # rubocop:enable LineLength
           ]
         end
+
+        context 'with inline_mode' do
+          before do
+            @xcode_summary.inline_mode = true
+          end
+
+          it 'asserts errors on the line' do
+            allow(@xcode_summary).to receive(:fail)
+            @xcode_summary.report('spec/fixtures/test_errors.json')
+            expect(@xcode_summary).to have_received(:fail).with(
+              instance_of(String),
+              sticky: false,
+              file: 'MyWeight/MyWeightTests/Tests.swift',
+              line: 86
+            )
+          end
+
+          it 'asserts warning on the line' do
+            allow(@xcode_summary).to receive(:warn)
+            @xcode_summary.report('spec/fixtures/summary.json')
+            expect(@xcode_summary).to have_received(:warn).with(
+              instance_of(String),
+              sticky: false,
+              file: 'Bla.m',
+              line: 32
+            )
+            expect(@xcode_summary).to have_received(:warn).with(
+              instance_of(String),
+              sticky: false,
+              file: 'ISO8601DateFormatter.m',
+              line: 176
+            )
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-xcode_summary
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Diogo Tridapalli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api