danger-swiftlint 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801ca7331651b5d31e403630ca6e5a7770da6e49
-  data.tar.gz: ad870c7c8b02c63f5ce0a51030ccb9eef85b346e
+  metadata.gz: 8be68ded24b96b58bdd94c5c100ed819fcea439f
+  data.tar.gz: c22a1ac2e4d56c2d19e9aad5ab84146ff3b0824b
 SHA512:
-  metadata.gz: 724d304989202a0703445c167377db51e6307261cf9d8939a9aaeac19da08f539b90e8deecdef7f959cb6e009fccbf820972fd7df367fad24f6135a8b78a8a5f
-  data.tar.gz: 65deb8b5a903315562c330aa156d87ac6a244f1220f6dbaeeb2979012099742b8ea2f99da6fdf7010be64d281344205c430a1e987082723a46b20432728c3269
+  metadata.gz: e2e83319fa891bcccf74e4c027cbee79742e56006e484fadbd9e51fdf7c44cf99e666f6867db16cfbf6524089ffb0ac921cef0097e82efd58a6768553a33aa5c
+  data.tar.gz: d7e95e8fa0baa9a2550feb75b78e50357a3a4ca144e2fae8b28da9fd2bf2994f2566d78a6b3937e7eb1a66ed08901947467f472e9bbf2e401d3edf82de3245df

data/lib/danger_plugin.rb

@@ -49,27 +49,34 @@ module Danger
       # Fails if swiftlint isn't installed
       raise 'swiftlint is not installed' unless swiftlint.installed?
 
-      config = if config_file
-                 config_file
-               elsif File.file?('.swiftlint.yml')
-                 File.expand_path('.swiftlint.yml')
-               end
-      log "Using config file: #{config}"
+      config_file_path = if config_file
+                           config_file
+                         elsif File.file?('.swiftlint.yml')
+                           File.expand_path('.swiftlint.yml')
+                         end
+      log "Using config file: #{config_file_path}"
 
       dir_selected = directory ? File.expand_path(directory) : Dir.pwd
       log "Swiftlint will be run from #{dir_selected}"
 
+      # Get config
+      config = load_config(config_file_path)
+
       # Extract excluded paths
-      excluded_paths = excluded_files_from_config(config)
+      excluded_paths = format_paths(config['excluded'] || [], config_file_path)
+
+      # Extract included paths
+      included_paths = format_paths(config['included'] || [], config_file_path)
 
       # Extract swift files (ignoring excluded ones)
-      files = find_swift_files(dir_selected, files, excluded_paths)
+      files = find_swift_files(dir_selected, files, excluded_paths, included_paths)
+      log files
       log "Swiftlint will lint the following files: #{files.join(', ')}"
 
       # Prepare swiftlint options
       options = {
         # Make sure we don't fail when config path has spaces
-        config: config ? Shellwords.escape(config) : nil,
+        config: config_file_path ? Shellwords.escape(config_file_path) : nil,
         reporter: 'json',
         quiet: true,
         pwd: dir_selected
@@ -125,7 +132,7 @@ module Danger
     # If files are not provided it will use git modifield and added files
     #
     # @return [Array] swift files
-    def find_swift_files(dir_selected, files = nil, excluded_paths = [])
+    def find_swift_files(dir_selected, files = nil, excluded_paths = [], included_paths = [])
       # Needs to be escaped before comparsion with escaped file paths
       dir_selected = Shellwords.escape(dir_selected)
 
@@ -146,29 +153,36 @@ module Danger
         # Ensure only files in the selected directory
         select { |file| file.start_with?(dir_selected) }.
         # Reject files excluded on configuration
-        reject do |file|
-        excluded_paths.any? do |excluded_path|
-          Find.find(excluded_path)
-              .map { |excluded_file| Shellwords.escape(excluded_file) }
-              .include?(file)
-        end
+        reject { |file| file_exists?(excluded_paths, file) }.
+        # Accept files included on configuration
+        select do |file|
+        next true if included_paths.empty?
+        file_exists?(included_paths, file)
       end
     end
 
-    # Parses the configuration file and return the excluded files
-    #
-    # @return [Array] list of files excluded
-    def excluded_files_from_config(filepath)
-      config = if filepath
-                 YAML.load_file(filepath)
-               else
-                 { 'excluded' => [] }
-               end
+    # Get the configuration file
+    def load_config(filepath)
+      filepath ? YAML.load_file(filepath) : {}
+    end
 
-      excluded_paths = config['excluded'] || []
+    # Return whether the file exists within a specified collection of paths
+    #
+    # @return [Bool] file exists within specified collection of paths
+    def file_exists?(paths, file)
+      paths.any? do |path|
+        Find.find(path)
+            .map { |path_file| Shellwords.escape(path_file) }
+            .include?(file)
+      end
+    end
 
-      # Extract excluded paths
-      excluded_paths
+    # Parses the configuration file and return the specified files in path
+    #
+    # @return [Array] list of files specified in path
+    def format_paths(paths, filepath)
+      # Extract included paths
+      paths
         .map { |path| File.join(File.dirname(filepath), path) }
         .map { |path| File.expand_path(path) }
         .select { |path| File.exist?(path) || Dir.exist?(path) }

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
   SWIFTLINT_VERSION = '0.20.1'
 end

data/spec/danger_plugin_spec.rb

@@ -169,6 +169,22 @@ module Danger
           @swiftlint.lint_files
         end
 
+        it 'lints files in the included 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/some_dir/SwiftFile.swift'
+                                                                       ])
+
+          expect_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .once
+            .and_return(@swiftlint_response)
+
+          @swiftlint.config_file = 'spec/fixtures/another_config.yml'
+          @swiftlint.lint_files
+        end
+
         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([
@@ -184,6 +200,21 @@ module Danger
           @swiftlint.lint_files
         end
 
+        it 'does not crash when included 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'
+                                                                       ])
+
+          expect_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .once
+            .and_return(@swiftlint_response)
+
+          @swiftlint.config_file = 'spec/fixtures/empty_included.yml'
+          @swiftlint.lint_files
+        end
+
         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([

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -161,7 +161,7 @@ files:
 - spec/danger_plugin_spec.rb
 - spec/spec_helper.rb
 - spec/swiftlint_spec.rb
-homepage: https://github.com/ashfurrow/danger-swiftlint
+homepage: https://github.com/ashfurrow/danger-ruby-swiftlint
 licenses:
 - MIT
 metadata: {}