Updated to the new grunt plugins

Matt Karl · Matt Karl · commit f1fccbb9bfcd · 2014-11-14T11:10:56.000-05:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.0.2",
+	"version": "0.1.0",
 	"private": true,
 	"dependencies": {
 		"jqueryui": "*",
diff --git a/build.json b/build.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.0.2",
+	"version": "0.1.0",
 	"main": [
 		"components/node-webkit-app/src/utils/UpdateChecker.js",
 		"components/node-webkit-app/src/NodeWebkitApp.js",
diff --git a/deploy/assets/templates/default/Gruntfile.js b/deploy/assets/templates/default/Gruntfile.js
@@ -8,7 +8,7 @@ module.exports = function(grunt)
 	grunt.initConfig(_.extend(
 
 		// Setup the default game tasks
-		require('grunt-game-builder')(grunt, { autoInit: false }),
+		require('grunt-springroll')(grunt, { autoInit: false }),
 
 		// Setup the current project tasks
 		require('load-grunt-config')(grunt,
@@ -22,7 +22,7 @@ module.exports = function(grunt)
 			{
 				pattern: [
 					'grunt-*',
-					'!grunt-game-builder'
+					'!grunt-springroll'
 				]
 			}
 		})
diff --git a/deploy/assets/templates/default/package.json b/deploy/assets/templates/default/package.json
@@ -2,7 +2,7 @@
 	"private": true,
 	"dependencies": {
 		"grunt": "*",
-		"grunt-game-builder": "*",
+		"grunt-springroll": "*",
 		"load-grunt-config": "*",
 		"lodash": "*"
 	}
diff --git a/deploy/assets/templates/default/springroll-template.json b/deploy/assets/templates/default/springroll-template.json
@@ -1,7 +1,7 @@
 {
 	"name" : "Default",
 	"id" : "io.springroll.default",
-	"version" : "1.0.0",
+	"version" : "1.1.0",
 	"rename" : {
 		"gitignore" : ".gitignore",
 		"bowerrc" : ".bowerrc"
diff --git a/deploy/assets/templates/default/springroll.json b/deploy/assets/templates/default/springroll.json
diff --git a/deploy/index.html b/deploy/index.html
@@ -3,10 +3,10 @@
 	<head>
 		<meta charset="utf-8">
 		<title>SpringRoll Studio</title>
-		<link href="assets/css/libraries.css?v=0.0.2" rel="stylesheet">
-		<link href="assets/css/main.css?v=0.0.2" rel="stylesheet">
-		<script src="assets/js/libraries.js?v=0.0.2"></script>
-		<script src="assets/js/main.js?v=0.0.2"></script>
+		<link href="assets/css/libraries.css?v=0.1.0" rel="stylesheet">
+		<link href="assets/css/main.css?v=0.1.0" rel="stylesheet">
+		<script src="assets/js/libraries.js?v=0.1.0"></script>
+		<script src="assets/js/main.js?v=0.1.0"></script>
 	</head>
 	<body>
 		<div class="modules btn-group-vertical">
diff --git a/deploy/package.json b/deploy/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"description": "Application for SpringRoll projects",
-	"version": "0.0.2",
+	"version": "0.1.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SpringRoll/SpringRollStudio"
diff --git a/installer/win.nsi b/installer/win.nsi
@@ -3,8 +3,8 @@
 !define DESCRIPTION "Application for SpringRoll projects"
 # These three must be integers
 !define VERSIONMAJOR 0
-!define VERSIONMINOR 0
-!define VERSIONBUILD 2
+!define VERSIONMINOR 1
+!define VERSIONBUILD 0
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"
diff --git a/package.json b/package.json
@@ -3,11 +3,11 @@
   "private": true,
   "dependencies": {
     "grunt": "~0.4.5",
-    "grunt-game-builder": "~0.3.1",
-    "load-grunt-tasks": "*",
+    "grunt-exec": "~0.4.6",
+    "grunt-game-builder": "^0.3.6",
     "grunt-node-webkit-builder": "~0.2.2",
-    "lodash": "~2.4.1",
     "load-grunt-config": "~0.13.1",
-    "grunt-exec": "~0.4.6"
+    "load-grunt-tasks": "*",
+    "lodash": "~2.4.1"
   }
 }
diff --git a/src/springroll/new/Installer.js b/src/springroll/new/Installer.js
@@ -28,6 +28,15 @@
 	// Reference to the prototype
 	var p = Installer.prototype;
 
+	/**
+	*  The build file required for springroll
+	*  @property {String} FILE
+	*  @readOnly
+	*  @static
+	*  @default  "springroll.json"
+	*/
+	Installer.FILE = 'springroll.json';
+
 	/**
 	*  The main execution point for creating a new project
 	*  @method run
@@ -89,7 +98,7 @@
 		}
 
 		// Update the build file with libraries and modules
-		var build = this.readJSON("build.json");
+		var build = this.readJSON(Installer.FILE);
 		
 		// Replace tokens with the list of depdendencies
 		insertAt(
@@ -102,7 +111,7 @@
 			build.librariesDebug, 
 			options.librariesDebug
 		);
-		this.writeJSON('build.json', build);
+		this.writeJSON(Installer.FILE, build);
 		
 		// Replace text in the files
 		var type, value, option, replacements = {};
diff --git a/src/springroll/new/TemplateManager.js b/src/springroll/new/TemplateManager.js
@@ -300,6 +300,11 @@
 	*/
 	p.load = function()
 	{
+		if (DEBUG)
+		{
+			localStorage.removeItem('templates');
+		}
+
 		try
 		{
 			this.templates = JSON.parse(localStorage.getItem('templates'));
diff --git a/src/springroll/tasks/input/ProjectManager.js b/src/springroll/tasks/input/ProjectManager.js
@@ -201,11 +201,11 @@
 			);
 		};
 
-		exec('grunt _spock_usertasks',
+		exec('grunt _springroll_usertasks',
 			{ cwd : project.path },
 			function(error, stdout, strderr)
 			{
-				//console.log("_spock_usertasks callback");
+				//console.log("_springroll_usertasks callback");
 				//try { var a = {}; a.debug(); } catch(ex) {console.log(ex.stack);}
 				if (error)
 				{

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`		`- "version": "0.0.2",`
	`3`	`+ "version": "0.1.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"jqueryui": "*",`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ module.exports = function(grunt)`
`8`	`8`	`grunt.initConfig(_.extend(`
`9`	`9`
`10`	`10`	`// Setup the default game tasks`
`11`		`- require('grunt-game-builder')(grunt, { autoInit: false }),`
	`11`	`+ require('grunt-springroll')(grunt, { autoInit: false }),`
`12`	`12`
`13`	`13`	`// Setup the current project tasks`
`14`	`14`	`require('load-grunt-config')(grunt,`
`@@ -22,7 +22,7 @@ module.exports = function(grunt)`
`22`	`22`	`{`
`23`	`23`	`pattern: [`
`24`	`24`	`'grunt-*',`
`25`		`- '!grunt-game-builder'`
	`25`	`+ '!grunt-springroll'`
`26`	`26`	`]`
`27`	`27`	`}`
`28`	`28`	`})`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"private": true,`
`3`	`3`	`"dependencies": {`
`4`	`4`	`"grunt": "*",`
`5`		`- "grunt-game-builder": "*",`
	`5`	`+ "grunt-springroll": "*",`
`6`	`6`	`"load-grunt-config": "*",`
`7`	`7`	`"lodash": "*"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name" : "Default",`
`3`	`3`	`"id" : "io.springroll.default",`
`4`		`- "version" : "1.0.0",`
	`4`	`+ "version" : "1.1.0",`
`5`	`5`	`"rename" : {`
`6`	`6`	`"gitignore" : ".gitignore",`
`7`	`7`	`"bowerrc" : ".bowerrc"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`	`3`	`"description": "Application for SpringRoll projects",`
`4`		`- "version": "0.0.2",`
	`4`	`+ "version": "0.1.0",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`7`	`7`	`"url": "https://github.com/SpringRoll/SpringRollStudio"`