From 4d8c8b3d0352af68c26cb31dbbce5a3be1e589c0 Mon Sep 17 00:00:00 2001
From: Ryan Grove <ryan@wonko.com>
Date: Wed, 9 Mar 2011 11:13:47 -0800
Subject: [PATCH] Merge override metadata into global metadata output.

---
 bin/selleck | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/selleck b/bin/selleck
index ff14d49..733d349 100755
--- a/bin/selleck
+++ b/bin/selleck
@@ -265,7 +265,7 @@ if (options.server) {
             log('Writing combined metadata to ' + options['out-meta'], 'info');
 
             meta = {
-                project: projectMeta,
+                project: util.merge(projectMeta, options.overrideMeta),
                 components: {}
             };
 
@@ -273,7 +273,13 @@ if (options.server) {
                 var data = selleck.getMetadata(component.path, 'component');
 
                 if (data && data.name) {
-                    meta.components[data.name] = data;
+                    meta.components[data.name] = util.merge(
+                        meta.project.componentDefaults || {},
+                        data,
+                        options.overrideMeta
+                    );
+
+                    delete meta.components[data.name].componentDefaults;
                 }
             });