Merge override metadata into global metadata output.

rgrove · Mar 9, 2011 · 4d8c8b3 · 4d8c8b3
1 parent 82b9b5d
commit 4d8c8b3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/bin/selleck b/bin/selleck
@@ -265,15 +265,21 @@ if (options.server) {
             log('Writing combined metadata to ' + options['out-meta'], 'info');
 
             meta = {
-                project: projectMeta,
+                project: util.merge(projectMeta, options.overrideMeta),
                 components: {}
             };
 
             docs.components.forEach(function (component) {
                 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;
                 }
             });