Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(699)

Unified Diff: utils/pub/pub.dart

Issue 10938003: Don't extract the name of a package from its description. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: utils/pub/pub.dart
diff --git a/utils/pub/pub.dart b/utils/pub/pub.dart
index 795faf5e8ab74df00685502381a0e6a9a265cf82..7b8ffc174ce75f0b44627fef15df1ee476293b10 100644
--- a/utils/pub/pub.dart
+++ b/utils/pub/pub.dart
@@ -156,6 +156,10 @@ class PubCommand {
*/
abstract String get usage;
+ /// Whether or not this command uses [entrypoint]. If false, Pub won't look
+ /// for a pubspec and [entrypoint] will be null when the command runs.
+ bool get usesEntrypoint => true;
Bob Nystrom 2012/09/18 01:34:47 How about "requiresEntrypoint"?
nweiz 2012/09/18 19:55:30 Done.
+
/**
* Override this to define command-specific options. The results will be made
* available in [commandOptions].
@@ -195,12 +199,17 @@ class PubCommand {
exit(1);
}
- // TODO(rnystrom): Will eventually need better logic to walk up
- // subdirectories until we hit one that looks package-like. For now, just
- // assume the cwd is it.
- var future = Package.load(workingDir, cache.sources).chain((package) {
- entrypoint = new Entrypoint(package, cache);
+ var future = new Future.immediate(null);
+ if (usesEntrypoint) {
+ // TODO(rnystrom): Will eventually need better logic to walk up
+ // subdirectories until we hit one that looks package-like. For now, just
+ // assume the cwd is it.
+ future = Package.load(null, workingDir, cache.sources)
+ .transform((package) => new Entrypoint(package, cache));
Bob Nystrom 2012/09/18 01:34:47 Indent +2.
nweiz 2012/09/18 19:55:30 Done.
+ }
+ future = future.chain((entrypoint) {
+ this.entrypoint = entrypoint;
try {
var commandFuture = onRun();
if (commandFuture == null) return new Future.immediate(true);
@@ -211,7 +220,18 @@ class PubCommand {
return new Future.immediate(null);
}
});
- future.handleException((e) => handleError(e, future.stackTrace));
+
+ future.handleException((e) {
+ if (e is PubspecNotFoundException && e.name == null) {
+ e = 'Could not find a file named "pubspec.yaml" in the directory '
+ '$workingDir.';
+ } else if (e is PubspecHasNoNameException && e.name == null) {
+ e = 'pubspec.yaml is missing the required "name" field (e.g. "name: '
+ '${basename(workingDir)}").';
+ }
+
+ handleError(e, future.stackTrace);
+ });
// Explicitly exit on success to ensure that any dangling dart:io handles
// don't cause the process to never terminate.
future.then((_) => exit(0));
« no previous file with comments | « utils/pub/package.dart ('k') | utils/pub/pubspec.dart » ('j') | utils/pub/version_solver.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698