fastlane-plugin-ciutils 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bceff1482108fdecec0a8a40f87507fcd6df460
-  data.tar.gz: 5a418e659c980d6b675946e514b2ef5dda11a356
+  metadata.gz: f0d65ab73b252a6e36cd9f6021f3e67fb3427b05
+  data.tar.gz: c5f048d5e095409ac658ecfe0e7529b3071baa5e
 SHA512:
-  metadata.gz: 7230ead5db8f74bd403c184422f7ae31ae1edd39f3359876c5ff043faa1a8a582caad4634bee2dec12d247ba94f718d88db460298fd25df4003fa2858328cbb9
-  data.tar.gz: 398b6be24c49be54714421cf44984874d6a90d903e6038b38109b25309f1a3b425fc998f79e85cd1d55b4c0fb2cfac59b7ce3f142c78dd68d84fac402e243acf
+  metadata.gz: 5d916eeb97307c8f4b65608b77e7998e1ac1c41f4b9217dbdc98367426be3ea249c84b215e4318a771ad3e522d2a5a3eeed085648646a5a6144e0f965150828f
+  data.tar.gz: 56913f7fec5fc1d579708499ec400b318982cb6971cccff87765a136a2c1070e718b5d9dc561936972468de76ddb7d7172aecaec2c4f0bf3ca987d2a87046220

data/lib/fastlane/plugin/ciutils/actions/en_create_sonar_reports.rb

@@ -13,6 +13,7 @@ module Fastlane
 
         lizard_extra_args = params[:lizard_extra_args]
         swiftlint_extra_args = params[:swiftlint_extra_args]
+        swiftlint_config_arg = swiftlint_config_path_arg(params)
 
         swiftlint_path_args = self.swiftlint_path_args(params)
         lizard_path_args = self.lizard_path_args(params)
@@ -39,7 +40,7 @@ module Fastlane
 
         # run static code analysis
         unless params[:skip_swiftlint_analysis]
-          sh("swiftlint lint #{swiftlint_path_args} --quiet > '#{swiftlint_output_path}' || exit 0")
+          sh("swiftlint lint #{swiftlint_path_args} #{swiftlint_config_arg} #{swiftlint_extra_args} --quiet > '#{swiftlint_output_path}' || exit 0")
         end
 
         unless params[:skip_lizard_analysis]
@@ -89,6 +90,28 @@ module Fastlane
         include_files + exclude_files
       end
 
+      def self.swiftlint_config_path_arg(params)
+        file_path = params[:swiftlint_config_path]
+        config_path_arg = ""
+
+        if File.exist?('.swiftlint.yml')
+          config_path_arg = File.expand_path('.swiftlint.yml')
+        end
+
+        if file_path != nil && !file_path.strip.empty?
+          config_path_arg = File.expand_path(file_path.strip)
+          if !File.exist?(config_path_arg)
+            config_path_arg = ""
+          end
+        end
+
+        if !config_path_arg.strip.empty?
+          return "--config '#{config_path_arg}'"
+        else
+          return ""
+        end
+      end
+
       def self.swiftlint_path_args(params)
         include_files = ""
 
@@ -135,6 +158,11 @@ module Fastlane
                                        default_value: false,
                                        optional: true),
 
+          FastlaneCore::ConfigItem.new(key: :swiftlint_config_path,
+                                       env_name: "FL_EN_SWIFTLINT_CONFIG_PATH",
+                                       description: 'Path to .swiftlint.yml',
+                                       optional: true),
+
           FastlaneCore::ConfigItem.new(key: :swiftlint_extra_args,
                                        env_name: "FL_EN_SWIFTLINT_EXTRA ARGS",
                                        description: 'Extra command line args for swiftlint',

data/lib/fastlane/plugin/ciutils/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Ciutils
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-ciutils
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Nicolae Ghimbovschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slather