Merge pull request #105 from sqlcollaborative/development

0.6.1

Author: nvarscar

build/Get-PRHistory.ps1

@@ -72,21 +72,19 @@ if ($ApiKey) {
     }
     Invoke-RestMethod @RequestParams -Uri 'https://api.github.com/' | Out-String | Write-Verbose
 }
+$RequestParams = if ($AuthSession) { @{ WebSession = $AuthSession } } else { @{ } }
 $gitParams = @(
     '--no-pager'
     'log'
     '--first-parent'
     "$CommitID..$HeadCommitID"
     '--format="%H"'
-    '--'
-    '.'
-    '":(exclude)*.md"'
 )
 $commits = & git @gitParams
 
 $prs = @()
 foreach ($commit in $commits) {
-    $result = Invoke-RestMethod @RequestParams -Uri "https://api.github.com/search/issues?q=$($commit)is%3Amerged"
+    $result = Invoke-RestMethod @RequestParams -Uri "https://api.github.com/search/issues?q=$($commit)+is%3Amerged+is%3Apr"
     if ($result.total_count -gt 0) {
         $prs += $result.items | Sort-Object -Property score -Descending | Select-Object -First 1
     }
@@ -110,4 +108,4 @@ if ($Append) {
     else { $currentContent = @() }
     $mdTable + $currentContent | Set-Content -Path $Path
 }
-else { $mdTable | Set-Content -Path $Path }
+else { $mdTable | Set-Content -Path $Path }

docs/changelog.md

@@ -1,3 +1,7 @@
+# Release notes for v0.6.1:
+- ### Files in subfolders are not being added when -Match is used (#104) by @nvarscar
+   ------
+   * Folders are no longer filtered out by the -Match regex string
 # Release notes for v0.6.0:
 - ### Adding prescripts and postscripts (#91) by @nvarscar
    ------

internal/functions/Get-DbopsFile.ps1

@@ -14,12 +14,12 @@
         )
         Write-PSFMessage -Level Debug -Message "Getting child items from $Item; Root defined as $Root"
         $fileItems = Get-ChildItem $Item.FullName
-        if ($Match) { $fileItems = $fileItems | Where-Object Name -match ($Match -join '|') }
         foreach ($childItem in $fileItems) {
             if ($childItem.PSIsContainer) {
                 if ($Recurse) { Select-DbopsFile -Item (Get-Item $childItem.FullName) -Root $Root }
             }
             else {
+                if ($Match -and $childItem.Name -notmatch ($Match -join '|')) { continue }
                 if ($Relative) {
                     $pkgPath = Resolve-Path $childItem.FullName -Relative
                 }

tests/Add-DBOBuild.Tests.ps1

@@ -192,7 +192,7 @@ Describe "Add-DBOBuild tests" -Tag $commandName, UnitTests {
             $testResults.Name | Should Be (Split-Path $packageNameTest -Leaf)
             Test-Path $packageNameTest | Should Be $true
             $scripts = $testResults.GetBuild('2.0').Scripts
-            Join-PSFPath -Normalize 'content\2.0' ((Resolve-Path $v2scripts -Relative) -replace '^\.\\|^\.\/', '')| Should BeIn $scripts.GetPackagePath()
+            Join-PSFPath -Normalize 'content\2.0' ((Resolve-Path $v2scripts -Relative) -replace '^\.\\|^\.\/', '') | Should BeIn $scripts.GetPackagePath()
             Join-PSFPath -Normalize 'content\2.0\1.sql' | Should Not BeIn $scripts.GetPackagePath()
             $items = Get-ArchiveItem $packageNameTest
             Join-PSFPath -Normalize 'content\1.0\1.sql' | Should BeIn $items.Path
@@ -204,7 +204,7 @@ Describe "Add-DBOBuild tests" -Tag $commandName, UnitTests {
             $testResults.Name | Should Be (Split-Path $packageNameTest -Leaf)
             Test-Path $packageNameTest | Should Be $true
             $scripts = $testResults.GetBuild('2.0').Scripts
-            Join-PSFPath -Normalize 'content\2.0' ($v2scripts -replace ':', '')| Should BeIn $scripts.GetPackagePath()
+            Join-PSFPath -Normalize 'content\2.0' ($v2scripts -replace ':', '') | Should BeIn $scripts.GetPackagePath()
             Join-PSFPath -Normalize 'content\2.0\1.sql' | Should Not BeIn $scripts.GetPackagePath()
             $items = Get-ArchiveItem $packageNameTest
             Join-PSFPath -Normalize 'content\1.0\1.sql' | Should BeIn $items.Path
@@ -242,6 +242,22 @@ Describe "Add-DBOBuild tests" -Tag $commandName, UnitTests {
             Join-PSFPath -Normalize 'content\2.0\2.sql' | Should BeIn $items.Path
             Join-PSFPath -Normalize 'content\2.0\3.sql' | Should Not BeIn $items.Path
         }
+        It "Should add only matched files from a recursive folder" {
+            $testResults = Add-DBOBuild -ScriptPath $noRecurseFolder\* -Name $packageNameTest -Build 2.0 -Match '2\.sql'
+            $testResults | Should Not Be $null
+            $testResults.Name | Should Be (Split-Path $packageNameTest -Leaf)
+            Test-Path $packageNameTest | Should Be $true
+            $scripts = $testResults.GetBuild('2.0').Scripts
+            $scripts | Should -Not -BeNullOrEmpty
+            Join-PSFPath -Normalize 'content\2.0\success\1.sql' | Should Not BeIn $scripts.GetPackagePath()
+            Join-PSFPath -Normalize 'content\2.0\success\2.sql' | Should BeIn $scripts.GetPackagePath()
+            Join-PSFPath -Normalize 'content\2.0\success\3.sql' | Should Not BeIn $scripts.GetPackagePath()
+            $items = Get-ArchiveItem $packageNameTest
+            Join-PSFPath -Normalize 'content\1.0\1.sql' | Should BeIn $items.Path
+            Join-PSFPath -Normalize 'content\2.0\success\1.sql' | Should Not BeIn $items.Path
+            Join-PSFPath -Normalize 'content\2.0\success\2.sql' | Should BeIn $items.Path
+            Join-PSFPath -Normalize 'content\2.0\success\3.sql' | Should Not BeIn $items.Path
+        }
     }
     Context "negative tests" {
         BeforeAll {
@@ -267,7 +283,7 @@ Describe "Add-DBOBuild tests" -Tag $commandName, UnitTests {
             $errorResult.Exception.Message -join ';' | Should BeLike '*Incorrect package format*'
         }
         It "should throw error when package zip does not exist" {
-            { Add-DBOBuild -Name ".\nonexistingpackage.zip" -ScriptPath $v1scripts -ErrorAction Stop} | Should Throw
+            { Add-DBOBuild -Name ".\nonexistingpackage.zip" -ScriptPath $v1scripts -ErrorAction Stop } | Should Throw
         }
         It "should throw error when path cannot be resolved" {
             try {