NotificationsYou must be signed in to change notification settings
Fork23
Star227

Commit16c3fdd

committed

Merge branch 'glob-extension-options' into fix-git-version

2 parentsb86b542 +8f4737a commit16c3fddCopy full SHA for 16c3fdd

File tree

3 files changed

+50

-1

lines changed

3 files changed

+50

-1

lines changed

`‎ChangeLog.md‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)`
`6`	`6`	`and this project adheres to[Semantic Versioning](http://semver.org/spec/v2.0.0.html).`
`7`	`7`
`8`	`8`	`##[Unreleased]`
	`9`	`+##[1.1.9]`
	`10`	`+###Added`
	`11`	`+- Issue#63: Added glob options for Glob Extension methods`
	`12`	`+`
`9`	`13`	`##[1.1.8]`
`10`	`14`	`###Fixed`
`11`	`15`	`- Issue#59: Cannot enumerate iterator multiple times`
`@@ -85,7 +89,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.`
`85`	`89`	`- Fix issue that caused unnecessary directory traversal (#20)`
`86`	`90`	`- Fix issue where Glob.Directories did not always match properly`
`87`	`91`
`88`		`-[Unreleased]:https://github.com/kthompson/glob/compare/1.1.8...HEAD`
	`92`	`+[Unreleased]:https://github.com/kthompson/glob/compare/1.1.9...HEAD`
	`93`	`+[1.1.9]:https://github.com/kthompson/glob/compare/1.1.8...1.1.9`
`89`	`94`	`[1.1.8]:https://github.com/kthompson/glob/compare/1.1.7...1.1.8`
`90`	`95`	`[1.1.7]:https://github.com/kthompson/glob/compare/1.1.6...1.1.7`
`91`	`96`	`[1.1.6]:https://github.com/kthompson/glob/compare/1.1.5...1.1.6`

`‎src/Glob/GlobExtensions.cs‎`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,31 @@ public static IEnumerable<DirectoryInfo> GlobDirectories(this DirectoryInfo di,`
`13`	`13`	`returnGlob.Directories(di,pattern);`
`14`	`14`	`}`
`15`	`15`
	`16`	`+publicstaticIEnumerable<DirectoryInfo>GlobDirectories(thisDirectoryInfodi,stringpattern,GlobOptionsoptions)`
	`17`	`+{`
	`18`	`+returnGlob.Directories(di,pattern,options);`
	`19`	`+}`
	`20`	`+`
`16`	`21`	`publicstaticIEnumerable<FileInfo>GlobFiles(thisDirectoryInfodi,stringpattern)`
`17`	`22`	`{`
`18`	`23`	`returnGlob.Files(di,pattern);`
`19`	`24`	`}`
`20`	`25`
	`26`	`+publicstaticIEnumerable<FileInfo>GlobFiles(thisDirectoryInfodi,stringpattern,GlobOptionsoptions)`
	`27`	`+{`
	`28`	`+returnGlob.Files(di,pattern,options);`
	`29`	`+}`
	`30`	`+`
	`31`	`+`
`21`	`32`	`publicstaticIEnumerable<FileSystemInfo>GlobFileSystemInfos(thisDirectoryInfodi,stringpattern)`
`22`	`33`	`{`
`23`	`34`	`returnGlob.FilesAndDirectories(di,pattern);`
`24`	`35`	`}`
	`36`	`+`
	`37`	`+publicstaticIEnumerable<FileSystemInfo>GlobFileSystemInfos(thisDirectoryInfodi,stringpattern,GlobOptionsoptions)`
	`38`	`+{`
	`39`	`+returnGlob.FilesAndDirectories(di,pattern,options);`
	`40`	`+}`
	`41`	`+`
`25`	`42`	`}`
`26`	`43`	`}`

`‎test/Glob.Tests/GlobExtensionTests.cs‎`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,15 @@ public void CanMatchBinFolderGlob()`
`17`	`17`	`Assert.True(allBinFolders.Any(),"There should be some bin folders");`
`18`	`18`	`}`
`19`	`19`
	`20`	`+[Fact]`
	`21`	`+publicvoidCanMatchBinFolderGlobCaseInsensitive()`
	`22`	`+{`
	`23`	`+varroot=newDirectoryInfo(SourceRoot);`
	`24`	`+varallBinFolders=root.GlobDirectories("**/BIN",GlobOptions.CaseInsensitive);`
	`25`	`+`
	`26`	`+Assert.True(allBinFolders.Any(),"There should be some BIN folders");`
	`27`	`+}`
	`28`	`+`
`20`	`29`	`[Fact]`
`21`	`30`	`publicvoidCanMatchDllExtension()`
`22`	`31`	`{`
`@@ -26,6 +35,15 @@ public void CanMatchDllExtension()`
`26`	`35`	`Assert.True(allDllFiles.Any(),"There should be some DLL files");`
`27`	`36`	`}`
`28`	`37`
	`38`	`+[Fact]`
	`39`	`+publicvoidCanMatchDllExtensionCaseInsensitive()`
	`40`	`+{`
	`41`	`+varroot=newDirectoryInfo(SourceRoot);`
	`42`	`+varallDllFiles=root.GlobFiles("*/.DLL",GlobOptions.CaseInsensitive);`
	`43`	`+`
	`44`	`+Assert.True(allDllFiles.Any(),"There should be some DLL files");`
	`45`	`+}`
	`46`	`+`
`29`	`47`	`[Fact]`
`30`	`48`	`publicvoidCanMatchInfoInFileSystemInfo()`
`31`	`49`	`{`
`@@ -36,6 +54,15 @@ public void CanMatchInfoInFileSystemInfo()`
`36`	`54`	`}`
`37`	`55`
`38`	`56`	`[Fact]`
	`57`	`+publicvoidCanMatchInfoInFileSystemInfoCaseInsensitive()`
	`58`	`+{`
	`59`	`+varroot=newDirectoryInfo(SourceRoot);`
	`60`	`+varallInfoFilesAndFolders=root.GlobFileSystemInfos("*/INFO",GlobOptions.CaseInsensitive);`
	`61`	`+`
	`62`	`+Assert.True(allInfoFilesAndFolders.Any(),"There should be some 'allINFOFilesAndFolders'");`
	`63`	`+}`
	`64`	`+`
	`65`	`+[Fact]`
`39`	`66`	`publicvoidCanMatchConfigFilesInMsDirectory()`
`40`	`67`	`{`
`41`	`68`	`varglobPattern=@"*/.sln";`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit16c3fdd

File tree

3 files changed

3 files changed

`‎ChangeLog.md‎`

`‎src/Glob/GlobExtensions.cs‎`

`‎test/Glob.Tests/GlobExtensionTests.cs‎`

0 commit comments