feat: change makefile, add sync pages command

Makefile

@@ -15,9 +15,12 @@ test:
 spm:
 	spm build --skip fs,path -O build
 
-pages:
-	cake runner && cp tests/runner/* ../gh-pages/velocity.js/runner/
+runner:
+	@node tests/script/syncRunner.js
+
+pages: spm runner
 	cp build/velocityjs/${version}/*.js tests/runner/
+	cp tests/runner/* ../gh-pages/velocity.js/runner/
 
 publish:
 	@git tag ${version}

index.js

@@ -1,25 +1,2 @@
 'use strict';
-var Parser  = require('./src/parse/index');
-var utils   = require('./src/utils');
-var Compile = require('./src/compile/index');
-var Helper  = {};
-
-Parser._parse = Parser.parse;
-
-Parser.parse = function (str) {
-  var asts = Parser._parse(str);
-  return utils.makeLevel(asts);
-};
-
-var Velocity = {
-  Parser  : Parser,
-  Compile : Compile
-};
-
-Velocity.render = function (template, context, macros) {
-  var asts = Parser.parse(template);
-  var compile = new Compile(asts);
-  return compile.render(context, macros);
-};
-
-module.exports = Velocity;
+module.exports = require('./src/velocity');

tests/compile.js

@@ -390,7 +390,7 @@ describe('Compile', function(){
         }
       }
 
-      assert.equal(ret, render(vm, data))
+      assert.equal(ret.trim(), render(vm, data).trim())
 
     })
 

tests/helper.js

@@ -1,9 +1,9 @@
 var Velocity = require('../src/velocity')
 var assert = require("assert")
-var getRefText = Velocity.Helper.getRefText;
-var parse = Velocity.Parser.parse;
 
 describe('Helper', function(){
+  var getRefText = Velocity.Helper.getRefText
+  var parse = Velocity.Parser.parse
   describe('getRefText', function() {
     it('simple reference', function() {
       var foo = '$a.b'