fix(@angular/cli): fix new to work with custom collections

packages/@angular/cli/commands/new.ts

@@ -144,7 +144,11 @@ const NewCommand = Command.extend({
       `);
     }
 
-    commandOptions.collectionName = this.getCollectionName(rawArgs);
+    if (commandOptions.collection) {
+      commandOptions.collectionName = commandOptions.collection;
+    } else {
+      commandOptions.collectionName = this.getCollectionName(rawArgs);
+    }
 
     const initCommand = new InitCommand({
       ui: this.ui,

tests/acceptance/new.spec.ts

@@ -15,13 +15,17 @@ describe('Acceptance: ng new', function () {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
     spyOn(console, 'error');
+    // symlink custom collections to node_modules, so we can use with ng new
+    // it is a bit dirty, but bootstrap-local tricks won't work here
+    fs.symlinkSync(`${process.cwd()}/tests/collections/@custom`, `./node_modules/@custom`, 'dir');
 
     tmp.setup('./tmp')
       .then(() => process.chdir('./tmp'))
       .then(() => done());
   }, 10000);
 
   afterEach((done) => {
+    fs.unlinkSync(path.join(__dirname, '/../../node_modules/@custom'));
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     tmp.teardown('./tmp').then(() => done());
   });
@@ -172,6 +176,12 @@ describe('Acceptance: ng new', function () {
       expect(pkgJson.devDependencies['@angular/cli']).toMatch(/\d+\.\d+\.\d+/);
     })
     .then(done, done.fail);
-  })
+  });
 
+  it('should support passing a custom collection', (done) => {
+    return ng(['new', 'foo', '--collection=@custom/application', '--skip-install', '--skip-git']).then(() => {
+      expect(() => fs.readFileSync('emptyapp', 'utf8')).not.toThrow();
+    })
+    .then(done, done.fail);
+  });
 });

tests/collections/@custom/application/collection.json

@@ -0,0 +1,11 @@
+{
+  "name": "@custom/application",
+  "version": "0.1",
+  "schematics": {
+    "application": {
+      "factory": "./index.js",
+      "schema": "./schema.json",
+      "description": "Create an empty application"
+    }
+  }
+}

tests/collections/@custom/application/index.js

@@ -0,0 +1,6 @@
+const s = require('@angular-devkit/schematics');
+
+exports.default = function(options) {
+  return s.chain([s.mergeWith(s.apply(
+    s.url('./files'), [s.template({}), s.move(options.name)]))]);
+};

tests/collections/@custom/application/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "empty-app",
+  "schematics": "./collection.json"
+}

tests/collections/@custom/application/schema.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "EmptyApp",
+  "title": "Angular Bazel Workspace Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string"
+    }
+  },
+  "required": [
+  ]
+}