Merge pull request #3 from sgmeyer/Development

Release v0.1.2

Author: sgmeyer

README.md

@@ -1,11 +1,9 @@
 generator-crafty
 ================
 
-
-
 ## Features
 
-* CSS minification
+* JavaScript minification
 * Built-in preview server with LiveReload
 * CraftyBootstrap scaffolding for more information (https://github.com/ahilles107/CraftyBoilerplate).
 
@@ -33,5 +31,25 @@ Make a new directory, and `cd` into it:
 mkdir my-new-project && cd $_
 ```
 
-Run `yo crafty`
+Run `yo crafty`:
+```
+yo crafty
+```
+
+## Previewing Gaming
+
+Run game in local server with live preview.  Run command in root directory of your game:
+```
+grunt server
+```
+or
+```
+grunt
+```
+
+
+## Minify and build game
+
+```
+grunt build
 ```

app/index.js

@@ -37,6 +37,8 @@ CraftyGenerator.prototype.app = function app() {
 };
 
 CraftyGenerator.prototype.projectfiles = function projectfiles() {
+  this.mkdir('app');
+  this.mkdir('app/web');
   this.mkdir('app/web/css');
   this.mkdir('app/web/images');
 

app/templates/_.bowerrc

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

app/templates/_Gruntfile.js

@@ -12,32 +12,47 @@ module.exports = function(grunt) {
 				files: [{
                     expand: true,
                     cwd: 'app/src/',
-                    src: ['**/*.js', '!libs/**/*'],
+                    src: ['**/*.js', '!libs/**/*', '!bower_components/**/*'],
                     dest: 'dist/src/',
                     ext: 'a.js'
 				},
 				{
                     expand: true,
                     flatten: true,
-                    cwd: 'app/src/libs/',
+                    cwd: 'app/src/brower_components/',
         		    src: ['jquery/jquery.js', 'modernizr/modernizr.js'],
         		    dest: 'dist/src/libs/',
                     ext: '.min.js'
         		},
                 {
-                    'dist/src/libs/requirejs-jquery.min.js': ['app/src/libs/requirejs-jquery/parts/require.js', 'app/src/libs/requirejs-jquery/parts/query.js']
+                    'dist/src/libs/requirejs-jquery.min.js': ['app/src/bower_components/requirejs-jquery/parts/require.js', 'app/src/bower_components/requirejs-jquery/parts/query.js']
                 }]
 			}
 		},
 		copy: {
     	  dist: {
             files: [{
+              expand: true,
+              flatten: true,
+              cwd: 'app/src/bower_components/',
+              src: ['backbone/backbone-min.js', 'backbone/backbone-min.map', 'underscore/underscore-min.js', 'underscore/underscore-min.map'],
+              dest: 'dist/src/libs/',
+              filter: 'isFile'
+            },
+            {
               expand: true,
               flatten: true,
               cwd: 'app/src/libs/',
-              src: ['backbone/backbone-min.js', 'backbone/backbone-min.map', 'underscore/underscore-min.js', 'underscore/underscore-min.map', 'crafty/crafty.min.js'],
+              src: ['**/*'],
               dest: 'dist/src/libs/',
               filter: 'isFile'
+            }, 
+            {
+            	expand: true,
+            	cwd: 'app/web',
+            	src: ['**/*'],
+            	dest: 'dist/web',
+            	filter: 'isFile'
             }]
           }
         },

app/templates/_package.json

@@ -1,5 +1,5 @@
 {
-  "name": "<%= gameName %>",
+  "name": "YourGame",
   "version": "0.0.0",
   "description": "<%= gameName %> is an HTML and JavaScript game built using the Crafty.js game engine and the generator-crafty templates.",
   "keywords": [

changelog.txt

@@ -1,3 +1,11 @@
+v0.1.2 - 10-17-2013
+
+* Copy over the web directory and the sub content
+* Moving bower dependencies to src/bower_components
+* Adding build to copy over entire src/libs directory
+* Giving package.json 'name' a static name.  packag.json files do not support spaces in the name
+  http://github.com/isaacs/npm/issues/3105
+
 v0.1.1 - 10-17-2013
 
 * Adding changelog.txt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-crafty",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A Crafty.js generator for Yeoman.  Provides Craft.js scaffolding based on CraftyBoilerplate (https://github.com/ahilles107/CraftyBoilerplate)",
   "keywords": [
     "yeoman-generator",