danger-swiftlint 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724a5435fe3b3b09ef18f15e76407a5f9d2deea0
-  data.tar.gz: ad2d97395e8578039090fdf1898b8f290f6b1ff8
+  metadata.gz: eb6c93186c9141189a2be976b2728381f983bc5e
+  data.tar.gz: d100191c3a3ab38801ec23ba87f79294e4a7d26b
 SHA512:
-  metadata.gz: c181f89260aa3c63f1efae0b2a63312025a0bc23cf6471a207c8a6c6f0296129bcc5434c3129211d661e729d75cdcc89a88c99a63bd7da07762644673cd9cbb8
-  data.tar.gz: 5b6916bb7e8011aaff00bb19b96ccf30cd80c7f8cdd9572ee9ac4a92a53908e4e7a340511155c778831e77fb1937b19962b971a3b67326a1e216daf1a4e592c6
+  metadata.gz: e4469183c1e4b05686ae048cbeda886eaa25e96bb9197e12473bb63a1a1cd6e228245503dcc66266fae698641f8fb4dd62c21f4de1334d888a803804848de24e
+  data.tar.gz: 467441b08eef27d8415ecaa4302412a087c93848cf298c17afa2624375bfdaa6de59534d56438d9798924c21fec195280fc3e98cdada21723f190760c0b4b921

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-swiftlint (0.1.0)
+    danger-swiftlint (0.1.2)
       danger
 
 GEM
@@ -14,7 +14,7 @@ GEM
     colored (1.2)
     cork (0.1.0)
       colored (~> 1.2)
-    danger (0.8.4)
+    danger (0.8.5)
       claide (~> 1.0)
       colored (~> 1.2)
       cork (~> 0.1)

data/README.md

@@ -2,7 +2,7 @@
 
 # Danger SwiftLint
 
-A [Danger](https://github.com/danger/danger) plugin for [SwiftLint](https://github.com/realm/SwiftLint).
+A [Danger](https://github.com/danger/danger) plugin for [SwiftLint](https://github.com/realm/SwiftLint) that runs on macOS.
 
 ## Installation
 
@@ -20,24 +20,13 @@ The easiest way to use is just add this to your Dangerfile:
 swiftlint.lint_files
 ```
 
-That will lint any changed or added Swift files in the PR. You can also set up a config file first.
+That's going to lint all your Swift files. It would be better to only lint the changed or added ones, which is complicated due. Check out [this issue](https://github.com/ashfurrow/danger-swiftlint/issues/16) for more details.
 
 ```rb
 swiftlint.config_file = '.swiftlint.yml'
 swiftlint.lint_files
 ```
 
-And finally, you can provide a list of files manually:
-
-``` ruby
-# Look through all changed Swift files
-swift_files = (modified_files + added_files).select do |file|
-  file.end_with?(".swift")
-end
-
-swiftlint.lint_files swift_files
-```
-
 ## Attribution
 
 Original structure, sequence, and organization of repo taken from [danger-prose](https://github.com/dbgrandi/danger-prose) by [David Grandinetti](https://github.com/dbgrandi/).

data/lib/danger_plugin.rb

@@ -26,7 +26,7 @@ module Danger
     #          if nil, modified and added files from the diff will be used.
     # @return  [void]
     #
-    def lint_files(files=nil)
+    def lint_files
       # Installs SwiftLint if needed
       system "brew install swiftlint" unless swiftlint_installed?
 
@@ -36,21 +36,14 @@ module Danger
         return
       end
 
-      # Either use files provided, or use the modified + added
-      swift_files = files ? Dir.glob(files) : (modified_files + added_files)
-      swift_files.select! do |line| line.end_with?(".swift") end
-
-      # Make sure we don't fail when paths have spaces
-      swift_files = swift_files.map { |file| "\"#{file}\"" }
-
       swiftlint_command = "swiftlint lint --quiet --reporter json"
       swiftlint_command += " --config #{config_file}" if config_file
 
       require 'json'
-      result_json = swift_files.uniq.collect { |f| JSON.parse(`#{swiftlint_command} --path #{f}`.strip).flatten }.flatten
+      result_json = JSON.parse(`#{swiftlint_command}`).flatten
 
       # Convert to swiftlint results
-      warnings = result_json.flatten.select do |results| 
+      warnings = result_json.select do |results| 
         results['severity'] == 'Warning'
       end
       errors = result_json.select do |results| 
@@ -61,13 +54,13 @@ module Danger
 
       # We got some error reports back from swiftlint
       if warnings.count > 0 || errors.count > 0
-        message = '### SwiftLint found issues\n\n'
+        message = "### SwiftLint found issues\n\n"
       end
 
       message << parse_results(warnings, 'Warnings') unless warnings.empty?
       message << parse_results(errors, 'Errors') unless errors.empty?
 
-      markdown message
+      markdown message unless message.empty?
     end
 
     # Parses swiftlint invocation results into a string

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DangerSwiftlint
-  VERSION = "0.1.2".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/danger_plugin_spec.rb

@@ -24,6 +24,14 @@ module Danger
         expect(@swiftlint.swiftlint_installed?).to be_truthy
       end
 
+      it 'does not markdown an empty message' do
+        allow(@swiftlint).to receive(:`)
+          .with('swiftlint lint --quiet --reporter json')
+          .and_return('[]')
+        
+        expect(@swiftlint.status_report[:markdowns].first).to be_nil
+      end
+
       describe :lint_files do
         before do
           # So it doesn't try to install on your computer
@@ -34,10 +42,10 @@ module Danger
         end
 
         it 'handles a known SwiftLint report' do
-          allow(@swiftlint).to receive(:`).with('swiftlint lint --quiet --reporter json --path "spec/fixtures/SwiftFile.swift"').and_return(@swiftlint_response)
+          allow(@swiftlint).to receive(:`).with('swiftlint lint --quiet --reporter json').and_return(@swiftlint_response)
 
           # Do it
-          @swiftlint.lint_files("spec/fixtures/*.swift")
+          @swiftlint.lint_files
 
           output = @swiftlint.status_report[:markdowns].first
 
@@ -50,9 +58,7 @@ module Danger
         end
 
         it 'handles no files' do
-          allow(@swiftlint).to receive(:modified_files).and_return(['spec/fixtures/SwiftFile.swift'])
-          allow(@swiftlint).to receive(:added_files).and_return([])
-          allow(@swiftlint).to receive(:`).with('swiftlint lint --quiet --reporter json --path "spec/fixtures/SwiftFile.swift"').and_return(@swiftlint_response)
+          allow(@swiftlint).to receive(:`).with('swiftlint lint --quiet --reporter json').and_return(@swiftlint_response)
 
           @swiftlint.lint_files
 
@@ -61,9 +67,9 @@ module Danger
 
         it 'uses a config file' do
           @swiftlint.config_file = 'some_config.yml'
-          allow(@swiftlint).to receive(:`).with('swiftlint lint --quiet --reporter json --config some_config.yml --path "spec/fixtures/SwiftFile.swift"').and_return(@swiftlint_response)
+          allow(@swiftlint).to receive(:`).with('swiftlint lint --quiet --reporter json --config some_config.yml').and_return(@swiftlint_response)
 
-          @swiftlint.lint_files("spec/fixtures/*.swift")
+          @swiftlint.lint_files
 
           expect(@swiftlint.status_report[:markdowns].first).to_not be_empty
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger