Create packages directories in test/ and bin/ as well as at the top level.

utils/pub/entrypoint.dart

 // 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('entrypoint');
 
 #import('io.dart');
 #import('lock_file.dart');
 #import('package.dart');
 #import('root_source.dart');
@@ skipping 130 matching lines @@
   /**
    * Installs all dependencies listed in [packageVersions] and writes a
    * [LockFile].
    */
   Future _installDependencies(List<PackageId> packageVersions) {
     return _removeUnusedDependencies(packageVersions).chain((_) {
       return Futures.wait(packageVersions.map((id) {
         if (id.source is RootSource) return new Future.immediate(id);
         return install(id);
       }));
-    }).chain(_saveLockFile).chain(_installSelfReference);
+    }).chain(_saveLockFile)
+      .chain(_installSelfReference)
+      .chain(_linkSecondaryPackageDirs);
   }
 
   /**
    * Loads the list of concrete package versions from the `pubspec.lock`, if it
    * exists. If it doesn't, this completes to an empty [LockFile].
    *
    * If there's an error reading the `pubspec.lock` file, this will print a
    * warning message and act as though the file doesn't exist.
    */
   Future<LockFile> _loadLockFile() {
@@ skipping 58 matching lines @@
    */
   Future _installSelfReference(_) {
     var linkPath = join(path, root.name);
     return exists(linkPath).chain((exists) {
       if (exists) return new Future.immediate(null);
       return ensureDir(path).chain((_) => createSymlink(root.dir, linkPath));
     });
   }
 
   /**
+   * If `bin/` or `test/` directories exist, symlink `packages/` into them so
+   * that their entrypoints can be run. Do the same for any subdirectories of
+   * `test/`.
+   */
+  Future _linkSecondaryPackageDirs(_) {
+    var binDir = join(root.dir, 'bin');
+    var testDir = join(root.dir, 'test');
+    return dirExists(binDir).chain((exists) {
+      if (!exists) return new Future.immediate(null);
+      return _linkSecondaryPackageDir(binDir);
+    }).chain((_) => dirExists(testDir)).chain((exists) {
+      if (!exists) return new Future.immediate(null);
+      return _linkSecondaryPackageDir(testDir)
+        .chain((_) => _listDirWithoutPackages(testDir))
+        .chain((testFiles) {
+        return Futures.wait(testFiles.map((testFile) {
+          return dirExists(testFile).chain((isDir) {
+            if (!isDir) return new Future.immediate(null);
+            return _linkSecondaryPackageDir(testFile);
+          });
+        }));
+      });
+    });
+  }
+
+  // TODO(nweiz): roll this into [listDir] in io.dart once issue 4775 is fixed.
+  /**
+   * Recursively lists the contents of [dir], excluding hidden `.DS_Store` files
+   * and `package` files.
+   */
+  Future<List<String>> _listDirWithoutPackages(dir) {

[Bob Nystrom, 2012/08/29 16:56:48]

Instead of recurisively building up a list of directories that need "packages"
symlinks and then adding them, how about just making _linkSecondaryPackageDir()
also recurse into subdirectories?

[nweiz, 2012/08/29 19:57:58]

I didn't do that because it doesn't seem like that's strictly correct for
"bin/", although maybe that doesn't really matter. I also feel like this is
somewhat better factored for when issue 4775 is fixed.

+    return listDir(dir).chain((files) {
+      return Futures.wait(files.map((file) {
+        if (basename(file) == 'packages') return new Future.immediate([]);
+        return dirExists(file).chain((isDir) {
+          if (!isDir) return new Future.immediate([]);
+          return _listDirWithoutPackages(file);
+        }).transform((subfiles) {
+          var fileAndSubfiles = [file];
+          fileAndSubfiles.addAll(subfiles);
+          return fileAndSubfiles;
+        });
+      }));
+    }).transform(flatten);
+  }
+
+  /**
+   * Creates a symlink to the `packages` directory in [dir] if none exists.
+   */
+  Future _linkSecondaryPackageDir(String dir) {
+    var to = join(dir, 'packages');
+    return exists(to).chain((exists) {
+      if (exists) return new Future.immediate(null);
+      return createSymlink(path, to);
+    });
+  }
+
+  /**
    * Validate that the pubspec for the entrypoint exists and specifies the name
    * of the root package.
    */
   Future _validatePubspec() {
     var future = new Future.immediate(null);;
     if (root.pubspec.isEmpty) {
       future = exists(join(path, "pubspec.yaml")).transform((exists) {
         if (exists) return;
         throw 'Could not find a file named "pubspec.yaml" in the directory'
           '$path.';
       });
     }
 
     return future.transform((_) {
       if (root.pubspec.name != null) return;
       throw '"pubspec.yaml" must contain a "name" key.';
     });
   }
 }