Validate if manifest format has been passed in the arguments

Author: estebanlopez

lib/manifestTools/manifestLoader.js

@@ -62,7 +62,7 @@ function processManifestContents (data, manifestFormat, callback) {
     detectedFormat = manifestFormat;
   } else if (!detectedFormat) {
     var availableFormats = listAvailableManifestFormats().join(', ');
-    return callback(new Error('Unable to detect the input manifest format. Try specifying the correct format using the -f <format> option. Available formats are: ' + availableFormats + ' .'));
+    return callback(new Error('Unable to detect the input manifest format. Try specifying the correct format using the -f <format> option. Available formats are: ' + availableFormats + '.'));
   }
 
   log.info('Found a ' + detectedFormat + ' manifest...');
@@ -94,7 +94,14 @@ function processManifestContents (data, manifestFormat, callback) {
 }
 
 function downloadManifestFromUrl (manifestUrl, manifestFormat, callback) {
-  
+
+  if (arguments.length < 3) {
+    if (utils.isFunction(manifestFormat)) {
+      callback = manifestFormat;
+      manifestFormat = undefined;      
+    }
+  }
+
   var deferred = Q.defer();
   request({ uri: manifestUrl }, function (err, response, data) {
     if (err || response.statusCode !== 200) {
@@ -117,7 +124,14 @@ function downloadManifestFromUrl (manifestUrl, manifestFormat, callback) {
 }
 
 function getManifestFromSite (siteUrl, manifestFormat, callback) {
-  
+
+  if (arguments.length < 3) {
+    if (utils.isFunction(manifestFormat)) {
+      callback = manifestFormat;
+      manifestFormat = undefined;      
+    }
+  }
+
   return fetchManifestUrlFromSite(siteUrl).then(function (manifestUrl) {
     if (manifestUrl) {
       return Q.nfcall(downloadManifestFromUrl, manifestUrl, manifestFormat);
@@ -141,6 +155,14 @@ function getManifestFromSite (siteUrl, manifestFormat, callback) {
 }
 
 function getManifestFromFile (filePath, manifestFormat, callback) {
+
+  if (arguments.length < 3) {
+    if (utils.isFunction(manifestFormat)) {
+      callback = manifestFormat;
+      manifestFormat = undefined;      
+    }
+  }
+
   return Q.nfcall(fs.readFile, filePath).then(function (data) {
     return Q.nfcall(processManifestContents, data, manifestFormat);    
   })

test/manifestTools.js

@@ -62,7 +62,7 @@ describe('Manifest Tools', function () {
     it('Should return an Error if manifest format is invalid', function (done) {
       manifestTools.getManifestFromFile(inputFiles.invalidManifestFormat, function (err){
         should.exist(err);
-        err.should.have.property('message', 'Invalid manifest format.');
+        err.should.have.property('message', 'Unable to detect the input manifest format. Try specifying the correct format using the -f <format> option. Available formats are: w3c, chromeos, edgeextension.');
         done();
       });
     });