danger-swiftformat 0.4.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e4ff2c06c4f47af744f1ecc4900ec266670fd93c20180b0aedd39a808f3c54c
-  data.tar.gz: 96433fecb5ba65121988850db61de14cd990d30f05146764e918766e006b7daf
+  metadata.gz: b79df1cd49dbf9b086b132f91292f0db8e0bae4cc7118feaa865a1353df10b80
+  data.tar.gz: 747b28dda4e5917274519b6205fabeaa0ff33f674bbf906387e8d188f6b55de9
 SHA512:
-  metadata.gz: '093e955e3ad8c198b162e557746ab18fc572ef5d99f856d0c054db05d402a1e4f1b48d3c4f6c39b5cc88d30fdc4e4fd05cefc3cd3bd64339c06a3146546aee28'
-  data.tar.gz: 29b8270dcc22adbd1e84c2dd128c0f5c5c4f60bd52349480cc8896087edfbc3abd1a9c0c7ad52b2a6571c5e863a3831e3b8ad4b1363410f3d448c12c5c66122b
+  metadata.gz: 10a5bec311017e59fae92cf9144a5f2a199993c5e6ad0dc0f60f6634fbdb3868633a8ed2ee99d45a5d61ce414c1fd5e6f431c3b736cecd61d94043a63143497c
+  data.tar.gz: 16e57a203cf81103dc0aca649e61fc4d14d9e758f73fef76d8c3f48e07f0509809a345e2523d1d3556122ae92ee0fc8cd486924accac25cbad8c83e585b92976

data/.github/workflows/ruby.yml

@@ -0,0 +1,26 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -3,7 +3,8 @@
 # If you don't like these settings, just delete this file :)
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
+  NewCops: enable
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -13,20 +14,16 @@ Style/StringLiterals:
 Style/ClassCheck:
   EnforcedStyle: kind_of?
 
-# It's better to be more explicit about the type
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 # specs sometimes have useless assignments, which is fine
 Lint/UselessAssignment:
   Exclude:
     - '**/spec/**/*'
 
 # We could potentially enable the 2 below:
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
 # HoundCI doesn't like this rule
@@ -37,6 +34,18 @@ Layout/DotPosition:
 Style/DoubleNegation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 # Cop supports --auto-correct.
 Lint/UnusedBlockArgument:
   Enabled: false
@@ -130,7 +139,7 @@ Style/MixinGrouping:
 Naming/FileName:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
 Style/SpecialGlobalVars:
@@ -150,3 +159,7 @@ PercentLiteralDelimiters:
 
 Security/YAMLLoad:
   Enabled: false
+
+Metrics/ModuleLength:
+  Exclude:
+    - "**/*_spec.rb"

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in danger-swiftformat.gemspec
 gemspec
+gem "faraday", "0.15.4"

data/Gemfile.lock

@@ -1,47 +1,49 @@
 PATH
   remote: .
   specs:
-    danger-swiftformat (0.4.0)
+    danger-swiftformat (0.8.1)
       danger-plugin-api (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    claide (1.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.11.0)
+    danger (8.2.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1.5)
-      kramdown (~> 1.5)
+      faraday (>= 0.9.0, < 2.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
-      faraday (~> 0.8)
-    ffi (1.9.25)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    ffi (1.14.2)
     formatador (0.2.5)
-    git (1.5.0)
-    guard (2.14.2)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -55,76 +57,83 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    jaro_winkler (1.5.1)
-    kramdown (1.17.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.0)
-    multipart-post (2.0.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
     no_proxy_fix (0.1.2)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.13.0)
+    octokit (4.20.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rake (12.3.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rchardet (1.8.0)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    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.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.59.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    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 (0.20.0)
-    unicode-display_width (1.4.0)
-    yard (0.9.16)
+    thor (1.1.0)
+    unicode-display_width (1.7.0)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   danger-swiftformat!
+  faraday (= 0.15.4)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
   listen (~> 3.1)
@@ -135,4 +144,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   1.17.2
+   2.2.6

data/README.md

@@ -1,4 +1,4 @@
-# danger-swiftformat [![Build Status](https://travis-ci.org/garriguv/danger-ruby-swiftformat.svg?branch=master)](https://travis-ci.org/garriguv/danger-ruby-swiftformat) [![Gem Version](https://badge.fury.io/rb/danger-swiftformat.svg)](https://rubygems.org/gems/danger-swiftformat)
+# danger-swiftformat [![Gem Version](https://badge.fury.io/rb/danger-swiftformat.svg)](https://rubygems.org/gems/danger-swiftformat)
 
 A [Danger] plugin to check Swift formatting using [SwiftFormat].
 
@@ -8,7 +8,9 @@ This plugin is heavily inspired by [danger-swiftlint].
 
 Add this line to your Gemfile:
 
-    require 'danger-swiftformat'
+```ruby
+gem 'danger-swiftformat'
+```
 
 [SwiftFormat] also needs to be installed before you run Danger.
 
@@ -22,6 +24,8 @@ swiftformat.check_format
 
 By default, danger-swiftformat will check added and modified files.
 
+## Options and parameters
+
 If you want errors to fail Danger, you can use the `fail_on_error` option:
 
 ```ruby
@@ -34,12 +38,34 @@ You can specify the `swiftformat` binary using the `binary_path` parameter:
 swiftformat.binary_path = "/path/to/swiftformat"
 ```
 
+You can specify the Swift version of your project using the `swiftversion` parametter:
+
+```ruby
+swiftformat.swiftversion = "5"
+```
+
 You can specify additional `swiftformat` arguments using the `additional_args` parameter:
 
 ```ruby
 swiftformat.additional_args = "--indent tab --self insert"
 ```
 
+You can specify additional message (e.g. how to fix format issue) for danger comment using the `additional_message` parameter:
+
+```ruby
+swiftformat.additional_message = "your additional message for contributor"
+```
+
+By default, `danger-swiftformat` will run on any modified or created file ending in `.swift`. If you'd like to exclude
+certain directories or files such as `Pods`, you can use the `exclude` parameter:
+
+```ruby
+swiftformat.exclude = %w(Pods/** Carthage/** Sources/Nope.swift **/*_autogenerated.swift)
+```
+
+The `exclude` option takes an array of glob patterns; you can find additional documentation on the patterns
+[here](https://ruby-doc.org/core-2.6.3/File.html#method-c-fnmatch).
+
 ## Development
 
 1. Clone this repo
@@ -48,6 +74,16 @@ swiftformat.additional_args = "--indent tab --self insert"
 4. Use `bundle exec guard` to automatically have tests run as you make changes.
 5. Make your changes.
 
+## Releasing a new version
+
+Use the release.sh script:
+
+```shell
+./scripts/release.sh
+```
+
+Then bump the gem to the next patch version.
+
 [Danger]: https://danger.systems/ruby/
 [SwiftFormat]: https://github.com/nicklockwood/SwiftFormat
 [danger-swiftlint]: https://github.com/ashfurrow/danger-ruby-swiftlint

data/danger-swiftformat.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{A danger plugin for checking Swift formatting using SwiftFormat.}
   spec.homepage      = 'https://github.com/garriguv/danger-swiftformat'
   spec.license       = 'MIT'
+  spec.metadata      = { "github_repo" => "ssh://github.com/garriguv/danger-ruby-swiftformat" }
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -21,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   # General ruby development
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 12.3'
 
   # Testing support

data/lib/swiftformat/gem_version.rb

@@ -1,3 +1,3 @@
 module Swiftformat
-  VERSION = "0.4.0".freeze
+  VERSION = "0.8.1".freeze
 end

data/lib/swiftformat/plugin.rb

@@ -19,6 +19,21 @@ module Danger
     # @return [String]
     attr_accessor :additional_args
 
+    # Additional message to be appended the report
+    #
+    # @return [String]
+    attr_accessor :additional_message
+
+    # An array of file and directory paths to exclude
+    #
+    # @return [Array<String>]
+    attr_accessor :exclude
+
+    # The project Swift version
+    #
+    # @return [String]
+    attr_accessor :swiftversion
+
     # Runs swiftformat
     #
     # @param [Boolean] fail_on_error
@@ -36,7 +51,7 @@ module Danger
       return if swift_files.empty?
 
       # Run swiftformat
-      results = swiftformat.check_format(swift_files, additional_args)
+      results = swiftformat.check_format(swift_files, additional_args, swiftversion)
 
       # Stop processing if the errors array is empty
       return if results[:errors].empty?
@@ -46,8 +61,13 @@ module Danger
       message << "| File | Rules |\n"
       message << "| ---- | ----- |\n"
       results[:errors].each do |error|
-        message << "| #{error[:file].gsub(Dir.pwd + '/', '')} | #{error[:rules].join(', ')} |\n"
+        message << "| #{error[:file].gsub("#{Dir.pwd}/", '')} | #{error[:rules].join(', ')} |\n"
+      end
+
+      unless additional_message.nil?
+        message << "\n" << additional_message
       end
+
       markdown message
 
       if fail_on_error
@@ -59,10 +79,18 @@ module Danger
     #
     # @return [Array<String]
     def find_swift_files
-      files = (git.modified_files - git.deleted_files) + git.added_files
+      renamed_files_hash = git.renamed_files.map { |rename| [rename[:before], rename[:after]] }.to_h
+
+      post_rename_modified_files = git.modified_files
+        .map { |modified_file| renamed_files_hash[modified_file] || modified_file }
+
+      files = (post_rename_modified_files - git.deleted_files) + git.added_files
+
+      @exclude = %w() if @exclude.nil?
 
       files
         .select { |file| file.end_with?(".swift") }
+        .reject { |file| @exclude.any? { |glob| File.fnmatch(glob, file) } }
         .uniq
         .sort
     end

data/lib/swiftformat/swiftformat.rb

@@ -10,10 +10,16 @@ module Danger
       Cmd.run([@path, "--version"])
     end
 
-    def check_format(files, additional_args = "")
+    def check_format(files, additional_args = "", swiftversion = "")
       cmd = [@path] + files
       cmd << additional_args.split unless additional_args.nil? || additional_args.empty?
-      cmd << %w(--dryrun --verbose)
+
+      unless swiftversion.nil? || swiftversion.empty?
+        cmd << "--swiftversion"
+        cmd << swiftversion
+      end
+
+      cmd << %w(--lint --lenient)
       stdout, stderr, status = Cmd.run(cmd.flatten)
 
       output = stdout.empty? ? stderr : stdout
@@ -41,7 +47,7 @@ module Danger
       }
     end
 
-    ERRORS_REGEX = /rules applied:(.*)\n.*updated (.*)$/
+    ERRORS_REGEX = /(.*:\d+:\d+): ((warning|error):.*)$/.freeze
 
     def errors(output)
       errors = []
@@ -49,20 +55,20 @@ module Danger
         next if match.count < 2
 
         errors << {
-            file: match[1],
-            rules: match[0].split(",").map(&:strip)
+            file: match[0].sub("#{Dir.pwd}/", ""),
+            rules: match[1].split(",").map(&:strip)
         }
       end
       errors
     end
 
-    RUNTIME_REGEX = /.*swiftformat completed.*(.+\..+)s/
+    RUNTIME_REGEX = /.*SwiftFormat completed.*(.+\..+)s/.freeze
 
     def run_time(output)
       if RUNTIME_REGEX.match(output)
         RUNTIME_REGEX.match(output)[1]
       else
-        logger = Logger.new(STDERR)
+        logger = Logger.new($stderr)
         logger.error("Invalid run_time output: #{output}")
         "-1"
       end

data/scripts/release.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+
+version=$(cat lib/swiftformat/gem_version.rb | grep -o "\d\.\d\.\d")
+
+echo "Releasing version ${version}"
+
+echo "Releasing to rubygems.org"
+bundle exec rake release
+
+echo "Releasing to GitHub Package Registry"
+gem push \
+    --key github \
+    --host https://rubygems.pkg.github.com/garriguv \
+    pkg/danger-swiftformat-${version}.gem

data/spec/fixtures/0_GoodFile.swift

@@ -0,0 +1,8 @@
+import SwiftUI
+
+struct MyView: View {
+    var body: some View {
+        Text("Hello World!")
+            .padding()
+    }
+}

data/spec/fixtures/1_BadFile.swift

@@ -0,0 +1,7 @@
+import SwiftUI
+struct MyView: View {
+    var body : some View {
+        Text( "Hello World!")
+        .padding()
+    }
+}

data/spec/fixtures/2_GoodFile.swift

@@ -0,0 +1,8 @@
+import SwiftUI
+
+struct MyView: View {
+    var body: some View {
+        Text("Hello World!")
+            .padding()
+    }
+}

data/spec/fixtures/swiftformat_output.txt

@@ -1,9 +1,4 @@
-running swiftformat...
-formatting /Users/garriguv/FirstClass.swift
--- no changes
-formatting /Users/garriguv/FileWithErrors.swift
--- no changes
-formatting /Users/garriguv/OtherFile.swift
--- no changes
-
-swiftformat completed. 0/3 files would have been updated in 0.08s
+Running SwiftFormat...
+(lint mode - no files will be changed.)
+SwiftFormat completed in 0.01s.
+0/2 files require formatting.

data/spec/fixtures/swiftformat_output_with_errors.txt

@@ -1,10 +1,8 @@
-running swiftformat...
-formatting /Users/garriguv/FirstClass.swift
--- no changes
-formatting /Users/garriguv/FileWithErrors.swift
- -- rules applied: consecutiveBlankLines, spaceAroundParens, trailingSpace
-would have updated /Users/garriguv/FileWithErrors.swift
-formatting /Users/garriguv/OtherFile.swift
--- no changes
-
-swiftformat completed. 1/3 files would have been updated in 0.08s
+Running SwiftFormat...
+(lint mode - no files will be changed.)
+spec/fixtures/1_BadFile.swift:3:1: warning: (spaceAroundOperators) Add or remove space around operators or delimiters.
+spec/fixtures/1_BadFile.swift:4:1: warning: (spaceInsideParens) Remove space inside parentheses.
+spec/fixtures/1_BadFile.swift:5:1: warning: (indent) Indent code in accordance with the scope level.
+SwiftFormat completed in 0.02s.
+Source input did not pass lint check.
+1/3 files require formatting.

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require "pathname"
 ROOT = Pathname.new(File.expand_path("..", __dir__))
-$:.unshift((ROOT + "lib").to_s)
-$:.unshift((ROOT + "spec").to_s)
+$:.unshift("#{ROOT}lib".to_s)
+$:.unshift("#{ROOT}spec".to_s)
 
 require "bundler/setup"
 require "pry"

data/spec/swiftformat/plugin_spec.rb

@@ -39,9 +39,102 @@ module Danger
           allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
           allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
           allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
           allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
           allow_any_instance_of(SwiftFormat).to receive(:check_format)
-            .with(%w(Added.swift Modified.swift), additional_args)
+            .with(%w(Added.swift Modified.swift), additional_args, nil)
+            .and_return(success_output)
+
+          @sut.additional_args = additional_args
+
+          @sut.check_format(fail_on_error: true)
+
+          status = @sut.status_report
+          expect(status[:errors]).to be_empty
+          expect(status[:markdowns]).to be_empty
+        end
+      end
+
+      context "with swiftversion" do
+        let(:swiftversion) { "5" }
+        let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
+
+        it "should pass the additional flag to swiftformat" do
+          allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
+          allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
+          allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
+          allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
+          allow_any_instance_of(SwiftFormat).to receive(:check_format)
+            .with(%w(Added.swift Modified.swift), nil, swiftversion)
+            .and_return(success_output)
+
+          @sut.swiftversion = swiftversion
+
+          @sut.check_format(fail_on_error: true)
+
+          status = @sut.status_report
+          expect(status[:errors]).to be_empty
+          expect(status[:markdowns]).to be_empty
+        end
+      end
+
+      context "with additional_message" do
+        let(:additional_message) { "I'm the additional message." }
+        let(:error_output) { { errors: [{ file: "Modified.swift", rules: %w(firstRule secondRule) }], stats: { run_time: "0.16s" } } }
+
+        it "should include the additional message in the report" do
+          allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
+          allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
+          allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
+          allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
+          allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil, nil).and_return(error_output)
+          @sut.additional_message = additional_message
+          @sut.check_format(fail_on_error: true)
+
+          status = @sut.status_report
+          markdown = status[:markdowns].first.message
+          expect(markdown).to include(additional_message)
+        end
+      end
+
+      context "with exclude" do
+        let(:exclude) { %w(**/Modified.swift Pods/** Carthage/** **/*_autogenerated.swift) }
+        let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
+
+        it "should filter the files passed to swiftformat" do
+          allow(@sut.git).to receive(:added_files).and_return(%w(Added.swift Pods/Test.swift Carthage/SQLite.swift Sources/Module/JSONParsing_autogenerated.swift))
+          allow(@sut.git).to receive(:modified_files).and_return(["Source/Modified.swift"])
+          allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
+          allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
+          allow_any_instance_of(SwiftFormat).to receive(:check_format)
+            .with(%w(Added.swift), nil, nil)
+            .and_return(success_output)
+
+          @sut.exclude = exclude
+
+          @sut.check_format(fail_on_error: true)
+
+          status = @sut.status_report
+          expect(status[:errors]).to be_empty
+          expect(status[:markdowns]).to be_empty
+        end
+      end
+
+      context "with renamed files" do
+        let(:additional_args) { "--indent tab --self insert" }
+        let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
+
+        it "should use the post-rename filename" do
+          allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
+          allow(@sut.git).to receive(:modified_files).and_return(["ModifiedBefore.swift"])
+          allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{ before: "ModifiedBefore.swift", after: "ModifiedAfter.swift" }])
+          allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
+          allow_any_instance_of(SwiftFormat).to receive(:check_format)
+            .with(%w(Added.swift ModifiedAfter.swift), additional_args, nil)
             .and_return(success_output)
 
           @sut.additional_args = additional_args
@@ -64,6 +157,7 @@ module Danger
             allow(@sut.git).to receive(:added_files).and_return(["Added.m"])
             allow(@sut.git).to receive(:modified_files).and_return(["Modified.m"])
             allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.m"])
+            allow(@sut.git).to receive(:renamed_files).and_return([{}])
           end
 
           it "should not do anything" do
@@ -81,11 +175,12 @@ module Danger
             allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
             allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
             allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+            allow(@sut.git).to receive(:renamed_files).and_return([{}])
           end
 
           context "when swiftformat does not find any errors" do
             before do
-              allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil).and_return(success_output)
+              allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil, nil).and_return(success_output)
             end
 
             it "should not do anything" do
@@ -99,7 +194,7 @@ module Danger
 
           context "when swiftformat finds errors" do
             before do
-              allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil).and_return(error_output)
+              allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil, nil).and_return(error_output)
             end
 
             it "should output some markdown and error if fail_on_error is true" do

data/spec/swiftformat/swiftformat_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Danger::SwiftFormat do
     it "should run swiftformat on the specified files" do
       files = %w(/path/to/file.swift /path/to/directory/)
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat /path/to/file.swift /path/to/directory/ --dryrun --verbose))
+        .with(%w(swiftformat /path/to/file.swift /path/to/directory/ --lint --lenient))
         .and_return(fixture("swiftformat_output.txt"))
 
       @sut.check_format(files)
@@ -44,18 +44,17 @@ RSpec.describe Danger::SwiftFormat do
 
     it "should return a formatted output including rules when there are errors" do
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat . --dryrun --verbose))
+        .with(%w(swiftformat . --lint --lenient))
         .and_return(fixture("swiftformat_output_with_errors.txt"))
 
       output = {
           errors: [
-            {
-                file: "/Users/garriguv/FileWithErrors.swift",
-                rules: %w(consecutiveBlankLines spaceAroundParens trailingSpace)
-            }
+            { file: "spec/fixtures/1_BadFile.swift:3:1", rules: ["warning: (spaceAroundOperators) Add or remove space around operators or delimiters."] },
+            { file: "spec/fixtures/1_BadFile.swift:4:1", rules: ["warning: (spaceInsideParens) Remove space inside parentheses."] },
+            { file: "spec/fixtures/1_BadFile.swift:5:1", rules: ["warning: (indent) Indent code in accordance with the scope level."] }
           ],
           stats: {
-              run_time: "0.08"
+              run_time: "0.02"
           }
       }
       expect(@sut.check_format(%w(.))).to eq(output)
@@ -63,13 +62,13 @@ RSpec.describe Danger::SwiftFormat do
 
     it "should also return a formatted output if there were no errors" do
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat . --dryrun --verbose))
+        .with(%w(swiftformat . --lint --lenient))
         .and_return(fixture("swiftformat_output.txt"))
 
       output = {
           errors: [],
           stats: {
-              run_time: "0.08"
+              run_time: "0.01"
           }
       }
 
@@ -78,7 +77,7 @@ RSpec.describe Danger::SwiftFormat do
 
     it "should raise an error if the output is empty" do
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat . --dryrun --verbose))
+        .with(%w(swiftformat . --lint --lenient))
         .and_return("")
 
       expect { @sut.check_format(%w(.)) }.to raise_error("Error running SwiftFormat: Empty output.")
@@ -86,37 +85,37 @@ RSpec.describe Danger::SwiftFormat do
 
     it "should support nil additional command line arguments" do
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat . --dryrun --verbose))
+        .with(%w(swiftformat . --lint --lenient))
         .and_return(fixture("swiftformat_output.txt"))
 
       output = {
           errors: [],
           stats: {
-              run_time: "0.08"
+              run_time: "0.01"
           }
       }
 
-      expect(@sut.check_format(%w(.), nil)).to eq(output)
+      expect(@sut.check_format(%w(.), nil, nil)).to eq(output)
     end
 
     it "should support additional command line arguments" do
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat . --self insert --indent tab --dryrun --verbose))
+        .with(%w(swiftformat . --self insert --indent tab --swiftversion 5 --lint --lenient))
         .and_return(fixture("swiftformat_output.txt"))
 
       output = {
           errors: [],
           stats: {
-              run_time: "0.08"
+              run_time: "0.01"
           }
       }
 
-      expect(@sut.check_format(%w(.), "--self insert --indent tab")).to eq(output)
+      expect(@sut.check_format(%w(.), "--self insert --indent tab", "5")).to eq(output)
     end
 
     it "should not crash if the output is invalid" do
       expect(@cmd).to receive(:run)
-        .with(%w(swiftformat . --self insert --indent tab --dryrun --verbose))
+        .with(%w(swiftformat . --self insert --indent tab --lint --lenient))
         .and_return(fixture("swiftformat_output_bad.txt"))
 
       output = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftformat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Vincent Garrigues
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +157,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -173,6 +173,10 @@ files:
 - lib/swiftformat/gem_version.rb
 - lib/swiftformat/plugin.rb
 - lib/swiftformat/swiftformat.rb
+- scripts/release.sh
+- spec/fixtures/0_GoodFile.swift
+- spec/fixtures/1_BadFile.swift
+- spec/fixtures/2_GoodFile.swift
 - spec/fixtures/swiftformat_output.txt
 - spec/fixtures/swiftformat_output_bad.txt
 - spec/fixtures/swiftformat_output_with_errors.txt
@@ -182,8 +186,9 @@ files:
 homepage: https://github.com/garriguv/danger-swiftformat
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  github_repo: ssh://github.com/garriguv/danger-ruby-swiftformat
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,11 +203,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A danger plugin for checking Swift formatting using SwiftFormat.
 test_files:
+- spec/fixtures/0_GoodFile.swift
+- spec/fixtures/1_BadFile.swift
+- spec/fixtures/2_GoodFile.swift
 - spec/fixtures/swiftformat_output.txt
 - spec/fixtures/swiftformat_output_bad.txt
 - spec/fixtures/swiftformat_output_with_errors.txt

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-cache:
-  directories:
-    - bundle
-
-rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-
-script:
-    - bundle exec rake spec