From c5cde472dd48c0f4550037813f251fd10f5cf1d4 Mon Sep 17 00:00:00 2001 From: Maxim Sorokin Date: Wed, 29 Jul 2020 12:40:54 +0300 Subject: [PATCH] =?UTF-8?q?changed=20pods=5Fdirectory=20=E2=80=93>=20swift?= =?UTF-8?q?lint=5Fexecutable=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build_phases/multiple_swiftlint/setting_option.rb | 6 +++--- .../build_phases/multiple_swiftlint/strategy_maker.rb | 11 ++++------- xcode/build_phases/multiple_swiftlint/swiftlint.rb | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/xcode/build_phases/multiple_swiftlint/setting_option.rb b/xcode/build_phases/multiple_swiftlint/setting_option.rb index 338d56e..923acab 100644 --- a/xcode/build_phases/multiple_swiftlint/setting_option.rb +++ b/xcode/build_phases/multiple_swiftlint/setting_option.rb @@ -8,7 +8,7 @@ class SettingOption @options = OpenStruct.new OptionParser.new do |opt| opt.on('-s', '--source_directory STRING', 'The directory of source') { |option| @options.source_directory = option } - opt.on('-p', '--pods_directory STRING', 'The directory of pods') { |option| @options.pods_directory = option } + opt.on('-l', '--swiftlint_executable_path STRING', 'The executable path of swiftlint') { |option| @options.swiftlint_executable_path = option } opt.on('-c', '--check_mode MODE', 'The mode of check is "fully" or "simplified"') { |option| @options.check_mode = option } opt.on('-u', '--use_multiple BOOL', 'The flag indicates the use of multiple yaml swiftlint configurations') { |option| @options.use_multiple = option } opt.on('-d', '--source_date DATE', 'The date of grouping files according touchin and old swiftlint rules') { |option| @options.source_date = option } @@ -41,8 +41,8 @@ class SettingOption @options.source_date end - def pods_directory - @options.pods_directory + def swiftlint_executable_path + @options.swiftlint_executable_path end def check_mode diff --git a/xcode/build_phases/multiple_swiftlint/strategy_maker.rb b/xcode/build_phases/multiple_swiftlint/strategy_maker.rb index 14fcdf0..28e4ee3 100644 --- a/xcode/build_phases/multiple_swiftlint/strategy_maker.rb +++ b/xcode/build_phases/multiple_swiftlint/strategy_maker.rb @@ -7,11 +7,8 @@ require_relative 'swift_file_manager.rb' require_relative 'yaml_manager.rb' class StrategyMaker - def initialize(source_directory, pods_directory, touchin_swiftlint_yaml_path) - @source_directory = source_directory - @pods_directory = pods_directory - @swiftlint = pods_directory + '/SwiftLint/swiftlint' - + def initialize(source_directory, swiftlint_executable_path, touchin_swiftlint_yaml_path) + @source_directory = source_directory @touchin_swiftlint_yaml_path = source_directory + touchin_swiftlint_yaml_path @old_swiftlint_yaml_path = source_directory + '/.swiftlint.yml' @@ -19,8 +16,8 @@ class StrategyMaker @touchin_swiftlint_yaml_temporary_path = @temporary_swiftlint_folder_name + '/.touchin_swiftlint.yml' @old_swiftlint_yaml_temporary_path = @temporary_swiftlint_folder_name + '/.old_swiftlint.yml' - @swiftlint_autocorrect_command = @swiftlint + ' autocorrect --path ' + @source_directory + ' --config ' - @swiftlint_lint_command = @swiftlint + ' --path ' + @source_directory + ' --config ' + @swiftlint_autocorrect_command = swiftlint_executable_path + ' autocorrect --path ' + @source_directory + ' --config ' + @swiftlint_lint_command = swiftlint_executable_path + ' --path ' + @source_directory + ' --config ' end def run_fully_multiple_strategy(source_date) diff --git a/xcode/build_phases/multiple_swiftlint/swiftlint.rb b/xcode/build_phases/multiple_swiftlint/swiftlint.rb index cf8852c..533c927 100644 --- a/xcode/build_phases/multiple_swiftlint/swiftlint.rb +++ b/xcode/build_phases/multiple_swiftlint/swiftlint.rb @@ -6,7 +6,7 @@ Encoding.default_external = Encoding::UTF_8 Encoding.default_internal = Encoding::UTF_8 setting = SettingOption.new -strategy_maker = StrategyMaker.new(setting.source_directory, setting.pods_directory, setting.touchin_swiftlint_yaml_path) +strategy_maker = StrategyMaker.new(setting.source_directory, setting.swiftlint_executable_path, setting.touchin_swiftlint_yaml_path) if setting.check_mode.eql? 'fully' and setting.use_multiple.true? strategy_maker.run_fully_multiple_strategy(setting.source_date)