public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #439 from Seldaek/git_push 

Set push url correctly for github clones
pull/469/head
Nils Adermann 2012-03-16 03:24:14 -07:00
parent 136198d38d e763af7412
commit 15e764bb3f
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Downloader/GitDownloader.php
View File

@ -34,6 +34,13 @@ class GitDownloader extends VcsDownloader
}; };
$this->runCommand($commandCallable, $package->getSourceUrl(), $path); $this->runCommand($commandCallable, $package->getSourceUrl(), $path);
// set push url for github projects
if (preg_match('{^(?:https?|git)://github.com/([^/]+)/([^/]+?)(?:\.git)?$}', $package->getSourceUrl(), $match)) {
$pushUrl = 'git@github.com:'.$match[1].'/'.$match[2].'.git';
$cmd = sprintf('cd %s && git remote set-url --push origin %s', escapeshellarg($path), escapeshellarg($pushUrl));
$this->process->execute($cmd, $ignoredOutput);
}
} }
/** /**

13
tests/Composer/Test/Downloader/GitDownloaderTest.php
View File

@ -41,7 +41,6 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
public function testDownload() public function testDownload()
{ {
$expectedGitCommand = $this->getCmd("git clone 'https://example.com/composer/composer' 'composerPath' && cd 'composerPath' && git checkout 'ref' && git reset --hard 'ref'");
$packageMock = $this->getMock('Composer\Package\PackageInterface'); $packageMock = $this->getMock('Composer\Package\PackageInterface');
$packageMock->expects($this->any()) $packageMock->expects($this->any())
->method('getSourceReference') ->method('getSourceReference')
@ -50,6 +49,8 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
->method('getSourceUrl') ->method('getSourceUrl')
->will($this->returnValue('https://example.com/composer/composer')); ->will($this->returnValue('https://example.com/composer/composer'));
$processExecutor = $this->getMock('Composer\Util\ProcessExecutor'); $processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
$expectedGitCommand = $this->getCmd("git clone 'https://example.com/composer/composer' 'composerPath' && cd 'composerPath' && git checkout 'ref' && git reset --hard 'ref'");
$processExecutor->expects($this->once()) $processExecutor->expects($this->once())
->method('execute') ->method('execute')
->with($this->equalTo($expectedGitCommand)) ->with($this->equalTo($expectedGitCommand))
@ -59,13 +60,13 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
$downloader->download($packageMock, 'composerPath'); $downloader->download($packageMock, 'composerPath');
} }
public function testDownloadUsesVariousProtocolsForGithub() public function testDownloadUsesVariousProtocolsAndSetsPushUrlForGithub()
{ {
$packageMock = $this->getMock('Composer\Package\PackageInterface'); $packageMock = $this->getMock('Composer\Package\PackageInterface');
$packageMock->expects($this->any()) $packageMock->expects($this->any())
->method('getSourceReference') ->method('getSourceReference')
->will($this->returnValue('ref')); ->will($this->returnValue('ref'));
$packageMock->expects($this->once()) $packageMock->expects($this->any())
->method('getSourceUrl') ->method('getSourceUrl')
->will($this->returnValue('https://github.com/composer/composer')); ->will($this->returnValue('https://github.com/composer/composer'));
$processExecutor = $this->getMock('Composer\Util\ProcessExecutor'); $processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
@ -88,6 +89,12 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($expectedGitCommand)) ->with($this->equalTo($expectedGitCommand))
->will($this->returnValue(0)); ->will($this->returnValue(0));
$expectedGitCommand = $this->getCmd("cd 'composerPath' && git remote set-url --push origin 'git@github.com:composer/composer.git'");
$processExecutor->expects($this->at(3))
->method('execute')
->with($this->equalTo($expectedGitCommand))
->will($this->returnValue(0));
$downloader = $this->getDownloaderMock(null, $processExecutor); $downloader = $this->getDownloaderMock(null, $processExecutor);
$downloader->download($packageMock, 'composerPath'); $downloader->download($packageMock, 'composerPath');
} }