From 82ca5cbbc095403f20508c8388d49288c7d96a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B8=CC=86=20=D0=A1=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Mon, 5 Aug 2019 13:15:05 +0300 Subject: [PATCH] Rename ignore to exclude --- xcode/UnusedConfig.yml | 5 +++-- xcode/build_phases/Unused.rb | 14 +++++++------- xcode/build_phases/unused.sh | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/xcode/UnusedConfig.yml b/xcode/UnusedConfig.yml index ba35344..619dd71 100644 --- a/xcode/UnusedConfig.yml +++ b/xcode/UnusedConfig.yml @@ -1,5 +1,6 @@ -ignored-resources: +excluded-resources: - Generated/ - Resources/Localization - Carthage/ - - Pods/ \ No newline at end of file + - Pods/ + - FormattingService.swift \ No newline at end of file diff --git a/xcode/build_phases/Unused.rb b/xcode/build_phases/Unused.rb index 66ff067..478a8d2 100644 --- a/xcode/build_phases/Unused.rb +++ b/xcode/build_phases/Unused.rb @@ -102,24 +102,24 @@ class Unused options = {} OptionParser.new do |opts| - options[:ignore] = [] + options[:exclude] = [] opts.on("-c", "--config=FileName") { |c| options[:config] = c } - opts.on("-i", "--ignore [a, b, c]", Array) { |i| options[:ignore] += i if !i.nil? } + opts.on("-i", "--exclude [a, b, c]", Array) { |i| options[:exclude] += i if !i.nil? } end.parse! # find --config file if !options[:config].nil? fileName = options[:config] - resources += YAML.load_file(fileName).fetch("ignored-resources") + resources += YAML.load_file(fileName).fetch("excluded-resources") elsif puts "---------\n Warning: Config file is not provided \n---------" end - # find --ignored files - if !options[:ignore].nil? - resources += options[:ignore] + # find --exclude files + if !options[:exclude].nil? + resources += options[:exclude] end # create and return Regexp @@ -137,7 +137,7 @@ class Unused } end - # remove files, that maches ignored Regexps array + # remove files, that maches excluded Regexps array def ignore_files_with_regexps(files, regexps) files.select { |f| regexps.all? { |r| r.match(f.file).nil? } } end diff --git a/xcode/build_phases/unused.sh b/xcode/build_phases/unused.sh index 2c12160..5a0a906 100644 --- a/xcode/build_phases/unused.sh +++ b/xcode/build_phases/unused.sh @@ -1,4 +1,4 @@ arguments=("$@") ignored_files=$(IFS=, ; echo "${arguments[*]}") -ruby ${PROJECT_DIR}/build-scripts/xcode/build_phases/Unused.rb --config ${PROJECT_DIR}/build-scripts/xcode/UnusedConfig.yml --ignore ${ignored_files} +ruby ${PROJECT_DIR}/build-scripts/xcode/build_phases/Unused.rb --config ${PROJECT_DIR}/build-scripts/xcode/UnusedConfig.yml --exclude ${ignored_files}