chore(test): e2e css preprocessor tests

Author: jkuri

.eslintignore

@@ -0,0 +1 @@
+addon/ng2/blueprints/ng2/files/src/config/system.config.js

addon/ng2/commands/install.js addon/ng2/commands/install.tsaddon/ng2/commands/install.js renamed to addon/ng2/commands/install.ts

@@ -1,20 +1,12 @@
-/* jshint node: true, esnext: true */
-'use strict';
-
-const Command      = require('ember-cli/lib/models/command');
-const SilentError  = require('silent-error');
-const Promise      = require('ember-cli/lib/ext/promise');
-const InstallTask  = require('../tasks/install');
+import * as Command from 'ember-cli/lib/models/command';
+import * as SlientError from 'silent-error';
+import * as InstallTask from '../tasks/install.ts';
 
 module.exports = Command.extend({
   name: 'install',
   description: 'Adds 3rd party library to existing project',
   works: 'insideProject',
 
-  availableOptions: [
-    { name: 'typings', type: String, aliases: ['t'], description: 'Installs specified typings' }
-  ],
-
   run: function (commandOptions, rawArgs) {
     if (!rawArgs.length) {
       const msg = 'The `ng install` command must take an argument with ' +
@@ -30,8 +22,7 @@ module.exports = Command.extend({
     });
 
     return installTask.run({
-      packages: rawArgs,
-      typings: commandOptions.typings || null
+      packages: rawArgs
     });
   }
 });

addon/ng2/commands/uninstall.js addon/ng2/commands/uninstall.tsaddon/ng2/commands/uninstall.js renamed to addon/ng2/commands/uninstall.ts

@@ -1,20 +1,12 @@
-/* jshint node: true, esnext: true */
-'use strict';
-
-const Command       = require('ember-cli/lib/models/command');
-const SilentError   = require('silent-error');
-const Promise       = require('ember-cli/lib/ext/promise');
-const UninstallTask = require('../tasks/uninstall');
+import * as Command from 'ember-cli/lib/models/command';
+import * as SilentError from 'silent-error';
+import * as UninstallTask from '../tasks/uninstall';
 
 module.exports = Command.extend({
   name: 'uninstall',
   description: 'Removes 3rd party library from existing project',
   works: 'insideProject',
 
-  availableOptions: [
-    { name: 'typings', type: String, aliases: ['t'], description: 'Removes specified typings' }
-  ],
-
   run: function (commandOptions, rawArgs) {
     if (!rawArgs.length) {
       const msg = 'The `ng uninstall` command must take an argument with ' +
@@ -30,8 +22,7 @@ module.exports = Command.extend({
     });
 
     return uninstallTask.run({
-      packages: rawArgs,
-      typings: commandOptions.typings || null
+      packages: rawArgs
     });
   }
 });

addon/ng2/tasks/install.js

@@ -0,0 +1,128 @@
+import * as Task from 'ember-cli/lib/models/task';
+import * as npmTask from 'ember-cli/lib/tasks/npm-task';
+import * as chalk from 'chalk';
+import * as path from 'path';
+import { EventEmitter } from 'events';
+import * as search from 'typings-core/dist/search';
+import * as typings from 'typings-core/dist/install';
+import * as systemJS from '../utilities/systemjs-helper.ts';
+
+module.exports = Task.extend({
+  completionOKMessage: 'Successfully installed.',
+  completionErrorMessage: 'Error installing package.',
+
+  run: function(options) {
+    this.packages = options.packages;
+
+    if (this.packages.indexOf('sass') !== -1) {
+      this.packages[this.packages.indexOf('sass')] = 'node-sass';
+    }
+
+    if (this.packages.indexOf('compass') !== -1) {
+      this.packages[this.packages.indexOf('compass')] = 'compass-importer';
+      if (this.packages.indexOf('sass') === -1 || this.packages.indexOf('node-sass')) {
+        this.packages.push('node-sass');
+      }
+    }
+
+    return this.installProcedure();
+  },
+
+  installProcedure: function() {
+    const that = this;
+
+    const NpmTask = new npmTask({
+      command: 'install',
+      ui: this.ui,
+      analytics: this.analytics,
+      project: this.project,
+      startProgressMessage: 'Installing packages: ' + this.packages,
+      completionMessage: 'Packages successfully installed.'
+    });
+
+    return NpmTask.run({
+      packages: this.packages,
+      verbose: false
+    })
+    .then(() => this.storeInSystemJSConfig(this.packages))
+    .then(() => this.installTypings());
+  },
+
+  installTypings: function() {
+    const that = this;
+
+    that.ui.startProgress(chalk.green('Searching and installing typings'), chalk.green('.'));
+    let typingsList = [];
+
+    return new Promise(resolve => {
+      let promises = [];
+
+      that.packages.forEach(p => {
+        let promise = new Promise(res => {
+          search.search({ query: p }).then(resp => {
+            if (resp.results.length) {
+              let names = resp.results.map(x => {
+                if (x.source === 'dt') {
+                  return x.name;
+                }
+              }).filter(x => !!x);
+
+              typingsList = typingsList.concat(names);
+            }
+
+            res();
+          });
+        });
+
+        promises.push(promise);
+      });
+
+      Promise.all(promises).then(() => {
+        if (typingsList.length) {
+          let promises = [];
+
+          typingsList.forEach(t => {
+            let installOpts = {
+              cwd: process.env.PWD,
+              save: true,
+              ambient: true
+            };
+
+            let promise = new Promise(res => {
+              typings.installDependencyRaw(t, installOpts).then(() => { res(); });
+            });
+
+            promises.push(promise);
+          });
+          
+          Promise.all(promises).then(() => {
+            that.ui.stopProgress();
+            resolve();
+          });
+        } else {
+          that.ui.stopProgress();
+          resolve();
+        }
+      });
+    });
+  },
+
+  storeInSystemJSConfig: function(packages) {
+    const systemPath = path.resolve(process.cwd(), 'src', 'config', 'system.config.js');
+    let json = systemJS.loadSystemJson(systemPath);
+
+    packages = packages.filter(p => {
+      return (!/node-sass|stylus|less|compass-importer/.test(p));
+    });
+
+    let mappings = json.map || {};
+    packages.forEach(pkg => {
+      mappings[pkg] = 'libs/' + pkg + '/' + pkg + '.js';
+    });
+    json.map = mappings;
+    systemJS.saveSystemJson(systemPath, json);
+    
+    return Promise.resolve();
+  }
+
+});