Fixed set to use merge and not assign, updated dependencies -> Releas…

…e v1.0.2
nachos · Jul 29, 2015 · 9ccadf7 · 9ccadf7
1 parent aa1d6de
commit 9ccadf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -160,7 +160,7 @@ SettingsFile.prototype.set = function (content) {
 
   return self._readFile()
     .then(function (fileContent) {
-      fileContent.global = _.assign(fileContent.global || {}, content);
+      fileContent.global = _.merge(fileContent.global || {}, content);
 
       return self._writeFile(fileContent);
     });
@@ -173,7 +173,7 @@ SettingsFile.prototype.set = function (content) {
 SettingsFile.prototype.setSync = function (content) {
   var fileContent = this._readFileSync();
 
-  fileContent.global = _.assign(fileContent.global || {}, content);
+  fileContent.global = _.merge(fileContent.global || {}, content);
   this._writeFileSync(fileContent);
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nachos-settings-file",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Settings file is a tool to handle nachos settings files",
   "main": "lib/index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "gulp-bump": "^0.3.1",
     "gulp-coveralls": "^0.1.4",
     "gulp-istanbul": "^0.10.0",
-    "gulp-jscs": "^1.6.0",
+    "gulp-jscs": "^2.0.0",
     "gulp-jshint": "^1.11.2",
     "gulp-mocha": "^2.1.3",
     "jshint-stylish": "^2.0.1",