Merge branch 'stable'

* stable: reference chocolateyErrored from script scope in chocolatey.ps1 in case chocolatey is intercepted from a module (like boxstarter) write to the correctly scopped chocolateyErrored variable (shimgen) updating shims
chocolatey-archive · Jan 22, 2015 · b77f9b1 · b77f9b1
2 parents ad6b488 + bcea921
commit b77f9b1
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 5 deletions.
diff --git a/src/chocolatey.ps1 b/src/chocolatey.ps1
@@ -166,7 +166,7 @@ if ($forceX86) {
 
 $env:chocolateyPackageParameters = $packageParameters
 
-$chocolateyErrored = $false
+$script:chocolateyErrored = $false
 $badPackages = ''
 
 #todo: This does not catch package names that come later
@@ -193,7 +193,7 @@ foreach ($packageName in $packageNames) {
     }
   }
   catch {
-    $chocolateyErrored = $true
+    $script:chocolateyErrored = $true
     Write-Host "$($_.Exception.Message)" -BackgroundColor $ErrorColor -ForegroundColor White ;
     if ($badPackages -ne '') { $badPackages += ', '}
     $badPackages += "$packageName"
@@ -208,7 +208,7 @@ if ($badPackages -ne '') {
  Write-Host "Command `'$command`' failed (sometimes this indicates a partial failure). Additional info/packages: $badpackages" -BackgroundColor $ErrorColor -ForegroundColor White
 }
 
-if ($chocolateyErrored) {
+if ($script:chocolateyErrored) {
   Write-Debug "Exiting with non-zero exit code."
   exit 1
 }

diff --git a/src/functions/Chocolatey-NuGet.ps1 b/src/functions/Chocolatey-NuGet.ps1
@@ -76,7 +76,7 @@ Write-Debug "Installing packages to `"$nugetLibPath`"."
             Write-Host " "
             Write-Host "$installedPackageName v$installedPackageVersion" -ForegroundColor $Note -BackgroundColor Black
 
-            if ([System.IO.Directory]::Exists($packageFolder)) {
+            if (Test-Path $packageFolder) {
               try {
                 Delete-ExistingErrorLog $installedPackageName
                 Run-ChocolateyPS1 $packageFolder $installedPackageName "install" $installerArguments
@@ -90,7 +90,7 @@ Write-Debug "Installing packages to `"$nugetLibPath`"."
                 Write-Error "Package `'$installedPackageName v$installedPackageVersion`' did not install successfully: $($_.Exception.Message)"
                 if ($badPackages -ne '') { $badPackages += ', '}
                 $badPackages += "$packageName"
-                $chocolateyErrored = $true
+                $script:chocolateyErrored = $true
               }
             }
           }

diff --git a/src/redirects/choco.exe b/src/redirects/choco.exe
diff --git a/src/redirects/chocolatey.exe b/src/redirects/chocolatey.exe
diff --git a/src/redirects/cinst.exe b/src/redirects/cinst.exe
diff --git a/src/redirects/clist.exe b/src/redirects/clist.exe
diff --git a/src/redirects/cpack.exe b/src/redirects/cpack.exe
diff --git a/src/redirects/cpush.exe b/src/redirects/cpush.exe
diff --git a/src/redirects/cuninst.exe b/src/redirects/cuninst.exe
diff --git a/src/redirects/cup.exe b/src/redirects/cup.exe
diff --git a/src/redirects/cver.exe b/src/redirects/cver.exe
diff --git a/tests/unit/Chocolatey-NuGet.tests.ps1 b/tests/unit/Chocolatey-NuGet.tests.ps1
@@ -1,6 +1,7 @@
 $here = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $common = Join-Path (Split-Path -Parent $here)  '_Common.ps1'
 . $common
+$chocolateyErrored = $false
 
 Describe "Chocolatey-NuGet" {
   Context "under normal circumstances" {
@@ -17,6 +18,22 @@ Describe "Chocolatey-NuGet" {
     }
   }
 
+  Context "chocolateyPS1 throws an error" {
+    $nugetLibPath = "c:\fake-lib"
+    Mock Update-SessionEnvironment
+    Mock Run-NuGet {"Successfully installed 'somepackage 1.0.0'"} -Verifiable -ParameterFilter {$packageName -eq 'somepackage'}
+    Mock Run-ChocolateyPS1 { throw "big bad error" }
+    Mock Test-Path { $true } -ParameterFilter {$path -eq 'c:\fake-lib\somepackage.1.0.0'}
+    Mock Move-BadInstall
+    Mock Write-Error
+
+    Chocolatey-NuGet 'somepackage'
+
+    It "should set chocolateyErrored to true" {
+      $chocolateyErrored | should be $true
+    }
+  }
+
   Context "with packageName 'all'" {
     Mock Update-SessionEnvironment
     Mock Chocolatey-InstallAll {} -Verifiable -ParameterFilter {$source -eq 'source'}