rename RetrieveFlags.option to RetrieveFlags.optionWithDefault (#4181)
diff --git a/bin/dependency_services.dart b/bin/dependency_services.dart index 9fd589d..95558b3 100644 --- a/bin/dependency_services.dart +++ b/bin/dependency_services.dart
@@ -21,7 +21,7 @@ class _DependencyServicesCommandRunner extends CommandRunner<int> implements PubTopLevel { @override - String get directory => argResults.option('directory'); + String get directory => argResults.optionWithDefault('directory'); @override bool get captureStackChains => argResults.flag('verbose');
diff --git a/lib/src/command/lish.dart b/lib/src/command/lish.dart index dec54f1..f8d8214 100644 --- a/lib/src/command/lish.dart +++ b/lib/src/command/lish.dart
@@ -45,7 +45,9 @@ // An explicit argument takes precedence. if (argResults.wasParsed('server')) { try { - return validateAndNormalizeHostedUrl(argResults.option('server')); + return validateAndNormalizeHostedUrl( + argResults.optionWithDefault('server'), + ); } on FormatException catch (e) { usageException('Invalid server: $e'); }
diff --git a/lib/src/command/uploader.dart b/lib/src/command/uploader.dart index 8a1602a..86fc2c9 100644 --- a/lib/src/command/uploader.dart +++ b/lib/src/command/uploader.dart
@@ -23,7 +23,7 @@ bool get hidden => true; /// The URL of the package hosting server. - Uri get server => Uri.parse(argResults.option('server')); + Uri get server => Uri.parse(argResults.optionWithDefault('server')); UploaderCommand() { argParser.addOption(
diff --git a/lib/src/command_runner.dart b/lib/src/command_runner.dart index 2ad3d52..2f4728e 100644 --- a/lib/src/command_runner.dart +++ b/lib/src/command_runner.dart
@@ -44,7 +44,7 @@ class PubCommandRunner extends CommandRunner<int> implements PubTopLevel { @override - String get directory => argResults.option('directory'); + String get directory => argResults.optionWithDefault('directory'); @override bool get captureStackChains {
diff --git a/lib/src/pub_embeddable_command.dart b/lib/src/pub_embeddable_command.dart index d4549f2..a5fad51 100644 --- a/lib/src/pub_embeddable_command.dart +++ b/lib/src/pub_embeddable_command.dart
@@ -39,7 +39,7 @@ String get docUrl => 'https://dart.dev/tools/pub/cmd/pub-global'; @override - String get directory => argResults.option('directory'); + String get directory => argResults.optionWithDefault('directory'); final bool Function() isVerbose;
diff --git a/lib/src/utils.dart b/lib/src/utils.dart index ccfb055..754cc87 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart
@@ -764,7 +764,7 @@ extension RetrieveFlags on ArgResults { bool flag(String name) => this[name] as bool; - String option(String name) => this[name] as String; + String optionWithDefault(String name) => this[name] as String; String? optionWithoutDefault(String name) => this[name] as String?; }