From 66d2c4a885fa0529345419dcfb489ad66eb60ca1 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: Fri, 2 Aug 2019 17:30:42 +0300 Subject: [PATCH] Refactor code a bit --- xcode/build_phases/Unused.rb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/xcode/build_phases/Unused.rb b/xcode/build_phases/Unused.rb index 2f88d64..b85cfb9 100644 --- a/xcode/build_phases/Unused.rb +++ b/xcode/build_phases/Unused.rb @@ -96,7 +96,7 @@ class Unused end end - def parse_arguments() + def parse_arguments resources = [] options = {} @@ -125,6 +125,17 @@ class Unused resources.map { |r| Regexp.new(r) } end + def grab_items(file) + lines = File.readlines(file).map {|line| line.gsub(/^\s*\/\/.*/, "") } + items = lines.each_with_index.select { |line, i| line[/(func|let|var|class|enum|struct|protocol)\s+\w+/] }.map { |line, i| Item.new(file, line, i)} + end + + def filter_items(items) + items.select { |f| + !f.name.start_with?("test") && !f.modifiers.include?("@IBAction") && !f.modifiers.include?("override") && !f.modifiers.include?("@objc") && !f.modifiers.include?("@IBInspectable") + } + end + # remove files, that maches ignored Regexps array def ignore_files_with_regexps(files, regexps) files.select { |f| regexps.all? { |r| r.match(f.file).nil? } } @@ -171,18 +182,6 @@ class Unused items = ignore_files_with_regexps(items, regexps) end - - def grab_items(file) - lines = File.readlines(file).map {|line| line.gsub(/^\s*\/\/.*/, "") } - items = lines.each_with_index.select { |line, i| line[/(func|let|var|class|enum|struct|protocol)\s+\w+/] }.map { |line, i| Item.new(file, line, i)} - end - - def filter_items(items) - items.select { |f| - !f.name.start_with?("test") && !f.modifiers.include?("@IBAction") && !f.modifiers.include?("override") && !f.modifiers.include?("@objc") && !f.modifiers.include?("@IBInspectable") - } - end - end