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

Merge pull request #2769 from sndpl/issue/2739 

Fix for #2739 (and #1755), added support for directory excludes in the gitignore file
pull/2800/merge
Jordi Boggiano 2014-03-23 22:01:39 +01:00
parent 70a20ebcc1 3e161e8ea9
commit 808e65f7de
3 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Package/Archiver/BaseExcludeFilter.php
View File

@ -136,12 +136,15 @@ abstract class BaseExcludeFilter
if (strlen($rule) && $rule[0] === '/') { if (strlen($rule) && $rule[0] === '/') {
$pattern .= '^/'; $pattern .= '^/';
$rule = substr($rule, 1); $rule = substr($rule, 1);
} elseif (false === strpos($rule, '/') || strlen($rule) - 1 === strpos($rule, '/')) { } elseif (strlen($rule) - 1 === strpos($rule, '/')) {
$pattern .= '/';
$rule = substr($rule, 0, -1);
} elseif (false === strpos($rule, '/')) {
$pattern .= '/'; $pattern .= '/';
} }
// remove delimiters as well as caret (^) from the regex // remove delimiters as well as caret (^) and dollar sign ($) from the regex
$pattern .= substr(Finder\Glob::toRegex($rule), 2, -1); $pattern .= substr(Finder\Glob::toRegex($rule), 2, -2) . '(?=$|/)';
return array($pattern . '#', $negate, false); return array($pattern . '#', $negate, false);
} }

61
tests/Composer/Test/Package/Archiver/ArchivableFilesFinderTest.php
View File

@ -46,6 +46,24 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'B/sub/prefixD.foo', 'B/sub/prefixD.foo',
'B/sub/prefixE.foo', 'B/sub/prefixE.foo',
'B/sub/prefixF.foo', 'B/sub/prefixF.foo',
'C/prefixA.foo',
'C/prefixB.foo',
'C/prefixC.foo',
'C/prefixD.foo',
'C/prefixE.foo',
'C/prefixF.foo',
'D/prefixA',
'D/prefixB',
'D/prefixC',
'D/prefixD',
'D/prefixE',
'D/prefixF',
'E/subtestA.foo',
'F/subtestA.foo',
'G/subtestA.foo',
'H/subtestA.foo',
'I/J/subtestA.foo',
'K/dirJ/subtestA.foo',
'toplevelA.foo', 'toplevelA.foo',
'toplevelB.foo', 'toplevelB.foo',
'prefixA.foo', 'prefixA.foo',
@ -54,6 +72,10 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'prefixD.foo', 'prefixD.foo',
'prefixE.foo', 'prefixE.foo',
'prefixF.foo', 'prefixF.foo',
'parameters.yml',
'parameters.yml.dist',
'!important!.txt',
'!important_too!.txt'
); );
foreach ($fileTree as $relativePath) { foreach ($fileTree as $relativePath) {
@ -82,6 +104,8 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
$this->finder = new ArchivableFilesFinder($this->sources, $excludes); $this->finder = new ArchivableFilesFinder($this->sources, $excludes);
$this->assertArchivableFiles(array( $this->assertArchivableFiles(array(
'/!important!.txt',
'/!important_too!.txt',
'/A/prefixA.foo', '/A/prefixA.foo',
'/A/prefixD.foo', '/A/prefixD.foo',
'/A/prefixE.foo', '/A/prefixE.foo',
@ -91,6 +115,24 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'/B/sub/prefixD.foo', '/B/sub/prefixD.foo',
'/B/sub/prefixE.foo', '/B/sub/prefixE.foo',
'/B/sub/prefixF.foo', '/B/sub/prefixF.foo',
'/C/prefixA.foo',
'/C/prefixD.foo',
'/C/prefixE.foo',
'/C/prefixF.foo',
'/D/prefixA',
'/D/prefixB',
'/D/prefixC',
'/D/prefixD',
'/D/prefixE',
'/D/prefixF',
'/E/subtestA.foo',
'/F/subtestA.foo',
'/G/subtestA.foo',
'/H/subtestA.foo',
'/I/J/subtestA.foo',
'/K/dirJ/subtestA.foo',
'/parameters.yml',
'/parameters.yml.dist',
'/prefixB.foo', '/prefixB.foo',
'/prefixD.foo', '/prefixD.foo',
'/prefixE.foo', '/prefixE.foo',
@ -120,6 +162,15 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'!/*/*/prefixF.foo', '!/*/*/prefixF.foo',
'', '',
'refixD.foo', 'refixD.foo',
'/C',
'D/prefixA',
'E',
'F/',
'G/*',
'H/**',
'J/',
'parameters.yml',
'\!important!.txt'
))); )));
// git does not currently support negative git attributes // git does not currently support negative git attributes
@ -160,9 +211,15 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'# comments', '# comments',
'', '',
'^prefixD.foo', '^prefixD.foo',
'D/prefixA',
'parameters.yml',
'\!important!.txt',
'E',
'F/',
'syntax: glob', 'syntax: glob',
'prefixF.*', 'prefixF.*',
'B/*', 'B/*',
'H/**',
))); )));
$this->finder = new ArchivableFilesFinder($this->sources, array()); $this->finder = new ArchivableFilesFinder($this->sources, array());
@ -173,7 +230,9 @@ class ArchivableFilesFinderTest extends \PHPUnit_Framework_TestCase
'hg archive archive.zip' 'hg archive archive.zip'
); );
array_shift($expectedFiles); // remove .hg_archival.txt // Remove .hg_archival.txt from the expectedFiles
$archiveKey = array_search('/.hg_archival.txt', $expectedFiles);
array_splice($expectedFiles, $archiveKey, 1);
$this->assertArchivableFiles($expectedFiles); $this->assertArchivableFiles($expectedFiles);
} }

4
tests/Composer/Test/Package/Archiver/GitExcludeFilterTest.php
View File

@ -29,8 +29,8 @@ class GitExcludeFilterTest extends \PHPUnit_Framework_TestCase
public function patterns() public function patterns()
{ {
return array( return array(
array('app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml$#', false, false)), array('app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml(?=$|/)#', false, false)),
array('!app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml$#', true, false)), array('!app/config/parameters.yml', array('#(?=[^\.])app/(?=[^\.])config/(?=[^\.])parameters\.yml(?=$|/)#', true, false)),
); );
} }
} }