From 2fcda45161c6767164ba12858bb75380d84b6fbe Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Wed, 24 Aug 2016 13:54:04 -0700
Subject: [PATCH] chore(api): Dart API source folders renamed (#2181)

- angular2 dartdoc files will be in `doc/api`
- angular2 site examples will be in `example`
---
 gulpfile.js                            | 12 +++++++-----
 tools/api-builder/dart-package/test.js |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 33a555d09e..7950387283 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -72,9 +72,10 @@ var _apiShredOptions =  {
   logLevel: _dgeniLogLevel
 };
 
+const relDartDocApiDir = path.join('doc', 'api');
 var _apiShredOptionsForDart =  {
   lang: 'dart',
-  examplesDir: path.resolve(ngPathFor('dart'), 'examples'),
+  examplesDir: path.resolve(ngPathFor('dart'), 'example'),
   fragmentsDir: path.join(DOCS_PATH, '_fragments/_api'),
   zipDir: path.join(RESOURCES_PATH, 'zips/api'),
   logLevel: _dgeniLogLevel
@@ -346,6 +347,7 @@ function runE2eDartTests(appDir, outputFile) {
   }
   if (argv.pub === false) {
     var prepPromise = Promise.resolve(true);
+    gutil.log('Skipping pub upgrade and pub build (--no-pub flag present)');
   } else {
     var pubUpgradeSpawnInfo = spawnExt('pub', ['upgrade'], { cwd: appDir });
     var prepPromise = pubUpgradeSpawnInfo.promise.then(function (data) {
@@ -608,8 +610,8 @@ gulp.task('build-dart-cheatsheet', [], function() {
 
 gulp.task('dartdoc', ['pub upgrade'], function() {
   const ngRepoPath = ngPathFor('dart');
-  if (argv.fast && fs.existsSync(path.resolve(ngRepoPath, 'docs', 'api'))) {
-    gutil.log('Skipping dartdoc: --fast flag enabled and "docs/api" dir exists');
+  if (argv.fast && fs.existsSync(path.resolve(ngRepoPath, relDartDocApiDir))) {
+    gutil.log(`Skipping dartdoc: --fast flag enabled and api dir exists (${relDartDocApiDir})`);
     return true;
   }
   checkAngularProjectPath(ngRepoPath);
@@ -618,7 +620,7 @@ gulp.task('dartdoc', ['pub upgrade'], function() {
   renameIfExistsSync(topLevelLibFilePath, tmpPath);
   gutil.log(`Hiding top-level angular2 library: ${topLevelLibFilePath}`);
   // Remove dartdoc '--add-crossdart' flag while we are fixing links to API pages.
-  const dartdoc = spawnExt('dartdoc', ['--output', 'docs/api'], { cwd: ngRepoPath});
+  const dartdoc = spawnExt('dartdoc', ['--output', relDartDocApiDir], { cwd: ngRepoPath});
   return dartdoc.promise.finally(() => {
       gutil.log(`Restoring top-level angular2 library: ${topLevelLibFilePath}`);
       renameIfExistsSync(tmpPath, topLevelLibFilePath);
@@ -1246,7 +1248,7 @@ function buildApiDocsForDart() {
   log.level = _dgeniLogLevel;
   const dabInfo = dab.dartPkgConfigInfo;
   dabInfo.ngIoDartApiDocPath = path.join(DOCS_PATH, 'dart', vers, 'api');
-  dabInfo.ngDartDocPath = path.join(ngPathFor('dart'), 'docs', 'api');
+  dabInfo.ngDartDocPath = path.join(ngPathFor('dart'), relDartDocApiDir);
   // Exclude API entries for developer/internal libraries. Also exclude entries for
   // the top-level catch all "angular2" library (otherwise every entry appears twice).
   dabInfo.excludeLibRegExp = new RegExp(/^(?!angular2)|\.testing|_|codegen|^angular2$/);
diff --git a/tools/api-builder/dart-package/test.js b/tools/api-builder/dart-package/test.js
index bba07a62b9..c6c665cc77 100644
--- a/tools/api-builder/dart-package/test.js
+++ b/tools/api-builder/dart-package/test.js
@@ -14,7 +14,7 @@ const apiDocPath = path.join(DOCS_PATH, 'dart/latest/api');
 
 dartPkg.config(function (dartPkgConfigInfo) {
     dartPkgConfigInfo.ngIoDartApiDocPath = apiDocPath;
-    dartPkgConfigInfo.ngDartDocPath = path.join(ANGULAR_IO_PROJECT_PATH, '../angular-dart/docs/api');
+    dartPkgConfigInfo.ngDartDocPath = path.join(ANGULAR_IO_PROJECT_PATH, '../angular-dart/doc/api');
 });
 
 const dgeni = new Dgeni([dartPkg]);