admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Simplify implementation of ARGV.flag? and ARGV.switch?

Browse Source
This commit is contained in:
Jack Nagel 2014-08-28 22:11:08 -05:00
parent 54348f55d8
commit db04b04135
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/extend/ARGV.rb
View File

@ -135,9 +135,7 @@ module HomebrewArgvExtension
end end
def flag? flag def flag? flag
options_only.any? do |arg| options_only.include?(flag) || switch?(flag[2, 1])
arg == flag || arg[1, 1] != "-" && arg.include?(flag[2, 1])
end
end end
def force_bottle? def force_bottle?
@ -145,11 +143,9 @@ module HomebrewArgvExtension
end end
# eg. `foo -ns -i --bar` has three switches, n, s and i # eg. `foo -ns -i --bar` has three switches, n, s and i
def switch? switch_character def switch? char
return false if switch_character.length > 1 return false if char.length > 1
options_only.any? do |arg| options_only.any? { |arg| arg[1, 1] != "-" && arg.include?(char) }
arg[1, 1] != "-" && arg.include?(switch_character)
end
end end
def usage def usage