Skip to content

Amend --skip-foo fix with a trailing option #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2019
Merged

Amend --skip-foo fix with a trailing option #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9103e70
Make `switch_option` return a strict boolean
deivid-rodriguez Sep 26, 2019
091f827
Amend previous --skip-foo with trailing option fix
deivid-rodriguez Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lib/thor/parser/options.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def current_is_value?
end

def switch?(arg)
switch_option(normalize_switch(arg))
!switch_option(normalize_switch(arg)).nil?
end

def switch_option(arg)
Expand All @@ -196,21 +196,18 @@ def parsing_options?
# Parse boolean values which can be given as --foo=true, --foo or --no-foo.
#
def parse_boolean(switch)
no_or_skip = no_or_skip?(switch)
if no_or_skip
@switches.key?(switch) || !no_or_skip
elsif current_is_value?
if current_is_value?
if ["true", "TRUE", "t", "T", true].include?(peek)
shift
true
elsif ["false", "FALSE", "f", "F", false].include?(peek)
shift
false
else
!no_or_skip
@switches.key?(switch) || !no_or_skip?(switch)
end
else
@switches.key?(switch) || !no_or_skip
@switches.key?(switch) || !no_or_skip?(switch)
end
end

Expand Down
8 changes: 8 additions & 0 deletions spec/parser/options_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,14 @@ def remaining
expect(parse("--skip-foo", "asdf")["skip-foo"]).to eq(true)
end

it "will prefer 'skip-opt' variant over inverting 'opt' if explicitly set, and given a value" do
create "--skip-foo" => true
expect(parse("--skip-foo=f")["skip-foo"]).to eq(false)
expect(parse("--skip-foo=false")["skip-foo"]).to eq(false)
expect(parse("--skip-foo=t")["skip-foo"]).to eq(true)
expect(parse("--skip-foo=true")["skip-foo"]).to eq(true)
end

it "accepts inputs in the human name format" do
create :foo_bar => :boolean
expect(parse("--foo-bar")["foo_bar"]).to eq(true)
Expand Down