appmake 0.1.0 → 0.1.1

data/README.md

@@ -28,3 +28,7 @@ Run `bundle exec appmake init` to bootstrap app directory structure. Next issue
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Authors
+
+**appmake** is being developed by Sebastian Sito and Sławomir Kołodziej

data/appmake.gemspec

@@ -6,7 +6,7 @@ require 'appmake/version'
 Gem::Specification.new do |gem|
   gem.name          = "appmake"
   gem.version       = Appmake::VERSION
-  gem.authors       = ["Sebastian Sito"]
+  gem.authors       = ["Sebastian Sito", "Sławomir Kołodziej"]
   gem.email         = ["sebastian@hypenode.com"]
   gem.description   = %q{Appmake allows you to easily develop single-page apps in HTML5}
   gem.summary       = %q{Appmake app bootstrapper}

data/lib/appmake/listeners/js.rb

@@ -17,7 +17,7 @@ module Appmake
 
 			def self.compile
 				Basic.new.say_status :compile, "JS"
-				system("webmake js/app.js public/app.js")
+				system("npm run-script build")
 			end
 		end
 	end

data/lib/appmake/listeners/tpl.rb

@@ -16,8 +16,8 @@ module Appmake
 			end
 
 			def self.compile
-				Basic.new.say_status :compile, "CSS"
-				system("node bin/compile_templates.js &> /dev/null")
+				Basic.new.say_status :compile, "TPL"
+				system("npm run-script tpl")
 			end
 		end
 	end

data/lib/appmake/version.rb

@@ -1,3 +1,3 @@
 module Appmake
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/appmake.rb

@@ -14,16 +14,16 @@ module Appmake
 
 		desc "init", "initialize new application"
 		def init
-			empty_directory "bin"
-			template"templates/bin/compile_templates.js.tt", "bin/compile_templates.js"
+			template "templates/package.json.tt", "package.json"
+			template "templates/README.md.tt", "README.md"
+			system "npm install"
 
 			empty_directory "css"
-			template"templates/css/app.scss.tt", "css/app.scss"
-			template"templates/css/body.scss.tt", "css/body.scss"
+			template "templates/css/app.scss.tt", "css/app.scss"
+			template "templates/css/body.scss.tt", "css/body.scss"
 
 			empty_directory "js"
-			template"templates/js/lib/doT.js.tt", "js/lib/doT.js"
-			template"templates/js/app.js.tt", "js/app.js"
+			template "templates/js/app.js.tt", "js/app.js"
 
 			empty_directory "tpl"
 			template "templates/tpl/welcome.html.tt", "tpl/welcome.html"
@@ -31,6 +31,7 @@ module Appmake
 			empty_directory "public"
 			template "templates/public/index.html.tt", "public/index.html"
 
+
 			Listeners::Css.compile
 			Listeners::Tpl.compile
 			Listeners::Js.compile

data/templates/README.md.tt

@@ -0,0 +1,3 @@
+# MyApp
+
+Build with Appmake [https://github.com/sebastiansito/appmake]()

data/templates/package.json.tt

@@ -0,0 +1,16 @@
+{
+    "name": "myapp",
+    "author": "",
+    "version": "0.0.1",
+    "preferGlobal": "true",
+    "dependencies": {
+        "webmake": ">= 0.3.14",
+        "dot-module": ">= 0.0.1"
+    },
+    "scripts": {
+        "tpl": "dot-module -d tpl/ -o js/templates.js",
+        "build": "webmake js/app.js public/app.js --sourcemap",
+        "deploy": "webmake js/app.js public/app.js"
+    },
+    "engines": { "node": "*" }
+}

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appmake
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
 - Sebastian Sito
+- Sławomir Kołodziej
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,11 +96,11 @@ files:
 - lib/appmake/listeners/js.rb
 - lib/appmake/listeners/tpl.rb
 - lib/appmake/version.rb
-- templates/bin/compile_templates.js.tt
+- templates/README.md.tt
 - templates/css/app.scss.tt
 - templates/css/body.scss.tt
 - templates/js/app.js.tt
-- templates/js/lib/doT.js.tt
+- templates/package.json.tt
 - templates/public/index.html.tt
 - templates/tpl/welcome.html.tt
 homepage: https://github.com/sebastiansito/appmake

data/templates/bin/compile_templates.js.tt

@@ -1,64 +0,0 @@
-var app_dir = __dirname + '/../',
-    tpl_dir = app_dir + 'tpl/',
-    js_dir = app_dir + 'js/',
-
-    fs = require('fs'),
-    dot = require('../js/lib/doT.js'),
-
-    templates = {};
-
-walk();
-fs.writeFile(js_dir + 'templates.js', buildModule(templates));
-
-
-function walk(subdir) {
-  var dir = tpl_dir,
-      files;
-
-  if (subdir)
-    dir += subdir;
-
-  files = fs.readdirSync(dir);
-  files.forEach(function (filename) {
-    var stats = fs.statSync(dir + filename);
-
-    if (stats.isDirectory()) {
-      if (subdir) filename = subdir + filename;
-      filename += '/';
-
-      walk(filename);
-    }
-
-    if (!isHTML(filename))
-      return;
-
-    readFile(filename, subdir, fs.readFileSync(dir + filename));
-  });
-}
-
-function readFile (filename, dir, data) {
-  var name = filename.split('.').slice(0, -1).join('.'),
-      compiled = dot.template(data).toString().replace(/^function anonymous/, 'function ');
-
-  if (dir)
-    name = dir + name;
-
-  templates[name] = compiled;
-}
-
-function isHTML(name) {
-  if (!~name.indexOf('.'))
-    return false;
-
-  return name.split('.').slice(-1)[0].toLowerCase() === 'html';
-}
-
-function buildModule() {
-  var content = [],
-      n;
-
-  for (n in templates)
-    content.push('"' + n + '": ' + templates[n]);
-
-  return ['module.exports = {', content.join(','), '};'].join('').replace(/(\n|\r|\r\n)/, '');
-}

data/templates/js/lib/doT.js.tt

@@ -1,135 +0,0 @@
-// doT.js
-// 2011, Laura Doktorova, https://github.com/olado/doT
-// Licensed under the MIT license.
-
-(function() {
-	"use strict";
-
-	var doT = {
-		version: '1.0.0',
-		templateSettings: {
-			evaluate:    /\{\{([\s\S]+?\}?)\}\}/g,
-			interpolate: /\{\{=([\s\S]+?)\}\}/g,
-			encode:      /\{\{!([\s\S]+?)\}\}/g,
-			use:         /\{\{#([\s\S]+?)\}\}/g,
-			useParams:   /(^|[^\w$])def(?:\.|\[[\'\"])([\w$\.]+)(?:[\'\"]\])?\s*\:\s*([\w$\.]+|\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})/g,
-			define:      /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,
-			defineParams:/^\s*([\w$]+):([\s\S]+)/,
-			conditional: /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g,
-			iterate:     /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g,
-			varname:	'it',
-			strip:		true,
-			append:		true,
-			selfcontained: false
-		},
-		template: undefined, //fn, compile template
-		compile:  undefined  //fn, for express
-	};
-
-	if (typeof module !== 'undefined' && module.exports) {
-		module.exports = doT;
-	} else if (typeof define === 'function' && define.amd) {
-		define(function(){return doT;});
-	} else {
-		(function(){ return this || (0,eval)('this'); }()).doT = doT;
-	}
-
-	function encodeHTMLSource() {
-		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': '&#34;', "'": '&#39;', "/": '&#47;' },
-			matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g;
-		return function() {
-			return this ? this.replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : this;
-		};
-	}
-	String.prototype.encodeHTML = encodeHTMLSource();
-
-	var startend = {
-		append: { start: "'+(",      end: ")+'",      endencode: "||'').toString().encodeHTML()+'" },
-		split:  { start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"}
-	}, skip = /$^/;
-
-	function resolveDefs(c, block, def) {
-		return ((typeof block === 'string') ? block : block.toString())
-		.replace(c.define || skip, function(m, code, assign, value) {
-			if (code.indexOf('def.') === 0) {
-				code = code.substring(4);
-			}
-			if (!(code in def)) {
-				if (assign === ':') {
-					if (c.defineParams) value.replace(c.defineParams, function(m, param, v) {
-						def[code] = {arg: param, text: v};
-					});
-					if (!(code in def)) def[code]= value;
-				} else {
-					new Function("def", "def['"+code+"']=" + value)(def);
-				}
-			}
-			return '';
-		})
-		.replace(c.use || skip, function(m, code) {
-			if (c.useParams) code = code.replace(c.useParams, function(m, s, d, param) {
-				if (def[d] && def[d].arg && param) {
-					var rw = (d+":"+param).replace(/'|\\/g, '_');
-					def.__exp = def.__exp || {};
-					def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2");
-					return s + "def.__exp['"+rw+"']";
-				}
-			});
-			var v = new Function("def", "return " + code)(def);
-			return v ? resolveDefs(c, v, def) : v;
-		});
-	}
-
-	function unescape(code) {
-		return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, ' ');
-	}
-
-	doT.template = function(tmpl, c, def) {
-		c = c || doT.templateSettings;
-		var cse = c.append ? startend.append : startend.split, needhtmlencode, sid = 0, indv,
-			str  = (c.use || c.define) ? resolveDefs(c, tmpl, def || {}) : tmpl;
-
-		str = ("var out='" + (c.strip ? str.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g,' ')
-					.replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,''): str)
-			.replace(/'|\\/g, '\\$&')
-			.replace(c.interpolate || skip, function(m, code) {
-				return cse.start + unescape(code) + cse.end;
-			})
-			.replace(c.encode || skip, function(m, code) {
-				needhtmlencode = true;
-				return cse.start + unescape(code) + cse.endencode;
-			})
-			.replace(c.conditional || skip, function(m, elsecase, code) {
-				return elsecase ?
-					(code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='") :
-					(code ? "';if(" + unescape(code) + "){out+='" : "';}out+='");
-			})
-			.replace(c.iterate || skip, function(m, iterate, vname, iname) {
-				if (!iterate) return "';} } out+='";
-				sid+=1; indv=iname || "i"+sid; iterate=unescape(iterate);
-				return "';var arr"+sid+"="+iterate+";if(arr"+sid+"){var "+vname+","+indv+"=-1,l"+sid+"=arr"+sid+".length-1;while("+indv+"<l"+sid+"){"
-					+vname+"=arr"+sid+"["+indv+"+=1];out+='";
-			})
-			.replace(c.evaluate || skip, function(m, code) {
-				return "';" + unescape(code) + "out+='";
-			})
-			+ "';return out;")
-			.replace(/\n/g, '\\n').replace(/\t/g, '\\t').replace(/\r/g, '\\r')
-			.replace(/(\s|;|\}|^|\{)out\+='';/g, '$1').replace(/\+''/g, '')
-			.replace(/(\s|;|\}|^|\{)out\+=''\+/g,'$1out+=');
-
-		if (needhtmlencode && c.selfcontained) {
-			str = "String.prototype.encodeHTML=(" + encodeHTMLSource.toString() + "());" + str;
-		}
-		try {
-			return new Function(c.varname, str);
-		} catch (e) {
-			if (typeof console !== 'undefined') console.log("Could not create a template function: " + str);
-			throw e;
-		}
-	};
-
-	doT.compile = function(tmpl, def) {
-		return doT.template(tmpl, null, def);
-	};
-}());