Merge branch 'master' of https://github.com/sgmeyer/generator-crafty

Conflicts:
	app/templates/_Gruntfile.js
	app/templates/_index.html

Author: sgmeyer

app/index.js

@@ -6,16 +6,32 @@ var yeoman = require('yeoman-generator');
 var CraftyGenerator = module.exports = function CraftyGenerator(args, options, config) {
   yeoman.generators.Base.apply(this, arguments);
 
-  this.on('end', function () {
-    this.installDependencies({ skipInstall: options['skip-install'] });
-  });
-
   this.pkg = JSON.parse(this.readFileAsString(path.join(__dirname, '../package.json')));
+
+  // setup the test-framework property, Gruntfile template will need this
+  this.testFramework = options['test-framework'] || 'mocha';
+
+  // for hooks to resolve on mocha by default
+  if (!options['test-framework']) {
+    options['test-framework'] = 'mocha';
+  }
+
+  // hook for karma test runner
+  this.options.karma = options.karma;
+
+  // resolved to mocha by default (could be switched to jasmine for instance)
+  this.hookFor('test-framework', { as: 'app' });
+
+  this.indexFile = this.readFileAsString(path.join(this.sourceRoot(), '_index.html'));
+
+  //this.on('end', function () {
+  //  this.installDependencies({ skipInstall: options['skip-install'] });
+  //});
 };
 
 util.inherits(CraftyGenerator, yeoman.generators.Base);
 
-CraftyGenerator.prototype.askFor = function askFor() {
+CraftyGenerator.prototype.askQuestions = function askQuestions() {
   var cb = this.async();
 
   console.log(this.yeoman);
@@ -24,45 +40,44 @@ CraftyGenerator.prototype.askFor = function askFor() {
     name: 'gameName',
     message: 'What is the name of your game?',
     default: (this.appname)
+  }, {
+    name: 'gameWidth',
+    message: 'How wide do you want your game canvas to be?',
+    default: 800
+  }, {
+    name: 'gameHeight',
+    message: 'And how tall do you want it to be?',
+    default: 600
   }];
 
   this.prompt(prompts, function (props) {
     this.gameName = props.gameName;
+    this.gameWidth = props.gameWidth;
+    this.gameHeight = props.gameHeight;
 
     cb();
   }.bind(this));
 };
 
-CraftyGenerator.prototype.app = function app() {
+CraftyGenerator.prototype.createDirLayout = function createDirLayout() {
+  this.mkdir('app/styles');
+  this.mkdir('app/images');
+  this.mkdir('app/scripts/scenes');
+  this.mkdir('app/scripts/components');
+  this.mkdir('app/libs');
+  this.mkdir('app/bower_components');
 };
 
-CraftyGenerator.prototype.projectfiles = function projectfiles() {
-  this.mkdir('app');
-  this.mkdir('app/web');
-  this.mkdir('app/web/css');
-  this.mkdir('app/web/images');
-
+CraftyGenerator.prototype.editorConfig = function editorConfig() {
   this.copy('_.editorconfig', '.editorconfig');
-  this.copy('_.jshintrc', '.jshintrc');
-
-  this.copy('src/_config.js', 'app/src/config.js');
-  this.copy('src/_game.js', 'app/src/game.js');
-  this.copy('src/_sprites.js', 'app/src/sprites.js');
-  this.copy('src/components/_MouseHover.js', 'app/src/components/MouseHover.js');
-  this.copy('src/entities/base/_BaseEntity.js', 'app/src/entities/base/BaseEntity.js');
-  this.copy('src/interfaces/_info.js', 'app/src/interfaces/info.js');
-  this.copy('src/scenes/_main.js', 'app/src/scenes/main.js');
-
-  this.copy('src/libs/Crafty/_crafty.js', 'app/src/libs/Crafty/crafty.js');
-  this.copy('src/libs/Crafty/_crafty.min.js', 'app/src/libs/Crafty/crafty.min.js');
+};
 
-  this.copy('src/libs/CraftyDebug/_craftyDebug.js', 'app/src/libs/CraftyDebug/craftyDebug.js');
-  this.copy('src/libs/CraftyDebug/panels/_assets.js', 'app/src/libs/CraftyDebug/panels/assets.js');
-  this.copy('src/libs/CraftyDebug/panels/_entities.js', 'app/src/libs/CraftyDebug/panels/entities.js');
+CraftyGenerator.prototype.jshintrc = function jsHint() {
+  this.copy('_.jshintrc', '.jshintrc');
 };
 
 CraftyGenerator.prototype.gruntfileJSON = function gruntfile() {
-  this.copy('_Gruntfile.js', 'Gruntfile.js');
+  this.template('_Gruntfile.js', 'Gruntfile.js');
 };
 
 CraftyGenerator.prototype.packageJSON = function packageJSON() {
@@ -74,6 +89,59 @@ CraftyGenerator.prototype.bowerJSON = function bower() {
   this.copy('_bower.json', 'bower.json');
 };
 
-CraftyGenerator.prototype.indexHTML = function writeIndex() {
-  this.copy("_index.html", "app/index.html");
-}
+CraftyGenerator.prototype.craftyFiles = function craftyFiles() {
+  this.copy('libs/Crafty/_crafty.js', 'app/libs/Crafty/crafty.js');
+  this.copy('libs/Crafty/_crafty.min.js', 'app/libs/Crafty/crafty.min.js');
+};
+
+CraftyGenerator.prototype.craftyDebugFiles = function craftyDebugFiles() {
+  this.copy('libs/CraftyDebug/_craftyDebug.js', 'app/libs/CraftyDebug/craftyDebug.js');
+  this.copy('libs/CraftyDebug/panels/_assets.js', 'app/libs/CraftyDebug/panels/assets.js');
+  this.copy('libs/CraftyDebug/panels/_entities.js', 'app/libs/CraftyDebug/panels/entities.js');
+};
+
+CraftyGenerator.prototype.app = function app() {
+  this.copy('scripts/_app.js', 'app/scripts/app.js');
+  this.template('scripts/_game.js', 'app/scripts/game.js');
+};
+
+CraftyGenerator.prototype.writeIndex = function writeIndex() {
+  var mainCssFiles = ['styles/normalize.css', 'styles/style.css'];
+
+  this.indexFile = this.appendStyles(this.indexFile, 'styles/main.css', mainCssFiles);
+
+  this.indexFile = this.appendFiles(this.indexFile, 'js', 'scripts/bower_components.js', ['bower_components/jquery/jquery.js'], null, 'app');
+
+  this.indexFile = this.appendScripts(this.indexFile, 'scripts/crafty.js', [
+    'libs/Crafty/crafty.js'
+  ], null, 'app');
+
+  this.indexFile = this.appendScripts(this.indexFile, 'scripts/crafty_debug.js', [
+    'libs/CraftyDebug/craftyDebug.js',
+    'libs/CraftyDebug/panels/assets.js',
+    'libs/CraftyDebug/panels/entities.js'
+  ], null, 'app');
+
+  this.indexFile = this.appendFiles(this.indexFile, 'js', 'scripts/components.js', ['scripts/compiled-components.js'], null, '.tmp');
+  this.indexFile = this.appendFiles(this.indexFile, 'js', 'scripts/scenes.js', ['scripts/compiled-scenes.js'], null, '.tmp');
+  this.indexFile = this.appendFiles(this.indexFile, 'js', 'scripts/main.js', ['scripts/combined-scripts.js'], null, '.tmp');
+
+  this.write('app/index.html', this.indexFile);
+
+  this.copy('styles/normalize.css', 'app/styles/normalize.css');
+  this.copy('styles/style.css', 'app/styles/style.css');
+  //this.copy("_index.html", "app/index.html");
+};
+
+CraftyGenerator.prototype.install = function () {
+  if (this.options['skip-install']) {
+    return;
+  }
+
+  var done = this.async();
+  this.installDependencies({
+    skipMessage: this.options['skip-message'],
+    skipInstall: this.options['skip-install'],
+    callback: done
+  });
+};

app/templates/_.bowerrc

@@ -1,3 +1,3 @@
 {
-	"directory": "app/src/bower_components"
-}
+	"directory": "app/bower_components"
+}

app/templates/_.jshintrc

@@ -6,7 +6,7 @@
     "curly": true,
     "eqeqeq": true,
     "immed": true,
-    "indent": 4,
+    "indent": 2,
     "latedef": true,
     "newcap": true,
     "noarg": true,