Skip to content

Commit

Permalink
[dist fix] Cleanup some whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
indexzero committed Nov 26, 2014
1 parent 0934255 commit af0e9fb
Show file tree
Hide file tree
Showing 34 changed files with 62 additions and 65 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011 Nodejitsu Inc.
Copyright (C) 2011 Charlie Robbins and the Contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion lib/nconf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* nconf.js: Top-level include for the nconf module
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/common.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* utils.js: Utility functions for the nconf module.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/formats.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* formats.js: Default formats supported by nconf
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/provider.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* provider.js: Abstraction providing an interface into pluggable configuration storage.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/stores/argv.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* argv.js: Simple memory-based store for command-line arguments.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/stores/env.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* env.js: Simple memory-based store for environment variables
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/stores/file.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* file.js: Simple file storage engine for nconf files
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/nconf/stores/literal.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* literal.js: Simple literal Object store for nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions lib/nconf/stores/memory.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* memory.js: Simple memory storage engine for nconf configuration(s)
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down Expand Up @@ -49,7 +49,7 @@ Memory.prototype.get = function (key) {
}
return undefined;
}

return target;
};

Expand Down
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"name": "nconf",
"description": "Hierarchical node.js configuration with files, environment variables, command-line arguments, and atomic object merging.",
"version": "0.6.9",
"author": "Nodejitsu Inc. <[email protected]>",
"maintainers": [
"indexzero <[email protected]>"
],
"author": "Charlie Robbins <[email protected]>",
"repository": {
"type": "git",
"url": "http://github.com/flatiron/nconf.git"
Expand Down
2 changes: 1 addition & 1 deletion test/common-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* common.js: Tests for common utility function in nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion test/complete-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* complete-test.js: Complete test for multiple stores.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/data.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* data.js: Simple data fixture for configuration test.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

exports.data = {
isNull: null,
literal: 'bazz',
literal: 'bazz',
arr: ['one', 2, true, { value: 'foo' }],
obj: {
host: 'localhost',
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/scripts/nconf-argv.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* default-argv.js: Test fixture for using optimist defaults with nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var nconf = require('../../../lib/nconf').argv().env();

process.stdout.write(nconf.get('something'));
4 changes: 2 additions & 2 deletions test/fixtures/scripts/nconf-change-argv.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* nconf-change-argv.js: Test fixture for changing argv on the fly
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var nconf = require('../../../lib/nconf').argv();

//
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/scripts/nconf-env.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* nconf-env.js: Test fixture for using process.env defaults with nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var nconf = require('../../../lib/nconf').env();

process.stdout.write(nconf.get('SOMETHING'));
4 changes: 2 additions & 2 deletions test/fixtures/scripts/nconf-hierarchical-file-argv.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* nconf-hierarchical-file-argv.js: Test fixture for using optimist defaults and a file store with nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
* (C) 2011, Sander Tolsma
*
*/

var path = require('path'),
nconf = require('../../../lib/nconf');

Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/scripts/nconf-hierarchical-load-merge.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* nconf-hierarchical-load-merge.js: Test fixture for loading and merging nested objects across stores.
*
* (C) 2012, Nodejitsu Inc.
* (C) 2012, Charlie Robbins and the Contributors.
* (C) 2012, Michael Hart
*
*/

var path = require('path'),
nconf = require('../../../lib/nconf');

Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/scripts/nconf-hierarchical-load-save.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*
* nconf-hierarchical-load-save.js: Test fixture for using optimist, envvars and a file store with nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var fs = require('fs'),
path = require('path'),
nconf = require('../../../lib/nconf');

//
// Setup nconf to use (in-order):
// Setup nconf to use (in-order):
// 1. Command-line arguments
// 2. Environment variables
// 3. A file located at 'path/to/config.json'
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/scripts/nconf-nested-env.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* nconf-nested-env.js: Test fixture for env with nested keys.
*
* (C) 2012, Nodejitsu Inc.
* (C) 2012, Charlie Robbins and the Contributors.
* (C) 2012, Michael Hart
*
*/

var nconf = require('../../../lib/nconf').env('_');

process.stdout.write(nconf.get('SOME:THING'));
4 changes: 2 additions & 2 deletions test/fixtures/scripts/provider-argv.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* provider-argv.js: Test fixture for using optimist defaults with nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var nconf = require('../../../lib/nconf');

var provider = new (nconf.Provider)().argv();
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/scripts/provider-env.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* provider-argv.js: Test fixture for using process.env defaults with nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var nconf = require('../../../lib/nconf');

var provider = new (nconf.Provider)().env();
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* helpers.js: Test helpers for nconf.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
10 changes: 5 additions & 5 deletions test/hierarchy-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* hierarchy-test.js: Basic tests for hierarchical file stores.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down Expand Up @@ -52,16 +52,16 @@ vows.describe('nconf/hierarchy').addBatch({
that = this,
data = '',
child;

try { fs.unlinkSync(configFile) }
catch (ex) { }

child = spawn('node', [script].concat(argv));

child.stdout.on('data', function (d) {
data += d;
});

child.on('exit', function () {
fs.readFile(configFile, 'utf8', that.callback.bind(null, null, data));
});
Expand Down
6 changes: 3 additions & 3 deletions test/mocks/mock-store.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* mock-store.js: Mock store for ensuring certain operations are actually called.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand All @@ -28,9 +28,9 @@ Mock.prototype.save = function (value, callback) {
callback = value;
value = null;
}

var self = this;

setTimeout(function () {
self.emit('save');
callback();
Expand Down
2 changes: 1 addition & 1 deletion test/nconf-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* file-store-test.js: Tests for the nconf File store.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
8 changes: 4 additions & 4 deletions test/provider-save-test.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
* provider-save-test.js: Ensures consistency for Provider `save` operations.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

var assert = require('assert'),
vows = require('vows'),
nconf = require('../lib/nconf');

//
// Expose `nconf.Mock`
//
require('./mocks/mock-store');

vows.describe('nconf/provider/save').addBatch({
"When using nconf": {
"an instance of 'nconf.Provider'": {
Expand All @@ -25,7 +25,7 @@ vows.describe('nconf/provider/save').addBatch({
topic: function () {
var mock = nconf.stores.mock,
that = this;

mock.on('save', function () { that.saved = true });
nconf.save(this.callback);
},
Expand Down
2 changes: 1 addition & 1 deletion test/provider-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* provider-test.js: Tests for the nconf Provider object.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion test/stores/argv-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* argv-test.js: Tests for the nconf argv store.
*
* (C) 2011, Nodejitsu Inc.
* (C) 2011, Charlie Robbins and the Contributors.
*
*/

Expand Down
Loading

0 comments on commit af0e9fb

Please sign in to comment.