update schematics version and fix TODOs

Author: mmalerba

package-lock.json

@@ -40,8 +40,8 @@
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular-devkit/core": "^0.5.4",
-    "@angular-devkit/schematics": "file:../devkit/dist/@angular-devkit/schematics/angular-devkit-schematics-0.5.4.tgz",
+    "@angular-devkit/core": "^0.5.5",
+    "@angular-devkit/schematics": "^0.5.5",
     "@angular/bazel": "6.0.0-rc.1",
     "@angular/compiler-cli": "6.0.0-rc.1",
     "@angular/http": "6.0.0-rc.1",
@@ -51,7 +51,7 @@
     "@angular/upgrade": "6.0.0-rc.1",
     "@bazel/ibazel": "0.3.1",
     "@google-cloud/storage": "^1.1.1",
-    "@schematics/angular": "^0.5.4",
+    "@schematics/angular": "^0.5.5",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
     "@types/glob": "^5.0.33",

package.json

@@ -9,16 +9,23 @@
       "schema": "./shell/schema.json",
       "aliases": ["material-shell"]
     },
+
+    // Group of schematics used to update Angular CDK and Angular Material.
     "ng-update": {
       "description": "Updates API usage for the most recent major version of Angular CDK and Angular Material",
       "factory": "./update/update"
     },
     "ng-post-update": {
-      "description": "Updates API usage for the most recent major version of Angular CDK and Angular Material",
+      "description": "Performs cleanup after ng-update.",
       "factory": "./update/update#postUpdate",
-      // TODO(mmalerba): put back.
-      // "private": true
+      "private": true
+    },
+    "ng-post-post-update": {
+      "description": "Logs completion message for ng-update after ng-post-update.",
+      "factory": "./update/update#postPostUpdate",
+      "private": true
     },
+
     // Create a dashboard component
     "materialDashboard": {
       "description": "Create a card-based dashboard component",

src/lib/schematics/collection.json

@@ -1,4 +1,4 @@
-import {FileEntry, Rule, SchematicContext, Tree} from '@angular-devkit/schematics';
+import {chain, FileEntry, Rule, SchematicContext, Tree} from '@angular-devkit/schematics';
 import {
   NodePackageInstallTask,
   RunSchematicTask,
@@ -64,13 +64,13 @@ export default function(): Rule {
 
     // Upgrade @angular/material back to 6.x.
     const upgradeTask = context.addTask(new NodePackageInstallTask({
-      // TODO(mmalerba): Change "next" to ">=6 <7". Change material back to npm package.
-      packageName: '@angular/cdk@next /usr/local/google/home/mmalerba/material2/dist/releases/material/angular-material-6.0.0-rc.1.tgz'
+      // TODO(mmalerba): Change "next" to ">=6 <7".
+      packageName: '@angular/cdk@next @angular/material@next'
     }), [updateTask]);
 
     // Delete the temporary schematics directory.
     context.addTask(
-        new RunSchematicTask(path.join(__dirname, '../collection.json'), 'ng-post-update', {
+        new RunSchematicTask('ng-post-update', {
           deleteFiles: updateSrcs
               .map(entry => entry.path.replace(schematicsSrcPath, schematicsTmpPath))
         }), [upgradeTask]);
@@ -79,12 +79,18 @@ export default function(): Rule {
 
 /** Post-update schematic to be called when ng update is finished. */
 export function postUpdate(options: {deleteFiles: string[]}): Rule {
-  return (tree: Tree) => {
+  return (tree: Tree, context: SchematicContext) => {
     for (let file of options.deleteFiles) {
       tree.delete(file);
     }
 
-    console.log('\nComplete! Please check the output above for any issues that were detected but' +
-                ' could not be automatically fixed.');
-  }
+    context.addTask(new RunSchematicTask('ng-post-post-update', {}));
+  };
+}
+
+/** Post-post-update schematic to be called when post-update is finished. */
+export function postPostUpdate(): Rule {
+  return () => console.log(
+      '\nComplete! Please check the output above for any issues that were detected but could not' +
+      ' be automatically fixed.');
 }