Merge pull request #83 from vishrutshah/oad-v0.1.5

Update sequence to look for autorest in different cases

Author: vishrutshah

index.js

@@ -11,7 +11,7 @@ exports.log = require('./lib/util/logging');
 exports.compare = validate.compare;
 
 // Classes
-exports.OpenApiDiff = require('./lib/validators/OpenApiDiff');
+exports.OpenApiDiff = require('./lib/validators/openApiDiff');
 
 // Constants
 exports.Constants = require('./lib/util/constants');

lib/validators/openApiDiff.js

@@ -100,7 +100,18 @@ class OpenApiDiff {
   autoRestPath() {
     log.silly(`autoRestPath is being called`);
 
-    return path.join(__dirname, "..", "..", "node_modules", "autorest", "app.js");
+    // When oad is installed globally
+    let result = path.join(__dirname, "..", "..", "node_modules", "autorest", "app.js");
+    if (fs.existsSync(result))
+      return `node ${result}`;
+
+    // When oad is installed locally
+    result = path.join(__dirname, "..", "..", "..", "autorest", "app.js");
+    if (fs.existsSync(result))
+      return `node ${result}`;
+
+    // Assume that autorest is in the path
+    return 'autorest';
   }
 
   /**
@@ -144,7 +155,7 @@ class OpenApiDiff {
 
       let outputFolder = os.tmpdir();
       let outputFilePath = path.join(outputFolder, `${outputFileName}.json`);
-      let autoRestCmd = `node ${self.autoRestPath()} --input-file=${swaggerPath} --output-artifact=swagger-document.json --output-file=${outputFileName} --output-folder=${outputFolder}`;
+      let autoRestCmd = `${self.autoRestPath()} --input-file=${swaggerPath} --output-artifact=swagger-document.json --output-file=${outputFileName} --output-folder=${outputFolder}`;
 
       log.debug(`Executing: "${autoRestCmd}"`);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oad",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "author": {
     "name": "Microsoft Corporation",
     "email": "[email protected]",