Merge pull request #2 from bzabos/master

Swapping to deeply nested merge rather than top-level.

index.js

@@ -20,7 +20,7 @@ function readAsJSON(fileName) {
 function yamlMerge(...from) {
   const files = from.map((path) => readAsJSON(path));
 
-  const outputJSON = _.assign({}, ...files);
+  const outputJSON = _.merge({}, ...files);
   return jsYaml.dump(outputJSON);
 }
 

test/fixtures/merge/a.yml

@@ -0,0 +1,3 @@
+key:
+  first_value: a
+

test/fixtures/merge/b.yml

@@ -0,0 +1,3 @@
+key:
+  second_value: b
+

test/lib-test.js

@@ -31,5 +31,15 @@ describe('merge logic', function() {
         value: c
     ` + '\n');
   });
+
+  it('allows keys to trickle in from all merge sources', function () {
+    const output = merge(...fixtureFiles('merge/a.yml', 'merge/b.yml'));
+
+    expect(output).to.equal(stripIndent`
+      key:
+        first_value: a
+        second_value: b
+    ` + '\n');
+  });
 });