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

Unified Diff: sdk/lib/_internal/pub_generated/lib/src/validator/pubspec_field.dart

Issue 657673002: Regenerate pub sources. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 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: sdk/lib/_internal/pub_generated/lib/src/validator/pubspec_field.dart
diff --git a/sdk/lib/_internal/pub_generated/lib/src/validator/pubspec_field.dart b/sdk/lib/_internal/pub_generated/lib/src/validator/pubspec_field.dart
index 250afd71037e6c7f852f23897c657b87f9ddbd46..d0f55b70cd3f57c6cada926336b878d6a4155ab3 100644
--- a/sdk/lib/_internal/pub_generated/lib/src/validator/pubspec_field.dart
+++ b/sdk/lib/_internal/pub_generated/lib/src/validator/pubspec_field.dart
@@ -1,21 +1,42 @@
+// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
library pub.validator.pubspec_field;
+
import 'dart:async';
+
import '../entrypoint.dart';
import '../validator.dart';
+
+/// A validator that checks that the pubspec has valid "author" and "homepage"
+/// fields.
class PubspecFieldValidator extends Validator {
- PubspecFieldValidator(Entrypoint entrypoint) : super(entrypoint);
+ PubspecFieldValidator(Entrypoint entrypoint)
+ : super(entrypoint);
+
Future validate() {
_validateAuthors();
_validateFieldIsString('description');
_validateFieldIsString('homepage');
_validateFieldUrl('homepage');
_validateFieldUrl('documentation');
+
+ // Any complex parsing errors in version will be exposed through
+ // [Pubspec.allErrors].
_validateFieldIsString('version');
+
+ // Pubspec errors are detected lazily, so we make sure there aren't any
+ // here.
for (var error in entrypoint.root.pubspec.allErrors) {
errors.add('In your pubspec.yaml, ${error.message}');
}
+
return new Future.value();
}
+
+ /// Adds an error if the "author" or "authors" field doesn't exist or has the
+ /// wrong type.
void _validateAuthors() {
var pubspec = entrypoint.root.pubspec;
var author = pubspec.fields['author'];
@@ -24,12 +45,14 @@ class PubspecFieldValidator extends Validator {
errors.add('Your pubspec.yaml must have an "author" or "authors" field.');
return;
}
+
if (author != null && author is! String) {
errors.add(
'Your pubspec.yaml\'s "author" field must be a string, but it '
'was "$author".');
return;
}
+
if (authors != null &&
(authors is! List || authors.any((author) => author is! String))) {
errors.add(
@@ -37,7 +60,9 @@ class PubspecFieldValidator extends Validator {
'it was "$authors".');
return;
}
+
if (authors == null) authors = [author];
+
var hasName = new RegExp(r"^ *[^< ]");
var hasEmail = new RegExp(r"<[^>]+> *$");
for (var authorName in authors) {
@@ -52,6 +77,8 @@ class PubspecFieldValidator extends Validator {
}
}
}
+
+ /// Adds an error if [field] doesn't exist or isn't a string.
void _validateFieldIsString(String field) {
var value = entrypoint.root.pubspec.fields[field];
if (value == null) {
@@ -62,14 +89,18 @@ class PubspecFieldValidator extends Validator {
'it was "$value".');
}
}
+
+ /// Adds an error if the URL for [field] is invalid.
void _validateFieldUrl(String field) {
var url = entrypoint.root.pubspec.fields[field];
if (url == null) return;
+
if (url is! String) {
errors.add(
'Your pubspec.yaml\'s "$field" field must be a string, but ' 'it was "$url".');
return;
}
+
var goodScheme = new RegExp(r'^https?:');
if (!goodScheme.hasMatch(url)) {
errors.add(

Powered by Google App Engine
This is Rietveld 408576698