Skip to content

Commit b26e679

Browse files
devcrustdevcrust
committed
Merge branch 'release/v0.1.6'
2 parents b58dc06 + e6b905a commit b26e679

File tree

19 files changed

+409
-29
lines changed

19 files changed

+409
-29
lines changed

‎.coveralls.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
service_name: travis-ci

‎.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ deploy:
1919
on:
2020
tags: true
2121

22+
after_success:
23+
- npm run test-coverage
24+
2225
notifications:
2326
email:
2427
- [email protected]

‎README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# Dips [![NPM version](https://badge.fury.io/js/dips.png)](http://badge.fury.io/js/dips) [![Build Status](https://travis-ci.org/devcrust/node-dips.png?branch=master)](https://travis-ci.org/devcrust/node-dips)
1+
# Dips
2+
3+
[![NPM version](https://badge.fury.io/js/dips.png)](http://badge.fury.io/js/dips)
4+
[![Build Status](https://travis-ci.org/devcrust/node-dips.png?branch=master)](https://travis-ci.org/devcrust/node-dips)
5+
[![Dependency Status](https://gemnasium.com/devcrust/node-dips.png)](https://gemnasium.com/devcrust/node-dips)
6+
[![Coverage Status](https://coveralls.io/repos/devcrust/node-dips/badge.png?branch=master)](https://coveralls.io/r/devcrust/node-dips?branch=master)
7+
[![Stories in Ready](https://badge.waffle.io/devcrust/node-dips.png?label=ready)](https://waffle.io/devcrust/node-dips)
28

39
A simple yet powerful dependency injection and entity (file) management framework for Node.js
410

‎docs/report/coverage.html

Lines changed: 354 additions & 0 deletions
Large diffs are not rendered by default.

‎package.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@
5454
},
5555
"devDependencies" : {
5656

57-
"mocha" : "1.17.x"
57+
"mocha" : "1.17.x",
58+
"mocha-lcov-reporter" : "0.0.x",
59+
"coveralls" : "2.7.x",
60+
"blanket" : "1.1.x"
5861

5962
},
6063

@@ -68,10 +71,22 @@
6871

6972
"main" : "./dips.js",
7073

74+
"config" : {
75+
76+
"blanket" : {
77+
78+
"pattern" : "src"
79+
80+
}
81+
82+
},
83+
7184
"scripts" : {
7285

73-
"test" : "NODE_ENV=test ./node_modules/.bin/mocha --reporter spec --ui tdd --timeout 5000 --slow 100 --colors --bail --recursive test/",
74-
"build-doc" : "jsdoc --destination docs --recurse --private lib/ dips.js"
86+
"test" : "./node_modules/.bin/mocha --reporter spec --ui tdd --timeout 5000 --slow 100 --colors --bail --recursive test/",
87+
"test-coverage" : "./node_modules/.bin/mocha --require blanket --reporter mocha-lcov-reporter --ui tdd | ./node_modules/coveralls/bin/coveralls.js",
88+
"coverage" : "./node_modules/.bin/mocha --require blanket --reporter html-cov --ui tdd > docs/report/coverage.html",
89+
"build-doc" : "jsdoc --destination docs --recurse --private lib/ dips.js"
7590

7691
}
7792

‎dips.js renamed to ‎src/dips.js

File renamed without changes.

‎lib/dependency/container.js renamed to ‎src/lib/dependency/container.js

File renamed without changes.

‎lib/dependency/core.js renamed to ‎src/lib/dependency/core.js

File renamed without changes.

‎lib/dependency/npm.js renamed to ‎src/lib/dependency/npm.js

File renamed without changes.

‎lib/entity/file.js renamed to ‎src/lib/entity/file.js

File renamed without changes.

‎lib/helper/arguments.js renamed to ‎src/lib/helper/arguments.js

File renamed without changes.

‎lib/helper/lazy_loader.js renamed to ‎src/lib/helper/lazy_loader.js

File renamed without changes.

‎test/dependency/container.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*global suite: false, setup: false, test: false*/
22

33
var assert = require('assert'),
4-
Container = require('../../lib/dependency/container.js');
4+
Container = require('../../src/lib/dependency/container.js');
55

66
suite('Dependency Container', function ()
77
{

‎test/dependency/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
var assert = require('assert'),
44
util = require('util'),
5-
core = require('../../lib/dependency/core.js');
5+
core = require('../../src/lib/dependency/core.js');
66

77
suite('Core Dependencies', function ()
88
{

‎test/dependency/npm.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
var assert = require('assert'),
44
util = require('util'),
5-
npm = require('../../lib/dependency/npm.js');
5+
npm = require('../../src/lib/dependency/npm.js');
66

77
suite('NPM Dependencies', function ()
88
{
@@ -75,13 +75,13 @@ suite('NPM Dependencies', function ()
7575
dependencies = npm.getDependencies(undefined, ['mocha']);
7676

7777
// Check equal
78-
assert.deepEqual(dependencies, [], 'Result does not match');
78+
assert.deepEqual(Object.keys(dependencies), ['blanket', 'coveralls', 'mocha-lcov-reporter'], 'Result does not match');
7979

8080
// Get dependencies
8181
dependencies = npm.getDependencies(undefined, [/mocha/]);
8282

8383
// Check equal
84-
assert.deepEqual(dependencies, [], 'Result does not match');
84+
assert.deepEqual(Object.keys(dependencies), ['blanket', 'coveralls'], 'Result does not match');
8585

8686
});
8787

‎test/dips.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
var assert = require('assert'),
44
path = require('path'),
5-
Dips = require('../dips.js'),
6-
Container = require('../lib/dependency/container.js');
5+
Dips = require('../src/dips.js'),
6+
Container = require('../src/lib/dependency/container.js');
77

88
suite('Dips', function ()
99
{
@@ -80,7 +80,7 @@ suite('Dips', function ()
8080

8181
// Check equal
8282
assert.deepEqual(Object.keys(dips.$),
83-
Object.keys(require('../lib/entity/file.js').getEntities(['helpers', 'lib'],
83+
Object.keys(require('../src/lib/entity/file.js').getEntities(['helpers', 'lib'],
8484
path.resolve(__dirname, '_fixtures'))), 'Result does not match');
8585

8686
// Check equal
@@ -152,7 +152,7 @@ suite('Dips', function ()
152152
});
153153

154154
// Check equal
155-
assert.deepEqual(Object.keys(dips.$), Object.keys(require('../lib/entity/file.js').getEntities({
155+
assert.deepEqual(Object.keys(dips.$), Object.keys(require('../src/lib/entity/file.js').getEntities({
156156

157157
libraries : 'lib',
158158
json_helpers : 'helpers/view/json'
@@ -190,7 +190,7 @@ suite('Dips', function ()
190190
});
191191

192192
// Check equal
193-
assert.deepEqual(Object.keys(dips.$), Object.keys(require('../lib/entity/file.js').getEntities({
193+
assert.deepEqual(Object.keys(dips.$), Object.keys(require('../src/lib/entity/file.js').getEntities({
194194

195195
libraries : 'lib',
196196
json_helpers : 'helpers/view/json'
@@ -689,7 +689,7 @@ suite('Dips', function ()
689689
assert.deepEqual(dips.getDependencies().sort(), (function ()
690690
{
691691

692-
var keys = Object.keys(require('../lib/dependency/core.js').getDependencies());
692+
var keys = Object.keys(require('../src/lib/dependency/core.js').getDependencies());
693693

694694
// Add dips
695695
keys.unshift('dips');
@@ -727,7 +727,7 @@ suite('Dips', function ()
727727
assert.deepEqual(dips.getDependencies().sort(), (function ()
728728
{
729729

730-
var keys = Object.keys(require('../lib/dependency/core.js').getDependencies('core'));
730+
var keys = Object.keys(require('../src/lib/dependency/core.js').getDependencies('core'));
731731

732732
// Add dips
733733
keys.unshift('dips');
@@ -766,7 +766,7 @@ suite('Dips', function ()
766766
assert.deepEqual(dips.getDependencies().sort(), (function ()
767767
{
768768

769-
var keys = Object.keys(require('../lib/dependency/npm.js').getDependencies());
769+
var keys = Object.keys(require('../src/lib/dependency/npm.js').getDependencies());
770770

771771
// Add dips
772772
keys.push('dips');
@@ -804,7 +804,7 @@ suite('Dips', function ()
804804
assert.deepEqual(dips.getDependencies().sort(), (function ()
805805
{
806806

807-
var keys = Object.keys(require('../lib/dependency/npm.js').getDependencies('npm'));
807+
var keys = Object.keys(require('../src/lib/dependency/npm.js').getDependencies('npm'));
808808

809809
// Add dips
810810
keys.unshift('dips');
@@ -842,7 +842,7 @@ suite('Dips', function ()
842842
assert.deepEqual(dips.getDependencies().sort(), (function ()
843843
{
844844

845-
var keys = Object.keys(require('../lib/dependency/npm.js').getDependencies(undefined, ['mocha']));
845+
var keys = Object.keys(require('../src/lib/dependency/npm.js').getDependencies(undefined, ['mocha']));
846846

847847
// Add dips
848848
keys.unshift('dips');
@@ -898,8 +898,8 @@ suite('Dips', function ()
898898
assert.deepEqual(dips.getDependencies().sort(), (function ()
899899
{
900900

901-
var keys = Object.keys(extend(require('../lib/dependency/npm.js').getDependencies(),
902-
require('../lib/dependency/core.js').getDependencies()));
901+
var keys = Object.keys(extend(require('../src/lib/dependency/npm.js').getDependencies(),
902+
require('../src/lib/dependency/core.js').getDependencies()));
903903

904904
// Add dips
905905
keys.unshift('dips');
@@ -943,8 +943,8 @@ suite('Dips', function ()
943943
assert.deepEqual(dips.getDependencies().sort(), (function ()
944944
{
945945

946-
var keys = Object.keys(extend(require('../lib/dependency/npm.js').getDependencies('npm'),
947-
require('../lib/dependency/core.js').getDependencies('core')));
946+
var keys = Object.keys(extend(require('../src/lib/dependency/npm.js').getDependencies('npm'),
947+
require('../src/lib/dependency/core.js').getDependencies('core')));
948948

949949
// Add dips
950950
keys.unshift('dips');

‎test/entity/file.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
var assert = require('assert'),
44
path = require('path'),
5-
file = require('../../lib/entity/file.js');
5+
file = require('../../src/lib/entity/file.js');
66

77
suite('File Entities', function ()
88
{

‎test/helper/arguments.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*global suite: false, test: false*/
22

33
var assert = require('assert'),
4-
Container = require('../../lib/dependency/container.js'),
5-
args = require('../../lib/helper/arguments.js');
4+
Container = require('../../src/lib/dependency/container.js'),
5+
args = require('../../src/lib/helper/arguments.js');
66

77
suite('Helpers :: Arguments', function ()
88
{

‎test/helper/lazy_loader.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/*global suite: false, test: false*/
22

33
var assert = require('assert'),
4-
loader = require('../../lib/helper/lazy_loader.js');
4+
path = require('path'),
5+
loader = require('../../src/lib/helper/lazy_loader.js');
56

67
suite('Helpers :: Lazy Loader', function ()
78
{
89

9-
var modules = ['fs', 'http', 'util', '../../lib/dependency/core.js'],
10+
var modules = ['fs', 'http', 'util', path.resolve(__dirname, '../../src/lib/dependency/core.js')],
1011
modulesExports = modules.map(function (value)
1112
{
1213

@@ -43,7 +44,7 @@ suite('Helpers :: Lazy Loader', function ()
4344
'fs' : 'fs',
4445
'http' : 'http',
4546
'util' : 'util',
46-
'core' : '../../lib/dependency/core.js'
47+
'core' : path.resolve(__dirname, '../../src/lib/dependency/core.js')
4748

4849
});
4950

0 commit comments

Comments
 (0)