diff --git a/.travis.yml b/.travis.yml index afae4c5..207c568 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ cache: rvm: - 2.6.0 - 2.5.3 - - 2.4.5 script: - bundle exec rake spec diff --git a/Gemfile.lock b/Gemfile.lock index e241687..d495f16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - danger-xcode_summary (0.5.2) + danger-xcode_summary (0.5.3) danger-plugin-api (~> 1.0) GEM @@ -9,7 +9,7 @@ GEM specs: addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - ast (2.4.1) + ast (2.4.2) claide (1.0.3) claide-plugins (0.9.2) cork @@ -19,7 +19,7 @@ GEM colored2 (3.1.2) cork (0.3.0) colored2 (~> 3.1) - danger (8.0.2) + danger (8.2.3) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -27,23 +27,34 @@ GEM faraday (>= 0.9.0, < 2.0) faraday-http-cache (~> 2.0) git (~> 1.7) - kramdown (~> 2.0) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) - terminal-table (~> 1) + terminal-table (>= 1, < 4) danger-plugin-api (1.0.0) danger (> 2.0) diff-lcs (1.4.4) - faraday (1.0.1) + faraday (1.4.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) - ffi (1.13.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) + ffi (1.15.1) formatador (0.2.5) - git (1.7.0) + git (1.8.1) rchardet (~> 1.8) - guard (2.16.2) + guard (2.17.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -57,14 +68,14 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) listen (3.0.7) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) - lumberjack (1.2.6) + lumberjack (1.2.8) method_source (1.0.0) multipart-post (2.1.1) nap (1.1.0) @@ -73,59 +84,60 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - octokit (4.18.0) + octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - parallel (1.19.2) - parser (2.7.1.4) + parallel (1.20.1) + parser (3.0.1.1) ast (~> 2.4.1) - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.5) + public_suffix (4.0.6) rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.3) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) - regexp_parser (1.7.1) - rexml (3.2.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + regexp_parser (2.1.1) + rexml (3.2.5) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) - rubocop (0.86.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.15.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.0.3, < 1.0) + rubocop-ast (>= 1.5.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.1.0) - parser (>= 2.7.0.1) - ruby-progressbar (1.10.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.5.0) + parser (>= 3.0.1.1) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.4) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) shellany (0.0.1) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - thor (1.0.1) - unicode-display_width (1.7.0) - yard (0.9.25) + terminal-table (3.0.1) + unicode-display_width (>= 1.1.1, < 3) + thor (1.1.0) + unicode-display_width (2.0.0) + yard (0.9.26) PLATFORMS ruby diff --git a/lib/xcode_summary/gem_version.rb b/lib/xcode_summary/gem_version.rb index 2553486..66407e8 100644 --- a/lib/xcode_summary/gem_version.rb +++ b/lib/xcode_summary/gem_version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module XcodeSummary - VERSION = '0.5.2' + VERSION = '0.5.3' end diff --git a/lib/xcode_summary/plugin.rb b/lib/xcode_summary/plugin.rb index 5e4edee..d4bd1a9 100644 --- a/lib/xcode_summary/plugin.rb +++ b/lib/xcode_summary/plugin.rb @@ -147,6 +147,7 @@ def format_summary(xcode_summary) warn(result.message, sticky: false) end end + # rubocop:disable Lint/UnreachableLoop 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) @@ -154,6 +155,7 @@ def format_summary(xcode_summary) fail(result.message, sticky: false) end end + # rubocop:enable Lint/UnreachableLoop end def messages(xcode_summary) @@ -220,7 +222,7 @@ def parse_test_location(failure) def format_path(path) if plugin clean_path, line = parse_filename(path) - path = clean_path + '#L' + line if clean_path && line + path = "#{clean_path}#L#{line}" if clean_path && line plugin.html_link(path) else path diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a718254..fb7fba2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,8 +2,8 @@ require 'pathname' ROOT = Pathname.new(File.expand_path('..', __dir__)) -$LOAD_PATH.unshift((ROOT + 'lib').to_s) -$LOAD_PATH.unshift((ROOT + 'spec').to_s) +$LOAD_PATH.unshift("#{ROOT}lib".to_s) +$LOAD_PATH.unshift("#{ROOT}spec".to_s) require 'bundler/setup' require 'pry' diff --git a/spec/xcode_summary_spec.rb b/spec/xcode_summary_spec.rb index 34def4b..3740870 100644 --- a/spec/xcode_summary_spec.rb +++ b/spec/xcode_summary_spec.rb @@ -89,10 +89,8 @@ module Danger it 'formats test errors' do @xcode_summary.report('spec/fixtures/test_errors.json') expect(@dangerfile.status_report[:errors]).to eq [ - # rubocop:disable Layout/LineLength '**MyWeight.MyWeightSpec**: works_with_success, expected to eventually not be nil, got \
' \ "MyWeight/MyWeightTests/Tests.swift#L86" - # rubocop:enable Layout/LineLength ] end