Move generators

app/index.js → generators/app/index.js

@@ -5,7 +5,7 @@ var yosay = require('yosay');
 var chalk = require('chalk');
 var Insight = require('insight');
 
-var pkg = require('../package.json');
+var pkg = require('../../package.json');
 
 var GulpAngularGenerator = yeoman.generators.Base.extend({
 

index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  app: require.resolve('./generators/app')
+};

package.json

@@ -13,7 +13,7 @@
   "files": [
     "app"
   ],
-  "main": "app/index.js",
+  "main": "index.js",
   "repository": "Swiip/generator-gulp-angular",
   "scripts": {
     "pretest": "./scripts/prepare-test.sh",

test/inception.js

@@ -9,8 +9,8 @@ var helpers = require('yeoman-generator').test;
 
 var testDirectory = Promise.promisify(helpers.testDirectory);
 
-var mockOptions = require('../app/src/mock-options.js');
-var mockPrompts = require('../app/src/mock-prompts.js');
+var mockOptions = require('../generators/app/src/mock-options.js');
+var mockPrompts = require('../generators/app/src/mock-prompts.js');
 
 var skipOptions = {
   skipInstall: true,
@@ -33,7 +33,7 @@ function prepare(optionCase, promptCase) {
   }).then(function () {
     var gulpAngular = helpers.createGenerator(
       'gulp-angular:app',
-      ['../../../app'],
+      ['../../../generators/app'],
       false,
       options
     );

test/inception/test-inception.js

@@ -7,7 +7,7 @@ var chaiAsPromised = require('chai-as-promised');
 chai.should();
 chai.use(chaiAsPromised);
 
-var prompts = require('../../app/src/mock-prompts.js').prompts;
+var prompts = require('../../generators/app/src/mock-prompts.js').prompts;
 
 describe('gulp-angular generator inception tests', function () {
   var gulpAngular;

test/node/test-bower.js

@@ -7,7 +7,7 @@ var expect = chai.expect;
 var Generator = require('./mock-generator');
 var generator;
 
-var bower = require('../../app/src/bower.js');
+var bower = require('../../generators/app/src/bower.js');
 
 describe('gulp-angular generator bower script', function () {
 

test/node/test-files.js

@@ -11,8 +11,8 @@ var _ = require('lodash');
 var Generator = require('./mock-generator');
 var generator;
 
-var files = require('../../app/src/files.js');
-var filesJson = require('../../app/files.json');
+var files = require('../../generators/app/src/files.js');
+var filesJson = require('../../generators/app/files.json');
 var savedFilesJson = _.cloneDeep(filesJson);
 
 describe('gulp-angular generator files script', function () {

test/node/test-index.js

@@ -8,7 +8,7 @@ chai.use(sinonChai);
 
 var yeoman = require('yeoman-generator');
 
-var Generator = require('../../app/index.js');
+var Generator = require('../../generators/app/index.js');
 
 describe('gulp-angular generator index script', function () {
 

test/node/test-modules.js

@@ -8,7 +8,7 @@ chai.use(sinonChai);
 var Generator = require('./mock-generator');
 var generator;
 
-var modules = require('../../app/src/modules.js');
+var modules = require('../../generators/app/src/modules.js');
 
 describe('gulp-angular generator modules script', function () {
 

test/node/test-options.js

@@ -9,8 +9,8 @@ chai.use(sinonChai);
 var Generator = require('./mock-generator');
 var generator;
 
-var options = require('../../app/src/options.js');
-var optionsJson = require('../../app/options.json');
+var options = require('../../generators/app/src/options.js');
+var optionsJson = require('../../generators/app/options.json');
 
 describe('gulp-angular generator options script', function () {
 

test/node/test-paths.js

@@ -11,9 +11,9 @@ var _ = require('lodash');
 var Generator = require('./mock-generator');
 var generator;
 
-var utils = require('../../app/src/utils.js');
+var utils = require('../../generators/app/src/utils.js');
 
-var paths = require('../../app/src/paths.js');
+var paths = require('../../generators/app/src/paths.js');
 
 var pathsConf = {
   'app-path': 'src',

test/node/test-preprocessors.js

@@ -8,7 +8,7 @@ chai.use(sinonChai);
 var Generator = require('./mock-generator');
 var generator;
 
-var preprocessors = require('../../app/src/preprocessors.js');
+var preprocessors = require('../../generators/app/src/preprocessors.js');
 
 describe('gulp-angular generator preprocessors script', function () {
 

test/node/test-prompts.js

@@ -11,9 +11,9 @@ var _ = require('lodash');
 var Generator = require('./mock-generator');
 var generator;
 
-var prompts = require('../../app/src/prompts.js');
-var promptsJson = require('../../app/prompts.json');
-var mockPrompts = require('../../app/src/mock-prompts.js');
+var prompts = require('../../generators/app/src/prompts.js');
+var promptsJson = require('../../generators/app/prompts.json');
+var mockPrompts = require('../../generators/app/src/mock-prompts.js');
 
 describe('gulp-angular generator prompts script', function () {
 

test/node/test-router.js

@@ -9,7 +9,7 @@ chai.use(sinonChai);
 var Generator = require('./mock-generator');
 var generator;
 
-var router = require('../../app/src/router.js');
+var router = require('../../generators/app/src/router.js');
 
 describe('gulp-angular generator router script', function () {
   var read;

test/node/test-techs.js

@@ -8,8 +8,8 @@ chai.use(sinonChai);
 var Generator = require('./mock-generator');
 var generator;
 
-var techs = require('../../app/src/techs.js');
-var techsJson = require('../../app/techs.json');
+var techs = require('../../generators/app/src/techs.js');
+var techsJson = require('../../generators/app/techs.json');
 
 describe('gulp-angular generator techs script', function () {
 

test/node/test-ui.js

@@ -6,7 +6,7 @@ chai.should();
 var Generator = require('./mock-generator');
 var generator;
 
-var ui = require('../../app/src/ui.js');
+var ui = require('../../generators/app/src/ui.js');
 
 describe('gulp-angular generator ui script', function () {
 

test/node/test-utils.js

@@ -4,7 +4,7 @@ require('chai').should();
 
 var path = require('path');
 
-var utils = require('../../app/src/utils');
+var utils = require('../../generators/app/src/utils');
 
 describe('gulp-angular generator utils', function () {
   describe('normalizePath', function () {

test/node/test-writes.js

@@ -9,9 +9,9 @@ chai.use(sinonChai);
 var Generator = require('./mock-generator');
 var generator;
 
-var utils = require('../../app/src/utils.js');
+var utils = require('../../generators/app/src/utils.js');
 
-var write = require('../../app/src/write.js');
+var write = require('../../generators/app/src/write.js');
 
 describe('gulp-angular generator writes script', function () {
   var replacePrefix;

test/template-tools.js

@@ -9,7 +9,7 @@ var beautify = require('js-beautify').js_beautify;
 var readdir = Promise.promisify(require('recursive-readdir'));
 var ejs = require('ejs');
 
-var templatesDir = path.join(__dirname, '../app/templates/');
+var templatesDir = path.join(__dirname, '../generators/app/templates/');
 var depsDir = path.join(__dirname, 'tmp/deps/');
 var compiledTemplatesDir = path.join(__dirname, 'tmp/templates/');
 var compiledTemplatesSuffix = '-template.js';
@@ -83,7 +83,7 @@ function prepare() {
 }
 
 function deps() {
-  var prompts = require('../app/src/mock-prompts');
+  var prompts = require('../generators/app/src/mock-prompts');
   var angularVersion = prompts.defaults.angularVersion;
   var packageFileName = 'package.json';
   var packagePath = templatesDir + '_' + packageFileName;

test/template/mock-model.js

@@ -2,7 +2,7 @@
 
 require('yeoman-generator');
 var _ = require('lodash');
-var mockPrompts = require('../../app/src/mock-prompts');
+var mockPrompts = require('../../generators/app/src/mock-prompts');
 
 module.exports = function () {
   var props = _.extend(_.cloneDeep(mockPrompts.defaults), {