Replace utils with belty

Author: Stephen Gregory

.gitignore

@@ -10,7 +10,6 @@ plugins/default/csslint/libs/
 plugins/default/eslint/libs/
 plugins/default/coffeelint/libs/
 libs/
-!libs/js/utils.js
 
 #################
 ## NodeJs

gulpfile.js

@@ -91,3 +91,9 @@ gulp.task("eslint:install-dev-dependencies", function () {
     return gulp.src("./node_modules/eslint/package.json")
         .pipe(install());
 });
+
+gulp.task("belty", function () {
+    return gulp.src("./node_modules/belty/dist/index.js")
+        .pipe(rename("belty.js"))
+        .pipe(gulp.dest("./libs/js/"));
+});

package.json

@@ -33,8 +33,9 @@
     "restore": "gulp"
   },
   "dependencies": {
-    "coffeelint": "^1.9.1",
+    "belty": "^0.3.0",
     "coffee-script": "https://github.com/jashkenas/coffeescript/tarball/1.9.1",
+    "coffeelint": "^1.9.1",
     "eslint": "https://github.com/eslint/eslint/tarball/v1.0.0-rc-3",
     "htmlhint": "^0.9.7",
     "jscs": "^1.12.0",

plugins/default/coffeelint/main.js

@@ -12,7 +12,7 @@ var window = window || {};
 define(function(require /*, exports, module*/) {
     "use strict";
 
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var groomer        = require("coffeelint/groomer");
     var defaultOptions = JSON.parse(require("text!coffeelint/default.json"));
     var settings       = JSON.parse(require("text!coffeelint/settings.json"));
@@ -38,7 +38,7 @@ define(function(require /*, exports, module*/) {
 
 
     function lint(text, options) {
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
         var result;
 
         try {
@@ -54,7 +54,7 @@ define(function(require /*, exports, module*/) {
         return result;
     }
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });

plugins/default/csslint/main.js

@@ -7,15 +7,15 @@
 define(function(require) {
     "use strict";
 
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var groomer        = require("csslint/groomer");
     var defaultOptions = JSON.parse(require("text!csslint/default.json"));
     var settings       = JSON.parse(require("text!csslint/settings.json"));
 
     require("csslint/libs/csslint");
 
     function lint(text, options) {
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
         var results = CSSLint.verify(text, options).messages;
         var i, length;
 
@@ -27,7 +27,7 @@ define(function(require) {
         return results;
     }
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });

plugins/default/eslint/main.js

@@ -8,14 +8,14 @@
 define(function(require /*, exports, module*/) {
     "use strict";
 
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var groomer        = require("eslint/groomer");
     var eslint         = require("eslint/libs/eslint");
     var defaultOptions = JSON.parse(require("text!eslint/default.json"));
     var settings       = JSON.parse(require("text!eslint/settings.json"));
 
     function lint(source, options) {
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
         var results = [], i, length;
 
         try {
@@ -32,7 +32,7 @@ define(function(require /*, exports, module*/) {
         return results;
     }
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });

plugins/default/htmlhint/main.js

@@ -7,16 +7,16 @@
 define(function(require) {
     "use strict";
 
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var groomer        = require("htmlhint/groomer");
     var defaultOptions = JSON.parse(require("text!htmlhint/default.json"));
     var settings       = JSON.parse(require("text!htmlhint/settings.json"));
 
     require("htmlhint/libs/htmlhint");
 
     function lint(text, options) {
-        options = utils.mixin({}, defaultOptions, options);
-        var results = HTMLHint.verify(text, options);
+        options = belty.mixin({}, defaultOptions, options);
+        var results = HTMLHint.extend(text, options);
 
         var i, length;
         for (i = 0, length = results.length; i < length; i++) {
@@ -26,7 +26,7 @@ define(function(require) {
         return results;
     }
 
-    return utils.mixin(settings, {
+    return belty.mixin(settings, {
         lint: lint
     });
 });

plugins/default/jscs/main.js

@@ -8,13 +8,13 @@ define(function (require /*, exports, module*/) {
     "use strict";
 
     var JSCS           = require("jscs/libs/jscs-browser");
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var groomer        = require("jscs/groomer");
     var defaultOptions = JSON.parse(require("text!jscs/default.json"));
     var settings       = JSON.parse(require("text!jscs/settings.json"));
 
     function lint(text, options) {
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
         var i, length, jscs, errors, errList;
 
         try {
@@ -35,7 +35,7 @@ define(function (require /*, exports, module*/) {
         return errList;
     }
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });

plugins/default/jshint/main.js

@@ -15,15 +15,15 @@ define(function(require /*, exports, module*/) {
      */
 
     require("jshint/libs/jshint");
-    var utils           = require("libs/utils");
+    var belty           = require("libs/belty");
     var groomer         = require("jshint/groomer");
     var defaultOptions  = JSON.parse(require("text!jshint/default.json"));
     var settings        = JSON.parse(require("text!jshint/settings.json"));
 
     function lint(text, options) {
         var i, length;
 
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
 
         try {
           // Get document as a string to be passed into JSHint
@@ -50,7 +50,7 @@ define(function(require /*, exports, module*/) {
         }
     }
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });

plugins/default/jslint/main.js

@@ -8,15 +8,15 @@ define(function(require /*, exports, module*/) {
     "use strict";
 
     var jslint          = require("jslint/libs/jslint");
-    var utils           = require("libs/utils");
+    var belty           = require("libs/belty");
     var groomer         = require("jslint/groomer");
     var defaultSettings = JSON.parse(require("text!jslint/default.json"));
     var settings        = JSON.parse(require("text!jslint/settings.json"));
 
     function lint(text, options) {
         var i, length;
 
-        options = utils.mixin({}, defaultSettings, options);
+        options = belty.extend({}, defaultSettings, options);
 
         if (!jslint(text, options)) {
             var errors = jslint.errors.slice(0);
@@ -36,7 +36,7 @@ define(function(require /*, exports, module*/) {
         }
     }
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });

plugins/default/jsonlint/main.js

@@ -8,7 +8,7 @@ define(function(require /*, exports, module*/) {
     "use strict";
 
     require("jsonlint/libs/jsonlint");
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var groomer        = require("jsonlint/groomer");
     var defaultOptions = JSON.parse(require("text!jsonlint/default.json"));
     var settings       = JSON.parse(require("text!jsonlint/settings.json"));
@@ -24,23 +24,23 @@ define(function(require /*, exports, module*/) {
 
     function lint(text, options) {
         var errors;
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
 
         try {
             jsonlint.parse(text);
         }
         catch(ex) {
             if (lastError) {
                 groomer.groom(lastError);
-                errors = [utils.mixin({}, lastError)];
+                errors = [belty.extend({}, lastError)];
                 lastError = null;
             }
         }
 
         return errors;
     }
 
-    return utils.mixin(settings, {
+    return belty.mixin(settings, {
         lint: lint
     });
 });

plugins/default/jsx/main.js

@@ -7,15 +7,15 @@
 define(function(require /*, exports, module*/) {
     "use strict";
 
-    var utils          = require("libs/utils");
+    var belty          = require("libs/belty");
     var jshint         = require("jshint");
     var reacttools     = require("jsx/libs/reacttools");
     var defaultOptions = JSON.parse(require("text!jsx/default.json"));
     var settings       = JSON.parse(require("text!jsx/settings.json"));
 
 
     function lint(source, options) {
-        options = utils.mixin({}, defaultOptions, options);
+        options = belty.extend({}, defaultOptions, options);
 
         try {
             source = reacttools.transform(source, {harmony: true, es6module: true});
@@ -46,7 +46,7 @@ define(function(require /*, exports, module*/) {
     }
 
 
-    return utils.mixin(settings, {
+    return belty.extend(settings, {
         lint: lint
     });
 });