Updates

Author: FriedrichWeinmann

PSModuleDevelopment/changelog.md

@@ -4,6 +4,10 @@
  - New: Search-PSMDPropertyValue - search objects for values in properties
  - Upd: Template PSFTest - adding WMI commands to list of forbidden commands
  - Upd: Template PSFModule - adding changelog
+ - Upd: Template PSFModule - adding strings for localization
+ - Upd: Template PSFModule - adding scriptblocks
+ - Upd: Template PSFProject - updated build txt files to include new module content
+ - Fix: Template PSMTest - replacing all -Filter calls on Get-ChildItem
  - Fix: New-PSMDTemplate records binary files as text files
 
 ## 2.2.5.41 (December 18th, 2018)

templates/PSFModule/en-us/strings.psd1

@@ -0,0 +1,5 @@
+# This is where the strings go, that are written by
+# Write-PSFMessage, Stop-PSFFunction or the PSFramework validation scriptblocks
+@{
+	'key' = 'Value'
+}

templates/PSFModule/internal/scriptblocks/scriptblocks.ps1

@@ -0,0 +1,12 @@
+<#
+Stored scriptblocks are available in [PsfValidateScript()] attributes.
+This makes it easier to centrally provide the same scriptblock multiple times,
+without having to maintain it in separate locations.
+
+It also prevents lengthy validation scriptblocks from making your parameter block
+hard to read.
+
+Set-PSFScriptblock -Name 'þnameþ.ScriptBlockName' -Scriptblock {
+	
+}
+#>

templates/PSFModule/internal/scripts/postimport.ps1

@@ -1,17 +1,22 @@
 # Add all things you want to run after importing the main code
 
 # Load Configurations
-foreach ($file in (Get-ChildItem "$ModuleRoot\internal\configurations\*.ps1" -ErrorAction Ignore)) {
+foreach ($file in (Get-ChildItem "$($script:ModuleRoot)\internal\configurations\*.ps1" -ErrorAction Ignore)) {
+	. Import-ModuleFile -Path $file.FullName
+}
+
+# Load Scriptblocks
+foreach ($file in (Get-ChildItem "$($script:ModuleRoot)\internal\scriptblocks\*.ps1" -ErrorAction Ignore)) {
 	. Import-ModuleFile -Path $file.FullName
 }
 
 # Load Tab Expansion
-foreach ($file in (Get-ChildItem "$ModuleRoot\internal\tepp\*.tepp.ps1" -ErrorAction Ignore)) {
+foreach ($file in (Get-ChildItem "$($script:ModuleRoot)\internal\tepp\*.tepp.ps1" -ErrorAction Ignore)) {
 	. Import-ModuleFile -Path $file.FullName
 }
 
 # Load Tab Expansion Assignment
-. Import-ModuleFile -Path "$ModuleRoot\internal\tepp\assignment.ps1"
+. Import-ModuleFile -Path "$($script:ModuleRoot)\internal\tepp\assignment.ps1"
 
 # Load License
-. Import-ModuleFile -Path "$ModuleRoot\internal\scripts\license.ps1"
+. Import-ModuleFile -Path "$($script:ModuleRoot)\internal\scripts\license.ps1"

templates/PSFModule/internal/scripts/preimport.ps1

@@ -1 +1,4 @@
-# Add all things you want to run before importing the main code
+# Add all things you want to run before importing the main code
+
+# Load the strings used in messages
+. Import-ModuleFile -Path "$($script:ModuleRoot)\internal\scripts\strings.ps1"

templates/PSFModule/internal/scripts/strings.ps1

@@ -0,0 +1,8 @@
+<#
+This file loads the strings documents from the respective language folders.
+This allows localizing messages and errors.
+Load psd1 language files for each language you wish to support.
+Partial translations are acceptable - when missing a current language message,
+it will fallback to English or another available language.
+#>
+Import-PSFLocalizedString -Path "$($script:ModuleRoot)\en-us\*.psd1" -Module 'þnameþ' -Language 'en-US'

templates/PSFProject/build/filesAfter.txt

@@ -2,6 +2,7 @@
 # In the order they are loaded during postimport
 
 internal\configurations\*.ps1
+internal\scriptblocks\*.ps1
 internal\tepp\*.tepp.ps1
 internal\tepp\assignment.ps1
 internal\scripts\license.ps1

templates/PSFProject/build/filesBefore.txt

@@ -1,2 +1,4 @@
 # List all files that are loaded in the preimport.ps1
-# In the order they are loaded during preimport
+# In the order they are loaded during preimport
+
+internal\scripts\strings.ps1

templates/PSFTests/general/FileIntegrity.Tests.ps1

@@ -33,7 +33,7 @@ function Get-FileEncoding
 
 Describe "Verifying integrity of module files" {
 	Context "Validating PS1 Script files" {
-		$allFiles = Get-ChildItem -Path $moduleRoot -Recurse -Filter "*.ps1" | Where-Object FullName -NotLike "$moduleRoot\tests\*"
+		$allFiles = Get-ChildItem -Path $moduleRoot -Recurse | Where-Object Name -like "*.ps1" | Where-Object FullName -NotLike "$moduleRoot\tests\*"
 
 		foreach ($file in $allFiles)
 		{
@@ -72,7 +72,7 @@ Describe "Verifying integrity of module files" {
 	}
 
 	Context "Validating help.txt help files" {
-		$allFiles = Get-ChildItem -Path $moduleRoot -Recurse -Filter "*.help.txt" | Where-Object FullName -NotLike "$moduleRoot\tests\*"
+		$allFiles = Get-ChildItem -Path $moduleRoot -Recurse | Where-Object Name -like "*.help.txt" | Where-Object FullName -NotLike "$moduleRoot\tests\*"
 
 		foreach ($file in $allFiles)
 		{

templates/PSFTests/general/Manifest.Tests.ps1

@@ -2,7 +2,7 @@
 	$moduleRoot = (Resolve-Path "$PSScriptRoot\..\..").Path
 	$manifest = ((Get-Content "$moduleRoot\þnameþ.psd1") -join "`n") | Invoke-Expression
 	Context "Basic resources validation" {
-		$files = Get-ChildItem "$moduleRoot\functions" -Recurse -File -Filter "*.ps1"
+		$files = Get-ChildItem "$moduleRoot\functions" -Recurse -File | Where-Object Name -like "*.ps1"
 		It "Exports all functions in the public folder" {
 
 			$functions = (Compare-Object -ReferenceObject $files.BaseName -DifferenceObject $manifest.FunctionsToExport | Where-Object SideIndicator -Like '<=').InputObject