Fixed the template downloading/unzipping

Author: Matt Karl

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"private": true,
 	"dependencies": {
 		"jqueryui": "*",

deploy/assets/templates/default/springroll-template.json

@@ -1,7 +1,7 @@
 {
 	"name" : "Default",
 	"id" : "io.springroll.default",
-	"version" : "1.3.0",
+	"version" : "1.3.1",
 	"github": "SpringRoll/SpringRollTemplate",
 	"rename" : {
 		"gitignore" : ".gitignore",
@@ -61,7 +61,7 @@
 		},
 		{
 			"id": "easeljs-interface",
-			"name": "EaselJS Animation",
+			"name": "EaselJS Interface",
 			"description": "Drag management and basic buttons for EaselJS",
 			"main": "components/springroll/dist/modules/easeljs-interface.min.js",
 			"mainDebug": "components/springroll/dist/modules/easeljs-interface.js",

deploy/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"description": "Application for SpringRoll projects",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SpringRoll/SpringRollStudio"
@@ -23,7 +23,6 @@
 	},
 	"dependencies": {
 		"MD5": "~1.2.0",
-		"adm-zip": "~0.4.4",
 		"ansi2html": "~0.0.1",
 		"connect": "^3.3.4",
 		"fs-extra": "~0.12.0",
@@ -35,6 +34,7 @@
 		"request": "^2.48.0",
 		"semver": "~4.0.3",
 		"serve-static": "^1.8.1",
+		"unzip": "^0.1.11",
 		"ws": "~0.4.32"
 	}
 }

installer/win32.nsi

@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 3
+!define VERSIONBUILD 4
 # 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"

installer/win64.nsi

@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 3
+!define VERSIONBUILD 4
 # 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"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"private": true,
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"dependencies": {
 		"grunt": "^0.4.5",
 		"grunt-contrib-copy": "^0.7.0",

project.json

@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"main": [
 		"components/node-webkit-app/src/utils/UpdateChecker.js",
 		"components/node-webkit-app/src/utils/Browser.js",
@@ -77,6 +77,7 @@
 			"src/less/tasks/TaskRunner.less"
 		],
 		"new": [
+			"src/js/new/Extract.js",
 			"src/js/new/JSONUtils.js",
 			"src/js/new/TemplateModule.js",
 			"src/js/new/Template.js",

src/jade/new.jade

@@ -23,10 +23,12 @@ html
 								|  Drag template here.
 							.folder.center-vertical
 							.error.center-vertical
+						script#templateTemplate(type='text/html')
+							<div class="template">
+							<span class="name"></span>
+							<button class="btn btn-danger pull-right">&times;</button>
+							</div>
 						#listTemplates.templates
-							.template
-								span.name Default
-								button.btn.btn-default.disabled.pull-right(disabled='') ×
 		.form-horizontal(role='form')
 			header
 				h1 Create New Project

src/js/new/Extract.js

@@ -0,0 +1,64 @@
+(function()
+{
+	if (APP)
+	{
+		var path = require('path');
+		var fs = require('fs-extra');
+		var unzip = require('unzip');
+	}
+
+	/**
+	 * Extract abstraction
+	 * @class Extract
+	 * @static
+	 */
+	var Extract = {};
+
+	/**
+	 * Extract a zip file
+	 * @method run
+	 * @static
+	 * @param  {String}   zipPath    The path to the zip file
+	 * @param  {String}   outputPath The output folder
+	 * @param  {Function} callback   Callback when completed or errored
+	 */
+	Extract.run = function(zipPath, outputPath, callback)
+	{
+		// Read the zipfile
+		fs.createReadStream(zipPath)
+
+			// Parse the contents
+			.pipe(unzip.Parse())
+
+			// Read each entry
+			.on('entry', function(entry)
+			{
+				console.log(entry.type + " :: " + entry.path);
+
+				// remove the root directory which is <team>-<Repo>-<sha>
+				var localFile = entry.path.substr(entry.path.indexOf('/') + 1);
+				var outputFile = path.join(outputPath, localFile);
+
+				if (entry.type == "Directory")
+				{
+					fs.mkdirsSync(outputFile);
+				}
+				else
+				{
+					console.log("Copy file " + outputFile);
+
+					// Copy the file to output location
+					entry.pipe(fs.createWriteStream(outputFile));
+				}
+			})
+			.on('close', function()
+			{
+				console.log("Completed unzip");
+				callback();
+			});
+	};
+
+	// Assign to namespace
+	namespace('springroll.new').Extract = Extract;
+	
+}());