Prerelease module on new modulev3 (#106)

* Set default module to prerelease to 'dev'

* Add test check for dev and others

* Add test to check prerelease tag

* Fix bug for adding PreRelease to injected function.

Author: rulasg

TestingHelperTest/public/New-ModuleV3-Add-ModuleV3.Tests.ps1

@@ -2,33 +2,39 @@
 function TestingHelperTest_NewModuleV3_AddModule_FailCall_NewModuleManifest {
 
     # test when failing calling dependency Microsoft PowerShell.Core/New-ModuleManifest
-
-    $modulename = "MyModule"
 
-    # Inject depepdency
-    $module = Import-Module -Name $TESTED_MANIFEST_PATH -Prefix "LL_" -Force -PassThru
-    & $module {
-        . {
-            function script:New-MyModuleManifest {
-                [CmdletBinding()]
-                param(
-                    [Parameter(Mandatory)][string]$Path,
-                    [Parameter(Mandatory)][string]$RootModule
-                )
-                throw "Injected error from New-MymoduleManifest."
+    try {
+        
+        $modulename = "MyModule"
+        
+        # Inject depepdency
+        $module = Import-Module -Name $TESTED_MANIFEST_PATH -Prefix "LL_" -Force -PassThru
+        & $module {
+            . {
+                function script:New-MyModuleManifest {
+                    [CmdletBinding()]
+                    param(
+                        [Parameter(Mandatory)][string]$Path,
+                        [Parameter(Mandatory)][string]$RootModule,
+                        [Parameter(Mandatory)][string]$PreRelease
+                        )
+                        throw "Injected error from New-MymoduleManifest."
+                    }
+                }
             }
+            
+            $result = Add-LL_ModuleV3 -Name $modulename  @ErrorParameters
+            
+            Assert-IsNull -Object $result -Comment "No module is created"
+            Assert-IsNotNull -Object $errorVar.Exception -Comment "Error is thrown"
+            Assert-Contains -Expected "Injected error from New-MymoduleManifest." -Presented ($errorVar.Exception.Message)
+            Assert-ContainsPattern -Expected "Error creating the PSD1 file.*" -Presented ($errorVar.Exception.Message)
+        }
+        finally {
+            # reset module
+            Import-Module -Name $TESTED_MANIFEST_PATH -Prefix "TT_" -Force
         }
-    }
-
-    $result = Add-LL_ModuleV3 -Name $modulename  @ErrorParameters
-
-    Assert-IsNull -Object $result -Comment "No module is created"
-    Assert-IsNotNull -Object $errorVar.Exception -Comment "Error is thrown"
-    Assert-Contains -Expected "Injected error from New-MymoduleManifest." -Presented ($errorVar.Exception.Message)
-    Assert-ContainsPattern -Expected "Error creating the PSD1 file.*" -Presented ($errorVar.Exception.Message)
 
-    # reset module
-    Import-Module -Name $TESTED_MANIFEST_PATH -Prefix "TT_" -Force
 }
 
 function TestingHelperTest_NewModuleV3_AddModule_DefaultManifest {
@@ -39,6 +45,8 @@ function TestingHelperTest_NewModuleV3_AddModule_DefaultManifest {
 
     $defaultsManifest = Get-DefaultsManifest
 
+    $defaultsManifest.PrivateData.PSData.Prerelease = 'dev'
+
     Assert-AreEqualPath -Expected $moduleName -Presented $result
 
     Assert-AddModuleV3  -Path $moduleName -Expected $defaultsManifest
@@ -48,6 +56,7 @@ function TestingHelperTest_NewModuleV3_AddModule_MyManifest {
 
     $moduleName = "MyModule"
 
+    # Metadata is really the posible parameters for Update-ModuleManifest
     $param = @{
         RootModule        = "MyModule.psm1"
         Author            = "Me"
@@ -56,11 +65,28 @@ function TestingHelperTest_NewModuleV3_AddModule_MyManifest {
         Description       = "MyDescription of the module"
         FunctionsToExport = @("MyFunction")
         CopyRight         = "(c) 2020 MyCompany. All rights reserved."
+        Prerelease        = "radompre"
     } 
-    
+
     $result = Add-TT_ModuleV3 -Name $moduleName -Metadata $param
 
-    Assert-AddModuleV3  -Path $result -Expected $param
+    $ExpectedMetadata = @{
+        RootModule        = $param.RootModule
+        Author            = $param.Author
+        CompanyName       = $param.CompanyName
+        ModuleVersion     = $param.ModuleVersion
+        Description       = $param.Description
+        FunctionsToExport = $param.FunctionsToExport
+        Copyright         = $param.CopyRight
+    }
+
+    $ExpectedMetadata.PrivateData = @{
+        PSData = @{
+            Prerelease = $param.Prerelease
+        }
+    }
+
+    Assert-AddModuleV3  -Path $result -Expected $ExpectedMetadata
 
 }
 

private/Microsoft.PowerShell.Core.Dependency.ps1

@@ -4,9 +4,10 @@ function script:New-MyModuleManifest {
     [CmdletBinding()]
     param(
         [Parameter(Mandatory)][string]$Path,
-        [Parameter(Mandatory)][string]$RootModule
+        [Parameter(Mandatory)][string]$RootModule,
+        [Parameter(Mandatory)][string]$PreRelease
     )
-    New-ModuleManifest  -Path $Path -RootModule $RootModule
+    New-ModuleManifest  -Path $Path -RootModule $RootModule -PreRelease $PreRelease
 }
 
 function script:Update-MyModuleManifest {

public/Add-ModuleV3.ps1

@@ -40,7 +40,8 @@ function Add-ModuleV3 {
 
     try {
         # Create the PSD1 file
-        New-MyModuleManifest  -Path $psd1Path -RootModule $rootModule
+        # Default Prerelease to 'dev' but may be overriten by $metadata
+        New-MyModuleManifest  -Path $psd1Path -RootModule $rootModule -PreRelease "dev"
 
         # Update with metadata
         if ($Metadata.Count -gt 0) {

public/Add-TestModuleV3.ps1

@@ -20,6 +20,9 @@ function Add-TestModuleV3 {
         $manifest.Remove('Name')
         $manifest.Remove('RootModule')
         $manifest.Remove('GUID')
+
+        #match the prerelease field with module
+        $manifest.Prerelease = $manifest.PrivateData.PSData.Prerelease
     } 
 
     # TODO: Not sure how to mangage Force on Add-Module functions