Merge branch 'force-manifest-format' into v1.0.0

Author: estebanlopez

lib/manifestTools/index.js

@@ -10,6 +10,7 @@ module.exports = {
   writeToFile:                  manifestLoader.writeToFile,
   fetchManifestUrlFromSite:     manifestLoader.fetchManifestUrlFromSite,
   downloadManifestFromUrl:      manifestLoader.downloadManifestFromUrl,
+  listAvailableManifestFormats: manifestLoader.listAvailableManifestFormats,
   convertTo:                    manifestConverter.convertTo,
   validateManifest:             manifestValidator.validateManifest,
   loadValidationRules:          manifestValidator.loadValidationRules,

lib/manifestTools/manifestLoader.js

@@ -48,7 +48,7 @@ function fetchManifestUrlFromSite (siteUrl, callback) {
   return deferred.promise.nodeify(callback);
 }
 
-function processManifestContents (data, callback) {
+function processManifestContents (data, manifestFormat, callback) {
   var manifestObj = utils.parseJSON(data);
 
   if (!manifestObj) {
@@ -57,9 +57,12 @@ function processManifestContents (data, callback) {
 
   var detectedFormat = manifestTypeDetector.detect(manifestObj);
 
-  if (!detectedFormat) {   
-    log.debug('Unable to detect the input manifest format.');
-    return callback(new Error('Invalid manifest format.'));
+  if (manifestFormat) {
+    log.warn('Forcing to format ' + manifestFormat + '...');
+    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 + ' .'));
   }
 
   log.info('Found a ' + detectedFormat + ' manifest...');
@@ -90,15 +93,15 @@ function processManifestContents (data, callback) {
   });
 }
 
-function downloadManifestFromUrl (manifestUrl, callback) {
+function downloadManifestFromUrl (manifestUrl, manifestFormat, callback) {
 
   var deferred = Q.defer();
   request({ uri: manifestUrl }, function (err, response, data) {
     if (err || response.statusCode !== 200) {
       return deferred.reject(new Error('Failed to download manifest data.'));
     }
 
-    Q.nfcall(processManifestContents, data).then(function (manifestInfo) {
+    Q.nfcall(processManifestContents, data, manifestFormat).then(function (manifestInfo) {
       if (manifestInfo) {
         manifestInfo.generatedUrl = manifestUrl;
       }
@@ -113,11 +116,11 @@ function downloadManifestFromUrl (manifestUrl, callback) {
   return deferred.promise.nodeify(callback);
 }
 
-function getManifestFromSite (siteUrl, callback) {
+function getManifestFromSite (siteUrl, manifestFormat, callback) {
 
   return fetchManifestUrlFromSite(siteUrl).then(function (manifestUrl) {
     if (manifestUrl) {
-      return Q.nfcall(downloadManifestFromUrl, manifestUrl);
+      return Q.nfcall(downloadManifestFromUrl, manifestUrl, manifestFormat);
     } else {
       // TODO: review what to do in this case. (manifest meta tag is not present)
       log.warn('No manifest found. A new manifest will be created.');
@@ -137,9 +140,9 @@ function getManifestFromSite (siteUrl, callback) {
   .nodeify(callback);
 }
 
-function getManifestFromFile (filePath, callback) {
+function getManifestFromFile (filePath, manifestFormat, callback) {
   return Q.nfcall(fs.readFile, filePath).then(function (data) {
-    return Q.nfcall(processManifestContents, data);    
+    return Q.nfcall(processManifestContents, data, manifestFormat);    
   })
   .nodeify(callback);
 }
@@ -153,10 +156,15 @@ function writeToFile (manifestInfo, filePath, callback) {
   return Q.reject(new Error('Manifest content is empty or invalid.')).nodeify(callback);
 }
 
+function listAvailableManifestFormats() {
+  return [constants.BASE_MANIFEST_FORMAT, constants.CHROME_MANIFEST_FORMAT];
+}
+
 module.exports = {
   getManifestFromSite: getManifestFromSite,
   getManifestFromFile: getManifestFromFile,
   writeToFile: writeToFile,
   fetchManifestUrlFromSite: fetchManifestUrlFromSite,
-  downloadManifestFromUrl: downloadManifestFromUrl
+  downloadManifestFromUrl: downloadManifestFromUrl,
+  listAvailableManifestFormats: listAvailableManifestFormats
 };

lib/validations.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var platformTools = require('./platformTools');
+var platformTools = require('./platformTools'),
+    manifestTools = require('./manifestTools');
 
 function platformsValid(platforms) {
   var availablePlatforms = platformTools.listPlatforms();
@@ -29,8 +30,14 @@ function logLevelValid(level) {
   return availableLevels.indexOf(level.toLowerCase()) >= 0;
 }
 
+function manifestFormatValid(format) {
+  var availableFormats = manifestTools.listAvailableManifestFormats();
+  return availableFormats.indexOf(format.toLowerCase()) >= 0;
+}
+
 module.exports = {
   platformsValid: platformsValid,
   platformToRunValid: platformToRunValid,
-  logLevelValid: logLevelValid
+  logLevelValid: logLevelValid,
+  manifestFormatValid: manifestFormatValid
 };