Merge pull request #70 from WarehouseFinds/feature/dependencies

Refactor dependency resolution and update requirements format

Author: marko-stanojevic

.github/workflows/powershell-build-module.yml

@@ -135,7 +135,7 @@ jobs:
             tag_name = 'v${{ env.majorMinorPatch }}'
             target_commitish = "main"
             previous_tag_name = $previousTag
-          } | ConvertTo-Json
+          }
 
           $requestParams = @{
             Method      = 'Post'
@@ -144,7 +144,7 @@ jobs:
               Authorization = "Bearer $env:GITHUB_TOKEN"
               Accept = 'application/vnd.github+json'
             }
-            Body        = $body
+            Body        = ($body | ConvertTo-Json)
             ContentType = 'application/json'
           }
           $result = Invoke-RestMethod @requestParams

.github/workflows/powershell-cache-dependencies.yml

@@ -19,41 +19,27 @@ jobs:
         with:
           repository: ${{ github.repository }}
 
-      - name: Register PSRepositories
-        shell: pwsh
-        run: |
-          # Register required PSRepositories
-          $moduleRequirements = Import-PowerShellDataFile -Path './requirements.psd1'
-          foreach ($repository in $moduleRequirements.Repositories) {
-              $requestParams = @{
-                  Name               = $repository.Name
-                  SourceLocation     = $repository.SourceLocation
-                  PublishLocation    = $repository.PublishLocation
-                  InstallationPolicy = $repository.InstallationPolicy
-                  ErrorAction        = 'Stop'
-              }
-              [void] (Register-PSRepository @requestParams)
-          }
-
       - name: Resolve module dependencies
         id: resolve-dependencies
         shell: pwsh
         run: |
           # Resolve module dependencies from requirements.psd1
           $moduleRequirements = Import-PowerShellDataFile -Path './requirements.psd1'
-          $packages = @($moduleRequirements.Packages)
           $moduleList = (
-              $packages |
+              $moduleRequirements.GetEnumerator() |
                   ForEach-Object {
-                      $name = if ($_.Repository) {
-                          "$($_.Repository)\$($_.Name)"
+                      $moduleName = $_.Key
+                      $moduleInfo = $_.Value
+                      
+                      $name = if ($moduleInfo.Repository -and $moduleInfo.Repository -ne 'PSGallery') {
+                          "$($moduleInfo.Repository)\$moduleName"
                       }
                       else {
-                          $_.Name
+                          $moduleName
                       }
 
-                      if ($_.Version -ne 'latest') {
-                          "$($name):$($_.Version)"
+                      if ($moduleInfo.Version -and $moduleInfo.Version -ne 'latest') {
+                          "$($name):$($moduleInfo.Version)"
                       }
                       else {
                           "$($name)"
@@ -74,7 +60,6 @@ jobs:
         run: |
           # Verify that required modules are installed
           $moduleRequirements = Import-PowerShellDataFile -Path './requirements.psd1'
-          $packages = @($moduleRequirements.Packages)
-          foreach ($package in $packages) {
-              Get-Module -ListAvailable -Name $package.Name -ErrorAction Stop
+          foreach ($moduleName in $moduleRequirements.Keys) {
+              Get-Module -ListAvailable -Name $moduleName -ErrorAction Stop
           }

requirements.psd1

@@ -1,50 +1,11 @@
-# Project dependencies
+# PSDepend dependency specification
+# See https://github.com/RamblingCookieMonster/PSDepend for more information
 @{
-    Packages     = @(
-        @{
-            Name       = 'InvokeBuild'
-            Repository = 'PSGallery'
-            Type       = 'Release'
-            Version    = '5.14.22'
-        }
-        @{
-            Name       = 'ModuleBuilder'
-            Repository = 'PSGallery'
-            Type       = 'Release'
-            Version    = '3.1.8'
-        }
-        @{
-            Name       = 'Pester'
-            Repository = 'PSGallery'
-            Type       = 'Release'
-            Version    = '5.7.1'
-        }
-        @{
-            Name       = 'PSScriptAnalyzer'
-            Repository = 'PSGallery'
-            Type       = 'Release'
-            Version    = 'latest'
-        }
-        @{
-            Name       = 'InjectionHunter'
-            Repository = 'PSGallery'
-            Type       = 'Release'
-            Version    = '1.0.0'
-        }
-        @{
-            Name       = 'Microsoft.PowerShell.PlatyPS'
-            Repository = 'PSGallery'
-            Type       = 'Release'
-            Version    = '1.0.1'
-        }
-    )
-    Repositories = @(
-        # Default PSGallery repository, installed by PowerShellGet automatically
-        <# @{
-            Name               = 'PSGallery'
-            SourceLocation     = 'https://www.powershellgallery.com/api/v2/'
-            PublishLocation    = 'https://www.powershellgallery.com/api/v2/package/'
-            InstallationPolicy = 'Trusted'
-        } #>
-    )
+    # Build and test dependencies
+    'InvokeBuild'                  = @{ Version = '5.14.22'; Repository = 'PSGallery' }
+    'ModuleBuilder'                = @{ Version = '3.1.8'; Repository = 'PSGallery' }
+    'Pester'                       = @{ Version = '5.7.1'; Repository = 'PSGallery' }
+    'PSScriptAnalyzer'             = @{ Version = 'latest'; Repository = 'PSGallery' }
+    'InjectionHunter'              = @{ Version = '1.0.0'; Repository = 'PSGallery' }
+    'Microsoft.PowerShell.PlatyPS' = @{ Version = '1.0.1'; Repository = 'PSGallery' }
 }