Merge branch 'release/0.1.0'

.gitignore

@@ -1,27 +1,25 @@
-# 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)
+.DS_Store
 .grunt
-
-# node-waf configuration
+.hg
+.idea
 .lock-wscript
+.svn
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+_notes
 build/Release
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+coverage
+lib-cov
+logs
 node_modules
+pids
+test/output
+desktop.ini
+Thumbs.db
+
+*.cfg
+*.dmp
+*.log
+*.pid
+*.seed
+*.sublime-project
+*.sublime-workspace

.jshintrc

@@ -0,0 +1,27 @@
+{
+    "curly": true,
+    "eqeqeq": true,
+    "forin": true,
+    "freeze": true,
+    "funcscope": true,
+    "futurehostile": true,
+    "indent": 4,
+    "latedef": true,
+    "maxdepth": 3,
+    "newcap": false,
+    "noarg": true,
+    "nocomma": true,
+    "nonbsp": true,
+    "quotmark": "single",
+    "undef": true,
+    "unused": true,
+
+    "eqnull": true,
+    "laxcomma": false,
+    "strict": true,
+    "validthis": true,
+
+    "devel": true,
+    "mocha": true,
+    "node": true
+}

.npmignore

@@ -0,0 +1,7 @@
+.gitattributes
+.gitignore
+.gitkeep
+
+.travis.yml
+
+*.bat

.travis.yml

@@ -0,0 +1,10 @@
+sudo: false
+language: node_js
+node_js:
+  - 'node'
+  - 'iojs'
+  - '0.12'
+  - '0.10'
+
+script: 'npm run test-ci'
+after_script: 'cat ./coverage/lcov.info | coveralls'

LICENSE

@@ -278,63 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year}  {fullname}
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-

README.md

@@ -0,0 +1,54 @@
+# Confirge
+
+  [![NPM Version][npm-img]][npm-url]
+  [![Linux Build][travis-img]][travis-url]
+  [![Windows Build][appveyor-img]][appveyor-url]
+  [![Test Coverage][coveralls-img]][coveralls-url]
+  [![Dependency Status][david-img]][david-url]
+
+**Flexible configuration!**
+
+## Installation
+```sh
+npm install --save confirge
+```
+
+## How to use
+```js
+var confirge = require('confirge'),
+    config;
+
+// basic usage, load from a file
+config = confirge('config.yml');
+
+// load from a file, returned by a function
+config = confirge(function()
+{
+    return 'config.json';
+});
+
+// extend objects
+config = confirge.extend(config,
+{
+    'example': '%var1% and %var2%'
+});
+
+// will replace vars inside the config obj, eg. %var1%, %var2%
+// this will result in { 'example': 'value1 and value2' }
+config = confirge.replace(config,
+{
+    'var1': 'value1',
+    'var2': 'value2'
+});
+```
+
+[npm-img]: https://badge.fury.io/js/confirge.svg
+[npm-url]: https://www.npmjs.com/package/confirge
+[travis-img]: https://img.shields.io/travis/roeldev/confirge/master.svg?label=linux
+[travis-url]: https://travis-ci.org/roeldev/confirge
+[appveyor-img]: https://img.shields.io/appveyor/ci/roeldev/confirge/master.svg?label=windows
+[appveyor-url]: https://ci.appveyor.com/project/roeldev/confirge
+[coveralls-img]: https://img.shields.io/coveralls/roeldev/confirge/master.svg
+[coveralls-url]: https://coveralls.io/r/roeldev/confirge?branch=master
+[david-img]: https://david-dm.org/roeldev/confirge.svg
+[david-url]: https://david-dm.org/roeldev/confirge

appveyor.yml

@@ -0,0 +1,20 @@
+environment:
+  matrix:
+    - nodejs_version: "0.10"
+    - nodejs_version: "0.12"
+    - nodejs_version: "1.0"
+
+platform:
+  - x86
+  - x64
+
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  - npm install
+
+test_script:
+  - node --version
+  - npm --version
+  - npm run test-ci
+
+build: off

conemu.bat

@@ -0,0 +1,2 @@
+@echo off
+start ConEmu64 /cmdlist "npm run start" -cur_console:fn ^|^|^| cmd -cur_console:s2T60V

gulpfile.js

@@ -0,0 +1,42 @@
+/**
+ * confirge | gulpfile.js
+ * file version: 0.00.001
+ */
+'use strict';
+
+var Gulp        = require('gulp'),
+    GulpJsHint  = require('gulp-jshint'),
+    GulpMocha   = require('gulp-mocha'),
+    RunSequence = require('run-sequence');
+
+var JS_SRC = ['gulpfile.js', 'lib/**/*.js', 'test/*.js'];
+
+////////////////////////////////////////////////////////////////////////////////
+
+Gulp.task('lint', function()
+{
+    return Gulp.src(JS_SRC)
+        .pipe( GulpJsHint() )
+        .pipe( GulpJsHint.reporter('jshint-stylish') );
+});
+
+Gulp.task('test', function()
+{
+    return Gulp.src('test/*.js', { 'read': false })
+        .pipe( GulpMocha() );
+});
+
+Gulp.task('dev', function()
+{
+    for(var $i = 0; $i < 30; $i++)
+    {
+        console.log('');
+    }
+
+    RunSequence('lint', 'test');
+});
+
+Gulp.task('watch', function()
+{
+    Gulp.watch(JS_SRC, ['dev']);
+});