Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public final String getDefaultValueFor(final String optionName) {
if (this.environmentVariableValue == null)
return null;
final Matcher matcher = Pattern
.compile("(?:(?:.*\\s+)|(?:^))(" + Pattern.quote(optionName) + ")\\s*((?:'[^']*(?='))|(?:\"[^\"]*(?=\"))|(?:[^" + this.optionPrefixesPattern + "\\s]+))?.*")
.compile("(?:(?:.*\\s+)|(?:^))(" + Pattern.quote(optionName) + ")(?=\\s|$)\\s*((?:'[^']*(?='))|(?:\"[^\"]*(?=\"))|(?:[^" + this.optionPrefixesPattern + "\\s]+))?.*")
.matcher(this.environmentVariableValue);
if (!matcher.matches())
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,35 @@

public final class EnvironmentVariableDefaultProviderTest {

@Test
public void shouldNotMatchPrefixOfLongerOption() {
IDefaultProvider provider = new EnvironmentVariableDefaultProvider(null, "-/",
name -> "--foobar 123 --foo-bar 456 /foobar 789");

assertNull(provider.getDefaultValueFor("--foo"));
assertNull(provider.getDefaultValueFor("/foo"));
assertEquals(provider.getDefaultValueFor("--foobar"), "123");
assertEquals(provider.getDefaultValueFor("--foo-bar"), "456");
assertEquals(provider.getDefaultValueFor("/foobar"), "789");
}

@Test
public void shouldMatchExactOptionBeforeLongerOption() {
IDefaultProvider provider = new EnvironmentVariableDefaultProvider(null, "-",
name -> "--foo 'first value' --foobar second");

assertEquals(provider.getDefaultValueFor("--foo"), "first value");
assertEquals(provider.getDefaultValueFor("--foobar"), "second");
}

@Test
public void shouldMatchFlagAtEndOfInput() {
IDefaultProvider provider = new EnvironmentVariableDefaultProvider(null, "-",
name -> "--foobar value --foo");

assertEquals(provider.getDefaultValueFor("--foo"), "true");
}

@Test
public final void shouldParseEnvironmentVariable() {
// given
Expand Down
Loading