From a5add46b3193ad80fd9d590ecd328ece364dfbab Mon Sep 17 00:00:00 2001 From: Roel Dev Date: Wed, 18 Nov 2015 21:41:50 +0100 Subject: [PATCH] Updates to codestyle --- .jscsrc | 4 +--- gulpfile.js | 5 ++--- lib/utils.js | 2 +- test/main.js | 12 ++++++------ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.jscsrc b/.jscsrc index 845ebba..e12c332 100644 --- a/.jscsrc +++ b/.jscsrc @@ -37,14 +37,12 @@ ["do", "case", "try", "void", "while", "function"], //"requirePaddingNewLinesInObjects": true, "requireParenthesesAroundIIFE": true, - "requireQuotedKeysInObjects": true, "requireSemicolons": true, "requireSpaceAfterBinaryOperators": true, "requireSpaceAfterKeywords": ["do", "for", "if", "else", "switch", "case", "try", "catch", "void", "while", "with", "return", "typeof"], "requireSpaceAfterLineComment": - { "allExcept": ["#", "=", - "------------------------------------------------------------------------------", "//////////////////////////////////////////////////////////////////////////////"] }, + { "allExcept": ["#", "="] }, "requireSpaceBeforeBinaryOperators": true, "requireSpaceBeforeObjectValues": true, "requireSpaceBetweenArguments": true, diff --git a/gulpfile.js b/gulpfile.js index 029cb5b..3ed9dec 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,9 +10,8 @@ var GulpJsCs = require('gulp-jscs'); var GulpJsCsStylish = require('gulp-jscs-stylish'); var GulpMocha = require('gulp-mocha'); var RunSequence = require('run-sequence'); -var Utils = require('./lib/utils.js'); -//------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- var JS_SRC = ['gulpfile.js', 'lib/**/*.js', 'test/*.js']; @@ -20,7 +19,7 @@ function noop() { } -//////////////////////////////////////////////////////////////////////////////// +// ----------------------------------------------------------------------------- Gulp.task('lint', function() { diff --git a/lib/utils.js b/lib/utils.js index e7ce7f3..0ce7a89 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -5,7 +5,7 @@ var _ = require('underscore'); -//////////////////////////////////////////////////////////////////////////////// +// ----------------------------------------------------------------------------- var Utils = module.exports = { diff --git a/test/main.js b/test/main.js index c4679bf..9d191d2 100644 --- a/test/main.js +++ b/test/main.js @@ -9,7 +9,7 @@ var Confirge = require('../lib/index.js'); var Path = require('path'); var Utils = require('../lib/utils.js'); -//------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- var OBJ_PLAIN = { 'title': 'test obj', 'success': true }; var EXPECTED_YAML = { 'title': 'test yaml', 'success': true }; @@ -22,7 +22,7 @@ var EXPECTED_VARS = { } }; -//////////////////////////////////////////////////////////////////////////////// +// ----------------------------------------------------------------------------- function getFixtureFile($file, $relative) { @@ -39,7 +39,7 @@ function noop() { } -//------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- describe('Confirge()', function confirgeTests() { @@ -216,7 +216,7 @@ describe('Confirge.replace()', function confirgeReplaceTests() 'key2-2': [ 'replace me too! %var1%', 'skip me! %var2%', - [ 'down the rabbit hole', 'last %var1% replacement' ] + ['down the rabbit hole', 'last %var1% replacement'] ] } }; @@ -231,7 +231,7 @@ describe('Confirge.replace()', function confirgeReplaceTests() 'key2-2': [ 'replace me too! value1', 'skip me! %var2%', - [ 'down the rabbit hole', 'last value1 replacement' ] + ['down the rabbit hole', 'last value1 replacement'] ] } }); @@ -280,7 +280,7 @@ describe('Confirge.extend()', function confirgeExtendTests() }); }); -//------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- describe('Utils.findReplacements()', function utilsFindReplacementsTests() {