Moved tags to method call and out of options.

Author: alvadb

cli.js

@@ -28,16 +28,6 @@ yargs
     describe: `Set the log file path. It must be an absolute filepath. ` +
     `By default the logs will stored in a timestamp based log file at "${defaultLogDir}".`
   })
-  .option('o', {
-    alias: 'oldTagName',
-    describe: `The tag name for the old specification file.  If include it ` +
-    `indicates that the old spec file is a readme file`
-  })
-  .option('n', {
-    alias: 'newTagName',
-    describe: `The tag name for the new specification file.  If include it ` +
-    `indicates that the new spec file is a readme file`
-  })
   .global(['h', 'l', 'f'])
   .help()
   .argv;

lib/commands/oad.js

@@ -29,15 +29,22 @@ exports.builder = {
 exports.handler = function (argv) {
   log.debug(argv);
   let oldSpec = argv.oldSpec;
+  let oldTag = argv.o;
   let newSpec = argv.newSpec;
+  let newTag = argv.n;
   let vOptions = {};
   vOptions.consoleLogLevel = argv.logLevel;
   vOptions.logFilepath = argv.f;
   vOptions.json = argv.j;
-  vOptions.oldTagName = argv.o;
-  vOptions.newTagName = argv.n;
-
-  return validate.compare(oldSpec, newSpec, vOptions).then((result) => {
+  
+  let compareFunc;
+  if(oldTag && newTag) {
+    compareFunc = validate.compareTags(oldSpec, oldTag, oldSpec, newTag, vOptions);
+  }else {
+    compareFunc = validate.compare(oldSpec, newSpec, vOptions);
+  }
+  
+  return compareFunc.then((result) => {
     console.log(result);
   }).catch(err => {
     console.log(err);

lib/validate.js

@@ -21,17 +21,41 @@ exports = module.exports;
  * 
  * @param {boolean} [options.matchApiVersion] A boolean flag indicating whether to consider api-version while comparing.
  * 
- * @param {string} [options.oldTagName] Tag name used for autorest with the old specification file.
+ */
+exports.compare = function (oldSwagger, newSwagger, options) {
+  if (!options) options = {};
+
+  log.consoleLogLevel = options.consoleLogLevel || log.consoleLogLevel;
+  log.filepath = options.logFilepath || log.filepath;
+  let openApiDiff = new OpenApiDiff(options);
+
+  return openApiDiff.compare(oldSwagger, newSwagger);
+};
+
+/**
+ * Wrapper method to compares old and new specifications.
  *
- * @param {string} [options.newTagName] Tag name used for autorest with the new specification file.
+ * @param {string} oldSwagger Path to the old specification file.
+ *
+ * @param {string} oldTag Tag name used for autorest with the old specification file.
+ *
+ * @param {string} newSwagger Path to the new specification file.
+ *
+ * @param {string} newTagName Tag name used for autorest with the new specification file.
+ * 
+ * @param {object} options The configuration options.
+ *
+ * @param {boolean} [options.json] A boolean flag indicating whether output format of the messages is json.
+ * 
+ * @param {boolean} [options.matchApiVersion] A boolean flag indicating whether to consider api-version while comparing.
  * 
  */
-exports.compare = function compare(oldSwagger, newSwagger, options) {
+exports.compareTags = function (oldSwagger, oldTag, newSwagger, newTag, options) {
   if (!options) options = {};
 
   log.consoleLogLevel = options.consoleLogLevel || log.consoleLogLevel;
   log.filepath = options.logFilepath || log.filepath;
   let openApiDiff = new OpenApiDiff(options);
 
-  return openApiDiff.compare(oldSwagger, newSwagger);
+  return openApiDiff.compareTags(oldSwagger, oldTag, newSwagger, newTag);
 };

lib/validators/openApiDiff.js

@@ -27,10 +27,6 @@ class OpenApiDiff {
    *
    * @param {boolean} [options.matchApiVersion] A boolean flag indicating whether to consider api-version while comparing.
    *
-   * @param {string} [options.oldTagName] Tag name used for autorest with the old specification file.
-   *
-   * @param {string} [options.newTagName] Tag name used for autorest with the new specification file.
-   *
    * @returns {object} OpenApiDiff Returns the configured OpenApiDiff object.
    */
   constructor(options) {
@@ -60,8 +56,32 @@ class OpenApiDiff {
     log.silly(`compare is being called`);
 
     let self = this;
-    var promise1 = self.processViaAutoRest(oldSwagger, 'old', self.options.oldTagName);
-    var promise2 = self.processViaAutoRest(newSwagger, 'new', self.options.newTagName);
+    var promise1 = self.processViaAutoRest(oldSwagger, 'old');
+    var promise2 = self.processViaAutoRest(newSwagger, 'new');
+
+    return Promise.all([promise1, promise2]).then(results => {
+      return self.processViaOpenApiDiff(results[0], results[1]);
+    });
+  }
+
+  /**
+   * Compares old and new specifications.
+   *
+   * @param {string} oldSwagger Path to the old specification file.
+   *
+   * @param {string} [oldTag] Tag name used for autorest with the old specification file.
+   *
+   * @param {string} newSwagger Path to the new specification file.
+   *
+   * @param {string} [newTag] Tag name used for autorest with the new specification file.
+   *
+   */
+  compareTags(oldSwagger, oldTag, newSwagger, newTag) {
+    log.silly(`compare is being called`);
+
+    let self = this;
+    var promise1 = self.processViaAutoRest(oldSwagger, 'old', oldTag);
+    var promise2 = self.processViaAutoRest(newSwagger, 'new', newTag);
 
     return Promise.all([promise1, promise2]).then(results => {
       return self.processViaOpenApiDiff(results[0], results[1]);