Merge commit '7fd160c016d7b00aca923673004dcdcf4b5a0068' into sahar/update-pkg

# Conflicts:
#	package.json
#	src/index.js
#	src/targets/node/native.js
#	src/targets/node/unirest.js

Author: saharbechor

.jshintrc

@@ -1,3 +1,2 @@
-.jshintrc
 .editorconfig
 test

.npmignore

@@ -3,7 +3,6 @@ language: node_js
 node_js:
  - node
  - lts/*
- - 8
 
 before_install:
   - sudo apt-get update -qq

.travis.yml

@@ -23,7 +23,7 @@ npm install --save httpsnippet
 
 ```
 
-  Usage: httpsnippet [options] <file>
+  Usage: httpsnippet [options] <files ...>
 
   Options:
 
@@ -32,6 +32,7 @@ npm install --save httpsnippet
     -t, --target <target>     target output
     -c, --client [client]     target client library
     -o, --output <directory>  write output to directory
+    -x, --extra [{"optionKey": "optionValue"}]  provide extra options for the target/client
 
 ```
 
@@ -63,6 +64,13 @@ snippets/
 └── endpoint-3.js
 ```
 
+provide extra options:
+
+```shell
+httpsnippet example.json --target http --output ./snippets -x '{"autoHost": false, "autoContentLength": false}'
+```
+
+
 ## API
 
 ### HTTPSnippet(source)

README.md

@@ -2,37 +2,49 @@
 
 'use strict'
 
-var chalk = require('chalk')
-var cmd = require('commander')
-var fs = require('fs')
-var readFile = require('fs-readfile-promise')
-var writeFile = require('fs-writefile-promise')
-var HTTPSnippet = require('..')
-var path = require('path')
-var pkg = require('../package.json')
+const chalk = require('chalk')
+const cmd = require('commander')
+const fs = require('fs')
+const readFile = require('fs-readfile-promise')
+const writeFile = require('fs-writefile-promise')
+const HTTPSnippet = require('..')
+const path = require('path')
+const pkg = require('../package.json')
 
 cmd
   .version(pkg.version)
   .usage('[options] <files ...>')
   .option('-t, --target <target>', 'target output')
   .option('-c, --client [client]', 'target client library')
   .option('-o, --output <directory>', 'write output to directory')
+  .option('-x, --extra [{"optionKey": "optionValue"}]', 'provide extra options for the target/client')
   .parse(process.argv)
 
 if (!cmd.args.length || !cmd.target) {
   cmd.help()
 }
 
+let extraOptions
+if (cmd.extra) {
+  try {
+    extraOptions = JSON.parse(cmd.extra)
+  } catch (e) {
+    console.error('%s failed to parse options %s (should be JSON)', chalk.red('✖'), chalk.cyan.bold(cmd.extra))
+    process.exit()
+  }
+}
+
+let dir
 if (cmd.output) {
-  var dir = path.resolve(cmd.output)
+  dir = path.resolve(cmd.output)
 
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir)
   }
 }
 
 cmd.args.forEach(function (fileName) {
-  var file = path.basename(fileName)
+  const file = path.basename(fileName)
 
   readFile(fileName)
     .then(JSON.parse)
@@ -52,19 +64,24 @@ cmd.args.forEach(function (fileName) {
     })
 
     .then(function (snippet) {
-      return snippet.convert(cmd.target, cmd.client)
+      return snippet.convert(cmd.target, cmd.client, extraOptions)
     })
 
     .then(function (output) {
+      if (!output) {
+        const targetNames = HTTPSnippet.availableTargets().map(function (t) { return t.key }).join(', ')
+        return console.error('%s %s is not a valid target. Valid targets: %s', chalk.red('✖'), chalk.red(cmd.target), chalk.cyan(targetNames))
+      }
+
       // print
       if (!cmd.output) {
         return console.log('%s %s > %s [%s] :\n%s', chalk.green('✓'), chalk.cyan.bold(file), chalk.yellow(cmd.target), chalk.yellow(cmd.client ? cmd.client : 'default'), output)
       }
 
       // write to file
-      var name = path.basename(file, path.extname(file))
+      const name = path.basename(file, path.extname(file))
 
-      var filename = path.format({
+      const filename = path.format({
         dir: dir,
         base: name + HTTPSnippet.extname(cmd.target)
       })