Merge branch 'master' into v1.1

# Conflicts:
#	package.json

Author: eugene-matvejev

.gitignore

@@ -1,37 +1,4 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# 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 directories
 node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
+lib
+var
+!var/.gitkeep

index.js

@@ -1,15 +1,12 @@
 'use strict';
 
-let fs = require('fs');
-
-// let packageJsonPath = `${process.cwd()}/package.json`,
-let packageJsonPath = `${process.cwd()}/tests/fixtures/package.json`,
-    packageJsonContent = fs.readFileSync(packageJsonPath);
-
+let fs = require('fs'),
+    packageJsonPath = `${process.cwd()}/package.json`,
+    packageJsonContent = fs.readFileSync(packageJsonPath),
 /** @param {{extra: {node_parameter_handler: []}}} content */
-let packageJson = JSON.parse(packageJsonContent),
+    packageJson = JSON.parse(packageJsonContent),
     Processor = require('./src/processor'),
     processor = new Processor(packageJson.extra.node_parameter_handler, process.cwd());
 
 processor.process();
-processor.write();
+processor.write();

lib/file.js

@@ -1,3 +1,2 @@
 module.exports = class File {
-
-}
+}

lib/processor.js

@@ -1,6 +1,6 @@
-let File = require('./file');
-let fs = require('fs');
-let deepmerge = require('deepmerge');
+let fs = require('fs'),
+    deepmerge = require('deepmerge'),
+    File = require('./file');
 
 module.exports = class Processor {
     constructor(config, cwd) {
@@ -105,4 +105,4 @@ module.exports = class Processor {
             object = object[index];
         }
     }
-};
+};