Merge pull request #6 from jqian33/AddSchemaCmdOption

Add schema command line option

Author: ConnorChristie

Diff for: bin/apib2postman.js

@@ -9,11 +9,13 @@ const apib2postman = require('../src/index.js');
 
 var options = nopt({
     'output': String,
+    'schema': String,
     'environment': String,
     'testTemplate': String,
     'help': Boolean
 }, {
     'o': ['--output'],
+    's': ['--schema'],
     'e': ['--environment'],
     't': ['--testTemplate'],
     'h': ['--help']
@@ -31,6 +33,7 @@ if (options.help || options.argv.remain.length === 0) {
     console.log("Options:")
     console.log("  -h --help Print this help and exit.");
     console.log("  -o --output <file> Output result to file.");
+    console.log("  -s --schema <directory> Directory containing json schema output files.");
     console.log("  -e --environment <file> The output file for the Postman environment.");
     console.log("  -t --testTemplate <template.hbs> The postman test template to use for each action.");
     process.exit();
@@ -41,6 +44,9 @@ const collectionFile = options.output || 'API.postman_collection.json';
 const environmentFile = options.environment || 'API.postman_environment.json';
 const includePath = input ? path.dirname(input) : process.cwd();
 var apibData = '';
+if (!options.schema) {
+    options.schema = 'schema';
+}
 
 fs.createReadStream(input).on('data', (chunk) => {
     apibData += chunk;

Diff for: package.json

@@ -2,7 +2,7 @@
   "name": "@apib/2postman",
   "description": "Convert API Blueprints to Postman Collections",
   "author": "Johnson Controls, Plc.",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "BSD",
   "dependencies": {
     "apib-include-directive": "^0.1.0",
@@ -11,7 +11,8 @@
     "handlebars": "^4.0.11",
     "lodash": "^4.17.10",
     "nopt": "^3.0.6",
-    "uritemplate": "^0.3.4"
+    "uritemplate": "^0.3.4",
+    "mkdir-recursive": "^0.4.0"
   },
   "bin": {
     "apib2postman": "./bin/apib2postman.js"

Diff for: src/index.js

@@ -3,6 +3,7 @@ const _ = require('lodash'),
       UriTemplate = require('uritemplate'),
       Handlebars = require('handlebars'),
       postmanGenerator = require('./generators/postman'),
+      fx = require('mkdir-recursive');
       fs = require('fs');
 
 Handlebars.registerHelper('json', function (obj) {
@@ -23,20 +24,16 @@ function apib2postman(apib, options) {
   };
 
   addEnvVariables(environment.values, ['base_url', 'username', 'password', 'include_sad_tests']);
-  const schemaDir = 'schema';
-  if (!fs.existsSync(schemaDir)){
-      fs.mkdirSync(schemaDir);
-  }
 
   apib.content[0].content
     .filter(content => content.element === 'category')
     .forEach(category => {
       const title = category.meta.title;
       const groups = [];
 
-      const schemaGroupDir = schemaDir + '/' + title;
+      const schemaGroupDir = options.schema + '/' + title;
       if (!fs.existsSync(schemaGroupDir)){
-          fs.mkdirSync(schemaGroupDir);
+          fx.mkdirSync(schemaGroupDir);
       }
 
       category.content