[carton] 274/472: change the output of tree
Lucas Kanashiro
kanashiro-guest at moszumanska.debian.org
Fri Jul 24 00:38:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
kanashiro-guest pushed a commit to branch master
in repository carton.
commit 41b908dd5ff396ae79263aca69eb1942e7db0382
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date: Tue Jun 4 11:57:35 2013 +0900
change the output of tree
---
lib/Carton/CLI.pm | 11 +++++------
xt/cli/tree.t | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/lib/Carton/CLI.pm b/lib/Carton/CLI.pm
index 8831a43..5fed9bc 100644
--- a/lib/Carton/CLI.pm
+++ b/lib/Carton/CLI.pm
@@ -262,31 +262,30 @@ sub cmd_tree {
or $self->error("Can't find carton.lock: Run `carton install` to rebuild the lock file.\n");
my $cpanfile = Module::CPANfile->load($self->find_cpanfile);
- my $prereqs = $cpanfile->prereqs;
my $dumper = $self->_make_dumper($lock);
- $dumper->(undef, $prereqs, 0, {});
+ $dumper->(undef, $cpanfile->prereqs, 0, {});
}
sub _make_dumper {
my($self, $lock) = @_;
my $dumper; $dumper = sub {
- my($name, $prereqs, $level, $seen) = @_;
+ my($dependency, $prereqs, $level, $seen) = @_;
my $req = CPAN::Meta::Requirements->new;
$req->add_requirements($prereqs->requirements_for($_, 'requires'))
for qw( configure build runtime test);
- if ($name) {
- $self->print( (" " x ($level - 1)) . "$name\n" );
+ if ($dependency) {
+ $self->printf( "%s%s (%s)\n", " " x ($level - 1), $dependency->name, $dependency->dist, INFO );
}
my $requirements = $req->as_string_hash;
while (my($module, $version) = each %$requirements) {
if (my $dependency = $lock->find($module)) {
next if $seen->{$dependency->dist}++;
- $dumper->($dependency->dist, $dependency->prereqs, $level + 1, $seen);
+ $dumper->($dependency, $dependency->prereqs, $level + 1, $seen);
} else {
# TODO: probably core, what if otherwise?
}
diff --git a/xt/cli/tree.t b/xt/cli/tree.t
index 5ddd220..4e8e119 100644
--- a/xt/cli/tree.t
+++ b/xt/cli/tree.t
@@ -13,8 +13,8 @@ EOF
$app->run("install");
$app->run("tree");
- like $app->output, qr/^HTML-Parser-.*/m;
- like $app->output, qr/^ HTML-Tagset-.*/m;
+ like $app->output, qr/^HTML::Parser \(HTML-Parser-/m;
+ like $app->output, qr/^ HTML::Tagset \(HTML-Tagset-/m;
}
done_testing;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/carton.git
More information about the Pkg-perl-cvs-commits
mailing list