From 581eec98112cd00507cfce7f52cf9833d7e2107c Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 31 Jul 2012 13:26:43 +0000 Subject: move show-dependencies command into a plugin --- morphlib/app.py | 39 --------------- morphlib/plugins/show_dependencies_plugin.py | 71 ++++++++++++++++++++++++++++ without-test-modules | 1 + 3 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 morphlib/plugins/show_dependencies_plugin.py diff --git a/morphlib/app.py b/morphlib/app.py index 3e4a0bf5..06e7eba2 100755 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -521,45 +521,6 @@ class Morph(cliapp.Application): build_command = self.hookmgr.call('new-build-command', build_command) build_command.build(args) - def cmd_show_dependencies(self, args): - '''Dumps the dependency tree of all input morphologies.''' - - if not os.path.exists(self.settings['cachedir']): - os.mkdir(self.settings['cachedir']) - cachedir = os.path.join(self.settings['cachedir'], 'gits') - bundle_base_url = self.settings['bundle-server'] - repo_resolver = morphlib.repoaliasresolver.RepoAliasResolver( - self.settings['repo-alias']) - lrc = morphlib.localrepocache.LocalRepoCache( - self, cachedir, repo_resolver, bundle_base_url) - if self.settings['cache-server']: - rrc = morphlib.remoterepocache.RemoteRepoCache( - self.settings['cache-server'], repo_resolver) - else: - rrc = None - - # traverse the morphs to list all the sources - for repo, ref, filename in self._itertriplets(args): - pool = self._create_source_pool(lrc, rrc, (repo, ref, filename)) - - resolver = morphlib.artifactresolver.ArtifactResolver() - artifacts = resolver.resolve_artifacts(pool) - - self.output.write('dependency graph for %s|%s|%s:\n' % - (repo, ref, filename)) - for artifact in sorted(artifacts, key=str): - self.output.write(' %s\n' % artifact) - for dependency in sorted(artifact.dependencies, key=str): - self.output.write(' -> %s\n' % dependency) - - order = morphlib.buildorder.BuildOrder(artifacts) - self.output.write('build order for %s|%s|%s:\n' % - (repo, ref, filename)) - for group in order.groups: - self.output.write(' group:\n') - for artifact in group: - self.output.write(' %s\n' % artifact) - def _resolveref(self, lrc, rrc, reponame, ref, update=True): '''Resolves the sha1 of the ref in reponame and returns it. diff --git a/morphlib/plugins/show_dependencies_plugin.py b/morphlib/plugins/show_dependencies_plugin.py new file mode 100644 index 00000000..ff78e392 --- /dev/null +++ b/morphlib/plugins/show_dependencies_plugin.py @@ -0,0 +1,71 @@ +# Copyright (C) 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +import cliapp +import os + +import morphlib + + +class ShowDependenciesPlugin(cliapp.Plugin): + + def enable(self): + self.app.add_subcommand('show-dependencies', + self.show_dependencies, + arg_synopsis='(REPO REF MORPHOLOGY)...') + + def disable(self): + pass + + def show_dependencies(self, args): + '''Dumps the dependency tree of all input morphologies.''' + + if not os.path.exists(self.app.settings['cachedir']): + os.mkdir(self.app.settings['cachedir']) + cachedir = os.path.join(self.app.settings['cachedir'], 'gits') + bundle_base_url = self.app.settings['bundle-server'] + repo_resolver = morphlib.repoaliasresolver.RepoAliasResolver( + self.app.settings['repo-alias']) + lrc = morphlib.localrepocache.LocalRepoCache( + self.app, cachedir, repo_resolver, bundle_base_url) + if self.app.settings['cache-server']: + rrc = morphlib.remoterepocache.RemoteRepoCache( + self.app.settings['cache-server'], repo_resolver) + else: + rrc = None + + # traverse the morphs to list all the sources + for repo, ref, filename in self.app._itertriplets(args): + pool = self.app._create_source_pool( + lrc, rrc, (repo, ref, filename)) + + resolver = morphlib.artifactresolver.ArtifactResolver() + artifacts = resolver.resolve_artifacts(pool) + + self.app.output.write('dependency graph for %s|%s|%s:\n' % + (repo, ref, filename)) + for artifact in sorted(artifacts, key=str): + self.app.output.write(' %s\n' % artifact) + for dependency in sorted(artifact.dependencies, key=str): + self.app.output.write(' -> %s\n' % dependency) + + order = morphlib.buildorder.BuildOrder(artifacts) + self.app.output.write('build order for %s|%s|%s:\n' % + (repo, ref, filename)) + for group in order.groups: + self.app.output.write(' group:\n') + for artifact in group: + self.app.output.write(' %s\n' % artifact) diff --git a/without-test-modules b/without-test-modules index 47c5d7c8..5c3beb4b 100644 --- a/without-test-modules +++ b/without-test-modules @@ -9,4 +9,5 @@ morphlib/plugins/hello_plugin.py morphlib/plugins/graphing_plugin.py morphlib/plugins/syslinux-disk-systembuilder_plugin.py morphlib/plugins/tarball-systembuilder_plugin.py +morphlib/plugins/show_dependencies_plugin.py -- cgit v1.2.1