Fix output enclosure in dist command

Author: kylekatarnls

src/Phug/Split/Command/Dist.php

@@ -75,14 +75,14 @@ protected function distribute(Split $cli): bool
             return $cli->error('Unable to create output directory.');
         }
 
-        if (!preg_match('/^\* (.+)$/m', $this->git('branch'), $branch)) {
+        if (!preg_match('/^\* (.+)$/m', $this->git('branch', [], '2>&1'), $branch)) {
             return $cli->error('You must be on a branch in a git repository to run this command.');
         }
 
         $branch = $branch[1];
 
         if (substr($branch, 0, 18) === '(HEAD detached at ') {
-            $branch = trim(explode("\n", $this->git('describe --contains --all HEAD'))[0]);
+            $branch = trim(explode("\n", $this->git('describe --contains --all HEAD', [], '2>&1'))[0]);
         }
 
         foreach ($this->getPackages() as $package) {
@@ -121,7 +121,7 @@ protected function distributePackage(Split $cli, array $package, string $branch)
         }
 
         $cli->gray();
-        $this->git("clone $url $directory");
+        $cli->write($this->git("clone $url $directory", [], '2>&1'));
         $cli->discolor();
 
         $cli->chdir($directory);

tests/Phug/Command/DistTest.php

@@ -69,7 +69,7 @@ public function testRun()
         shell_exec('git commit --file=message.txt 2>&1');
         preg_match('/^commit (\S+)/', shell_exec('git log -n 1'), $match);
         $hash2 = $match[1];
-        shell_exec("git checkout $hash2");
+        shell_exec("git checkout $hash2 2>&1");
 
         chdir($directory1);
 
@@ -97,7 +97,9 @@ public function testRun()
             'vendor/package',
             '#[1;35mBuild vendor/sub-package',
             "#[0m#[1;32mgit clone $directory2 {$path}dist/vendor/sub-package",
-            "#[0m#[1;30m#[0m#[1;34mcd {$path}dist/vendor/sub-package",
+            "#[0m#[1;30mCloning into '{$path}dist/vendor/sub-package'...",
+            'done.',
+            "#[0m#[1;34mcd {$path}dist/vendor/sub-package",
             '#[0m#[1;32mgit checkout master',
             "#[0m#[1;30m#[0m#[1;35mBuild distributed in {$path}dist",
             '#[0m',
@@ -115,20 +117,29 @@ public function testRun()
      */
     public function testErrors()
     {
+        $cwd = getcwd();
         $cli = new Split();
         $cli->setEscapeCharacter('#');
 
         $dist = new Dist();
 
+        $directory = sys_get_temp_dir().'/split-test-'.mt_rand(0, 9999999);
+        FileSystem::createDir($directory);
+        $directory = realpath($directory);
+        chdir($directory);
+
         ob_start();
         $return = $dist->run($cli);
         $output = ob_get_contents();
         ob_end_clean();
 
+        @shell_exec('rm -rf ' . escapeshellarg($directory) . ' 2>&1');
+        file_exists($directory) && @shell_exec('rmdir /S /Q ' . escapeshellarg($directory) . ' 2>&1');
+        @FileSystem::delete($directory);
+
         $this->assertSame("#[0;31mRoot project directory should contains a composer.json file.\n#[0m", $output);
         $this->assertFalse($return);
 
-        $cwd = getcwd();
         $dist = new Dist();
 
         $directory = sys_get_temp_dir().'/split-test-'.mt_rand(0, 9999999);