danger-swiftformat 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c8c48bd8f7f861b6222d443bfa92df522b3808f
-  data.tar.gz: 0a8d82cb15fc5bc6e4fd9c7d663bdc246b160680
+  metadata.gz: 375ea947e323e0f7e27fc180969cd1b7f0228d9f
+  data.tar.gz: 5266c96a6d360af8651220a7b6f29132e35505af
 SHA512:
-  metadata.gz: 95dc50ab3b0fdea5415783920e82c231619472bcf8c07e8d9b70a97496100a8f2147b218c0db082232f36c5ed05209a21d41dab9fde5f59504abfdc20b254b2e
-  data.tar.gz: a509022e22ab09438da6f9098c47857d1cbb7e846ed4e0b9037b6192ef3c0e31973a2fdd1a0104ed1aee910f4bdc7a6d961d72185aec3f2f2e7d8410d7bba02a
+  metadata.gz: 731725453eaa2221908d99a3ce79457f21e43dd233197ec72765527fb594f5b31dac3e7a71cfafc89d21688b18a7e78240e108a6eafb3d0de1d0ca88398469b0
+  data.tar.gz: 677b404b8451886b45e72c14623a0b63e9effc5443e015100c968e3dd07122c23792bfe2b5e63f02a31b4b191ddba40cf3633737df3d6401b60eff940b10435a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-swiftformat (0.0.3)
+    danger-swiftformat (0.1.0)
       danger-plugin-api (~> 1.0)
 
 GEM

data/README.md

@@ -34,6 +34,12 @@ You can specify the `swiftformat` binary using the `binary_path` parameter:
 swiftformat.binary_path = "/path/to/swiftformat"
 ```
 
+You can specify additional `swiftformat` arguments using the `additional_swiftformat_args` parameter:
+
+```ruby
+swiftformat.additional_swiftformat_args = "--indent tab --self insert"
+```
+
 ## Development
 
 1. Clone this repo

data/lib/swiftformat/gem_version.rb

@@ -1,3 +1,3 @@
 module Swiftformat
-  VERSION = "0.0.3".freeze
+  VERSION = "0.1.0".freeze
 end

data/lib/swiftformat/plugin.rb

@@ -14,6 +14,11 @@ module Danger
     # @return [String]
     attr_accessor :binary_path
 
+    # Additional swiftformat command line arguments
+    #
+    # @return [String]
+    attr_accessor :additional_swiftformat_args
+
     # Runs swiftformat
     #
     # @param [Boolean] fail_on_error
@@ -31,7 +36,7 @@ module Danger
       return if swift_files.empty?
 
       # Run swiftformat
-      results = swiftformat.check_format(swift_files)
+      results = swiftformat.check_format(swift_files, additional_swiftformat_args)
 
       # Stop processing if the errors array is empty
       return if results[:errors].empty?

data/lib/swiftformat/swiftformat.rb

@@ -8,8 +8,11 @@ module Danger
       Cmd.run([@path, "--version"])
     end
 
-    def check_format(files)
-      output = Cmd.run([@path] + files + %w(--dryrun --verbose))
+    def check_format(files, additional_args = "")
+      cmd = [@path] + files
+      cmd << additional_args.split unless additional_args.empty?
+      cmd << %w(--dryrun --verbose)
+      output = Cmd.run(cmd.flatten)
       raise "error running swiftformat: empty output" if output.empty?
       process(output)
     end

data/spec/swiftformat/plugin_spec.rb

@@ -31,13 +31,36 @@ module Danger
         end
       end
 
+      context "with additional_swiftformat_args" do
+        let(:additional_swiftformat_args) { "--indent tab --self insert" }
+        let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
+
+        it "should pass the additional flags 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_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_swiftformat_args)
+            .and_return(success_output)
+
+          @sut.additional_swiftformat_args = additional_swiftformat_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
+
       describe "#check_format" do
         let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
         let(:error_output) { { errors: [{ file: "Modified.swift", rules: %w(firstRule secondRule) }], stats: { run_time: "0.16s" } } }
 
-
         context "when there are no swift files to check" do
           before do
+            allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
             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"])
@@ -62,7 +85,7 @@ module Danger
 
           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)).and_return(success_output)
+              allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil).and_return(success_output)
             end
 
             it "should not do anything" do
@@ -76,7 +99,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)).and_return(error_output)
+              allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), 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

@@ -83,5 +83,20 @@ RSpec.describe Danger::SwiftFormat do
 
       expect { @sut.check_format(%w(.)) }.to raise_error("error running swiftformat: empty output")
     end
+
+    it "should support additional command line arguments" do
+      expect(@cmd).to receive(:run)
+        .with(%w(swiftformat . --self insert --indent tab --dryrun --verbose))
+        .and_return(fixture("swiftformat_output.txt"))
+
+      output = {
+          errors: [],
+          stats: {
+              run_time: "0.08"
+          }
+      }
+
+      expect(@sut.check_format(%w(.), "--self insert --indent tab")).to eq(output)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftformat
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Vincent Garrigues