danger-swiftlint 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71b06256f2784921e22fbdc37355c02c0e254b3
-  data.tar.gz: c1ea5e23bfb6ad68c56a00df4576c5d0b10298a3
+  metadata.gz: 18a143487b60e3af2f374acebf0f22493b1906a8
+  data.tar.gz: 80dbc5a826284cc2b73f30c0356974247532a597
 SHA512:
-  metadata.gz: bb46882114d80a100b1c4a5cc932c923becc6540c3f893378df3a5c0120b5ae3f5bfcdc29653f19064145a8c0f2fb480764058b61a3fc1c81202159c19aeb403
-  data.tar.gz: 260ae84694e2b4193376b4df088048f53d0c830f94d66c3bf408fe5efe7bfa727bde836c360db6765af3e699b5c1d648fc7719b0d1c6a5234783df318fce8443
+  metadata.gz: eb8c96ef07981c6db9a5b879adfc6a9c51f1fd4bf30ab1f4826d786149fcbfb89e170f3870b50b8447dadf1d868b003d206c80e670890ae8fa5c25771b5e77af
+  data.tar.gz: ca3faab2254f588ddf10cf0e4c939c81c5d3f096ea59b0f17ac1b0cfe886a3da531b7276b27cb4b4bcec483bf3f26bb74d3647422e843c2b5145917ac5a85e79

data/bin/danger-swiftlint

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if $PROGRAM_NAME == __FILE__
   $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
@@ -6,6 +7,7 @@ end
 require 'thor'
 require 'version'
 
+# The class defining the CLI interface of the plugin.
 class DangerSwiftlintCLI < Thor
   desc 'version', 'The version of the installed danger-swiftlint plugin'
   def version

data/ext/swiftlint/Rakefile

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require_relative '../../lib/version'
 
 namespace :swiftlint do
-
-  desc "Download and install swiftlint tool"
+  desc 'Download and install swiftlint tool'
   task :install do
-    REPO = "https://github.com/realm/SwiftLint"
-    VERSION = ENV["SWIFTLINT_VERSION"] || DangerSwiftlint::SWIFTLINT_VERSION
-    ASSET = "portable_swiftlint.zip"
+    REPO = 'https://github.com/realm/SwiftLint'
+    VERSION = ENV['SWIFTLINT_VERSION'] || DangerSwiftlint::SWIFTLINT_VERSION
+    ASSET = 'portable_swiftlint.zip'
     URL = "#{REPO}/releases/download/#{VERSION}/#{ASSET}"
     DESTINATION = File.expand_path(File.join(File.dirname(__FILE__), 'bin'))
 
@@ -16,9 +17,8 @@ namespace :swiftlint do
       "curl -s -L #{URL} -o #{ASSET}",
       "unzip -q #{ASSET} -d #{DESTINATION}",
       "rm #{ASSET}"
-    ].join(" && ")
+    ].join(' && ')
   end
-
 end
 
 task default: 'swiftlint:install'

data/ext/swiftlint/swiftlint.rb

@@ -1,15 +1,15 @@
+# frozen_string_literal: true
 
+# A wrapper to use SwiftLint via a Ruby API.
 class Swiftlint
-  def initialize(swiftlint_path=nil)
+  def initialize(swiftlint_path = nil)
     @swiftlint_path = swiftlint_path
   end
 
   # Runs swiftlint
-  def run(cmd='lint', additional_swiftlint_args='', options={})
+  def run(cmd = 'lint', additional_swiftlint_args = '', options = {})
     # change pwd before run swiftlint
-    if options.has_key? :pwd
-      Dir.chdir options.delete(:pwd)
-    end
+    Dir.chdir options.delete(:pwd) if options.key? :pwd
 
     # run swiftlint with provided options
     `#{swiftlint_path} #{cmd} #{swiftlint_arguments(options, additional_swiftlint_args)}`
@@ -21,13 +21,13 @@ class Swiftlint
   end
 
   # Return true if swiftlint is installed or false otherwise
-  def is_installed?
+  def installed?
     File.exist?(swiftlint_path)
   end
 
   # Return swiftlint execution path
   def swiftlint_path
-    @swiftlint_path or default_swiftlint_path
+    @swiftlint_path || default_swiftlint_path
   end
 
   private
@@ -35,10 +35,10 @@ class Swiftlint
   # Parse options into shell arguments how swift expect it to be
   # more information: https://github.com/Carthage/Commandant
   # @param options (Hash) hash containing swiftlint options
-  def swiftlint_arguments (options, additional_swiftlint_args)
+  def swiftlint_arguments(options, additional_swiftlint_args)
     (options.
       # filter not null
-      select {|key, value| !value.nil?}.
+      reject { |_key, value| value.nil? }.
       # map booleans arguments equal true
       map { |key, value| value.is_a?(TrueClass) ? [key, ''] : [key, value] }.
       # map booleans arguments equal false
@@ -48,7 +48,7 @@ class Swiftlint
       # prepend '--' into the argument
       map { |key, value| ["--#{key}", value] }.
       # reduce everything into a single string
-      reduce('') { |args, option| "#{args} #{option[0]} #{option[1]}"} + 
+      reduce('') { |args, option| "#{args} #{option[0]} #{option[1]}" } +
       " #{additional_swiftlint_args}").
       # strip leading spaces
       strip

data/lib/danger_plugin.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'find'
 require 'yaml'
 require 'shellwords'
 require_relative '../ext/swiftlint/swiftlint'
 
 module Danger
-
   # Lint Swift files inside your projects.
   # This is done using the [SwiftLint](https://github.com/realm/SwiftLint) tool.
   # Results are passed out as a table in markdown.
@@ -32,34 +33,34 @@ module Danger
     attr_accessor :verbose
 
     # Lints Swift files. Will fail if `swiftlint` cannot be installed correctly.
-    # Generates a `markdown` list of warnings for the prose in a corpus of .markdown and .md files.
+    # Generates a `markdown` list of warnings for the prose in a corpus of
+    # .markdown and .md files.
     #
     # @param   [String] files
-    #          A globbed string which should return the files that you want to lint, defaults to nil.
+    #          A globbed string which should return the files that you want to
+    #          lint, defaults to nil.
     #          if nil, modified and added files from the diff will be used.
     # @return  [void]
     #
-    def lint_files(files=nil, inline_mode: false, fail_on_error: false, additional_swiftlint_args: "")
+    def lint_files(files = nil, inline_mode: false, fail_on_error: false, additional_swiftlint_args: '')
       # Fails if swiftlint isn't installed
-      raise "swiftlint is not installed" unless swiftlint.is_installed?
+      raise 'swiftlint is not installed' unless swiftlint.installed?
 
       config = if config_file
-        File.expand_path(config_file)
-      elsif File.file?('.swiftlint.yml')
-        File.expand_path('.swiftlint.yml')
-      else
-        nil
-      end
+                 File.expand_path(config_file)
+               elsif File.file?('.swiftlint.yml')
+                 File.expand_path('.swiftlint.yml')
+               end
       log "Using config file: #{config}"
-      
-      dir_selected = directory ? File.expand_path(directory) : Dir.pwd
+
+      dir_selected = directory ? File.expand_path(directory) : Shellwords.escape(Dir.pwd)
       log "Swiftlint will be run from #{dir_selected}"
 
       # Extract excluded paths
       excluded_paths = excluded_files_from_config(config)
 
       # Extract swift files (ignoring excluded ones)
-      files = find_swift_files(files, excluded_paths, dir_selected)
+      files = find_swift_files(dir_selected, files, excluded_paths)
       log "Swiftlint will lint the following files: #{files.join(', ')}"
 
       # Prepare swiftlint options
@@ -80,21 +81,19 @@ module Danger
       errors = issues.select { |issue| issue['severity'] == 'Error' }
 
       if inline_mode
-        # Reprt with inline comment
-        send_inline_comment(warnings, "warn")
-        send_inline_comment(errors, "fail")
-      else
+        # Report with inline comment
+        send_inline_comment(warnings, 'warn')
+        send_inline_comment(errors, 'fail')
+      elsif warnings.count.positive? || errors.count.positive?
         # Report if any warning or error
-        if warnings.count > 0 || errors.count > 0
-          message = "### SwiftLint found issues\n\n"
-          message << markdown_issues(warnings, 'Warnings') unless warnings.empty?
-          message << markdown_issues(errors, 'Errors') unless errors.empty?
-          markdown message
-
-          # Fail Danger on errors
-          if fail_on_error && errors.count > 0
-            fail "Failed due to SwiftLint errors"
-          end
+        message = +"### SwiftLint found issues\n\n"
+        message << markdown_issues(warnings, 'Warnings') unless warnings.empty?
+        message << markdown_issues(errors, 'Errors') unless errors.empty?
+        markdown message
+
+        # Fail Danger on errors
+        if fail_on_error && errors.count.positive?
+          raise 'Failed due to SwiftLint errors'
         end
       end
     end
@@ -104,8 +103,8 @@ module Danger
     # @return [Array] swiftlint issues
     def run_swiftlint(files, options, additional_swiftlint_args)
       files
-        .map { |file| options.merge({path: file})}
-        .map { |full_options| swiftlint.lint(full_options, additional_swiftlint_args)}
+        .map { |file| options.merge(path: file) }
+        .map { |full_options| swiftlint.lint(full_options, additional_swiftlint_args) }
         .reject { |s| s == '' }
         .map { |s| JSON.parse(s).flatten }
         .flatten
@@ -115,29 +114,33 @@ module Danger
     # If files are not provided it will use git modifield and added files
     #
     # @return [Array] swift files
-    def find_swift_files(files=nil, excluded_paths=[], dir_selected)
+    def find_swift_files(dir_selected, files = nil, excluded_paths = [])
       # Assign files to lint
-      files = files ? Dir.glob(files) : (git.modified_files - git.deleted_files) + git.added_files
+      files = if files.nil?
+                (git.modified_files - git.deleted_files) + git.added_files
+              else
+                Dir.glob(files)
+              end
 
       # Filter files to lint
-      return files.
+      files.
         # Ensure only swift files are selected
         select { |file| file.end_with?('.swift') }.
         # Make sure we don't fail when paths have spaces
         map { |file| Shellwords.escape(file) }.
         # Remove dups
-        uniq.
-        map { |file| File.expand_path(file) }.
+        uniq
+           .map { |file| File.expand_path(file) }.
         # Ensure only files in the selected directory
         select { |file| file.start_with?(dir_selected) }.
         # Reject files excluded on configuration
-        reject { |file|
-          excluded_paths.any? { |excluded_path|
-            Find.find(excluded_path).
-              map { |excluded_file| Shellwords.escape(excluded_file) }.
-              include?(file)
-          }
-        }
+        reject do |file|
+        excluded_paths.any? do |excluded_path|
+          Find.find(excluded_path)
+              .map { |excluded_file| Shellwords.escape(excluded_file) }
+              .include?(file)
+        end
+      end
     end
 
     # Parses the configuration file and return the excluded files
@@ -145,25 +148,25 @@ module Danger
     # @return [Array] list of files excluded
     def excluded_files_from_config(filepath)
       config = if filepath
-        YAML.load_file(filepath)
-      else
-        {"excluded" => []}
-      end
+                 YAML.load_file(filepath)
+               else
+                 { 'excluded' => [] }
+               end
 
       excluded_paths = config['excluded'] || []
 
       # Extract excluded paths
-      return excluded_paths.
-        map { |path| File.join(File.dirname(filepath), path) }.
-        map { |path| File.expand_path(path) }.
-        select { |path| File.exists?(path) || Dir.exists?(path) }
+      excluded_paths
+        .map { |path| File.join(File.dirname(filepath), path) }
+        .map { |path| File.expand_path(path) }
+        .select { |path| File.exist?(path) || Dir.exist?(path) }
     end
 
     # Create a markdown table from swiftlint issues
     #
     # @return  [String]
-    def markdown_issues (results, heading)
-      message = "#### #{heading}\n\n"
+    def markdown_issues(results, heading)
+      message = +"#### #{heading}\n\n"
 
       message << "File | Line | Reason |\n"
       message << "| --- | ----- | ----- |\n"
@@ -182,11 +185,11 @@ module Danger
     # Send inline comment with danger's warn or fail method
     #
     # @return [void]
-    def send_inline_comment (results, method)
+    def send_inline_comment(results, method)
       dir = "#{Dir.pwd}/"
       results.each do |r|
-      filename = r['file'].gsub(dir, "")
-      send(method, r['reason'], file: filename, line: r['line'])
+        filename = r['file'].gsub(dir, '')
+        send(method, r['reason'], file: filename, line: r['line'])
       end
     end
 

data/lib/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module DangerSwiftlint
-  VERSION = "0.10.1".freeze
-  SWIFTLINT_VERSION = "0.20.1".freeze
+  VERSION = '0.10.2'
+  SWIFTLINT_VERSION = '0.20.1'
 end

data/spec/danger_plugin_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../spec_helper', __FILE__)
 
 module Danger
@@ -12,9 +14,9 @@ module Danger
         allow(@swiftlint.git).to receive(:deleted_files).and_return([])
       end
 
-      it "handles swiftlint not being installed" do
-        allow_any_instance_of(Swiftlint).to receive(:is_installed?).and_return(false)
-        expect { @swiftlint.lint_files }.to raise_error("swiftlint is not installed")
+      it 'handles swiftlint not being installed' do
+        allow_any_instance_of(Swiftlint).to receive(:installed?).and_return(false)
+        expect { @swiftlint.lint_files }.to raise_error('swiftlint is not installed')
       end
 
       it 'does not markdown an empty message' do
@@ -35,7 +37,7 @@ module Danger
 
       describe :lint_files do
         before do
-          allow_any_instance_of(Swiftlint).to receive(:is_installed?).and_return(true)
+          allow_any_instance_of(Swiftlint).to receive(:installed?).and_return(true)
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([])
 
@@ -44,29 +46,29 @@ module Danger
 
         it 'accept files as arguments' do
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .and_return(@swiftlint_response)
 
-          @swiftlint.lint_files("spec/fixtures/*.swift")
+          @swiftlint.lint_files('spec/fixtures/*.swift')
 
           output = @swiftlint.status_report[:markdowns].first.to_s
-          expect(output).to include("SwiftLint found issues")
-          expect(output).to include("SwiftFile.swift | 13 | Force casts should be avoided.")
+          expect(output).to include('SwiftLint found issues')
+          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided.')
         end
 
         it 'accepts additional cli arguments' do
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '--lenient')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '--lenient')
             .and_return(@swiftlint_response)
 
-          @swiftlint.lint_files("spec/fixtures/*.swift", additional_swiftlint_args: '--lenient')
+          @swiftlint.lint_files('spec/fixtures/*.swift', additional_swiftlint_args: '--lenient')
         end
 
         it 'uses git diff when files are not provided' do
           allow(@swiftlint.git).to receive(:modified_files).and_return(['spec/fixtures/SwiftFile.swift'])
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .and_return(@swiftlint_response)
 
           @swiftlint.lint_files
@@ -79,29 +81,39 @@ module Danger
           @swiftlint.directory = 'spec/fixtures/some_dir'
 
           allow_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:pwd => File.expand_path(@swiftlint.directory)), '')
+            .with(hash_including(pwd: File.expand_path(@swiftlint.directory)), '')
+            .and_return(@swiftlint_response)
+
+          @swiftlint.lint_files(['spec/fixtures/some_dir/SwiftFile.swift'])
+
+          output = @swiftlint.status_report[:markdowns].first.to_s
+          expect(output).to_not be_empty
+        end
+
+        it 'uses escaped pwd when directory is not set' do
+          allow_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(pwd: File.expand_path('.')), '')
             .and_return(@swiftlint_response)
 
-          @swiftlint.lint_files(["spec/fixtures/some_dir/SwiftFile.swift"])
+          @swiftlint.lint_files(['spec/fixtures/some\ dir/SwiftFile.swift'])
 
           output = @swiftlint.status_report[:markdowns].first.to_s
           expect(output).to_not be_empty
-          
         end
 
         it 'only lint files specified in custom dir' do
           @swiftlint.directory = 'spec/fixtures/some_dir'
-        
+
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/some_dir/SwiftFile.swift',
-            'spec/fixtures/SwiftFile.swift'
-          ])
+                                                                         'spec/fixtures/some_dir/SwiftFile.swift',
+                                                                         'spec/fixtures/SwiftFile.swift'
+                                                                       ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-          .with(hash_including(:path => File.expand_path('spec/fixtures/some_dir/SwiftFile.swift')), '')
-          .once
-          .and_return(@swiftlint_response)
+            .with(hash_including(path: File.expand_path('spec/fixtures/some_dir/SwiftFile.swift')), '')
+            .once
+            .and_return(@swiftlint_response)
 
           @swiftlint.lint_files
         end
@@ -127,13 +139,13 @@ module Danger
         it 'does not lint files in the excluded paths' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/SwiftFile.swift',
-            'spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift',
-            'spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift'
-          ])
+                                                                         'spec/fixtures/SwiftFile.swift',
+                                                                         'spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift',
+                                                                         'spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift'
+                                                                       ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -144,11 +156,11 @@ module Danger
         it 'does not crash when excluded is nil' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/SwiftFile.swift',
-          ])
+                                                                         'spec/fixtures/SwiftFile.swift'
+                                                                       ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -159,11 +171,11 @@ module Danger
         it 'default config is nil, unspecified' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/SwiftFile.swift',
-          ])
+                                                                         'spec/fixtures/SwiftFile.swift'
+                                                                       ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:config => nil), '')
+            .with(hash_including(config: nil), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -173,13 +185,13 @@ module Danger
         it 'expands default config file (if present) to absolute path' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/SwiftFile.swift',
-          ])
+                                                                         'spec/fixtures/SwiftFile.swift'
+                                                                       ])
           expect(File).to receive(:file?).and_return(true)
           expect(YAML).to receive(:load_file).and_return({})
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:config => File.expand_path('.swiftlint.yml')), '')
+            .with(hash_including(config: File.expand_path('.swiftlint.yml')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -189,11 +201,11 @@ module Danger
         it 'expands specified config file to absolute path' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/SwiftFile.swift',
-          ])
+                                                                         'spec/fixtures/SwiftFile.swift'
+                                                                       ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:config => File.expand_path('spec/fixtures/some_config.yml')), '')
+            .with(hash_including(config: File.expand_path('spec/fixtures/some_config.yml')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -208,15 +220,15 @@ module Danger
           # they'd result in file not found errors.
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
-            'spec/fixtures/SwiftFile.swift',
-            'spec/fixtures/DeletedFile.swift'
-          ])
+                                                                         'spec/fixtures/SwiftFile.swift',
+                                                                         'spec/fixtures/DeletedFile.swift'
+                                                                       ])
           allow(@swiftlint.git).to receive(:deleted_files).and_return([
-            'spec/fixtures/DeletedFile.swift'
-          ])
+                                                                        'spec/fixtures/DeletedFile.swift'
+                                                                      ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -225,10 +237,10 @@ module Danger
 
         it 'generates errors instead of markdown when use inline mode' do
           allow_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .and_return(@swiftlint_response)
 
-          @swiftlint.lint_files("spec/fixtures/*.swift", inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
+          @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
 
           status = @swiftlint.status_report
           expect(status[:errors]).to_not be_empty

data/spec/spec_helper.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 ROOT = Pathname.new(File.expand_path('../../', __FILE__))
-$:.unshift((ROOT + 'lib').to_s)
-$:.unshift((ROOT + 'spec').to_s)
+$LOAD_PATH.unshift((ROOT + 'lib').to_s)
+$LOAD_PATH.unshift((ROOT + 'spec').to_s)
 
 RSpec.configure do |config|
- # Use color in STDOUT
+  # Use color in STDOUT
   config.color = true
 end
 
 RSpec::Matchers.define :including do |x|
-  match { |actual| actual.include? x  }
+  match { |actual| actual.include? x }
 end
 
 require 'bundler/setup'
@@ -32,11 +34,11 @@ end
 # running a PR on TravisCI
 def testing_env
   {
-    "HAS_JOSH_K_SEAL_OF_APPROVAL" => "true",
-    "TRAVIS_PULL_REQUEST" => "800",
-    "TRAVIS_REPO_SLUG" => "artsy/eigen",
-    "TRAVIS_COMMIT_RANGE" => "759adcbd0d8f...13c4dc8bb61d",
-    "DANGER_GITHUB_API_TOKEN" => "123sbdq54erfsd3422gdfio"
+    'HAS_JOSH_K_SEAL_OF_APPROVAL' => 'true',
+    'TRAVIS_PULL_REQUEST' => '800',
+    'TRAVIS_REPO_SLUG' => 'artsy/eigen',
+    'TRAVIS_COMMIT_RANGE' => '759adcbd0d8f...13c4dc8bb61d',
+    'DANGER_GITHUB_API_TOKEN' => '123sbdq54erfsd3422gdfio'
   }
 end
 
@@ -44,4 +46,4 @@ end
 def testing_dangerfile
   env = Danger::EnvironmentManager.new(testing_env)
   Danger::Dangerfile.new(env, testing_ui)
-end
+end

data/spec/swiftlint_spec.rb

@@ -1,31 +1,33 @@
+# frozen_string_literal: true
+
 require File.expand_path('../spec_helper', __FILE__)
 require_relative '../ext/swiftlint/swiftlint'
 
 describe Swiftlint do
   let(:swiftlint) { Swiftlint.new }
-  it 'is_installed? works based on bin/swiftlint file' do
-    expect(File).to receive(:exist?).with(/bin\/swiftlint/).and_return(true)
-    expect(swiftlint.is_installed?).to be_truthy
+  it 'installed? works based on bin/swiftlint file' do
+    expect(File).to receive(:exist?).with(%r{/bin\/swiftlint}).and_return(true)
+    expect(swiftlint.installed?).to be_truthy
 
-    expect(File).to receive(:exist?).with(/bin\/swiftlint/).and_return(false)
-    expect(swiftlint.is_installed?).to be_falsy
+    expect(File).to receive(:exist?).with(%r{bin\/swiftlint}).and_return(false)
+    expect(swiftlint.installed?).to be_falsy
   end
 
   context 'with binary_path' do
     let(:binary_path) { '/path/to/swiftlint' }
     let(:swiftlint) { Swiftlint.new(binary_path) }
-    it 'is_installed? works based on specific path' do
+    it 'installed? works based on specific path' do
       expect(File).to receive(:exist?).with(binary_path).and_return(true)
-      expect(swiftlint.is_installed?).to be_truthy
+      expect(swiftlint.installed?).to be_truthy
 
       expect(File).to receive(:exist?).with(binary_path).and_return(false)
-      expect(swiftlint.is_installed?).to be_falsy
+      expect(swiftlint.installed?).to be_falsy
     end
   end
 
   it 'runs lint by default with options being optional' do
     expect(swiftlint).to receive(:`).with(including('swiftlint lint'))
-    swiftlint.run()
+    swiftlint.run
   end
 
   it 'runs accepting symbolized options' do
@@ -36,8 +38,6 @@ describe Swiftlint do
                   '',
                   use_stdin: false,
                   cache_path: '/path',
-                  enable_all_rules: true
-                  )
+                  enable_all_rules: true)
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -153,28 +153,12 @@ extensions:
 - ext/swiftlint/Rakefile
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- Changelog.md
-- Gemfile
-- Gemfile.lock
-- Guardfile
-- LICENSE
-- README.md
-- Rakefile
 - bin/danger-swiftlint
-- danger-swiftlint.gemspec
 - ext/swiftlint/Rakefile
 - ext/swiftlint/swiftlint.rb
 - lib/danger_plugin.rb
 - lib/version.rb
 - spec/danger_plugin_spec.rb
-- spec/fixtures/SwiftFile.swift
-- spec/fixtures/empty_excluded.yml
-- spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift
-- spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift
-- spec/fixtures/some_config.yml
-- spec/fixtures/some_dir/SwiftFile.swift
 - spec/spec_helper.rb
 - spec/swiftlint_spec.rb
 homepage: https://github.com/ashfurrow/danger-swiftlint
@@ -203,11 +187,5 @@ specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.
 test_files:
 - spec/danger_plugin_spec.rb
-- spec/fixtures/SwiftFile.swift
-- spec/fixtures/empty_excluded.yml
-- spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift
-- spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift
-- spec/fixtures/some_config.yml
-- spec/fixtures/some_dir/SwiftFile.swift
 - spec/spec_helper.rb
 - spec/swiftlint_spec.rb

data/.gitignore

@@ -1,53 +0,0 @@
-# Swiftlint extension binary but keep the bin folder
-ext/swiftlint/bin
-
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc

data/.ruby-version

@@ -1 +0,0 @@
-2.4.1

data/Changelog.md

@@ -1,74 +0,0 @@
-# Changelog
-
-## Current Master
-
-- Nothing yet!
-
-## 0.10.1
-
-- Expands config paths to be absolute when passed to `swiftlint`.
-- Adds verbose logging option.
-
-## 0.10.0
-
-- Adds `additional_swiftlint_args` option. See[#57](https://github.com/ashfurrow/danger-swiftlint/issues/57).
-
-## 0.9.0
-
-- Fixes linting of superfluous files in subdirectories. See [#53](https://github.com/ashfurrow/danger-swiftlint/pull/53).
-
-## 0.8.0
-
-- Fixes Directory not found error. See [#51](https://github.com/ashfurrow/danger-swiftlint/pull/51).
-- Fixes issue with missing `.swiftlint.yml` file. See [#52](https://github.com/ashfurrow/danger-swiftlint/pull/52).
-- Adds `fail_on_error` option. See [#55](https://github.com/ashfurrow/danger-swiftlint/pull/55)
-
-## 0.7.0
-
-- Bump managed SwiftLint version to 0.20.1
-
-## 0.6.0
-
-- Fixes problem with differing swiftlint paths. See [#44](https://github.com/ashfurrow/danger-swiftlint/issues/44).
-
-## 0.5.1
-
-- Fixed excluded files containing characters that need escaping. See [#40](https://github.com/ashfurrow/danger-swiftlint/pull/40).
-
-## 0.5.0
-
-- Bump managed SwiftLint version to 0.18.1
-
-## 0.4.1
-
-- Fixes deleted files being added to the list of files to lint. See [#34](https://github.com/ashfurrow/danger-swiftlint/pull/34).
-
-## 0.4.0
-
-- Support for inline comments. See [#29](https://github.com/ashfurrow/danger-swiftlint/issues/28)
-
-- Adds SwiftLint installation as part of the gem install process, should make
-  it easier to track which upstream fixes should or shouldn't be done by
-  danger-swiftlint. See [#25](https://github.com/ashfurrow/danger-swiftlint/issues/25)
-
-- Add `danger-swiftlint` CLI, with `swiftlint_version` command to print the version of the SwiftLint binary installed by the plugin. See [#32](https://github.com/ashfurrow/danger-swiftlint/pull/32)
-
-## 0.3.0
-
-- Adds selective linting, now SwiftLint will only run on the PR added and modified files. See [#23](https://github.com/ashfurrow/danger-swiftlint/pull/23)
-
-## 0.2.1
-
-- Adds support for specifying a directory in which to run SwiftLint. See [#19](https://github.com/ashfurrow/danger-swiftlint/pull/19).
-
-## 0.1.2
-
-- Adds support for files with spaces in their names. See [#9](https://github.com/ashfurrow/danger-swiftlint/issues/9).
-
-## 0.1.1
-
-- Fixes double-escaped newline characters. See [#11](https://github.com/ashfurrow/danger-swiftlint/issues/11).
-
-## 0.1.0
-
-- Initial release.

data/Gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :development do
-  gem 'mocha'
-  gem 'bacon'
-  gem 'mocha-on-bacon'
-  gem 'prettybacon'
-end

data/Gemfile.lock

@@ -1,130 +0,0 @@
-PATH
-  remote: .
-  specs:
-    danger-swiftlint (0.10.0)
-      danger
-      rake (> 10)
-      thor (~> 0.19)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    bacon (1.2.0)
-    claide (1.0.2)
-    claide-plugins (0.9.2)
-      cork
-      nap
-      open4 (~> 1.3)
-    coderay (1.1.1)
-    colored2 (3.1.2)
-    cork (0.3.0)
-      colored2 (~> 3.1)
-    danger (5.5.3)
-      claide (~> 1.0)
-      claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
-      cork (~> 0.1)
-      faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1)
-      kramdown (~> 1.5)
-      no_proxy_fix
-      octokit (~> 4.7)
-      terminal-table (~> 1)
-    diff-lcs (1.3)
-    faraday (0.13.1)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
-      faraday (~> 0.8)
-    ffi (1.9.18)
-    formatador (0.2.5)
-    git (1.3.0)
-    guard (2.14.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    kramdown (1.15.0)
-    listen (3.0.7)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
-    lumberjack (1.0.11)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    mocha-on-bacon (0.2.3)
-      mocha (>= 0.13.0)
-    multipart-post (2.0.0)
-    nap (1.1.0)
-    nenv (0.3.0)
-    no_proxy_fix (0.1.1)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    octokit (4.7.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    open4 (1.3.4)
-    prettybacon (0.0.2)
-      bacon (~> 1.2)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.0.0)
-    rake (12.1.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    shellany (0.0.1)
-    slop (3.6.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.19.4)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bacon
-  bundler (~> 1.3)
-  danger-swiftlint!
-  guard (~> 2.14)
-  guard-rspec (~> 4.7)
-  listen (= 3.0.7)
-  mocha
-  mocha-on-bacon
-  prettybacon
-  pry
-  rspec (~> 3.4)
-
-BUNDLED WITH
-   1.15.1

data/Guardfile

@@ -1,21 +0,0 @@
-# A guardfile for making Danger Plugins
-# For more info see https://github.com/guard/guard#readme
-
-# To run, use `bundle exec guard`.
-
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # Feel free to open issues for suggestions and improvements
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-end

data/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ash Furrow
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

data/README.md

@@ -1,61 +0,0 @@
-[![CircleCI](https://circleci.com/gh/ashfurrow/danger-swiftlint.svg?style=svg)](https://circleci.com/gh/ashfurrow/danger-swiftlint)
-
-# Danger SwiftLint
-
-A [Danger](https://github.com/danger/danger) plugin for [SwiftLint](https://github.com/realm/SwiftLint) that runs on macOS.
-
-## Installation
-
-Add this line to your Gemfile:
-
-```rb
-gem 'danger-swiftlint'
-```
-
-SwiftLint also needs to be installed before you run Danger, which you can do [via Homebrew](https://github.com/realm/SwiftLint#installation) or a [Brewfile](https://github.com/Homebrew/homebrew-bundle).
-
-## Usage
-
-The easiest way to use is just add this to your Dangerfile:
-
-```rb
-swiftlint.lint_files
-```
-
-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.binary_path = '/path/to/swiftlint'
-swiftlint.lint_files
-```
-
-If you want the lint result shows in diff instead of comment, you can use `inline_mode` option. Violations that out of the diff will show in danger's fail or warn section.
-
-```rb
-swiftlint.lint_files inline_mode: true
-```
-
-If you want lint errors to fail Danger, you can use `fail_on_error` option.
-
-```rb
-swiftlint.lint_files fail_on_error: true
-```
-
-If you need to specify options for `swiftlint` that can _only_ be specified by command line arguments, use the `additional_swiftlint_args` option.
-
-```rb
-swiftlint.lint_files additional_swiftlint_args: '--lenient'
-```
-
-You can use the `SWIFTLINT_VERSION` environment variable to override the default version installed via the `rake install` task.
-
-Finally, if something's not working correctly, you can debug this plugin by using setting `swiftlint.verbose = true`.
-
-## 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/).
-
-## License
-
-MIT

data/Rakefile

@@ -1,14 +0,0 @@
-import 'ext/swiftlint/Rakefile'
-require 'bundler/gem_tasks'
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
-
-task :spec do
-  Rake::Task['specs'].invoke
-end
-
-task :default => :spec
-

data/danger-swiftlint.gemspec

@@ -1,45 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'danger-swiftlint'
-  spec.version       = DangerSwiftlint::VERSION
-  spec.authors       = ['Ash Furrow', 'David Grandinetti', 'Orta Therox', 'Thiago Felix', 'Giovanni Lodi']
-  spec.email         = ['ash@ashfurrow.com', 'dbgrandi@gmail.com', 'orta.therox@gmail.com', 'thiago@thiagofelix.com', 'gio@mokacoding.com']
-  spec.description   = %q{A Danger plugin for linting Swift with SwiftLint.}
-  spec.summary       = %q{A Danger plugin for linting Swift with SwiftLint.}
-  spec.homepage      = 'https://github.com/ashfurrow/danger-swiftlint'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.extensions    = %w(ext/swiftlint/Rakefile)
-  spec.executables   = ['danger-swiftlint']
-
-  spec.add_dependency 'danger'
-  spec.add_dependency 'thor', '~> 0.19'
-  spec.add_dependency 'rake', '> 10'
-
-  # General ruby development
-  spec.add_development_dependency 'bundler', '~> 1.3'
-
-  #  Testing support
-  spec.add_development_dependency "rspec", '~> 3.4'
-
-  # Makes testing easy via `bundle exec guard`
-  spec.add_development_dependency "guard", '~> 2.14'
-  spec.add_development_dependency "guard-rspec", '~> 4.7'
-
-  # If you want to work on older builds of ruby
-  spec.add_development_dependency "listen", '3.0.7'
-
-  # This gives you the chance to run a REPL inside your test
-  # via
-  #    binding.pry
-  # This will stop test execution and let you inspect the results
-  spec.add_development_dependency "pry"
-
-end

data/spec/fixtures/SwiftFile.swift

@@ -1 +0,0 @@
-// This file intentional left blank-ish.

data/spec/fixtures/empty_excluded.yml

@@ -1,7 +0,0 @@
-disabled_rules:
-  - todo
-
-included:
-  - an/included/folder
-
-excluded:

data/spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift

@@ -1 +0,0 @@
-// This file intentionally left blank-ish.

data/spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift

@@ -1 +0,0 @@
-// This file intentionally left blank-ish.

data/spec/fixtures/some_config.yml

@@ -1,8 +0,0 @@
-disabled_rules:
-  - todo
-
-included:
-  - an/included/folder
-
-excluded:
-  - excluded_dir

data/spec/fixtures/some_dir/SwiftFile.swift

@@ -1 +0,0 @@
-// This file intentional left blank-ish.