Skip to content

throw if user passes a command-line arg #593

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

Closed
wants to merge 2 commits into from
Closed

throw if user passes a command-line arg #593

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9693c
throw if user passes a command-line arg
sethladd Jun 17, 2015
4dcb801
print unknown args
sethladd Jun 17, 2015
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
30 changes: 19 additions & 11 deletions bin/dartdoc.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ main(List<String> arguments) async {
var args = parser.parse(arguments);

if (args['help']) {
_printUsageAndExit(parser);
_printHelp(parser);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this cause docs to be generated, if we don't exit here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nevermind

}

if (args['version']) {
Expand All @@ -29,7 +29,7 @@ main(List<String> arguments) async {

Directory sdkDir = cli_util.getSdkDir(arguments);
if (sdkDir == null) {
print("Warning: unable to locate the Dart SDK. Please use the --dart-sdk "
print("Error: unable to locate the Dart SDK. Please use the --dart-sdk "
"command line option or set the DART_SDK environment variable.");
exit(1);
}
Expand All @@ -41,13 +41,13 @@ main(List<String> arguments) async {

var readme = args['sdk-readme'];
if (readme != null && !(new File(readme).existsSync())) {
print("Warning: unable to locate the SDK description file at $readme.");
print("Error: unable to locate the SDK description file at $readme.");
exit(1);
}

Directory inputDir = new Directory(args['input']);
if (!inputDir.existsSync()) {
print("Warning: unable to locate the input directory at ${inputDir.path}.");
print("Error: unable to locate the input directory at ${inputDir.path}.");
exit(1);
}

Expand All @@ -56,14 +56,12 @@ main(List<String> arguments) async {
String url = args['hosted-url'];
String footerFilePath = _resolveTildePath(args['footer']);
if (footerFilePath != null && !new File(footerFilePath).existsSync()) {
print(
"Warning: unable to locate the file with footer at ${footerFilePath}.");
print("Error: unable to locate the file with footer at ${footerFilePath}.");
exit(1);
}
String headerFilePath = _resolveTildePath(args['header']);
if (headerFilePath != null && !new File(headerFilePath).existsSync()) {
print(
"Warning: unable to locate the file with header at ${headerFilePath}.");
print("Error: unable to locate the file with header at ${headerFilePath}.");
exit(1);
}

Expand All @@ -78,6 +76,12 @@ main(List<String> arguments) async {
packageRootDir = new Directory(_resolveTildePath(args['package-root']));
}

if (args.rest.isNotEmpty) {
var unknownArgs = args.rest.join(' ');
print('Error: detected unknown command-line argument(s): $unknownArgs');
_printUsageAndExit(parser, exitCode: 1);
}

PackageMeta packageMeta = sdkDocs
? new PackageMeta.fromSdk(sdkDir, sdkReadmePath: readme)
: new PackageMeta.fromDir(inputDir);
Expand Down Expand Up @@ -105,12 +109,16 @@ main(List<String> arguments) async {
}
}

/// Print help if we are passed the help option or invalid arguments.
void _printUsageAndExit(ArgParser parser) {
/// Print help if we are passed the help option.
void _printHelp(ArgParser parser, {int exitCode: 0}) {
print('Generate HTML documentation for Dart libraries.\n');
_printUsageAndExit(parser, exitCode: exitCode);
}

void _printUsageAndExit(ArgParser parser, {int exitCode: 0}) {
print('Usage: dartdoc [OPTIONS]\n');
print(parser.usage);
exit(0);
exit(exitCode);
}

ArgParser _createArgsParser() {
Expand Down