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

Side by Side Diff: utils/pub/validator/lib.dart

Issue 11558022: Fix #7330. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | utils/tests/pub/pub.status » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library lib_validator; 5 library lib_validator;
6 6
7 import 'dart:io'; 7 import 'dart:io';
8 8
9 import '../entrypoint.dart'; 9 import '../entrypoint.dart';
10 import '../io.dart'; 10 import '../io.dart';
11 import '../system_cache.dart'; 11 import '../system_cache.dart';
12 import '../utils.dart'; 12 import '../utils.dart';
13 import '../validator.dart'; 13 import '../validator.dart';
14 14
15 // TODO(nweiz): When issue 7196 is fixed, complain about non-Dart files in lib. 15 // TODO(nweiz): When issue 7196 is fixed, complain about non-Dart files in lib.
16 /// A validator that checks that libraries in "lib/" (and not "lib/src/") exist 16 /// A validator that checks that libraries in "lib/" (and not "lib/src/") exist
17 /// and are well-formed. 17 /// and are well-formed.
18 class LibValidator extends Validator { 18 class LibValidator extends Validator {
19 LibValidator(Entrypoint entrypoint) 19 LibValidator(Entrypoint entrypoint)
20 : super(entrypoint); 20 : super(entrypoint);
21 21
22 Future validate() { 22 Future validate() {
23 var libDir = join(entrypoint.root.dir, "lib"); 23 var libDir = join(entrypoint.root.dir, "lib");
24
24 return dirExists(libDir).chain((libDirExists) { 25 return dirExists(libDir).chain((libDirExists) {
25 if (!libDirExists) { 26 if (!libDirExists) {
26 errors.add('Your package must have a "lib/" directory so users have ' 27 errors.add('Your package must have a "lib/" directory so users have '
27 'something to import.'); 28 'something to import.');
28 return new Future.immediate(null); 29 return new Future.immediate(null);
29 } 30 }
30 31
32 // TODO(rnystrom): listDir() returns real file paths after symlinks are
33 // resolved. This means if libDir contains a symlink, the resulting paths
34 // won't appear to be within it, which confuses relativeTo(). Work around
35 // that here by making sure we have the real path to libDir. Remove this
36 // when #7346 is fixed.
37 libDir = new File(libDir).fullPathSync();
38
nweiz 2012/12/12 19:43:49 We should probably do this in LishCommand._filesTo
Bob Nystrom 2012/12/12 19:49:14 Done. I added it to the other patch since that pat
31 return listDir(libDir).transform((files) { 39 return listDir(libDir).transform((files) {
32 files = files.map((file) => relativeTo(file, libDir)); 40 files = files.map((file) => relativeTo(file, libDir));
33 if (files.isEmpty) { 41 if (files.isEmpty) {
34 errors.add('The "lib/" directory may not be empty so users have ' 42 errors.add('The "lib/" directory may not be empty so users have '
35 'something to import'); 43 'something to import');
36 } else if (files.length == 1 && files.first == "src") { 44 } else if (files.length == 1 && files.first == "src") {
37 errors.add('The "lib/" directory must contain something other than ' 45 errors.add('The "lib/" directory must contain something other than '
38 '"src/" so users have something to import'); 46 '"src/" so users have something to import');
39 } 47 }
40 }); 48 });
41 }); 49 });
42 } 50 }
43 } 51 }
OLDNEW
« no previous file with comments | « no previous file | utils/tests/pub/pub.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698