Merge pull request #1854 from angular-fullstack/canary

Canary

Author: Awk34

Diff for: .gitignore

@@ -1,9 +1,8 @@
 node_modules
 bower_components
-test/temp
+/generators/*
+/test/*
 demo
 .idea
 .DS_Store
-release.txt
-test/fixtures/bower.json
-test/fixtures/package.json
+release.txt

Diff for: .npmignore

@@ -1,3 +1,11 @@
 angular-fullstack-deps
 test
 .idea
+src
+scripts
+ISSUE_TEMPLATE.md
+PULL_REQUEST_TEMPLATE.md
+.travis.yml
+gulpfile.babel.js
+Gruntfile.js
+.jshintrc

Diff for: Gruntfile.js

@@ -87,7 +87,7 @@ module.exports = function (grunt) {
         curly: false,
         node: true
       },
-      all: ['Gruntfile.js', '*/index.js']
+      all: ['Gruntfile.js', 'src/**/*.js']
     },
     env: {
       fast: {
@@ -276,8 +276,8 @@ module.exports = function (grunt) {
       fs.writeFileSync(path.resolve(d), JSON.stringify(json, null, 2));
     };
 
-    processJson('app/templates/_package.json', dest + 'package.json');
-    processJson('app/templates/_bower.json', dest + 'bower.json');
+    processJson('templates/app/_package.json', dest + 'package.json');
+    processJson('templates/app/_bower.json', dest + 'bower.json');
   });
 
   grunt.registerTask('installFixtures', 'install package and bower fixtures', function() {

Diff for: angular-fullstack-deps

@@ -0,0 +1,170 @@
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const exec = require('child_process').exec;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const gulp = require('gulp');
+const gutil = require('gulp-util');
+const babel = require('gulp-babel');
+const gulpMocha = require('gulp-mocha');
+const plumber = require('gulp-plumber');
+const gulpIf = require('gulp-if');
+const del = require('del');
+const lazypipe = require('lazypipe');
+const runSequence = require('run-sequence');
+const merge = require('merge-stream');
+const shell = require('shelljs');
+
+var watching = false;
+
+const mocha = lazypipe()
+    .pipe(gulpMocha, {
+        reporter: 'spec',
+        timeout: 120000,
+        slow: 500,
+        globals: {
+            should: require('should')
+        },
+        require: [
+            './mocha.conf'
+        ]
+    });
+
+const transpile = lazypipe()
+    .pipe(babel);
+
+gulp.task('clean', () => {
+    return del(['generators/**/*', './test/(**|!fixtures/node_modules|!fixtures/bower_components)/*']);
+});
+
+gulp.task('babel', () => {
+    let generators = gulp.src(['src/generators/**/*.js'])
+    .pipe(gulpIf(watching, plumber()))
+        .pipe(transpile())
+        .pipe(gulp.dest('generators'));
+
+    let test = gulp.src(['src/test/**/*.js'])
+    .pipe(gulpIf(watching, plumber()))
+        .pipe(transpile())
+        .pipe(gulp.dest('test'));
+
+    return merge(generators, test);
+});
+
+gulp.task('watch', () => {
+    watching = true;
+    return gulp.watch('src/**/*.js', ['babel']);
+});
+
+gulp.task('copy', () => {
+    let nonJsGen = gulp.src(['src/generators/**/*', '!src/generators/**/*.js'], {dot: true})
+        .pipe(gulp.dest('generators'));
+
+    let nonJsTest = gulp.src(['src/test/**/*', '!src/test/**/*.js'], {dot: true})
+        .pipe(gulp.dest('test'));
+
+    return merge(nonJsGen, nonJsTest);
+});
+
+gulp.task('build', cb => {
+    return runSequence(
+        'clean',
+        'babel',
+        'copy',
+        cb
+    );
+});
+
+var processJson = function(src, dest, opt) {
+    return new Promise((resolve, reject) => {
+        // read file, strip all ejs conditionals, and parse as json
+        fs.readFile(path.resolve(src), 'utf8', (err, data) => {
+            if(err) return reject(err);
+
+            var json = JSON.parse(data.replace(/<%(.*)%>/g, ''));
+
+            // set properties
+            json.name = opt.appName;
+            json.description = opt.private
+                ? null
+                : 'The purpose of this repository is to track all the possible dependencies of an application created by generator-angular-fullstack.';
+            json.version = opt.genVer;
+            json.private = opt.private;
+
+            // stringify json and write it to the destination
+            fs.writeFile(path.resolve(dest), JSON.stringify(json, null, 2), err => {
+                if(err) reject(err);
+                else resolve();
+            });
+        });
+    });
+};
+
+function updateFixtures(target) {
+    const deps = target === 'deps';
+    const genVer = require('./package.json').version;
+    const dest = __dirname + (deps ? '/angular-fullstack-deps/' : '/test/fixtures/');
+    const appName = deps ? 'angular-fullstack-deps' : 'tempApp';
+
+    return Promise.all([
+        processJson('templates/app/_package.json', dest + 'package.json', {appName, genVer, private: !deps}),
+        processJson('templates/app/_bower.json', dest + 'bower.json', {appName, genVer, private: !deps})
+    ]);
+}
+
+gulp.task('updateFixtures', cb => {
+    return runSequence(['updateFixtures:test', 'updateFixtures:deps'], cb);
+});
+gulp.task('updateFixtures:test', () => {
+    return updateFixtures('test');
+});
+gulp.task('updateFixtures:deps', () => {
+    return updateFixtures('deps');
+});
+
+function execAsync(cmd, opt) {
+    return new Promise((resolve, reject) => {
+        exec(cmd, opt, (err, stdout, stderr) => {
+            if(err) {
+                console.log(`stderr: ${stderr}`);
+                return reject(err);
+            }
+
+            return resolve(stdout);
+        })
+    });
+}
+
+gulp.task('installFixtures', function() {
+    gutil.log('installing npm & bower dependencies for generated app');
+    let progress = setInterval(() => {
+        process.stdout.write('.');
+    }, 1 * 1000);
+    shell.cd('test/fixtures');
+
+    return Promise.all([
+        execAsync('npm install --quiet', {cwd: '../fixtures'}),
+        execAsync('bower install', {cwd: '../fixtures'})
+    ]).then(() => {
+        process.stdout.write('\n');
+        if(!process.env.SAUCE_USERNAME) {
+            gutil.log('running npm run-script update-webdriver');
+            return execAsync('npm run-script update-webdriver').then(() => {
+                clearInterval(progress);
+                process.stdout.write('\n');
+                shell.cd('../../');
+            });
+        } else {
+            clearInterval(progress);
+            process.stdout.write('\n');
+            shell.cd('../../');
+            return Promise.resolve();
+        }
+    });
+});
+
+gulp.task('test', () => {
+    return gulp.src(['test/pre.test.js', 'test/*.test.js'])
+        .pipe(mocha());
+});

Diff for: app/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+global.DEBUG = !!process.env.DEBUG;
+
+var fs = require('fs');
+var Promise = require('bluebird');
+Promise.promisifyAll(fs);

Diff for: endpoint/index.js

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-fullstack",
-  "version": "3.6.1",
+  "version": "3.7.0-beta.1",
   "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node",
   "keywords": [
     "yeoman-generator",
@@ -31,24 +31,32 @@
     "url": "git://github.com/angular-fullstack/generator-angular-fullstack.git"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "gulp updateFixtures:test && gulp installFixtures && gulp build && gulp test",
+    "prepublish": "gulp build"
   },
   "dependencies": {
-    "babel-core": "^6.7.0",
-    "babel-plugin-transform-class-properties": "^6.6.0",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-register": "^6.6.5",
+    "babel-plugin-syntax-class-properties": "^6.5.0",
+    "babel-plugin-syntax-flow": "^6.5.0",
+    "babel-plugin-transform-flow-strip-types": "^6.7.0",
     "chalk": "^1.1.0",
-    "generator-ng-component": "~0.2.1",
+    "generator-ng-component": "~0.3.0",
     "glob": "^7.0.3",
+    "gulp-babel": "^6.1.2",
+    "gulp-beautify": "^2.0.0",
+    "gulp-filter": "^4.0.0",
     "insight": "~0.8.1",
     "lodash": "^4.6.1",
     "underscore.string": "^3.1.1",
-    "yeoman-generator": "^0.22.5",
+    "yeoman-generator": "~0.23.3",
     "yeoman-welcome": "^1.0.1"
   },
   "devDependencies": {
+    "babel-plugin-transform-class-properties": "^6.6.0",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-register": "^6.6.5",
+    "bluebird": "^3.3.5",
     "chai": "^3.2.0",
+    "del": "^2.2.0",
     "grunt": "^1.0.1",
     "grunt-build-control": "^0.7.0",
     "grunt-contrib-clean": "^1.0.0",
@@ -58,13 +66,24 @@
     "grunt-env": "^0.4.1",
     "grunt-mocha-test": "^0.12.7",
     "grunt-release": "^0.13.0",
+    "gulp": "^3.9.1",
+    "gulp-if": "^2.0.0",
+    "gulp-mocha": "^2.2.0",
+    "gulp-plumber": "^1.1.0",
+    "gulp-util": "^3.0.7",
     "jit-grunt": "~0.10.0",
+    "jscs": "^3.0.3",
+    "lazypipe": "^1.0.1",
+    "merge-stream": "^1.0.0",
+    "minimatch": "^3.0.0",
     "mocha": "^2.2.5",
     "q": "^1.0.1",
     "recursive-readdir": "^2.0.0",
+    "run-sequence": "^1.1.5",
     "shelljs": "^0.7.0",
+    "should": "^8.3.1",
     "yeoman-assert": "^2.0.0",
-    "yeoman-test": "^1.1.0"
+    "yeoman-test": "~1.4.0"
   },
   "engines": {
     "node": "^5.10.1",