diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_ARGV.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index b8cfdf9fa..e7ac36628 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -195,7 +195,7 @@ module HomebrewArgvExtension # eg. `foo -ns -i --bar` has three switches, n, s and i def switch?(char) return false if char.length > 1 - options_only.any? { |arg| arg[1, 1] != "-" && arg.include?(char) } + options_only.any? { |arg| arg.scan("-").size == 1 && arg.include?(char) } end def usage diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test_ARGV.rb index 4dc3f2677..39f32f452 100644 --- a/Library/Homebrew/test/test_ARGV.rb +++ b/Library/Homebrew/test/test_ARGV.rb @@ -48,9 +48,9 @@ class ArgvExtensionTests < Homebrew::TestCase end def test_switch? - @argv << "-ns" << "-i" << "--bar" + @argv << "-ns" << "-i" << "--bar" << "-a-bad-arg" %w[n s i].each { |s| assert @argv.switch?(s) } - %w[b ns bar --bar -n].each { |s| assert !@argv.switch?(s) } + %w[b ns bar --bar -n a bad arg].each { |s| assert !@argv.switch?(s) } end def test_flag? |