Merge pull request #358 from ruyadorno/update-folder-structure

Updates folder structure, fixes #350
yeoman · Sep 6, 2015 · 115f049 · 115f049
2 parents d009831 + eebfec7
commit 115f049
Show file tree

Hide file tree

Showing 46 changed files with 23 additions and 23 deletions.
diff --git a/all/index.js → generators/all/index.js b/all/index.js → generators/all/index.js
diff --git a/app/index.js → generators/app/index.js b/app/index.js → generators/app/index.js
diff --git a/app/templates/Gruntfile.js → generators/app/templates/Gruntfile.js b/app/templates/Gruntfile.js → generators/app/templates/Gruntfile.js
diff --git a/app/templates/_bower.json → generators/app/templates/_bower.json b/app/templates/_bower.json → generators/app/templates/_bower.json
diff --git a/app/templates/_package.json → generators/app/templates/_package.json b/app/templates/_package.json → generators/app/templates/_package.json
diff --git a/app/templates/app.coffee → generators/app/templates/app.coffee b/app/templates/app.coffee → generators/app/templates/app.coffee
diff --git a/app/templates/app.js → generators/app/templates/app.js b/app/templates/app.js → generators/app/templates/app.js
diff --git a/app/templates/app/404.html → generators/app/templates/app/404.html b/app/templates/app/404.html → generators/app/templates/app/404.html
diff --git a/app/templates/app/favicon.ico → generators/app/templates/app/favicon.ico b/app/templates/app/favicon.ico → generators/app/templates/app/favicon.ico
diff --git a/app/templates/app/robots.txt → generators/app/templates/app/robots.txt b/app/templates/app/robots.txt → generators/app/templates/app/robots.txt
diff --git a/app/templates/bowerrc → generators/app/templates/bowerrc b/app/templates/bowerrc → generators/app/templates/bowerrc
diff --git a/app/templates/editorconfig → generators/app/templates/editorconfig b/app/templates/editorconfig → generators/app/templates/editorconfig
diff --git a/app/templates/gitattributes → generators/app/templates/gitattributes b/app/templates/gitattributes → generators/app/templates/gitattributes
diff --git a/app/templates/gitignore → generators/app/templates/gitignore b/app/templates/gitignore → generators/app/templates/gitignore
diff --git a/app/templates/index.html → generators/app/templates/index.html b/app/templates/index.html → generators/app/templates/index.html
diff --git a/app/templates/jshintrc → generators/app/templates/jshintrc b/app/templates/jshintrc → generators/app/templates/jshintrc
diff --git a/app/templates/main.scss → generators/app/templates/main.scss b/app/templates/main.scss → generators/app/templates/main.scss
diff --git a/app/templates/requirejs_app.coffee → ...rators/app/templates/requirejs_app.coffee b/app/templates/requirejs_app.coffee → ...rators/app/templates/requirejs_app.coffee
diff --git a/app/templates/requirejs_app.js → generators/app/templates/requirejs_app.js b/app/templates/requirejs_app.js → generators/app/templates/requirejs_app.js
diff --git a/collection/index.js → generators/collection/index.js b/collection/index.js → generators/collection/index.js
@@ -3,7 +3,7 @@ var path = require('path');
 var util = require('util');
 var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
-var scriptBase = require('../script-base');
+var scriptBase = require('../../script-base');
 
 var CollectionGenerator = scriptBase.extend({
   constructor: function () {

diff --git a/model/index.js → generators/model/index.js b/model/index.js → generators/model/index.js
@@ -3,7 +3,7 @@ var path = require('path');
 var util = require('util');
 var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
-var scriptBase = require('../script-base');
+var scriptBase = require('../../script-base');
 
 var ModelGenerator = scriptBase.extend({
   constructor: function (name) {

diff --git a/router/index.js → generators/router/index.js b/router/index.js → generators/router/index.js
@@ -3,7 +3,7 @@ var path = require('path');
 var util = require('util');
 var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
-var scriptBase = require('../script-base');
+var scriptBase = require('../../script-base');
 
 var RouterGenerator = scriptBase.extend({
   constructor: function () {

diff --git a/templates/coffeescript/collection.coffee → .../templates/coffeescript/collection.coffee b/templates/coffeescript/collection.coffee → .../templates/coffeescript/collection.coffee
diff --git a/templates/coffeescript/model.coffee → ...ators/templates/coffeescript/model.coffee b/templates/coffeescript/model.coffee → ...ators/templates/coffeescript/model.coffee
diff --git a/.../coffeescript/requirejs/collection.coffee → .../coffeescript/requirejs/collection.coffee b/.../coffeescript/requirejs/collection.coffee → .../coffeescript/requirejs/collection.coffee
diff --git a/...lates/coffeescript/requirejs/model.coffee → ...lates/coffeescript/requirejs/model.coffee b/...lates/coffeescript/requirejs/model.coffee → ...lates/coffeescript/requirejs/model.coffee
diff --git a/...ates/coffeescript/requirejs/router.coffee → ...ates/coffeescript/requirejs/router.coffee b/...ates/coffeescript/requirejs/router.coffee → ...ates/coffeescript/requirejs/router.coffee
diff --git a/templates/coffeescript/requirejs/view.coffee → ...plates/coffeescript/requirejs/view.coffee b/templates/coffeescript/requirejs/view.coffee → ...plates/coffeescript/requirejs/view.coffee
diff --git a/templates/coffeescript/router.coffee → ...tors/templates/coffeescript/router.coffee b/templates/coffeescript/router.coffee → ...tors/templates/coffeescript/router.coffee
diff --git a/templates/coffeescript/view.coffee → ...rators/templates/coffeescript/view.coffee b/templates/coffeescript/view.coffee → ...rators/templates/coffeescript/view.coffee
diff --git a/templates/coffeescript/view.ejs → generators/templates/coffeescript/view.ejs b/templates/coffeescript/view.ejs → generators/templates/coffeescript/view.ejs
diff --git a/templates/collection.js → generators/templates/collection.js b/templates/collection.js → generators/templates/collection.js
diff --git a/templates/model.js → generators/templates/model.js b/templates/model.js → generators/templates/model.js
diff --git a/templates/requirejs/collection.js → generators/templates/requirejs/collection.js b/templates/requirejs/collection.js → generators/templates/requirejs/collection.js
diff --git a/templates/requirejs/model.js → generators/templates/requirejs/model.js b/templates/requirejs/model.js → generators/templates/requirejs/model.js
diff --git a/templates/requirejs/router.js → generators/templates/requirejs/router.js b/templates/requirejs/router.js → generators/templates/requirejs/router.js
diff --git a/templates/requirejs/view.js → generators/templates/requirejs/view.js b/templates/requirejs/view.js → generators/templates/requirejs/view.js
diff --git a/templates/router.js → generators/templates/router.js b/templates/router.js → generators/templates/router.js
diff --git a/templates/view.ejs → generators/templates/view.ejs b/templates/view.ejs → generators/templates/view.ejs
diff --git a/templates/view.js → generators/templates/view.js b/templates/view.js → generators/templates/view.js
diff --git a/view/index.js → generators/view/index.js b/view/index.js → generators/view/index.js
@@ -3,7 +3,7 @@ var path = require('path');
 var util = require('util');
 var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
-var scriptBase = require('../script-base');
+var scriptBase = require('../../script-base');
 
 var ViewGenerator = scriptBase.extend({
   constructor: function () {

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "backbone"
   ],
   "author": "Yeoman",
-  "main": "app/index.js",
+  "main": "generators/app/index.js",
   "repository": "yeoman/generator-backbone",
   "scripts": {
     "test": "mocha --reporter spec"
@@ -35,13 +35,13 @@
   },
   "license": "BSD",
   "files": [
-    "all",
-    "app",
-    "collection",
-    "model",
-    "router",
-    "templates",
-    "view",
+    "generators/all",
+    "generators/app",
+    "generators/collection",
+    "generators/model",
+    "generators/router",
+    "generators/templates",
+    "generators/view",
     "script-base.js",
     "util.js"
   ]

diff --git a/script-base.js b/script-base.js
@@ -46,11 +46,11 @@ var ScriptBase = yeoman.generators.NamedBase.extend({
   },
 
   _setupSourceRootAndSuffix: function () {
-    var sourceRoot = '/templates';
+    var sourceRoot = '/generators/templates';
     this.scriptSuffix = '.js';
 
     if (this.env.options.coffee || this.options.coffee) {
-      sourceRoot = '/templates/coffeescript';
+      sourceRoot = '/generators/templates/coffeescript';
       this.scriptSuffix = '.coffee';
     }
 

diff --git a/test/helper.js b/test/helper.js
@@ -7,7 +7,7 @@ exports.createSubGenerator = function (config, type, asserts) {
   var deps = [
     [helpers.createDummyGenerator(), 'backbone-mocha:' + type]
   ];
-  helpers.run(path.join(__dirname, '../' + type))
+  helpers.run(path.join(__dirname, '../generators/' + type))
     .inDir(path.join(__dirname, 'temp'), function () {
       fs.writeFileSync('.yo-rc.json', config);
     })
@@ -25,7 +25,7 @@ exports.createAppGenerator = function (config, prompts, done) {
   var deps = [
     [helpers.createDummyGenerator(), 'mocha:app']
   ];
-  helpers.run(path.join(__dirname, '../app'))
+  helpers.run(path.join(__dirname, '../generators/app'))
     .inDir(path.join(__dirname, 'temp'), function () {
       fs.writeFileSync('.yo-rc.json', config);
     })

diff --git a/test/test-apppath.js b/test/test-apppath.js
@@ -21,7 +21,7 @@ describe('backbone generator with appPath option', function () {
     var deps = [
       [helpers.createDummyGenerator(), 'mocha:app']
     ];
-    helpers.run(path.join(__dirname, '../app'))
+    helpers.run(path.join(__dirname, '../generators/app'))
       .inTmpDir(function () {
         fs.writeFileSync('.yo-rc.json', config);
       })

diff --git a/test/test-foo.js b/test/test-foo.js
@@ -27,12 +27,12 @@ describe('Backbone generator test', function () {
 
   it('every generator can be required without throwing', function () {
     // not testing the actual run of generators yet
-    this.all = require('../all');
-    this.app = require('../app');
-    this.collection = require('../collection');
-    this.model = require('../model');
-    this.router = require('../router');
-    this.view = require('../view');
+    this.all = require('../generators/all');
+    this.app = require('../generators/app');
+    this.collection = require('../generators/collection');
+    this.model = require('../generators/model');
+    this.router = require('../generators/router');
+    this.view = require('../generators/view');
   });
 
   describe('create expected files', function () {