danger-swiftformat 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988d028ab6f8530bdbd0aac2e2db2b0cc7f1ec0176bf6ed4e91551acf10550fd
-  data.tar.gz: d1f276c732588da77f9028f723a4420b873e6ec1354afac91e6422ea55b757f6
+  metadata.gz: eef65e57aabf2cf8d1260a48acbd2394b74d1c359548fe058146fc4161649afe
+  data.tar.gz: c5d8cf5e39e3d9491b41c2ca941163b046d261647b5382659ce62f8cfc778819
 SHA512:
-  metadata.gz: e49d217585203fb321a0b25501ed39e6f7a891101d7ed625abfbc833a9a093599880cde86a680530f6e2a1807962dadb2fa2fdbb18304faf3b6d1342f745ca33
-  data.tar.gz: d3d444466a38ecef5b339e2e04e1a22ffce3015d3629ea5df375165f7c8aa34d39364246361303b348c766221f06659db8fc5087ea00a154e3838c9244b68b66
+  metadata.gz: 373c74dd0f0a993945361d74a930560112dd6b4132ab466ad789a609608beb3b0b956fd2782cf473aee0bdef679ded7bb0085649c0c9e6b9f5bfcc86d866193b
+  data.tar.gz: 8ac70d51871ac7b77d6db6b46ac2d68d4f1385617505554a7136c5aa6fb0b747064242fff6496c8443266410394913a306baabe497e0b835728e56f73654afe6

data/.github/workflows/ruby.yml

@@ -8,19 +8,13 @@ on:
 
 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
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: '3.2'
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
-    - name: Run tests
-      run: bundle exec rake
+    - run: bundle exec rake

data/.rubocop.yml

@@ -85,7 +85,7 @@ Metrics/CyclomaticComplexity:
   Max: 17
 
 # Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
+Layout/LineLength:
   Max: 370
 
 # Configuration parameters: CountKeywordArgs.
@@ -145,7 +145,7 @@ Layout/HeredocIndentation:
 Style/SpecialGlobalVars:
   Enabled: false
 
-PercentLiteralDelimiters:
+Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     "%":  ()
     "%i": ()

data/Gemfile

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

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    danger-swiftformat (0.8.0)
+    danger-swiftformat (0.9.0)
       danger-plugin-api (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    claide (1.0.3)
+    base64 (0.2.0)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
@@ -19,37 +20,41 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.2.2)
+    danger (9.3.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
+      faraday (>= 0.9.0, < 3.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.7)
+      git (~> 1.13)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (~> 4.7)
-      terminal-table (~> 1)
+      octokit (~> 6.0)
+      terminal-table (>= 1, < 4)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    diff-lcs (1.4.4)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.2.0)
+    diff-lcs (1.5.0)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-http-cache (2.5.0)
       faraday (>= 0.8)
-    ffi (1.14.2)
-    formatador (0.2.5)
-    git (1.8.1)
+    faraday-net_http (3.0.2)
+    ffi (1.16.3)
+    formatador (1.1.0)
+    git (1.18.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
-    guard (2.16.2)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -57,54 +62,55 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (2.3.0)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    listen (3.4.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
+    lumberjack (1.2.9)
     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.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (6.1.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    pry (0.13.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
+    public_suffix (5.0.3)
+    racc (1.7.3)
+    rainbow (3.1.1)
     rake (12.3.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.2)
     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)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -114,18 +120,19 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       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)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.1.0)
-    unicode-display_width (1.7.0)
-    yard (0.9.26)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.3.0)
+    unicode-display_width (1.8.0)
+    yard (0.9.34)
 
 PLATFORMS
   ruby
@@ -133,7 +140,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.1)
   danger-swiftformat!
-  faraday (= 0.15.4)
+  faraday (= 2.7.11)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
   listen (~> 3.1)
@@ -144,4 +151,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.6
+   2.4.22

data/README.md

@@ -63,6 +63,12 @@ certain directories or files such as `Pods`, you can use the `exclude` parameter
 swiftformat.exclude = %w(Pods/** Carthage/** Sources/Nope.swift **/*_autogenerated.swift)
 ```
 
+If you want the format results shows in the diff instead of a comment, you can use the `inline_mode` option. Violations that are out of the diff will be shown in danger's fail or warn section:
+
+```ruby
+swiftformat.inline_mode = true
+```
+
 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).
 

data/lib/swiftformat/gem_version.rb

@@ -1,3 +1,3 @@
 module Swiftformat
-  VERSION = "0.8.0".freeze
+  VERSION = "0.9.0".freeze
 end

data/lib/swiftformat/plugin.rb

@@ -34,6 +34,11 @@ module Danger
     # @return [String]
     attr_accessor :swiftversion
 
+    # Show issues inline in the diff instead of in a comment.
+    #
+    # @return [Boolean]
+    attr_accessor :inline_mode
+
     # Runs swiftformat
     #
     # @param [Boolean] fail_on_error
@@ -56,20 +61,24 @@ module Danger
       # Stop processing if the errors array is empty
       return if results[:errors].empty?
 
-      # Process the errors
-      message = "### SwiftFormat found issues:\n\n"
-      message << "| File | Rules |\n"
-      message << "| ---- | ----- |\n"
-      results[:errors].each do |error|
-        message << "| #{error[:file].gsub("#{Dir.pwd}/", '')} | #{error[:rules].join(', ')} |\n"
+      if inline_mode
+        send_inline_comment(results, fail_on_error ? :fail : :warn)
+      else
+        # Process the errors
+        message = "### SwiftFormat found issues:\n\n"
+        message << "| File | Rules |\n"
+        message << "| ---- | ----- |\n"
+        results[:errors].each do |error|
+          message << "| #{error[:file].gsub("#{Dir.pwd}/", '')} | #{error[:rules].join(', ')} |\n"
+        end
+
+        unless additional_message.nil?
+          message << "\n" << additional_message
+        end
+
+        markdown message
       end
 
-      unless additional_message.nil?
-        message << "\n" << additional_message
-      end
-
-      markdown message
-
       if fail_on_error
         fail "SwiftFormat found issues"
       end
@@ -95,6 +104,24 @@ module Danger
         .sort
     end
 
+    # Send inline comment with danger's warn or fail method
+    #
+    # @return [void]
+    def send_inline_comment(results, method)
+      results[:errors].each do |error|
+        file = error[:file]
+        file_components = file.split(":")
+        line = file_components[1]
+        filename = file_components.first.split("/").last
+        file_path = file_components.first
+
+        message = error[:rules].join(", ").to_s.dup
+        message << " `#{filename}:#{line}`" # file:line for pasting into Xcode Quick Open
+
+        send(method, message, file: file_path, line: line)
+      end
+    end
+
     # Constructs the SwiftFormat class
     #
     # @return [SwiftFormat]

data/lib/swiftformat/swiftformat.rb

@@ -14,7 +14,7 @@ module Danger
       cmd = [@path] + files
       cmd << additional_args.split unless additional_args.nil? || additional_args.empty?
 
-      unless swiftversion.empty?
+      unless swiftversion.nil? || swiftversion.empty?
         cmd << "--swiftversion"
         cmd << swiftversion
       end

data/spec/swiftformat/plugin_spec.rb

@@ -211,6 +211,19 @@ module Danger
               status = @sut.status_report
               expect(status[:errors]).to be_empty
               expect(status[:markdowns]).to_not be_empty
+              expect(status[:warnings]).to be_empty
+            end
+
+            it "should send inline comments when inline_mode is true" do
+              @sut.inline_mode = true
+
+              @sut.check_format
+
+              status = @sut.status_report
+              p status
+              expect(status[:errors]).to be_empty
+              expect(status[:markdowns]).to be_empty
+              expect(status[:warnings]).to_not be_empty
             end
           end
         end

data/spec/swiftformat/swiftformat_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe Danger::SwiftFormat do
           }
       }
 
-      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftformat
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Vincent Garrigues
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -188,7 +188,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/garriguv/danger-ruby-swiftformat
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -203,8 +203,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: A danger plugin for checking Swift formatting using SwiftFormat.
 test_files: