Replace builder order graph with just a single artifact

The artifact's build dependencies replace the build order graph
from previously.

1 files changed, 16 insertions, 18 deletions

diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index 907676fa..c12735bb 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -48,8 +48,8 @@ class BuildCommand(object):
         for repo_name, ref, filename in self.app.itertriplets(args):
             self.app.status(msg='Building %(repo_name)s %(ref)s %(filename)s',
                             repo_name=repo_name, ref=ref, filename=filename)
-            order = self.compute_build_order(repo_name, ref, filename)
-            self.build_in_order(order)
+            artifact = self.get_artifact_object(repo_name, ref, filename)
+            self.build_in_order(artifact)
 
         self.app.status(msg='Build ends successfully', chatty=True)
 
@@ -72,7 +72,14 @@ class BuildCommand(object):
     def new_repo_caches(self):
         return morphlib.util.new_repo_caches(self.app)
 
-    def compute_build_order(self, repo_name, ref, filename):
+    def get_artifact_object(self, repo_name, ref, filename):
+        '''Create an Artifact object representing the given triplet.'''
+        
+        order = self._compute_build_order(repo_name, ref, filename)
+        artifact = order.groups[-1][-1]
+        return artifact
+
+    def _compute_build_order(self, repo_name, ref, filename):
         '''Compute build order for a triplet.'''
         self.app.status(msg='Figuring out the right build order')
 
@@ -158,24 +165,13 @@ class BuildCommand(object):
                          other.morphology['kind'],
                          wanted))
 
-    def build_in_order(self, order):
+    def build_in_order(self, artifact):
         '''Build everything specified in a build order.'''
         self.app.status(msg='Building according to build ordering',
                         chatty=True)
-        for group in order.groups:
-            self.build_artifacts(group)
-
-    def build_artifacts(self, artifacts):
-        '''Build a set of artifact.
-
-        Typically, this would be a build group, but might be anything.
-        At this level of abstraction we don't care.
 
-        '''
-
-        self.app.status(msg='Building a set of artifacts', chatty=True)
-        for artifact in artifacts:
-            self.build_artifact(artifact)
+        for a in artifact.walk():
+            self.build_artifact(a)
 
     def build_artifact(self, artifact):
         '''Build one artifact.
@@ -287,7 +283,9 @@ class BuildCommand(object):
                 self.app.status(msg='Fetching to local cache: '
                                     'artifact %(name)s',
                                 name=artifact.name)
-                copy(self.rac.get(artifact), self.lac.put(artifact))
+                rac_file = self.rac.get(artifact)
+                lac_file = self.lac.put(artifact)
+                copy(rac_file, lac_file)
 
             if artifact.source.morphology.needs_artifact_metadata_cached:
                 if not self.lac.has_artifact_metadata(artifact, 'meta'):