✨ ModuleFast will now search directories for manifests if given one via -Path

JustinGrote · JustinGrote · commit da8c72d87a02 · 2024-09-08T22:11:15.000-07:00
diff --git a/ModuleFast.psm1 b/ModuleFast.psm1
@@ -346,7 +346,16 @@ function Install-ModuleFast {
         break
       }
       'Path' {
-        $ModulesToInstall = ConvertFrom-RequiredSpec -RequiredSpecPath $Path -SpecFileType $SpecFileType
+        $Paths = @()
+        #Search for a spec file if a directory was provided
+        if ('Directory' -in (Get-Item $Path).Attributes) {
+          $Paths += Find-RequiredSpecFile -Path $Path
+        } else {
+          $Paths = $Path
+        }
+        foreach ($pathItem in $Paths) {
+          $ModulesToInstall = ConvertFrom-RequiredSpec -RequiredSpecPath $pathItem -SpecFileType $SpecFileType
+        }
       }
     }
   }
diff --git a/Test/Mocks/ModuleFast.requires.json b/Test/Mocks/ModuleFast.requires.json
@@ -1,5 +1,5 @@
 {
-  "PnP.PowerShell": "2.2.156-nightly",
+  "PnP.PowerShell": "2.10.4-nightly",
   "Pester": "=5.4.0",
   "Az.Accounts": ":[2.0.0, 2.13.2)",
   "ImportExcel": "latest",
diff --git a/Test/Mocks/ModuleFast.requires.psd1 b/Test/Mocks/ModuleFast.requires.psd1
@@ -1,6 +1,6 @@
 @{
   'ImportExcel'      = 'latest'
-  'PnP.PowerShell'   = '2.2.156-nightly'
+  'PnP.PowerShell'   = '2.10.4-nightly'
   'PSScriptAnalyzer' = '<=1.21.0'
   'Pester'           = '=5.4.0'
   'Az.Accounts'      = ':[2.0.0, 2.13.2)'
diff --git a/Test/Mocks/ModuleFastArray.requires.json b/Test/Mocks/ModuleFastArray.requires.json
@@ -1,6 +1,6 @@
 [
   "ImportExcel",
-  "PnP.PowerShell=2.2.156-nightly",
+  "PnP.PowerShell=2.10.4-nightly",
   "PSScriptAnalyzer<=1.21.0",
   "Pester=5.4.0",
   "Az.Accounts:[2.0.0, 2.13.2)"

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,16 @@ function Install-ModuleFast {`
`346`	`346`	`break`
`347`	`347`	`}`
`348`	`348`	`'Path' {`
`349`		`- $ModulesToInstall = ConvertFrom-RequiredSpec -RequiredSpecPath $Path -SpecFileType $SpecFileType`
	`349`	`+ $Paths = @()`
	`350`	`+ #Search for a spec file if a directory was provided`
	`351`	`+ if ('Directory' -in (Get-Item $Path).Attributes) {`
	`352`	`+ $Paths += Find-RequiredSpecFile -Path $Path`
	`353`	`+ } else {`
	`354`	`+ $Paths = $Path`
	`355`	`+ }`
	`356`	`+ foreach ($pathItem in $Paths) {`
	`357`	`+ $ModulesToInstall = ConvertFrom-RequiredSpec -RequiredSpecPath $pathItem -SpecFileType $SpecFileType`
	`358`	`+ }`
`350`	`359`	`}`
`351`	`360`	`}`
`352`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "PnP.PowerShell": "2.2.156-nightly",`
	`2`	`+ "PnP.PowerShell": "2.10.4-nightly",`
`3`	`3`	`"Pester": "=5.4.0",`
`4`	`4`	`"Az.Accounts": ":[2.0.0, 2.13.2)",`
`5`	`5`	`"ImportExcel": "latest",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[`
`2`	`2`	`"ImportExcel",`
`3`		`- "PnP.PowerShell=2.2.156-nightly",`
	`3`	`+ "PnP.PowerShell=2.10.4-nightly",`
`4`	`4`	`"PSScriptAnalyzer<=1.21.0",`
`5`	`5`	`"Pester=5.4.0",`
`6`	`6`	`"Az.Accounts:[2.0.0, 2.13.2)"`