Fix not being able to set method-name in swig cli

Author: paularmstrong

bin/swig.js

@@ -10,6 +10,7 @@ var swig = require('../index'),
   uglify = require('uglify-js');
 
 var command,
+  wrapstart = 'var tpl = ',
   argv = optimist
     .usage('\n Usage:\n' +
       '    $0 compile [files] [options]\n' +
@@ -37,7 +38,7 @@ var command,
     .alias('j', 'json')
     .alias('c', 'context')
     .alias('m', 'minify')
-    .default('wrap-start', 'var tpl = ')
+    .default('wrap-start', wrapstart)
     .default('wrap-end', ';')
     .default('method-name', 'tpl')
     .check(function (argv) {
@@ -54,7 +55,7 @@ var command,
         throw new Error('Unrecognized command "' + command + '". Use -h for help.');
       }
 
-      if (argv['method-name'] !== 'tpl' && argv['wrap-start'] !== 'var tpl =') {
+      if (argv['method-name'] !== 'tpl' && argv['wrap-start'] !== wrapstart) {
         throw new Error('Cannot use arguments "--method-name" and "--wrap-start" together.');
       }
 

tests/bin/bin.test.js

@@ -95,6 +95,16 @@ describe('bin/swig compile -m', function () {
   });
 });
 
+describe('bin/swig compile --method-name="foo"', function () {
+  it('sets the method name to "foo"', function (done) {
+    var p = fixPath(casedir + '/extends_1.test.html');
+    exec('node ' + bin + ' compile ' + p + ' --method-name="foo"', function (err, stdout, stderr) {
+      expect(stdout).to.equal('var foo = function (_swig,_ctx,_filters,_utils,_fn) {\n  var _ext = _swig.extensions,\n    _output = "";\n_output += "Hi,\\n\\n";\n_output += "This is the body.";\n_output += "\\n\\nSincerely,\\nMe\\n";\n\n  return _output;\n\n};\n');
+      done();
+    });
+  });
+});
+
 describe('bin/swig compile & run from swig', function () {
   it('can be run', function (done) {
     var expectation = fs.readFileSync(casedir + '/extends_1.expectation.html', 'utf8'),