KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed Carthage vendor regex to allow folder in any subdirectory (#3921)

Browse Source 
In monorepro projects, it's not uncommon for `Carthage` to not be in the root directory.
This commit is contained in:
NachoSoto
2017-11-29 06:25:04 -08:00
committed by Colin Seymour
parent ded0dc74e0
commit 38901d51d2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/linguist/vendor.yml
View File

@@ -240,7 +240,7 @@
- \.imageset/ - \.imageset/
# Carthage # Carthage
- ^Carthage/ - (^|/)Carthage/
# Sparkle # Sparkle
- (^|/)Sparkle/ - (^|/)Sparkle/

3
test/test_file_blob.rb
View File

@@ -492,6 +492,9 @@ class TestFileBlob < Minitest::Test
# Carthage # Carthage
assert sample_blob('Carthage/blah').vendored? assert sample_blob('Carthage/blah').vendored?
assert sample_blob('iOS/Carthage/blah').vendored?
assert !sample_blob('My-Carthage/blah').vendored?
assert !sample_blob('iOS/My-Carthage/blah').vendored?
# Html5shiv # Html5shiv
assert sample_blob("Scripts/html5shiv.js").vendored? assert sample_blob("Scripts/html5shiv.js").vendored?