Merge pull request #35 from PowershellFrameworkCollective/development

 updated install script

Author: FriedrichWeinmann

PSModuleDevelopment/tests/general/PSScriptAnalyzer.Tests.ps1

@@ -20,7 +20,7 @@ Describe 'Invoking PSScriptAnalyzer against commandbase' {
 	foreach ($file in $commandFiles)
 	{
 		Context "Analyzing $($file.BaseName)" {
-			$analysis = Invoke-ScriptAnalyzer -Path $file.FullName
+			$analysis = Invoke-ScriptAnalyzer -Path $file.FullName -ExcludeRule PSAvoidTrailingWhitespace
 
 			forEach ($rule in $scriptAnalyzerRules)
 			{
@@ -29,11 +29,11 @@ Describe 'Invoking PSScriptAnalyzer against commandbase' {
 					{
 						$analysis | Where-Object RuleName -EQ $rule -outvariable failures | ForEach-Object { $list.Add($_) }
 
-						1 | Should Be 0
+						1 | Should -Be 0
 					}
 					else
 					{
-						0 | Should Be 0
+						0 | Should -Be 0
 					}
 				}
 			}

install.ps1

@@ -16,6 +16,10 @@
 	
 	.PARAMETER UserMode
 		The downloaded module will be moved to the user profile, rather than program files.
+		
+	.PARAMETER Scope
+		By default, the downloaded module will be moved to program files.
+		Setting this to 'CurrentUser' installs to the userprofile of the current user.
 
 	.PARAMETER Force
 		The install script will overwrite an existing module.
@@ -28,6 +32,10 @@ Param (
 	[switch]
 	$UserMode,
 
+	[ValidateSet('AllUsers', 'CurrentUser')]
+	[string]
+	$Scope = "AllUsers",
+	
 	[switch]
 	$Force
 )
@@ -43,6 +51,15 @@ $BaseUrl = "https://github.com/PowershellFrameworkCollective/PSModuleDevelopment
 $SubFolder = "PSModuleDevelopment"
 #endregion Configuration for cloning script
 
+#region Parameter Calculation
+$doUserMode = $false
+if ($UserMode) { $doUserMode = $true }
+if ($install_CurrentUser) { $doUserMode = $true }
+if ($Scope -eq 'CurrentUser') { $doUserMode = $true }
+
+if ($install_Branch) { $Branch = $install_Branch }
+#endregion Parameter Calculation
+
 #region Utility Functions
 function Compress-Archive
 {
@@ -2349,7 +2366,7 @@ function Write-LocalMessage
         [string]$Message
     )
 
-    if (Test-Path function:Write-PSFMessage) { Write-PSFMessage -Level Important -Message $Message }
+    if (([System.Management.Automation.PSTypeName]'PSFramework.Commands.WritePSFMessageCommand').Type) { Write-PSFMessage -Level Important -Message $Message -FunctionName "Install-$ModuleName" }
     else { Write-Host $Message }
 }
 #endregion Utility Functions
@@ -2378,7 +2395,7 @@ try
 
 	# Determine output path
 	$path = "$($env:ProgramFiles)\WindowsPowerShell\Modules\$($ModuleName)"
-	if ($UserMode) { $path = "$($HOME)\Documents\WindowsPowerShell\Modules\$($ModuleName)" }
+	if ($doUserMode) { $path = "$(Split-Path $profile.CurrentUserAllHosts)\Modules\$($ModuleName)" }
 	if ($PSVersionTable.PSVersion.Major -ge 5) { $path += "\$moduleVersion" }
 
 	if ((Test-Path $path) -and (-not $Force))
@@ -2411,4 +2428,4 @@ catch
 	Remove-Item -Path "$($env:TEMP)\$($ModuleName).zip" -Force
 
 	throw
-}
+}