diff --git a/.gitignore b/.gitignore index 0225d32..a0cd405 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ plugins/default/csslint/libs/ plugins/default/eslint/libs/ plugins/default/coffeelint/libs/ libs/ -!libs/js/utils.js ################# ## NodeJs diff --git a/gulpfile.js b/gulpfile.js index 02be75b..8baba15 100644 --- a/gulpfile.js +++ b/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/")); +}); diff --git a/package.json b/package.json index 50b6930..c1fd8b6 100644 --- a/package.json +++ b/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", diff --git a/plugins/default/coffeelint/main.js b/plugins/default/coffeelint/main.js index 1dfc8a6..b6d146a 100644 --- a/plugins/default/coffeelint/main.js +++ b/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 }); }); diff --git a/plugins/default/csslint/main.js b/plugins/default/csslint/main.js index 917c1d5..01775f6 100644 --- a/plugins/default/csslint/main.js +++ b/plugins/default/csslint/main.js @@ -7,7 +7,7 @@ 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")); @@ -15,7 +15,7 @@ define(function(require) { 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 }); }); diff --git a/plugins/default/eslint/main.js b/plugins/default/eslint/main.js index e944df7..a5efc82 100644 --- a/plugins/default/eslint/main.js +++ b/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 }); }); diff --git a/plugins/default/htmlhint/main.js b/plugins/default/htmlhint/main.js index 42b0295..57eba89 100644 --- a/plugins/default/htmlhint/main.js +++ b/plugins/default/htmlhint/main.js @@ -7,7 +7,7 @@ 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")); @@ -15,8 +15,8 @@ define(function(require) { 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 }); }); diff --git a/plugins/default/jscs/main.js b/plugins/default/jscs/main.js index c630a91..8b3d10d 100644 --- a/plugins/default/jscs/main.js +++ b/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 }); }); diff --git a/plugins/default/jshint/main.js b/plugins/default/jshint/main.js index 5ab4bc8..9c7c5c3 100644 --- a/plugins/default/jshint/main.js +++ b/plugins/default/jshint/main.js @@ -15,7 +15,7 @@ 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")); @@ -23,7 +23,7 @@ define(function(require /*, exports, module*/) { 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 }); }); diff --git a/plugins/default/jslint/main.js b/plugins/default/jslint/main.js index 051d87b..4395f88 100644 --- a/plugins/default/jslint/main.js +++ b/plugins/default/jslint/main.js @@ -8,7 +8,7 @@ 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")); @@ -16,7 +16,7 @@ define(function(require /*, exports, module*/) { 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 }); }); diff --git a/plugins/default/jsonlint/main.js b/plugins/default/jsonlint/main.js index 057892c..c09cbc0 100644 --- a/plugins/default/jsonlint/main.js +++ b/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,7 +24,7 @@ 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); @@ -32,7 +32,7 @@ define(function(require /*, exports, module*/) { catch(ex) { if (lastError) { groomer.groom(lastError); - errors = [utils.mixin({}, lastError)]; + errors = [belty.extend({}, lastError)]; lastError = null; } } @@ -40,7 +40,7 @@ define(function(require /*, exports, module*/) { return errors; } - return utils.mixin(settings, { + return belty.mixin(settings, { lint: lint }); }); diff --git a/plugins/default/jsx/main.js b/plugins/default/jsx/main.js index e41dd14..86753d2 100644 --- a/plugins/default/jsx/main.js +++ b/plugins/default/jsx/main.js @@ -7,7 +7,7 @@ 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")); @@ -15,7 +15,7 @@ define(function(require /*, exports, module*/) { 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 }); });