Merge pull request #22 from PowershellFrameworkCollective/development

2.2.1.12

Author: FriedrichWeinmann

.gitignore

@@ -7,6 +7,7 @@
 
 # Ignore staging info from Visual Studio
 library/PSModuleDevelopment/.vs/PSModuleDevelopment/v15/.suo
+library/PSModuleDevelopment/.vs/*
 library/PSModuleDevelopment/PSModuleDevelopment/bin/*
 library/PSModuleDevelopment/PSModuleDevelopment/obj/*
 

PSModuleDevelopment/PSModuleDevelopment.psd1

@@ -4,7 +4,7 @@
 	RootModule = 'PSModuleDevelopment.psm1'
 
 	# Version number of this module.
-	ModuleVersion = '2.2.0.11'
+	ModuleVersion = '2.2.1.12'
 
 	# ID used to uniquely identify this module
 	GUID = '37dd5fce-e7b5-4d57-ac37-832055ce49d6'

PSModuleDevelopment/PSModuleDevelopment.psm1

@@ -1,8 +1,8 @@
 $script:PSModuleRoot = $PSScriptRoot
-$script:PSModuleVersion = "2.2.0.11"
+$script:PSModuleVersion = "2.2.1.12"
 
 $script:doDotSource = $false
-if (Get-PSFConfigValue -Name PSModuleDevelopment.Import.DoDotSource) { $script:doDotSource = $true }
+if (Get-PSFConfigValue -FullName PSModuleDevelopment.Import.DoDotSource) { $script:doDotSource = $true }
 
 #region Helper function
 function Import-PSMDFile

PSModuleDevelopment/PSModuleDevelopment.psproj

@@ -27,7 +27,6 @@
     <Folder>internal\tabcompletion</Folder>
     <Folder>internal\tabcompletion\scriptblocks</Folder>
     <Folder>internal\maintenance</Folder>
-    <Folder>internal\tabcompletion\assignment</Folder>
     <Folder>internal\functions\template</Folder>
     <Folder>internal\templates</Folder>
   </Folders>
@@ -94,6 +93,12 @@
     <File Build="2">changelog.md</File>
     <File Build="2" Shared="True" ReferenceFunction="Invoke-template-store_ps1">internal\tabcompletion\scriptblocks\template-store.ps1</File>
     <File Build="2" Shared="True" ReferenceFunction="Invoke-template-templatename_ps1">internal\tabcompletion\scriptblocks\template-templatename.ps1</File>
+    <File Build="2">internal\templates\function-1.0.0.0-Info.xml</File>
+    <File Build="2">internal\templates\function-1.0.0.0.xml</File>
+    <File Build="2">internal\templates\module-1.0.0.0-Info.xml</File>
+    <File Build="2">internal\templates\module-1.0.0.0.xml</File>
+    <File Build="2">internal\templates\PSMDTemplateReference-1.0.0.0-Info.xml</File>
+    <File Build="2">internal\templates\PSMDTemplateReference-1.0.0.0.xml</File>
   </Files>
   <StartupScript>F:\Synchronized Data\Scripte\Powershell Studio\Projects\PSModuleDevelopment\Test-Module.ps1</StartupScript>
 </Project>

PSModuleDevelopment/changelog.md

@@ -1,4 +1,8 @@
 # Changelog
+## 2.2.1.12 (March 08th, 2018)
+ - Added out-of-the box templates
+ - fix: Verious bugfixes around the template system
+
 ## 2.2.1.11 (March 06th, 2018)
  - new: Alias imt --> Invoke-PSMDTemplate
  - Upd: Added TabCompletion to *-PSMDTemplate commands

PSModuleDevelopment/functions/templating/Get-PSMDTemplate.ps1

@@ -171,7 +171,7 @@
 		#endregion Apply filters
 
 		#region Return valid templates
-		if ($All) { return $filteredProspects }
+		if ($All) { return $filteredProspects | Sort-Object Type, Name, Version }
 
 		$prospectHash = @{ }
 		foreach ($prospect in $filteredProspects)
@@ -185,7 +185,7 @@
 				$prospectHash[$prospect.Name] = $prospect
 			}
 		}
-		$prospectHash.Values
+		$prospectHash.Values | Sort-Object Type, Name
 		#endregion Return valid templates
 	}
 }

PSModuleDevelopment/functions/templating/New-PSMDTemplate.ps1

@@ -229,6 +229,18 @@
 		}
 		#endregion Insert basic meta-data
 
+		#region Validation
+		#region Validate FilePath
+		if ($FilePath)
+		{
+			if (-not (Test-Path $FilePath -PathType Leaf))
+			{
+				Stop-PSFFunction -Message "Filepath $FilePath is invalid. Ensure it exists and is a file" -EnableException $EnableException -Category InvalidArgument -Tag 'fail', 'argument', 'path'
+				return
+			}
+		}
+		#endregion Validate FilePath
+		
 		#region Validate & ensure output folder
 		$fileName = "$($template.Name)-$($template.Version).xml"
 		$infoFileName = "$($template.Name)-$($template.Version)-Info.xml"
@@ -265,6 +277,7 @@
 			return
 		}
 		#endregion Validate & ensure output folder
+		#endregion Validation
 
 		#region Utility functions
 		function Convert-Item
@@ -428,7 +441,7 @@
 						#region Fixed string replacement
 						if ($find.Groups[1].Success)
 						{
-							if ($object.FileSystemParameterFlat -notcontains $find.Groups[1].Value)
+							if ($object.ContentParameterFlat -notcontains $find.Groups[1].Value)
 							{
 								$null = $object.ContentParameterFlat.Add($find.Groups[1].Value)
 							}
@@ -522,6 +535,7 @@
 			foreach ($item in (Get-ChildItem -Path $processedReferencePath -Filter $Filter))
 			{
 				if ($item.FullName -in $Exclusions) { continue }
+				if ($item.Name -eq "PSMDTemplate.ps1") { continue }
 				Convert-Item -Item $item -Filter $Filter -Exclusions $Exclusions -Template $template -ReferencePath $processedReferencePath -Identifier $identifier -BinaryExtensions $binaryExtensions
 			}
 		}