uses promises for options.cname also sets up CI

Author: JohannesHoppe

.angulardoc.json

@@ -0,0 +1,4 @@
+{
+  "repoId": "edad02a0-d76e-46a2-a4cc-8f9dc389b3b9",
+  "lastSync": 0
+}

.circleci/config.yml

@@ -0,0 +1,38 @@
+version: 2
+
+jobs:
+
+  deploy:
+
+    environment:
+      GITHUB_ORG: https://[email protected]/angular-schule
+      GITHUB_NAME: The Buildbot
+      GITHUB_EMAIL: [email protected]
+      NAME: angular-cli-ghpages
+
+    docker:
+      - image: circleci/node:10-browsers
+    steps:
+      - checkout
+
+
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run: npm i --silent
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+
+
+      - run: cd angular-testdrive
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run: npm i --silent
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run: npm run build
+      - run: ../bin/angular-cli-ghpages --repo "$GITHUB_ORG/$NAME.git" --name "$GITHUB_NAME" --email "$GITHUB_EMAIL" --dir=dist/angular-testdrive --cname=angular-cli-ghpages.angular.schule
+

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "cwd": "${workspaceRoot}/angular-testdrive",
+            "program": "${workspaceFolder}/bin/angular-cli-ghpages",
+            "args": [
+                "--dir=dist/angular-testdrive",
+                "--cname=angular-cli-ghpages.angular.schule"
+            ]
+        }
+    ]
+}

README.md

@@ -56,7 +56,7 @@ ng build --prod --base-href "/REPOSITORY_NAME/"
 npx ngh [OPTIONS]
 ```
 
-or (`<base href="">` stays untouched)
+or (`<base href="/">` stays untouched)
 
 ```bash
 ng build --prod
@@ -73,7 +73,7 @@ Please take a look at the `dist` folder to see whether there is a subfolder with
 If yes, you need to specify the deploy directory manually then when using this tool:
 
 ```bash
-npx ngh --dir dist/[PROJECTNAME]
+npx ngh --dir=dist/[PROJECTNAME]
 ```
 
 I most cases, the `[PROJECTNAME]` can be found in the `angular.json` file at `defaultProject`.
@@ -200,7 +200,7 @@ With `--no-dotfiles` files starting with `.` are ignored.
 
 Run through without making any changes. This can be very usefull, because it outputs what would happend without doing anything.
 
-#### <a id="cname">--cname</a> (will be released soon with v0.5.3)
+#### <a id="cname">--cname</a>
  * __optional__
  * Default: `No CNAME file is generated`
  * Example:

angular-testdrive/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

index.js

@@ -9,7 +9,7 @@ exports.run = function (options) {
   options = options || {};
 
   if (options.dryRun) {
-    console.log('*** Dry-run: No changes are applied at all. ***')
+    console.log('*** Dry-run: No changes are applied at all.')
   }
 
   if (options.name && options.email) {
@@ -44,7 +44,7 @@ exports.run = function (options) {
   // always clean the cache directory.
   // avoids "Error: Remote url mismatch."
   if (options.dryRun) {
-    console.info('Dry-run / SKIPPED: cleaning of the cache directory');
+    console.info('*** Dry-run / SKIPPED: cleaning of the cache directory');
   } else {
     ghpages.clean();
   }
@@ -61,13 +61,13 @@ exports.run = function (options) {
       return access(dir, fs.F_OK)
     })
     .catch(function handleMissingDistFolder(error) {
-      console.error('Dist folder does not exist. Check the dir --dir parameter or build the project first!\n');
+      console.error('*** Dist folder does not exist. Check the dir --dir parameter or build the project first!\n');
       return Promise.reject(error);
     })
     .then(function createNotFoundPage() {
 
       if (options.dryRun) {
-        console.info('Dry-run / SKIPPED: copying of index.html to 404.html');
+        console.info('*** Dry-run / SKIPPED: copying of index.html to 404.html');
         return;
       }
 
@@ -78,14 +78,37 @@ exports.run = function (options) {
       const notFoundPage = path.join(dir, '404.html');
 
       return fse.copy(indexHtml, notFoundPage).
-        catch(function () {
+        catch(function (err) { 
           console.info('index.html could not be copied to 404.html. Continuing without an error.');
+          console.info('(Hint: are you sure that you have setup the --dir parameter correctly?)');
+          console.dir(err);
           return;
         })
     })
+    .then(function createCnameFile() {
+
+      if (!options.cname) {
+        return;
+      }
+
+      const cnameFile = path.join(dir, 'CNAME');
+      if (options.dryRun) {
+        console.info('*** Dry-run / SKIPPED: creating of CNAME file with content: ' + options.cname);
+        return;
+      }
+
+      return fse.writeFile(cnameFile, options.cname)
+        .then(function () {
+          console.log('*** CNAME file created');
+        })
+        .catch(function (err) { 
+          console.info('*** CNAME file could not be created. Stopping execution.');
+          throw err;
+        })
+    })
     .then(function publishViaGhPages() {
       if (options.dryRun) {
-        console.info('Dry-run / SKIPPED: publishing to "' + dir + '" with the following options:', {
+        console.info('*** Dry-run / SKIPPED: publishing to "' + dir + '" with the following options:', {
           dir: dir,
           repo: options.repo || 'undefined: current working directory (which must be a git repo in this case) will be used to commit & push',
           message: options.message,
@@ -99,24 +122,14 @@ exports.run = function (options) {
         return;
       }
 
-      if (options.cname) {
-        console.log('CNAME option is present with value: ' + options.cname);
-        fs.writeFile(path.join(dir, 'CNAME'), options.cname, function (err) {
-          if (err) {
-            console.log(err);
-          } else {
-            console.log('CNAME file created');
-          }
-        })
-      }
-
       return publish(dir, options)
     })
     .then(function showSuccess() {
-      console.log('Successfully published!\n');
+      console.log('*** Successfully published!\n');
     })
     .catch(function showError(error) {
-      console.error('An error occurred!\n', error);
+      console.error('*** An error occurred!\n');
+      console.dir(error);
       return Promise.reject(error);
     });
 };