add wildcard boolean support

.travis.yml

@@ -1,18 +1,18 @@
 language: node_js
 node_js:
-    - "4.3"
-    - "5.6"
+    - "4"
+    - "6"
 
 before_script:
-    - npm install -g grunt-cli
+#   - npm install -g grunt-cli
 
 script:
-    - grunt lint
-    - node run_tests
+    - npm run lint
+    - npm test
 
 after_success:
-    - npm install istanbul codecov.io
-    - ./node_modules/istanbul/lib/cli.js cov run_tests
-    - cat ./coverage/coverage.json | ./node_modules/codecov.io/bin/codecov.io.js
+    - npm install istanbul codecov
+    - npm run coverage
+    - ./node_modules/.bin/codecov
 
 sudo: false

package.json

@@ -3,15 +3,15 @@
   "name": "haraka-config",
   "license": "MIT",
   "description": "Haraka's config file loader",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
     "url": "git@github.com:haraka/haraka-config.git"
   },
   "main": "config.js",
   "engines": {
-    "node": ">= 0.10.43"
+    "node": ">= 0.12.16"
   },
   "dependencies": {
     "js-yaml": "^3.5.3"
@@ -55,7 +55,7 @@
   },
   "optionalDependencies": {},
   "devDependencies": {
-    "eslint": ">=2.0.0",
+    "eslint": ">=2",
     "grunt": "*",
     "grunt-eslint": "*",
     "nodeunit": "^0.9.1"
@@ -65,6 +65,8 @@
     "url": "https://github.com/haraka/haraka-config/issues"
   },
   "scripts": {
-    "test": "./run_tests"
+    "test": "./run_tests",
+    "lint": "./node_modules/.bin/grunt lint",
+    "coverage": "./node_modules/.bin/istanbul cov run_tests"
   }
 }

readers/ini.js

@@ -60,8 +60,11 @@ exports.load = function (name, options, regex) {
         }
 
         if (options && Array.isArray(options.booleans) &&
-            exports.bool_matches.indexOf(
-                current_sect_name + '.' + match[1]) !== -1) {
+            (
+                exports.bool_matches.indexOf(current_sect_name + '.' + match[1]) !== -1
+                ||
+                exports.bool_matches.indexOf('*.' + match[1]) !== -1
+            )) {
             current_sect[match[1]] = regex.is_truth.test(match[2]);
             // var msg = 'Using boolean ' + current_sect[match[1]] +
             // ' for ' + current_sect_name + '.' + match[1] + '=' + match[2];

test/config.js

@@ -236,7 +236,9 @@ exports.get = {
             array_test: {
                 hostlist: [ 'first_host', 'second_host', 'third_host' ],
                 intlist: [ '123', '456', '789' ],
-            }
+            },
+            'foo.com': { is_bool: 'true' },
+            'bar.com': { is_bool: 'false' }
         });
     },
 

test/config/test.ini

@@ -35,3 +35,9 @@ hostlist[] = third_host
 intlist[] = 123
 intlist[] = 456
 intlist[] = 789
+
+[foo.com]
+is_bool=true
+
+[bar.com]
+is_bool=false

test/readers/ini.js

@@ -4,7 +4,9 @@ var regex = require('../../configfile').regex;
 
 var _set_up = function (done) {
     this.ini = require('../../readers/ini');
-    this.opts = { booleans: ['main.bool_true','main.bool_false'] };
+    this.opts = {
+        booleans: [ 'main.bool_true', 'main.bool_false' ]
+    };
     done();
 };
 
@@ -74,6 +76,15 @@ exports.load = {
         test.strictEqual(r.sect1.bool_false_default, false);
         test.done();
     },
+    'test.ini, wildcard boolean' : function (test) {
+        test.expect(2);
+        var r = this.ini.load('test/config/test.ini', {
+            booleans: [ '*.is_bool' ]
+        }, regex);
+        test.strictEqual(r['foo.com'].is_bool, true);
+        test.strictEqual(r['bar.com'].is_bool, false);
+        test.done();
+    },
 };
 
 exports.empty = {