Merge pull request #9 from azu/defaults-pattern

implement: default pattern

fix #8

Author: azu

.gitignore

@@ -0,0 +1,31 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
+node_modules
+
+

intelli-espower-loader.js

@@ -1,36 +1,8 @@
 "use strict";
-var fs = require("fs");
-var assert = require("assert");
 var pather = require("path");
-var normalizeDir = require("./lib/normalize-dir");
-var packageName = require("./package.json").name;
-
-function findPackageDir(paths) {
-    if (!paths) {
-        return null;
-    }
-    for (var i = 0; i < paths.length; ++i) {
-        var dir = pather.dirname(paths[i]);
-        var dirName = dir.split(pather.sep).pop();
-        if (dirName !== packageName && fs.existsSync(pather.join(dir, 'package.json'))) {
-            return dir;
-        }
-    }
-}
-function getPackageJSON() {
-    var dir = findPackageDir(module.paths);
-    assert(dir, "package.json is not found");
-    return require(pather.resolve(dir, "package.json"));
-}
-function getTestDirFromPkg(pkg) {
-    var directories = pkg.directories;
-    assert.equal(typeof directories, "object", 'You should setting `directories : { test : "test/" }`');
-    assert.equal(typeof directories.test, "string", 'You should setting `directories : { test : "test/" }`');
-    return directories.test;
-}
-var pkg = getPackageJSON();
-var testDirectory = getTestDirFromPkg(pkg);
+var pkg = require("./lib/get-package-json")(module.paths);
+var testDirectory = require("./lib/get-test-dir")(pkg);
 require('espower-loader')({
     cwd: process.cwd(),
-    pattern: normalizeDir(testDirectory) + "**" + pather.sep + "*.js"
+    pattern: testDirectory + "**" + pather.sep + "*.js"
 });

lib/get-package-json.js

@@ -0,0 +1,31 @@
+// LICENSE : MIT
+"use strict";
+
+var assert = require("assert");
+var path = require("path");
+var packageName = require("../package.json").name;
+
+function findPackageDir(paths) {
+    if (!paths) {
+        return null;
+    }
+    for (var i = 0; i < paths.length; ++i) {
+        var dir = path.dirname(paths[i]);
+        var dirName = dir.split(path.sep).pop();
+        if (dirName !== packageName) {
+            return dir;
+        }
+    }
+}
+/**
+ * find package.json directory and return package json.
+ * You should pass `module.paths` to `paths`.
+ * @param {string[]} paths the paths for look-up
+ * @returns {object}
+ */
+function getPackageJSON(paths) {
+    var dir = findPackageDir(paths);
+    assert(dir, "package.json is not found");
+    return require(path.resolve(dir, "package.json"));
+}
+module.exports = getPackageJSON;

lib/get-test-dir.js

@@ -0,0 +1,20 @@
+// LICENSE : MIT
+"use strict";
+var normalizeDir = require("./normalize-dir");
+var defaultTestDir = "test/";
+/**
+ * Return `dir/` string
+ * always suffix with `/`
+ * @param {object} pkg
+ * @returns {string}
+ */
+function getTestDirFromPkg(pkg) {
+    if (pkg &&
+        typeof pkg.directories === 'object' &&
+        typeof pkg.directories.test === 'string') {
+        return normalizeDir(pkg.directories.test);
+    }
+    return defaultTestDir;
+}
+
+module.exports = getTestDirFromPkg;

readme.md

@@ -16,7 +16,7 @@ npm install power-assert --save-dev
 
 ## Usage
 
-1. You have to set test directory to your `package.json`
+### 1. (Optional) You have to set test directory to your `package.json`
 
 ``` json
 {
@@ -37,7 +37,9 @@ npm install power-assert --save-dev
 }
 ```
 
-### Run mocha with `intelli-espower-loader`
+If you didn't set directories.test, use 'test/' as default value.
+
+### 2. Run mocha with `intelli-espower-loader`
 
 ``` sh
 mocha --require intelli-espower-loader

test/get-test-dir-test.js

@@ -0,0 +1,34 @@
+// LICENSE : MIT
+"use strict";
+var assert = require("assert");
+var getTestDir = require("../lib/get-test-dir");
+describe("get-test-dir-test", function () {
+    context("when package.json does not have directories properties", function () {
+        it("should return directories properties", function () {
+            var packageJsonMock = {};
+            var expected = "test/";
+            assert.equal(getTestDir(packageJsonMock), expected);
+        });
+    });
+    context("when `pkg.directories.test` is not found", function () {
+        it("should return 'test/'", function () {
+            var dir = getTestDir({
+                "directories": {}
+            });
+            var expected = "test/";
+            assert.equal(dir, expected);
+        });
+    });
+    context("when `pkg.directories.test` is set", function () {
+        it("should return 'user-dir/'", function () {
+            var dir = getTestDir({
+                "directories": {
+                    "test": "user-dir"
+                }
+            });
+            var expected = "user-dir/";
+            assert.equal(dir, expected);
+        });
+    });
+
+});