Skip to content

Commit

Permalink
refactor: make lint happy
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed May 17, 2016
1 parent 2d51260 commit ee20345
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 20 deletions.
5 changes: 5 additions & 0 deletions console.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PhantomJS 2.1.1 (Mac OS X 0.0.0)
PhantomJS 2.1.1 (Mac OS X 0.0.0)
PhantomJS 2.1.1 (Mac OS X 0.0.0)
PhantomJS 2.1.1 (Mac OS X 0.0.0)
PhantomJS 2.1.1 (Mac OS X 0.0.0)
8 changes: 4 additions & 4 deletions lib/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ var parser = function (pattern, out) {
return parser(pattern.substring(matches[0].length), out)
}

var gs_parser = function (pattern, out) {
var gsParser = function (pattern, out) {
if (pattern === '**') {
out.glob_star++
return out
}
return parser(pattern, out)
}

var compare_weight_object = function (w1, w2) {
var compareWeightObject = function (w1, w2) {
return exports.mmComparePatternWeights(
[w1.glob_star, w1.star, w1.ext_glob, w1.range, w1.optional],
[w2.glob_star, w2.star, w2.ext_glob, w2.range, w2.optional]
Expand All @@ -58,10 +58,10 @@ exports.mmPatternWeight = function (pattern) {
if (!m.globParts) return [0, 0, 0, 0, 0, 0]
var result = m.globParts.reduce(function (prev, p) {
var r = p.reduce(function (prev, p) {
return gs_parser(p, prev)
return gsParser(p, prev)
}, {glob_star: 0, ext_glob: 0, word: 0, star: 0, optional: 0, range: 0})
if (prev === undefined) return r
return compare_weight_object(r, prev) > 0 ? r : prev
return compareWeightObject(r, prev) > 0 ? r : prev
}, undefined)
result.glob_sets = m.set.length
return [result.glob_sets, result.glob_star, result.star, result.ext_glob, result.range, result.optional]
Expand Down
2 changes: 1 addition & 1 deletion lib/middleware/strip_host.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var createStripHostMiddleware = function () {
return function (request, response, next) {
function stripHostFromUrl (url) {
return url.replace(/^http[s]?:\/\/([a-z\-\.\:\d]+)\//, '/')
return url.replace(/^http[s]?:\/\/([a-z\-\.:\d]+)\//, '/')
}

request.normalizedUrl = stripHostFromUrl(request.url) || request.url
Expand Down
6 changes: 3 additions & 3 deletions lib/reporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ var createReporters = function (names, config, emitter, injector) {
emitter.emit('load_error', 'reporter', name)
return
}
var color_name = name + '_color'
if (names.indexOf(color_name) !== -1) {
var colorName = name + '_color'
if (names.indexOf(colorName) !== -1) {
return
}
try {
log.debug('Trying to load color-version of reporter: %s (%s)', name, color_name)
log.debug('Trying to load color-version of reporter: %s (%s)', name, colorName)
reporters.push(injector.createChild([locals], ['reporter:' + name + '_color']).get('reporter:' + name))
} catch (e) {
log.debug('Couldn\'t load color-version.')
Expand Down
22 changes: 11 additions & 11 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,23 +208,23 @@ Server.prototype._start = function (config, launcher, preprocess, fileList, webS
})

if (config.browserConsoleLogOptions && config.browserConsoleLogOptions.path) {
var config_level = config.browserConsoleLogOptions.level || 'debug'
var config_format = config.browserConsoleLogOptions.format || '%b %T: %m'
var config_path = config.browserConsoleLogOptions.path
self.log.info('Writing browser console to file: %s', config_path)
var browser_log_file = fs.openSync(config_path, 'w+')
var configLevel = config.browserConsoleLogOptions.level || 'debug'
var configFormat = config.browserConsoleLogOptions.format || '%b %T: %m'
var configPath = config.browserConsoleLogOptions.path
self.log.info('Writing browser console to file: %s', configPath)
var browserLogFile = fs.openSync(configPath, 'w+')
var levels = ['log', 'error', 'warn', 'info', 'debug']
self.on('browser_log', function (browser, message, level) {
if (levels.indexOf(level.toLowerCase()) > levels.indexOf(config_level)) return
if (levels.indexOf(level.toLowerCase()) > levels.indexOf(configLevel)) return
if (!helper.isString(message)) {
message = util.inspect(message, {showHidden: false, colors: false})
}
var log_map = {'%m': message, '%t': level.toLowerCase(), '%T': level.toUpperCase(), '%b': browser}
var log_string = config_format.replace(/%[mtTb]/g, function (m) {
return log_map[m]
var logMap = {'%m': message, '%t': level.toLowerCase(), '%T': level.toUpperCase(), '%b': browser}
var logString = configFormat.replace(/%[mtTb]/g, function (m) {
return logMap[m]
})
self.log.debug('Writing browser console line: %s', log_string)
fs.write(browser_log_file, log_string + '\n')
self.log.debug('Writing browser console line: %s', logString)
fs.write(browserLogFile, logString + '\n')
})
}

Expand Down
2 changes: 1 addition & 1 deletion lib/watcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var DIR_SEP = require('path').sep
var baseDirFromPattern = function (pattern) {
return pattern
.replace(/[\/\\][^\/\\]*\*.*$/, '') // remove parts with *
.replace(/[\/\\][^\/\\]*[\!\+]\(.*$/, '') // remove parts with !(...) and +(...)
.replace(/[\/\\][^\/\\]*[!\+]\(.*$/, '') // remove parts with !(...) and +(...)
.replace(/[\/\\][^\/\\]*\)\?.*$/, '') || DIR_SEP // remove parts with (...)?
}

Expand Down

0 comments on commit ee20345

Please sign in to comment.