Comparing version 1.0.2 to 1.0.3
exports.ServiceSync = require('./service.gen.sync'); | ||
exports.ServiceAsync = require('./service.gen.async'); | ||
exports.Api = require('./service.api'); | ||
exports.version = '1.0.2'; | ||
exports.version = '1.0.3'; |
@@ -123,7 +123,4 @@ /*jshint loopfunc: true */ | ||
options = options || {}; | ||
if (options.headers) { | ||
options.headers = Hoek.merge(options.headers, call.headers); | ||
} else { | ||
options.headers = call.headers; | ||
} | ||
// headers set in API call overwrites headers set in api.json | ||
options.headers = Hoek.merge(call.headers, options.headers); | ||
return self.httpRequest(this, method, options); | ||
@@ -135,3 +132,6 @@ }; | ||
default: | ||
call[sKey] = self.recursiveBuildServices(path + '/' + sKey, services[sKey], call.host, call.headers); | ||
call[sKey] = self.recursiveBuildServices( | ||
path + '/' + sKey, | ||
services[sKey], | ||
call.host, call.headers); | ||
break; | ||
@@ -138,0 +138,0 @@ } |
{ | ||
"name": "bluecat", | ||
"version": "1.0.2", | ||
"version": "1.0.3", | ||
"author": "ccy <ccy.chenchaoyi@gmail.com>", | ||
@@ -31,3 +31,3 @@ "description": "Library for building HTTP requests, good for generic REST API Test Framework", | ||
"request": "2.67.0", | ||
"yargs": "^3.31.0" | ||
"yargs": "^3.32.0" | ||
}, | ||
@@ -42,5 +42,5 @@ "scripts": { | ||
"grunt": "^0.4.5", | ||
"grunt-contrib-jshint": "^0.11.3", | ||
"grunt-contrib-jshint": "^0.12.0", | ||
"grunt-jscs": "^2.6.0" | ||
} | ||
} |
@@ -27,2 +27,3 @@ ## Bluecat <img src="https://raw.github.com/chenchaoyi/bluecat/master/images/bluecat.png" align="middle" /> | ||
- [Usage](#usage) | ||
- [Command line tool](#command-line-tool) | ||
- [Logging](#logging) | ||
@@ -225,2 +226,14 @@ - [License](#license) | ||
## Command line tool ## | ||
Bluecat comes with `bluecat` command line interface that helps you to create a basic Web services API test framework. | ||
```bash | ||
$ npm install bluecat | ||
$ ./node_modules/.bin/bluecat config | ||
``` | ||
Follow the instructions and it will create a scaffold of basic web services API test framework for you. | ||
--- | ||
## Logging | ||
@@ -227,0 +240,0 @@ |
32444
260
Updatedyargs@^3.32.0