Merge pull request #10 from SubPointSolutions/dev

Install-UpliftPSModule fix

Author: SubPointSupport

uplift.core/src/Uplift.Core.ps1

@@ -520,9 +520,39 @@ function Install-UpliftPSModule {
 
     Param(
         $name,
-        $version
+        $version,
+        $repository = "PSGallery",
+        $usePS6 = $False
     )
 
+    if( [String]::IsNullOrEmpty($version) -eq $True) {
+        $version = $null
+
+        Write-UpliftMessage "Looking for the latest module $name"
+
+        $moduleDefinition = Find-Module -Name $name `
+            | Select-Object Version, Repository `
+            | Sort-Object Version -Descending `
+            | Select-Object -First 1
+
+        Write-UpliftMessage "Found latest module"
+        Write-UpliftMessage $moduleDefinition
+        Write-UpliftMessage " - version   : $($moduleDefinition.Version)"
+        Write-UpliftMessage " - repository: $($moduleDefinition.Repository)"
+
+        if($null -eq $moduleDefinition) {
+            throw "Failed to install module $name - repo/version were not provided, and cannot find latest in any repo"
+        }
+
+        $version = $moduleDefinition.Version
+
+        if([String]::IsNullOrEmpty($repository) -eq $True) {
+            $repository = $moduleDefinition.Repository
+        }
+
+        Write-UpliftMessage "Installing latest ($version) $name version: $version, repository: $repository"
+    }
+
     $maxAttempt = 5
     $attempt = 1
     $success = $false
@@ -535,26 +565,30 @@ function Install-UpliftPSModule {
             $progressPreference = 'silentlyContinue'
 
             Write-UpliftMessage "`t[$attempt/$maxAttempt] ensuring package: $name $version"
-            $existinModule = $null
+            $moduleExists = $null
 
+            # does module exist locally?
             if( [String]::IsNullOrEmpty($version) -eq $True) {
                 Write-UpliftMessage "`tchecking if package exists: $name $version"
-                $existinModule = Get-Module -ListAvailable | Where-Object { $_.Name -eq $name }
+                $moduleExists = Get-Module -ListAvailable | Where-Object { $_.Name -eq $name }
             } else {
                 Write-UpliftMessage "`tchecking if package exists: $name $version"
-                $existinModule = Get-Module -ListAvailable | Where-Object { $_.Name -eq $name -and $_.Version -eq $version}
+                $moduleExists = Get-Module -ListAvailable | Where-Object { $_.Name -eq $name -and $_.Version -eq $version}
             }
 
-            if( $null -ne $existinModule) {
+            if( $null -ne $moduleExists) {
                 Write-UpliftMessage "`t`tpackage exists, nothing to do: $name $version"
             }
             else {
-                Write-UpliftMessage "`t`tpackage does not exist, installing: $name $version"
+                if($usePS6 -eq $True) {
+                    Write-UpliftMessage "`t`tpackage does not exist (PS6), installing: $name $version"
 
-                if ([System.String]::IsNullOrEmpty($version) -eq $true) {
-                    Install-Module -Name $name -Force -SkipPublisherCheck
+                    pwsh -c "Install-Package $name -Source $repository -RequiredVersion $version -Force -SkipPublisherCheck"
+                    Confirm-UpliftExitCode $LASTEXITCODE "Cannot install PS6 module: $name, version: $version repository: $repository"
                 } else {
-                    Install-Module -Name $name -RequiredVersion $version -Force -SkipPublisherCheck
+                    Write-UpliftMessage "`t`tpackage does not exist (PS), installing: $name $version"
+
+                    Install-Package $name -Source $repository -RequiredVersion $version -Force -SkipPublisherCheck
                 }
             }
 
@@ -687,81 +721,6 @@ function Install-UpliftPS6Module() {
     Install-UpliftPSModule $moduleName $version $repository $True
 }
 
-# function Install-UpliftPSModule() {
-#     [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess", "", Scope = "Function")]
-#     [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseShouldProcessForStateChangingFunctions", "", Scope = "Function")]
-#     [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost", "", Scope = "Function")]
-
-#     param(
-#         $moduleName,
-#         $version,
-#         $repository,
-#         $usePS6 = $false
-#     )
-
-#     if( [String]::IsNullOrEmpty($version) -eq $True) {
-#         $version = $null
-#     }
-
-#     Write-UpliftMessage "Installing module: $moduleName version: $version, repository: $repository"
-
-#     Write-UpliftMessage "Looking for the latest module $moduleName"
-#     $moduleDefinition = Find-Module -Name $moduleName `
-#         | Select-Object Version, Repository `
-#         | Sort-Object Version -Descending `
-#         | Select-Object -First 1
-
-#     Write-UpliftMessage "Found latest module"
-#     Write-UpliftMessage $moduleDefinition
-#     Write-UpliftMessage " - version   : $($moduleDefinition.Version)"
-#     Write-UpliftMessage " - repository: $($moduleDefinition.Repository)"
-
-#     if([String]::IsNullOrEmpty($version) -eq $True) {
-
-#         if($null -eq $moduleDefinition) {
-#             throw "Failed to install module $moduleName - repo/version were not provided, and cannot find latest in any repo"
-#         }
-
-#         $version = $moduleDefinition.Version
-
-#         if([String]::IsNullOrEmpty($repository) -eq $True) {
-#             $repository = $moduleDefinition.Repository
-#         }
-
-#         Write-UpliftMessage "Installing latest ($version) $moduleName version: $version, repository: $repository"
-
-#         if($usePS6 -eq $True) {
-#             pwsh -c "Install-Package $moduleName -Source $repository -RequiredVersion $version -Force -SkipPublisherCheck"
-#             Confirm-UpliftExitCode $LASTEXITCODE "Cannot install PS6 module: $moduleName, version: $version repository: $repository"
-#         } else {
-#             Install-Package $moduleName -Source $repository -RequiredVersion $version -Force -SkipPublisherCheck
-#         }
-#     }
-#     else {
-#         if([String]::IsNullOrEmpty($repository) -eq $True) {
-#             $repository = $moduleDefinition.Repository
-#         }
-
-#         Write-UpliftMessage "Installing specified version $moduleName version: $version, repository: $repository"
-
-#         if($usePS6 -eq $True) {
-#             pwsh -c "Install-Package $moduleName -Source $repository -Force  -RequiredVersion $version -SkipPublisherCheck"
-#             Confirm-UpliftExitCode $LASTEXITCODE "Cannot install PS6 module: $moduleName, version: $version repository: $repository"
-#         } else {
-#             Install-Package $moduleName -Source $repository -Force  -RequiredVersion $version -SkipPublisherCheck
-#         }
-#     }
-
-#     Write-UpliftMessage "Checking installed module: $moduleName"
-
-#     if($usePS6 -eq $True) {
-#         pwsh -c "Get-InstalledModule $moduleName"
-#         Confirm-UpliftExitCode $LASTEXITCODE "Cannot find installed PS6 module: $moduleName"
-#     } else {
-#         # TODO
-#     }
-# }
-
 function Repair-UpliftIISApplicationHostFile {
     # https://forums.iis.net/t/1160389.aspx