danger-swiftlint 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 01a0939fa22887ccd7c5fb12e95137480358a86b29fa5172013fcab5c4a641e8
-  data.tar.gz: fd0159f18351b1024d8a0375da700490a1fb65bf854b1afc43d9353129050ba6
+SHA1:
+  metadata.gz: ffd9d0b59c7ecad82f6881f19861fcd96b0516a1
+  data.tar.gz: fde0df1341996eb7ed3336f27e19130502397ad9
 SHA512:
-  metadata.gz: d4ab4971ad7ce9ec8534f1640e6fb6d0ab9ab5ebc150fb3978bf0f2090969ea51af28982d920fb791a579a19ab8a938ce4bea2971b3183473ff30ac00ff5b01e
-  data.tar.gz: 2d2dda5c3ce69edc438d2054a52ecbb13dd0479dcc116c1c4981393328f2134d69c27790160ac2f5a16e5c67b12739aa311fae403cb7db6793eaca87ff7b884f
+  metadata.gz: aab7ab1a826a81b8b71d1bba2a982c35b12a1e5b03521bc190592386faeecf8c0c3605ce6eeb00f4a1b523847d769c0354673b946b0299c98bad4f2f61030ba6
+  data.tar.gz: e5f9f91d254bf2a73e59a366bd63a2e1e8c83798d4d2d82f83f14d8d2cbd1b310c3b3a592a208dd6b5090f6b5aca9adb455b7040571b501bbc5e440569daad68

data/lib/danger_plugin.rb

@@ -65,12 +65,15 @@ module Danger
       # Extract excluded paths
       excluded_paths = format_paths(config['excluded'] || [], config_file_path)
 
+      log "Swiftlint will exclude the following paths: #{excluded_paths}"
+
       # Extract included paths
       included_paths = format_paths(config['included'] || [], config_file_path)
 
+      log "Swiftlint includes the following paths: #{included_paths}"
+
       # Extract swift files (ignoring excluded ones)
       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
@@ -163,7 +166,24 @@ module Danger
 
     # Get the configuration file
     def load_config(filepath)
-      filepath ? YAML.load_file(filepath) : {}
+      return {} if filepath.nil? || !File.exist?(filepath)
+
+      config_file = File.open(filepath).read
+
+      # Replace environment variables
+      config_file = parse_environment_variables(config_file)
+
+      YAML.safe_load(config_file)
+    end
+
+    # Find all requested environment variables in the given string and replace them with the correct values.
+    def parse_environment_variables(file_contents)
+      # Matches the file contents for environment variables defined like ${VAR_NAME}.
+      # Replaces them with the environment variable value if it exists.
+      file_contents.gsub(/\$\{([^{}]+)\}/) do |env_var|
+        return env_var if ENV[Regexp.last_match[1]].nil?
+        ENV[Regexp.last_match[1]]
+      end
     end
 
     # Return whether the file exists within a specified collection of paths

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
   SWIFTLINT_VERSION = '0.25.0'
 end

data/spec/danger_plugin_spec.rb

@@ -44,6 +44,10 @@ module Danger
           @swiftlint_response = '[{ "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 19, "file" : "/Users/me/this_repo/spec//fixtures/SwiftFile.swift", "severity" : "Error", "type" : "Force Cast", "line" : 13 }]'
         end
 
+        after(:each) do
+          ENV['ENVIRONMENT_EXAMPLE'] = nil
+        end
+
         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')), '')
@@ -235,7 +239,9 @@ module Danger
                                                                          'spec/fixtures/SwiftFile.swift'
                                                                        ])
           expect(File).to receive(:file?).and_return(true)
-          expect(YAML).to receive(:load_file).and_return({})
+          expect(File).to receive(:exist?).and_return(true)
+          expect(File).to receive(:open).and_return(StringIO.new)
+          expect(YAML).to receive(:safe_load).and_return({})
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(hash_including(config: File.expand_path('.swiftlint.yml')), '')
@@ -316,6 +322,25 @@ module Danger
           expect(status[:warnings]).to_not be_empty
           expect(status[:errors]).to be_empty
         end
+
+        it 'parses environment variables set within the swiftlint config' do
+          ENV['ENVIRONMENT_EXAMPLE'] = 'excluded_dir'
+
+          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'
+                                                                       ])
+
+          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/environment_variable_config.yml'
+          @swiftlint.lint_files
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.