Add jsformat and jshint. Add additional npm script tasks. Fix formatting errors

.jshintrc

+{
+  "asi": false,
+  "bitwise": true,
+  "browser": true,
+  "camelcase": false,
+  "curly": true,
+  "forin": false,
+  "immed": true,
+  "latedef": "nofunc",
+  "maxlen": false,
+  "newcap": false,
+  "noarg": true,
+  "node": true,
+  "noempty": true,
+  "nonew": true,
+  "predef": [
+    "jasmine",
+    "spyOn",
+    "beforeEach",
+    "afterEach",
+    "fdescribe",
+    "xdescribe",
+    "describe",
+    "expect",
+    "it",
+    "fit",
+    "xit"
+  ],
+  "quotmark": true,
+  "trailing": true,
+  "undef": true,
+  "unused": false,
+  "esversion": 6
+}

.travis.yml

 language: node_js
 node_js:
   - "6.0.0"
+script: npm run-script integrate

README.md

@@ -101,6 +101,22 @@ tournament: { tournament_type: 'single elimination' }
 $ npm test
 ```
 
+### Run JsFmt/JsHint
+
+```bash
+$ npm run-script format
+```
+
+```bash
+$ npm run-script lint
+```
+
+### All (travis integration tests)
+
+```bash
+$ npm run-script integrate
+```
+
 ### Issue Tracking
 
 Issues are tracked on github: https://github.com/Tidwell/node-challonge/issues

lib/api/client.js

@@ -39,7 +39,7 @@ function serializeProperties(obj) {
 	var serializedProperties = [];
 	for (var prop in obj) {
 		if (obj.hasOwnProperty(prop)) {
-			if (typeof(obj[prop]) === 'object' && obj[prop] !== null) {
+			if (typeof (obj[prop]) === 'object' && obj[prop] !== null) {
 				for (var attr in obj[prop]) {
 					compiledParams += '&';
 					compiledParams += prop + '[' + attr + ']=' + encodeURIComponent(obj[prop][attr]);
@@ -112,7 +112,7 @@ Client.prototype.makeRequest = function(obj) {
 
 	// Add on the api key
 	obj.api_key = this.options.get('apiKey'); //convert for url
-	obj.cache_bust = Math.random()
+	obj.cache_bust = Math.random();
 	//serialize the properties
 	var serialized = serializeProperties(obj);
 	var compiledParams = serialized.serialized;

lib/api/client.spec.js

@@ -152,7 +152,7 @@ describe('Client Class', () => {
 			const opts = parseOpts();
 
 			expect(opts['some_property[another_property]']).toBe('anotherthing');
-			expect(opts['something']).not.toBeDefined();
+			expect(opts.something).not.toBeDefined();
 		});
 
 		it('should add the api key to request', () => {
@@ -303,6 +303,6 @@ describe('Client Class', () => {
 			httpsMock.listeners.data[0]('<bla>');
 			httpsMock.listeners.end[0]();
 			expect(spy).toHaveBeenCalledWith(null, '<bla>');
-		})
+		});
 	});
 });

lib/api/error-handler.js

@@ -58,4 +58,4 @@ exports.handle = function(res, resData, callback, format) {
 	// ship the response object back as the data
 	callback(err, res);
 	return;
-}
+};

lib/api/matches.spec.js

@@ -32,7 +32,7 @@ describe('matches endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/matches',
 					method: 'GET'
-				})
+				});
 			};
 			matchesInstance.index({
 				id: 25

lib/api/participants.js

@@ -58,4 +58,4 @@ Participants.prototype.randomize = function(obj) {
 	delete obj.id;
 	obj.method = 'POST';
 	this.makeRequest(obj);
-}
+};

lib/api/participants.spec.js

@@ -20,7 +20,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/participants',
 					method: 'GET'
-				})
+				});
 			};
 			participantsInstance.index({
 				id: 25
@@ -32,7 +32,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/participants',
 					method: 'GET'
-				})
+				});
 			};
 			participantsInstance.index({
 				id: 25
@@ -47,7 +47,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/participants',
 					method: 'POST'
-				})
+				});
 			};
 			participantsInstance.create({
 				id: 25
@@ -59,7 +59,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/participants',
 					method: 'POST'
-				})
+				});
 			};
 			participantsInstance.create({
 				id: 25
@@ -74,7 +74,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/participants/456',
 					method: 'GET'
-				})
+				});
 			};
 			participantsInstance.show({
 				id: 25,
@@ -87,7 +87,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/participants/456',
 					method: 'GET'
-				})
+				});
 			};
 			participantsInstance.show({
 				id: 25,
@@ -103,7 +103,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/participants/456',
 					method: 'PUT'
-				})
+				});
 			};
 			participantsInstance.update({
 				id: 25,
@@ -116,7 +116,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/participants/456',
 					method: 'PUT'
-				})
+				});
 			};
 			participantsInstance.update({
 				id: 25,
@@ -132,7 +132,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/participants/456',
 					method: 'DELETE'
-				})
+				});
 			};
 			participantsInstance.destroy({
 				id: 25,
@@ -145,7 +145,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/participants/456',
 					method: 'DELETE'
-				})
+				});
 			};
 			participantsInstance.destroy({
 				id: 25,
@@ -161,7 +161,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/participants/randomize',
 					method: 'POST'
-				})
+				});
 			};
 			participantsInstance.randomize({
 				id: 25
@@ -173,7 +173,7 @@ describe('participants endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/participants/randomize',
 					method: 'POST'
-				})
+				});
 			};
 			participantsInstance.randomize({
 				id: 25

lib/api/tournaments.spec.js

@@ -39,7 +39,7 @@ describe('tournaments endpoints', () => {
 
 			expect(domain).toEqual('');
 		});
-	})
+	});
 
 	// index	GET	tournaments
 	describe('index', () => {
@@ -48,7 +48,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					id: 25,
 					method: 'GET'
-				})
+				});
 			};
 			tournamentsInstance.index({
 				id: 25
@@ -61,7 +61,7 @@ describe('tournaments endpoints', () => {
 					id: 25,
 					method: 'GET',
 					subdomain: 'somedomain'
-				})
+				});
 			};
 			tournamentsInstance.index({
 				id: 25
@@ -76,7 +76,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					id: 25,
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.create({
 				id: 25
@@ -91,7 +91,7 @@ describe('tournaments endpoints', () => {
 					tournament: {
 						subdomain: 'somedomain'
 					}
-				})
+				});
 			};
 			tournamentsInstance.create({
 				id: 25,
@@ -107,7 +107,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25',
 					method: 'GET'
-				})
+				});
 			};
 			tournamentsInstance.show({
 				id: 25
@@ -119,7 +119,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25',
 					method: 'GET'
-				})
+				});
 			};
 			tournamentsInstance.show({
 				id: 25
@@ -134,7 +134,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25',
 					method: 'PUT'
-				})
+				});
 			};
 			tournamentsInstance.update({
 				id: 25
@@ -146,7 +146,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25',
 					method: 'PUT'
-				})
+				});
 			};
 			tournamentsInstance.update({
 				id: 25
@@ -161,7 +161,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25',
 					method: 'DELETE'
-				})
+				});
 			};
 			tournamentsInstance.destroy({
 				id: 25
@@ -173,7 +173,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25',
 					method: 'DELETE'
-				})
+				});
 			};
 			tournamentsInstance.destroy({
 				id: 25
@@ -188,7 +188,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/start',
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.start({
 				id: 25
@@ -200,7 +200,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/start',
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.start({
 				id: 25
@@ -215,7 +215,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/finalize',
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.finalize({
 				id: 25
@@ -227,7 +227,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/finalize',
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.finalize({
 				id: 25
@@ -242,7 +242,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/25/reset',
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.reset({
 				id: 25
@@ -254,7 +254,7 @@ describe('tournaments endpoints', () => {
 				expect(obj).toEqual({
 					path: '/somedomain-25/reset',
 					method: 'POST'
-				})
+				});
 			};
 			tournamentsInstance.reset({
 				id: 25

lib/challonge.spec.js

@@ -47,5 +47,5 @@ describe('Challonge object', () => {
 			expect(client.participants.setSubdomain).toHaveBeenCalled();
 			expect(client.matches.setSubdomain).toHaveBeenCalled();
 		});
-	})
+	});
 });

package.json

@@ -4,13 +4,16 @@
   "author": "Aaron Tiwell <aaron.tidwell@gmail.com>",
   "main": "./lib/challonge.js",
   "version": "1.2.0",
-  "contributors": [{
+  "contributors": [
+    {
       "name": "Ricardo Reis",
       "email": "ricardojoaoreis@gmail.com"
-  }, {
+    },
+    {
       "name": "Jonas Vanen",
       "email": "jonas.vanen@gmail.com"
-  }],
+    }
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/Tidwell/node-challonge"
@@ -28,11 +31,23 @@
   "devDependencies": {
     "istanbul": "^0.4.5",
     "jasmine": "^2.5.3",
+    "jsfmt": "^0.5.3",
+    "jshint": "^2.9.4",
     "mockery": "^2.0.0"
   },
   "scripts": {
     "test": "./node_modules/jasmine/bin/jasmine.js",
-    "coverage": "node ./node_modules/istanbul/lib/cli.js cover --include-all-sources ./node_modules/jasmine/bin/jasmine.js -x '**/spec/**' -x '**/key.js'"
+    "coverage": "node ./node_modules/istanbul/lib/cli.js cover --include-all-sources ./node_modules/jasmine/bin/jasmine.js -x '**/spec/**' -x '**/key.js'",
+
+    "format-lib": "./node_modules/jsfmt/bin/jsfmt -w ./lib ./*.js",
+    "format-spec": "./node_modules/jsfmt/bin/jsfmt -w ./spec",
+    "format": "npm run-script format-lib && npm run-script format-spec",
+
+    "lint-lib": "./node_modules/jshint/bin/jshint ./lib",
+    "lint-spec": "./node_modules/jshint/bin/jshint ./spec",
+    "lint": "npm run-script lint-lib && npm run-script lint-spec",
+
+    "integrate": "npm run-script test && npm run-script format && npm run-script lint"
   },
   "engine": "node >= 0.10.x"
 }

spec/helpers/index.js

@@ -15,7 +15,9 @@ const httpsMock = {
 	},
 	res: {
 		on: (method, cb) => {
-			if (!httpsMock.listeners[method]) { httpsMock.listeners[method] = []; }
+			if (!httpsMock.listeners[method]) {
+				httpsMock.listeners[method] = [];
+			}
 			httpsMock.listeners[method].push(cb);
 		}
 	},
@@ -24,7 +26,8 @@ const httpsMock = {
 		pipe(this.res);
 
 		return {
-			end: () => {}
+			end: () => {
+			}
 		};
 	}
 };