Remove use of deprecated APIs.

Move to ES6.
Other assorted clean up and formatting.

Author: AaronAsAChimp

.gitignore

@@ -10,3 +10,5 @@ npm-debug.log
 
 # grunt-bless files
 tmp
+lib
+tasks

.jshintrc

@@ -9,5 +9,7 @@
   "undef": true,
   "boss": true,
   "eqnull": true,
-  "node": true
+  "node": true,
+  "smarttabs": true,
+  "esnext": true
 }

.npmignore

@@ -0,0 +1,13 @@
+# Node files
+node_modules
+npm-debug.log
+
+# OSX Files
+.DS_Store
+
+# Version control files
+*.orig
+
+# grunt-bless files
+tmp
+src

Gruntfile.js

@@ -16,16 +16,49 @@ module.exports = function(grunt) {
 		jshint: {
 			all: [
 				'Gruntfile.js',
-				'tasks/*.js'
+				'src/**/*.js'
 			],
 			options: {
 				jshintrc: '.jshintrc'
 			}
 		},
 
+		babel: {
+			options: {
+				'modules': 'commonStrict',
+				'whitelist': [
+					'es6.modules',
+					'es6.arrowFunctions',
+					//'minification.deadCodeElimination',
+					//'minification.constantFolding',
+					'strict'
+				],
+				'optional': [
+					'runtime'
+				]
+			},
+			dist: {
+				files: [
+					{
+						'cwd': 'src/lib/',
+						'src': '**/*.js',
+						'dest': 'lib/',
+						'expand': true,
+						'filter': 'isFile'
+					}, {
+						'cwd': 'src/tasks/',
+						'src': '**/*.js',
+						'dest': 'tasks/',
+						'expand': true,
+						'filter': 'isFile'
+					}
+				]
+			}
+		},
+
 		// Before generating any new files, remove any previously-created files.
 		clean: {
-			tests: ['tmp']
+			tests: ['tmp', 'tasks', 'lib']
 		},
 
 		// Configuration to be run (and then tested).
@@ -72,6 +105,18 @@ module.exports = function(grunt) {
 					'test/input/above-limit.css': 'test/input/above-limit.css'
 				}
 			}
+		},
+
+		// Configuration for unit tests
+		mochaTest: {
+			test: {
+				options: {
+					reporter: 'spec'
+				},
+				src: [
+					'test/**/*.js'
+				]
+			}
 		}
 	});
 
@@ -81,13 +126,16 @@ module.exports = function(grunt) {
 	// These plugins provide necessary tasks.
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-clean');
-	grunt.loadNpmTasks('grunt-contrib-nodeunit');
+	grunt.loadNpmTasks('grunt-mocha-test');
+	grunt.loadNpmTasks('grunt-babel');
+
+	grunt.registerTask('build', ['babel']);
 
 	// Whenever the "test" task is run, first clean the "tmp" dir, then run this
 	// plugin's task(s), then test the result.
-	grunt.registerTask('test', ['clean', 'bless:default_options', 'bless:custom_options', 'bless:check']);
+	grunt.registerTask('test', ['clean', 'build', 'mochaTest', 'bless:default_options', 'bless:custom_options', 'bless:check']);
 
 	// By default, lint and run all tests.
-	grunt.registerTask('default', ['jshint', 'test']);
+	grunt.registerTask('default', ['clean', 'jshint', 'build']);
 
 };

README.md

@@ -97,13 +97,6 @@ Default value: `true`
 Enable or disable the use of `@import` in generated CSS files. This feature was
 added in bless.js 3.0.3.
 
-#### options.cacheBuster ####
-
-Type: `Boolean`
-Default value: `true`
-
-Add or remove a cache-buster parameter from the generated CSS files.
-
 #### options.logCount ####
 
 Type: `Boolean | String`
@@ -118,6 +111,22 @@ Default value: `false`
 
 Requires `logCount`. If set to `true,` the process will exit with an error if the selector limit is exceeded.
 
+### Removed options ###
+
+These options have been removed from `grunt-bless` and no longer function.
+
+#### options.cacheBuster ####
+
+Type: `Boolean`
+Default value: `true`
+Reason for removal:
+	- Removed in bless 4.0.0.
+	- Other plugins may provide better support.
+	- [See this issue](https://github.com/BlessCSS/bless/issues/57)
+
+Add or remove a cache-buster parameter from the generated CSS files.
+
+
 ### Usage Examples ###
 
 #### Default Options ####
@@ -188,7 +197,9 @@ Release History
 	- Update to bless 4.0.0
 - **Next**
 	- Clean up the NPM package, thanks @mimiflynn
-	- other assorted clean up and formatting.
+	- Remove use of deprecated APIs.
+	- Move to ES6.
+	- Other assorted clean up and formatting.
 - **0.2.0**
 	- Updated documentation to note the newness of the not yet released to npm `imports` option, thanks @spoike
 	- Added a banner option to avoid banners getting misplaced in the blessing process, thanks @jelmerdemaat

package.json

@@ -34,13 +34,17 @@
     "test": "grunt test"
   },
   "dependencies": {
+    "async": "^1.5.0",
     "bless": "~4.0.0-alpha",
-    "chalk": "~0.5.1"
+    "chalk": "~1.1.0"
   },
   "devDependencies": {
-    "grunt-contrib-jshint": "~0.1.1",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt": "~0.4.1"
+    "grunt": "~0.4.1",
+    "grunt-babel": "^5.0.1",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-jshint": "~0.11.0",
+    "grunt-mocha-test": "^0.12.7",
+    "mocha": "^2.3.4"
   },
   "peerDependencies": {
     "grunt": "~0.4.1"