Configuration: correct config dir detection

Fixes #1932

Author: markelog

lib/config/node-configuration.js

@@ -1,11 +1,15 @@
 var path = require('path');
 var util = require('util');
-var utils = require('../utils');
+var fs = require('fs');
+var assert = require('assert');
+
 var glob = require('glob');
+var resolve = require('resolve');
+
+var utils = require('../utils');
 var Configuration = require('./configuration');
-var assert = require('assert');
 var configFinder = require('../cli-config');
-var resolve = require('resolve');
+
 
 var OVERRIDE_OPTIONS = [
     'fix',
@@ -200,7 +204,10 @@ NodeConfiguration.prototype._loadAdditionalRule = function(additionalRule, confi
 
     if (typeof additionalRule === 'string') {
         if (glob.hasMagic(additionalRule)) {
-            config = path.extname(config).length ? path.dirname(config) : config;
+
+            // In some cases there might not be a config
+            // like if options are defined through direct initialization (grunt plugin case)
+            config = fs.statSync(config).isDirectory() ? config : path.dirname(config);
 
             glob.sync(path.resolve(config, additionalRule)).forEach(function(p) {
                 var Rule = require(p);

test/data/configs/additionalRules/gh-1932/.jscsrc

@@ -0,0 +1,3 @@
+{
+    "successRule": true
+}

test/data/configs/additionalRules/gh-1932/success-rule.js

@@ -0,0 +1,12 @@
+module.exports = function() {};
+
+module.exports.prototype = {
+
+    configure: function() {},
+
+    getOptionName: function() {
+        return 'successRule';
+    },
+
+    check: function(file, errors) {}
+};

test/specs/config/node-configuration.js

@@ -395,6 +395,24 @@ describe('modules/config/node-configuration', function() {
             expect(configuration.getRegisteredRules()[0]).to.be.an.instanceof(AdditionalRule);
         });
 
+        it('should register additional rule with dot config (gh-1932)', function() {
+            configuration.load({
+                additionalRules: ['./success-rule.js'],
+                configPath: path.resolve(__dirname + '/../../data/configs/additionalRules/gh-1932/.jscsrc')
+            });
+            expect(configuration.getRegisteredRules().length).to.equal(1);
+            expect(configuration.getRegisteredRules()[0].getOptionName()).to.equal('successRule');
+        });
+
+        it('should register additional rule with dot config through glob pattern (gh-1932)', function() {
+            configuration.load({
+                additionalRules: ['./*.js'],
+                configPath: path.resolve(__dirname + '/../../data/configs/additionalRules/gh-1932/.jscsrc')
+            });
+            expect(configuration.getRegisteredRules().length).to.equal(1);
+            expect(configuration.getRegisteredRules()[0].getOptionName()).to.equal('successRule');
+        });
+
         it('should accept `additionalRules` without "configPath" option', function() {
             configuration.load({
                 additionalRules: ['./test/data/rules/*.js']