[carton] 216/472: stop chdir

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro-guest pushed a commit to branch master
in repository carton.

commit bb22b3f54b3703ebddf2c66140db5f620fd6b15c
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Fri May 31 00:43:15 2013 +0900

    stop chdir
---
 cpanfile         |  2 +-
 xt/CLI.pm        | 11 +++--------
 xt/cli/version.t |  5 ++++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cpanfile b/cpanfile
index 4f290e9..eed339f 100644
--- a/cpanfile
+++ b/cpanfile
@@ -26,5 +26,5 @@ requires 'IO::Compress::Gzip';
 on develop => sub {
     requires 'Test::Requires';
     requires 'Directory::Scratch';
-    requires 'Capture::Tiny';
+    requires 'File::pushd';
 };
diff --git a/xt/CLI.pm b/xt/CLI.pm
index 92955e3..b907bd7 100644
--- a/xt/CLI.pm
+++ b/xt/CLI.pm
@@ -3,11 +3,10 @@ use strict;
 use base qw(Exporter);
 our @EXPORT = qw(run cli);
 
-use Test::Requires qw( Directory::Scratch Capture::Tiny );
+use Test::Requires qw( Directory::Scratch Capture::Tiny File::pushd );
 
 sub cli {
     my $dir = Directory::Scratch->new();
-    chdir $dir;
 
     my $app = Carton::CLI::Tested->new(dir => $dir);
     $app->carton->{mirror} = "$ENV{HOME}/minicpan" if -e "$ENV{HOME}/minicpan";
@@ -15,16 +14,11 @@ sub cli {
     return $app;
 }
 
-sub run {
-    my $app = cli();
-    $app->run(@_);
-    return $app;
-}
-
 package Carton::CLI::Tested;
 use parent qw(Carton::CLI);
 
 use Capture::Tiny qw(capture);
+use File::pushd;
 
 sub new {
     my($class, %args) = @_;
@@ -47,6 +41,7 @@ sub print {
 
 sub run {
     my($self, @args) = @_;
+    my $pushd = File::pushd::pushd $self->{dir};
     $self->{output} = '';
     ($self->{system_output}, $self->{system_error}) = capture {
         eval { $self->SUPER::run(@args) };
diff --git a/xt/cli/version.t b/xt/cli/version.t
index 5ee107b..781b1e9 100644
--- a/xt/cli/version.t
+++ b/xt/cli/version.t
@@ -3,7 +3,10 @@ use Test::More;
 
 use xt::CLI;
 
-like run("version")->output, qr/carton $Carton::VERSION/;
+my $app = cli();
+$app->run("version");
+
+like $app->output, qr/carton $Carton::VERSION/;
 
 done_testing;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/carton.git