support case-insensitive command names, add comment parsing, more tests

Author: twhiteman

parser.js

@@ -271,9 +271,9 @@ function splitCommand(line) {
     // Make sure we get the same results irrespective of leading/trailing spaces
     var match = line.match(TOKEN_WHITESPACE);
     if (!match) {
-        return { name: line, rest: '' };
+        return { name: line.toUpperCase(), rest: '' };
     }
-    var name = line.substr(0, match.index);
+    var name = line.substr(0, match.index).toUpperCase();
     var rest = line.substr(match.index + match[0].length);
 
     return { name: name, rest: rest };
@@ -348,6 +348,7 @@ function parse(contents, options) {
     var lines = contents.split(/[\r?\n]/);
     var parseResult;
     var remainder = '';
+    var includeComments = options && options['includeComments'];
 
     for (i = 0; i < lines.length; i++) {
         lineno = i + 1;
@@ -359,9 +360,7 @@ function parse(contents, options) {
 
         parseResult = parseLine(line, lineno);
         if (parseResult.command) {
-            if (parseResult.command.name !== 'COMMENT' ||
-                options.includeComments)
-            {
+            if (parseResult.command.name !== 'COMMENT' || includeComments) {
                 commands.push(parseResult.command);
             }
         }

test/test_parser.js

@@ -9,24 +9,53 @@ tape('should parse a Dockerfile', function (t) {
   var commands = dockerfileParser.parse(dockerFile);
 
   var numCommands = 15;
-  t.assert(commands.length === numCommands, 'Check number of commands');
+  t.equal(commands.length, numCommands, 'Check number of commands');
 
   var from = commands[0];
-  t.assert(from.name === 'FROM', 'First command should be FROM');
+  t.equal(from.name, 'FROM', 'First command should be FROM');
 
   var add = commands[1];
-  t.assert(add.name === 'ADD', 'Check ADD command');
-  t.assert(add.args[0] === '.', 'Check ADD first arg');
-  t.assert(add.args[1] === '/srv/app', 'Check ADD second arg');
+  t.equal(add.name, 'ADD', 'Check ADD command');
+  t.equal(add.args[0], '.', 'Check ADD first arg');
+  t.equal(add.args[1], '/srv/app', 'Check ADD second arg');
 
   var env = commands[7];
-  t.assert(env.name === 'ENV', '8th command is ENV');
-  t.assert(Object.keys(env.args).length === 2, 'ENV command has 2 keys');
-  t.assert(env.args['VAR2'] === '20', 'ENV VAR2 check');
-  t.assert(env.args['VAR3'] === '30', 'ENV VAR3 check');
+  t.equal(env.name, 'ENV', '8th command is ENV');
+  t.equal(Object.keys(env.args).length, 2, 'ENV command has 2 keys');
+  t.equal(env.args['VAR2'], '20', 'ENV VAR2 check');
+  t.equal(env.args['VAR3'], '30', 'ENV VAR3 check');
 
-  t.assert(commands[numCommands-1].name === 'ENTRYPOINT',
+  t.equal(commands[numCommands-1].name, 'ENTRYPOINT',
             'Last command should be ENTRYPOINT');
 
   t.end();
 });
+
+
+tape('mesos Dockerfile', function (t) {
+
+  var dname = __dirname;
+  var dockerFile = fs.readFileSync(dname + '/mesos/Dockerfile', 'utf8');
+  var commands = dockerfileParser.parse(dockerFile);
+
+  t.equal(commands.length, 18, 'Check number of commands');
+  t.equal(commands[0].name, 'FROM', 'First command should be FROM');
+  t.equal(commands[17].name, 'WORKDIR', 'Last command should be WORKDIR');
+
+  t.end();
+});
+
+
+tape('case insensitive', function (t) {
+
+  var dname = __dirname;
+  var dockerFile = fs.readFileSync(dname + '/caseTest', 'utf8');
+  var commands = dockerfileParser.parse(dockerFile);
+
+  t.equal(commands.length, 3, 'Check number of commands');
+  t.equal(commands[0].name, 'FROM', 'Command should be FROM');
+  t.equal(commands[1].name, 'ADD',  'Command should be ADD');
+  t.equal(commands[2].name, 'COPY', 'Command should be COPY');
+
+  t.end();
+});