Merge pull request #30 from rulasg/29-testps1-and-publishps1-improvements

29 testps1 and publishps1 improvements

Author: rulasg

publish.ps1

@@ -26,15 +26,16 @@ param(
     # The NuGet API Key for the PSGallery
     [Parameter(Mandatory=$false)] [string]$NuGetApiKey,
     # Force the publish without prompting for confirmation
-    [Parameter(Mandatory=$false)] [switch]$Force
+    [Parameter(Mandatory=$false)] [switch]$Force,
+    # Force publishing package to the gallery. Equivalente to Import-Module -Force
+    [Parameter(Mandatory=$false)] [switch]$ForcePublish
 )
 
 # check that $NuggetApiKey is null or whitespace
 # If it is use environment variable $env:NugetApiKey
 if ( [string]::IsNullOrWhiteSpace($NuGetApiKey) ) {
 
     if ( [string]::IsNullOrWhiteSpace($env:NUGETAPIKEY) ) {
-        Write-Error -Message '$Env:NUGETAPIKEY is not set. Try running `$Env:NUGETAPIKEY = fdf nuget | Get-SecretValue`'
         Write-Error -Message '$Env:NUGETAPIKEY is not set. Try running `$Env:NUGETAPIKEY = (Find-DocsFile nugetapikey | rsk | Get-SecretData).Get()`'
         return
     }
@@ -74,5 +75,5 @@ if ($PSCmdlet.ShouldProcess($psdPath, "Publish-Module")) {
     # show an empty line
     Write-Information -InformationAction Continue -Message ""
     Write-Information -InformationAction Continue -Message $message 
-    publish-Module   -Name $psdPath -NuGetApiKey $NuGetApiKey
+    Publish-Module   -Name $psdPath -NuGetApiKey $NuGetApiKey -Force:$ForcePublish
 }

test.ps1

@@ -1,18 +1,41 @@
 [CmdletBinding()]
 param ()
 
-function Import-TestingHelper($Version){
+function Import-TestingHelper{
+    [CmdletBinding()]
+    param (
+        [Parameter()][string]$Version,
+        [Parameter()][switch]$AllowPrerelease,
+        [Parameter()][switch]$PassThru
+    )
 
-    if (-not (import-Module TestingHelper -RequiredVersion $Version -PassThru -ErrorAction SilentlyContinue )) {
-        Install-Module -Name TestingHelper -Force -RequiredVersion $Version
-        Import-Module -Name TestingHelper -Force -RequiredVersion $Version
+    
+    if ($Version) {
+        $V = $Version.Split('-')
+        $semVer = $V[0]
+        $AllowPrerelease = ($AllowPrerelease -or ($null -ne $V[1]))
+    }
+    
+    $module = Import-Module TestingHelper -PassThru -ErrorAction SilentlyContinue -RequiredVersion:$semVer
+
+    if ($null -eq $module) {
+        $installed = Install-Module -Name TestingHelper -Force -AllowPrerelease:$AllowPrerelease -passThru -RequiredVersion:$Version
+        $module = Import-Module -Name $installed.Name -RequiredVersion ($installed.Version.Split('-')[0]) -Force -PassThru
     }
-}
 
-Import-TestingHelper -Version $Version
+    if ($PassThru) {
+        $module
+    }
+}
 
-$psd = get-childitem -Path $PSScriptRoot -Filter *.psd1
+Import-TestingHelper -version 2.1.1-alpha #first version wiht Test-ModulelocalPsd1
 
-Import-Module -Name $psd.FullName -Force
+# Run test by PSD1 file
+Test-ModulelocalPSD1
 
-Test-Module -Name $psd.BaseName
+# Run tests by module name
+# We need to manage the import of the version we want to test
+# If there are different versions of the module installed, we need to import the one we want to test
+# $psd = get-childitem -Path $PSScriptRoot -Filter *.psd1
+# Import-Module -Name $psd.FullName -Force
+# Test-Module -Name $psd.BaseName