Merge branch 'master' of https://github.com/lzybkr/PSReadLine

Author: lzybkr

.gitignore

@@ -107,3 +107,7 @@ Generated_Code #added for RIA/Silverlight projects
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
+
+#Chocolatey Build Output
+ChocolateyPackage/PSReadLine/
+*.nupkg

ChocolateyPackage/PSReadline.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>PSReadline</id>
+    <version></version>
+    <authors>Jason Shirk</authors>
+    <owners>Jason Shirk</owners>
+    <projectUrl>https://github.com/lzybkr/PSReadLine</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://raw.github.com/lzybkr/PSReadLine/master/License.txt</licenseUrl>
+    <summary>A bash inspired readline implementation for PowerShell</summary>
+    <description>Once installed you will likely want to change your profile.ps1 to automatically load the PSReadLine module. Please refer to the project website for instructions. Note that to upgrade or uninstall you will likely need to close all instances of PowerShell and uninstall from cmd.exe. This package installs as a global module accessible by all users.</description>
+    <releaseNotes>https://raw.github.com/lzybkr/PSReadLine/master/Changes.txt</releaseNotes>
+    <copyright></copyright>
+    <tags>Powershell PS Script</tags>
+    <dependencies>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+    <file src="PSReadline\**" target="PSReadline" />
+  </files>
+</package>

ChocolateyPackage/tools/Install-Module.ps1

@@ -0,0 +1,43 @@
+param(
+        [Parameter(Mandatory=$TRUE)]
+        [String] $PathToModuleFiles,
+        [Parameter(Mandatory=$TRUE)]
+        [String] $ModuleName
+     )
+
+$ErrorActionPreference = "Stop"
+
+if (!(Test-Path -PathType Container $PathToModuleFiles)) {
+    Write-Error "$PathToModuleFiles not found or is not a directory. Nothing to install."
+    exit
+}
+
+$moduleRoot = "$($env:CommonProgramW6432)\Modules\"
+$dest = "$moduleRoot\$ModuleName\"
+
+if (!(Test-Path $moduleRoot)) {
+    New-Item -ItemType directory $moduleRoot | out-null
+}
+
+Write-Host -NoNewLine "Copying $ModuleName module to $moduleRoot... "
+
+Copy-Item -Force -Recurse $PathToModuleFiles $dest
+
+Write-Host -ForegroundColor Green "done"
+
+#Update PSModulePath if it needs it
+$path = [Environment]::GetEnvironmentVariable("PSModulePath")
+
+$pathContainsRoot = 0 -ne ($path.Split(';') | ? { Test-Path $_ } | ? { (Resolve-Path $_).Path -eq (Resolve-Path $moduleRoot).Path}).count
+
+if(-Not $pathContainsRoot) {
+
+    Write-Host -NoNewLine "Adding $moduleRoot to `$env:PSModulePath... "
+
+    $path += ";$moduleRoot"
+    [Environment]::SetEnvironmentVariable("PSModulePath", $path, "Machine")
+
+    Write-Host -ForegroundColor Green "done"
+}
+
+Write-Host "Installation complete."

ChocolateyPackage/tools/Remove-Module.ps1

@@ -0,0 +1,50 @@
+param(
+    [Parameter(Mandatory=$TRUE)]
+    [String] $ModuleName
+)
+
+    $ErrorActionPreference = "Stop"
+
+
+    $moduleRoot = "$($env:CommonProgramW6432)\Modules\"
+    $dir = "$moduleRoot\$ModuleName\"
+
+    if (Test-Path $dir) {
+        Write-Host -NoNewLine "Removing $ModuleName module from $moduleRoot... "
+
+        Remove-Item -Recurse -Force $dir
+
+        Write-Host -ForegroundColor Green "done"
+    }
+
+    if (Test-Path $moduleRoot) {
+        if (!(Get-ChildItem -Recurse -Force $moduleRoot)) {
+            Write-Host "Module directory empty."
+
+            Write-Host -NoNewLine "Removing module directory from `$env:PSModulePath... "
+
+            $path = [Environment]::GetEnvironmentVariable("PSModulePath")
+
+            #Remove match paths but be careful about handling paths that don't
+            #exist. We don't want to accidentally remove a path that we didn't
+            #add.
+            $cleanedPath = $path.Split(';') | 
+                            Where-Object { 
+                                    (-Not (Test-Path $_ )) -or
+                                    ((Resolve-Path $_).Path -ne (Resolve-Path $moduleRoot).Path) } |
+                            Select-Object -Unique
+            $cleanedPath = $cleanedPath -Join ';'
+
+            [Environment]::SetEnvironmentVariable("PSModulePath", $cleanedPath, "Machine")
+
+            Write-Host -ForegroundColor Green "done"
+
+
+            Write-Host -NoNewLine "Removing empty module directory... "
+            Remove-Item $moduleRoot
+            Write-Host -ForegroundColor Green "done"
+
+        }
+
+        Write-Host "Removal complete."
+    }

ChocolateyPackage/tools/chocolateyinstall.ps1

@@ -0,0 +1,13 @@
+$packageName = "PSReadLine"
+
+try {
+  $source = Resolve-Path ($PSScriptRoot + "\..\$packageName\")
+
+  Start-ChocolateyProcessAsAdmin "$PSScriptRoot\Install-Module.ps1 '$source' '$packageName'"
+
+
+  Write-ChocolateySuccess $packageName
+} catch {
+  Write-ChocolateyFailure $packageName $($_.Exception.Message)
+  throw
+}

ChocolateyPackage/tools/chocolateyuninstall.ps1

@@ -0,0 +1,21 @@
+$packageName = "PSReadLine"
+
+try {
+
+  Start-ChocolateyProcessAsAdmin "$PSScriptRoot\Remove-Module.ps1 '$packageName'"
+
+  Write-ChocolateySuccess $packageName
+} catch {
+  $message = @"
+  Uhoh. Looks like $packageName doesn't want to uninstall! But don't worry there is probably a good explanation.
+
+  It is highly likely that you have an instance of PowerShell running with $packageName loaded.
+
+  You should probably try closing all instances of PowerShell and rerunning this uninstall from cmd.exe.
+"@
+
+  Write-Host "==============================================="
+  Write-Host $message
+  Write-Host "==============================================="
+  throw
+}

MakeRelease.ps1

@@ -44,6 +44,22 @@ $version = (Get-ChildItem $targetDir\PSReadline.dll).VersionInfo.FileVersion
 
 & $PSScriptRoot\Update-ModuleManifest.ps1 $targetDir\PSReadline.psd1 $version
 
+#make sure chocolatey is installed and in the path
+if (gcm cpack -ea Ignore)
+{
+    $chocolateyDir = "$PSScriptRoot\ChocolateyPackage"
+
+    if (Test-Path $chocolateyDir\PSReadline)
+    {
+        rm -re $chocolateyDir\PSReadline
+    }
+
+    & $PSScriptRoot\Update-NuspecVersion.ps1 "$chocolateyDir\PSReadline.nuspec" $version
+
+    cp -r $targetDir $chocolateyDir\PSReadline
+
+    cpack "$chocolateyDir\PSReadline.nuspec"
+}
 
 del $PSScriptRoot\PSReadline.zip -ea Ignore
 [System.IO.Compression.ZipFile]::CreateFromDirectory($targetDir, "$PSScriptRoot\PSReadline.zip")

README.md

@@ -48,6 +48,26 @@ Import-Module PSReadLine
 
 In either case, you can create the appropriate file if you don't already have one.
 
+Upgrading
+============
+
+If you installed with `PSGet` you can run `Update-Module PSReadLine`.
+
+
+If you've added it to your `$PROFILE`, when you run `Update-Module PSReadLine` you will get the following error
+
+```
+Remove-Item : Cannot remove item
+C:\Users\{yourName}\Documents\WindowsPowerShell\Modules\PSReadLine\PSReadline.dll: Access to the path
+'C:\Users\{yourName}\Documents\WindowsPowerShell\Modules\PSReadLine\PSReadline.dll' is denied.
+At C:\Users\{yourName}\Documents\WindowsPowerShell\Modules\PsGet\PsGet.psm1:1009 char:52
+```
+
+1. Run `cmd.exe`
+2. `powershell -noprofile`
+3. `Update-Module PSReadLine`
+
+
 Usage
 =====
 

Update-NuspecVersion.ps1

@@ -0,0 +1,24 @@
+param (
+     [Parameter(Mandatory=$TRUE)]
+     [String] $FilePath,
+     [Parameter(Mandatory=$TRUE)]
+     [String] $Version
+)
+
+if ((Test-Path $FilePath -PathType Leaf) -ne $TRUE) {
+    Write-Error -Message ($FilePath + ' not found.') -Category InvalidArgument;
+    exit 1;
+}
+
+#normalize path
+$FilePath = (Resolve-Path $FilePath).Path;
+
+$nuspecConfig = [xml] (Get-Content $FilePath);
+$nuspecConfig.DocumentElement.metadata.version = $Version;
+
+if (!$?) {
+    Write-Error -Message "Unable to perform update.";
+    exit 1;
+}
+
+$nuspecConfig.Save($FilePath);