Update support files.

.gitignore

@@ -1,5 +1,5 @@
-build
-reports
+docs/
+reports/
 
 # Mac OS X
 .DS_Store

.jshintrc

@@ -1,6 +1,5 @@
 {
   "node": true,
-
   "bitwise": true,
   "camelcase": true,
   "curly": true,
@@ -15,6 +14,5 @@
   "undef": true,
   "unused": true,
   "trailing": true,
-
   "laxcomma": true
 }

.npmignore

@@ -1,19 +1,8 @@
-README.md
 Makefile
-build/
 docs/
 examples/
 reports/
-support/
 test/
 
-# Mac OS X
-.DS_Store
-
-# Node.js
-.npmignore
-node_modules/
-npm-debug.log
-
-# Git
-.git*
+.jshintrc
+.travis.yml

.travis.yml

@@ -1,18 +1,26 @@
 language: "node_js"
 node_js:
-  - "0.4"
-  - "0.6"
-  - "0.8"
-  - "0.10"
+  - "8"
+  - "7"
+  - "6"
+  - "5"
+  - "4"
+  - "3" # io.js
+  - "2" # io.js
+  - "1" # io.js
   - "0.12"
-  - "4.0"
-  - "4.1"
+  - "0.10"
+  - "0.8"
+
 
 before_install:
- - "npm install istanbul -g"
- - "npm install coveralls -g"
+  - "npm install [email protected] -g"
+  - "preinstall-compat"
 
-script: "make ci-travis"
+script:
+  - "make test-cov"
 
 after_success:
-  - "make submit-coverage-to-coveralls"
+  - "make report-cov"
+
+sudo: false

LICENSE

@@ -1,6 +1,6 @@
-(The MIT License)
+The MIT License (MIT)
 
-Copyright (c) 2013 Jared Hanson
+Copyright (c) 2013-2017 Jared Hanson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

Makefile

@@ -1,49 +1,23 @@
-SOURCES = *.js
-TESTS = test/*.test.js
+include node_modules/make-node/main.mk
 
-lint: lint-jshint
-test: test-mocha
-test-cov: test-istanbul-mocha
-view-cov: view-istanbul-report
 
+SOURCES = lib/*.js lib/**/*.js
+TESTS = test/*.test.js test/**/*.test.js
 
-# ==============================================================================
-# Node.js
-# ==============================================================================
-include support/mk/node.mk
-include support/mk/mocha.mk
+LCOVFILE = ./reports/coverage/lcov.info
 
-# ==============================================================================
-# Browserify
-# ==============================================================================
-BROWSERIFY_MAIN = ./index.js
 
-include support/mk/browserify.mk
-include support/mk/testling.mk
+view-docs:
+	open ./docs/index.html
 
-# ==============================================================================
-# Code Quality
-# ==============================================================================
-include support/mk/notes.mk
-include support/mk/jshint.mk
-include support/mk/istanbul.mk
+view-cov:
+	open ./reports/coverage/lcov-report/index.html
 
-# ==============================================================================
-# Continuous Integration
-# ==============================================================================
-include support/mk/coveralls.mk
+clean: clean-docs clean-cov
+	-rm -r $(REPORTSDIR)
 
-ci-travis: test test-cov
-submit-coverage-to-coveralls: submit-istanbul-lcov-to-coveralls
+clobber: clean
+	-rm -r node_modules
 
-# ==============================================================================
-# Clean
-# ==============================================================================
-clean:
-	rm -rf build
-	rm -rf reports
 
-clobber: clean clobber-node
-
-
-.PHONY: lint test test-cov view-cov ci-travis clean clobber
+.PHONY: clean clobber

package.json

@@ -5,23 +5,30 @@
   "keywords": [
     "util"
   ],
+  "author": {
+    "name": "Jared Hanson",
+    "email": "[email protected]",
+    "url": "http://www.jaredhanson.net/"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/jaredhanson/utils-merge.git"
   },
   "bugs": {
     "url": "http://github.com/jaredhanson/utils-merge/issues"
   },
-  "author": {
-    "name": "Jared Hanson",
-    "email": "[email protected]",
-    "url": "http://www.jaredhanson.net/"
-  },
   "license": "MIT",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    }
+  ],
   "main": "./index",
   "dependencies": {
   },
   "devDependencies": {
+    "make-node": "0.3.x",
     "mocha": "1.x.x",
     "chai": "1.x.x"
   },
@@ -30,15 +37,5 @@
   },
   "scripts": {
     "test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js"
-  },
-  "testling": {
-    "browsers": [
-      "chrome/latest"
-    ],
-    "harness" : "mocha",
-    "files": [
-      "test/bootstrap/testling.js",
-      "test/*.test.js"
-    ]
   }
 }