Pre-release house cleaning

alexindigo · alexindigo · commit 440d72b5fd44 · 2016-08-26T00:42:22.000-07:00
diff --git a/.npmignore b/.npmignore
@@ -3,11 +3,7 @@
 *.sublime-*
 *.un~
 
-.idea
-.gitignore
-.istanbul.yml
-.npmignore
-.travis.yml
+.*
 
 Makefile
 appveyor.yml
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,14 @@ node_js:
   - "0.10"
   - "0.12"
   - "iojs"
-  - "4.2"
-  - "stable"
+  - "4"
+  - "5"
+  - "6"
+script:
+  - node --version
+  - npm --version
+  - npm run lint
+  - npm run test
 after_script:
   - "cat coverage/lcov.info | ./node_modules/.bin/coveralls"
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,12 +1,11 @@
-init:
-  - git config --global core.autocrlf true
 environment:
   matrix:
     - nodejs_version: '0.10'
     - nodejs_version: '0.12'
     - nodejs_version: '1.0'
-    - nodejs_version: '4.2'
+    - nodejs_version: '4'
     - nodejs_version: '5'
+    - nodejs_version: '6'
 platform:
   - x86
   - x64
@@ -20,3 +19,5 @@ test_script:
   - npm --version
   - npm run test
 build: off
+matrix:
+  fast_finish: true
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -291,6 +291,7 @@ FormData.prototype.getHeaders = function(userHeaders) {
   return formHeaders;
 };
 
+// TODO: Looks like unused function
 FormData.prototype.getCustomHeaders = function(contentType) {
   contentType = contentType ? contentType : 'multipart/form-data';
 
diff --git a/lib/populate.js b/lib/populate.js
@@ -1,9 +1,10 @@
 // populates missing values
 module.exports = function(dst, src) {
-  for (var prop in src) {
-    if (src.hasOwnProperty(prop) && !dst[prop]) {
-      dst[prop] = src[prop];
-    }
-  }
+
+  Object.keys(src).forEach(function(prop)
+  {
+    dst[prop] = dst[prop] || src[prop];
+  });
+
   return dst;
 };
diff --git a/package.json b/package.json
@@ -16,8 +16,7 @@
     "lint": "eslint lib/*.js test/*.js test/**/*.js",
     "predebug": "rimraf coverage test/tmp",
     "debug": "verbose=1 ./test/run.js",
-    "check": "istanbul check-coverage coverage/coverage*.json",
-    "coverage": "codacy-coverage < ./coverage/lcov.info; true"
+    "check": "istanbul check-coverage coverage/coverage*.json"
   },
   "pre-commit": [
     "lint",
@@ -32,9 +31,7 @@
     "combined-stream": "^1.0.5",
     "mime-types": "^2.1.10"
   },
-  "license": "MIT",
   "devDependencies": {
-    "codacy-coverage": "^1.1.3",
     "coveralls": "^2.11.8",
     "cross-spawn": "^2.1.5",
     "eslint": "^2.4.0",
@@ -45,5 +42,6 @@
     "pre-commit": "^1.1.2",
     "request": "^2.69.0",
     "rimraf": "^2.5.2"
-  }
+  },
+  "license": "MIT"
 }
diff --git a/wercker.yml b/wercker.yml
