Merge pull request #1 from tyabonil/master (58a6af4a) · Commits · Isfand Yar Khan / request-promise

.editorconfig

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,3 +19,6 @@ insert_final_newline = true

	[*.md]		[*.md]
	trim_trailing_whitespace = false		trim_trailing_whitespace = false

			[*.json]
			indent_size = 2

.gitignore

+4 −19

Original line number	Original line	Diff line number	Diff line
	.idea		.DS_Store
			.idea/
	coverage		coverage/
	lib-cov		node_modules/
	*.seed
	*.log
	*.csv
	*.dat
	*.out
	*.pid
	*.gz

	pids
	logs
	results

	npm-debug.log		npm-debug.log
	node_modules

	test.js
	No newline at end of file

.jshintrc

+10 −6

.npmignore

0 → 100644

+7 −0

Original line number	Original line	Diff line number	Diff line
			.idea/
			coverage/
			test/
			.editorconfig
			.jshintrc
			.travis.yml
			gulpfile.js

.travis.yml

+12 −2

Original line number	Original line	Diff line number	Diff line
	language: node_js		language: node_js

	node_js:		node_js:
	- "0.8"
	- "0.10"		- "0.10"
	- "0.11"		- "0.11"

			env:
			- V_REQUEST=2.34.0 V_BLUEBIRD=2.3.0
			- V_REQUEST=latest V_BLUEBIRD=latest

			before_script:
			- npm uninstall request
			- npm uninstall bluebird
			- npm install request@$V_REQUEST
			- npm install bluebird@$V_BLUEBIRD

Original line number	Original line	Diff line number	Diff line
	@@ -13,11 +13,11 @@
	// with different skill levels.		// with different skill levels.

	"bitwise" : true, // Prohibit bitwise operators (&, \|, ^, etc.).		"bitwise" : true, // Prohibit bitwise operators (&, \|, ^, etc.).
	"curly" : false, // Require {} for every new block or scope.		"curly" : true, // Require {} for every new block or scope.
	"eqeqeq" : true, // Require triple equals i.e. `===`.		"eqeqeq" : true, // Require triple equals i.e. `===`.
	"forin" : true, // Tolerate `for in` loops without `hasOwnPrototype`.		"forin" : true, // Tolerate `for in` loops without `hasOwnPrototype`.
	"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`		"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
	"latedef" : false, // Prohibit variable use before definition.		"latedef" : true, // Prohibit variable use before definition.
	"newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`.		"newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`.
	"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.		"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.
	"noempty" : true, // Prohibit use of empty blocks.		"noempty" : true, // Prohibit use of empty blocks.
	@@ -25,7 +25,7 @@
	"plusplus" : true, // Prohibit use of `++` & `--`.		"plusplus" : true, // Prohibit use of `++` & `--`.
	"regexp" : true, // Prohibit `.` and `[^...]` in regular expressions.		"regexp" : true, // Prohibit `.` and `[^...]` in regular expressions.
	"undef" : true, // Require all non-global variables be declared before they are used.		"undef" : true, // Require all non-global variables be declared before they are used.
	"strict" : false, // Require `use strict` pragma in every file.		"strict" : true, // Require `use strict` pragma in every file.
	"trailing" : true, // Prohibit trailing whitespaces.		"trailing" : true, // Prohibit trailing whitespaces.

	// == Relaxing Options ================================================		// == Relaxing Options ================================================
	@@ -35,7 +35,7 @@
	// them only if you are absolutely positive that you know what you are		// them only if you are absolutely positive that you know what you are
	// doing.		// doing.

	"asi" : true, // Tolerate Automatic Semicolon Insertion (no semicolons).		"asi" : false, // Tolerate Automatic Semicolon Insertion (no semicolons).
	"boss" : false, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.		"boss" : false, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
	"debug" : false, // Allow debugger statements e.g. browser breakpoints.		"debug" : false, // Allow debugger statements e.g. browser breakpoints.
	"eqnull" : false, // Tolerate use of `== null`.		"eqnull" : false, // Tolerate use of `== null`.
	@@ -80,13 +80,17 @@
	"rhino" : false, // Enable globals available when your code is running inside of the Rhino runtime environment.		"rhino" : false, // Enable globals available when your code is running inside of the Rhino runtime environment.
	"wsh" : false, // Enable globals available when your code is running as a script for the Windows Script Host.		"wsh" : false, // Enable globals available when your code is running as a script for the Windows Script Host.

	// Additional globals introduced by Mocha		// Additional globals introduced by Mocha and Chai
	"globals": {		"globals": {
	"describe" : false,		"describe" : false,
			"xdescribe" : false,
	"it" : false,		"it" : false,
			"xit" : false,
	"before" : false,		"before" : false,
			"beforeEach" : false,