Merge branch 'basic-grunt-support' of https://github.com/davidlinse/n…

…ightwatch into davidlinse-basic-grunt-support * 'basic-grunt-support' of https://github.com/davidlinse/nightwatch: style: remove unused require'd modules chore: add 'unsued:true' to .jshintrc chore: split complexity-task into separate tasks chore: remove options for unused uglify-task
xuaniyo · Jun 14, 2014 · 5560890 · 5560890
2 parents e86feb3 + b34a4a9
commit 5560890
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 20 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -12,5 +12,6 @@
   "quotmark":"single",
   "indent":2,
   "newcap":true,
-  "trailing":true
+  "trailing":true,
+  "unused":true
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,16 +5,6 @@ module.exports = function(grunt) {
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-
-    uglify: {
-      options: {
-        banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
-      },
-      build: {
-        src: 'src/<%= pkg.name %>.js',
-        dest: 'build/<%= pkg.name %>.min.js'
-      }
-    },
     jshint: {
       options: {
         jshintrc: '.jshintrc'
@@ -39,8 +29,19 @@ module.exports = function(grunt) {
       src: ['tests/*.json']
     },
     complexity: {
-      generic: {
-        src: ['lib/**/*.js', 'examples/**/*.js'],
+      lib: {
+        src: ['lib/**/*.js'],
+        options: {
+          breakOnErrors: true,
+          errorsOnly: false,
+          cyclomatic: [12, 10, 8, 6, 4],
+          halstead: [30.19, 25, 20, 16, 12, 6, 3],
+          maintainability: 98.65, // should be 100+,
+          hideComplexFunctions: false
+        }
+      },
+      examples: {
+        src: ['examples/**/*.js'],
         options: {
           breakOnErrors: true,
           errorsOnly: false,

diff --git a/bin/_clirunner.js b/bin/_clirunner.js
@@ -1,7 +1,6 @@
 var Runner = require('../lib/runner/run.js');
 var Logger = require('../lib/util/logger.js');
 var Selenium = require('../lib/runner/selenium.js');
-var util = require('util');
 var fs = require('fs');
 var path = require('path');
 

diff --git a/bin/runner.js b/bin/runner.js
@@ -1,8 +1,6 @@
 /**
  * Module dependencies
  */
-var fs = require('fs');
-var path = require('path');
 var Logger = require('../lib/util/logger.js');
 var cli = require('./_cli.js');
 var CliRunner = require('./_clirunner.js');

diff --git a/lib/http/request.js b/lib/http/request.js
@@ -1,6 +1,5 @@
 var util    = require('util'),
   events  = require('events'),
-  qs      = require('querystring'),
   http    = require('http'),
   https   = require('https'),
   Logger  = require('./../util/logger');

diff --git a/lib/runner/reporters/junit.js b/lib/runner/reporters/junit.js
@@ -1,7 +1,6 @@
 var fs = require('fs'),
     path = require('path'),
-    ejs = require('ejs'),
-    child_process = require('child_process');
+    ejs = require('ejs');
 
 exports.save = function(results, opts, callback) {
   var tmpl = __dirname + '/junit.xml.ejs';

diff --git a/lib/runner/run.js b/lib/runner/run.js
@@ -3,7 +3,6 @@
  */
 var path = require('path');
 var fs = require('fs');
-var util = require('util');
 var mkpath = require('mkpath');
 var minimatch = require('minimatch');
 var Nightwatch = require('../../index.js');