Merge branch 'stable'

* stable: (doc) update CHANGELOG/nuspec (maint) formatting (GH-735) Remove actual when uninstalling meta (GH-455) Summary - log reason for warnings/errors (GH-735) split package list from all operation (GH-710) If timeout, inform user (maint) add review note (GH-689) Report install location (GH-755) Track more MSI information (maint) Template specs - restrict to Windows only
chocolatey · May 30, 2016 · 23379b7 · 23379b7
2 parents 46858b3 + f6e5c1d
commit 23379b7
Show file tree

Hide file tree

Showing 11 changed files with 350 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,6 +56,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Provide PowerShell tab completion for Chocolatey - see [#412](https://github.com/chocolatey/choco/issues/412)
  * [Security] Sign the powershell scripts and assemblies - see [#501](https://github.com/chocolatey/choco/issues/501)
  * Add a `choco info` command to show info for one package - see [#644](https://github.com/chocolatey/choco/issues/644)
+ * Mark packages pending until install completes successfully - see [#198](https://github.com/chocolatey/choco/issues/198)
  * Resolve sources by name - see [#356](https://github.com/chocolatey/choco/issues/356)
  * Pro/Business - Ubiquitous Install Directory Switch - see [#258](https://github.com/chocolatey/choco/issues/258)
  * Pro/Business - Runtime Virus Scanning - see [virus scanning](https://chocolatey.org/docs/features-virus-check)
@@ -91,6 +92,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * [POSH Host] Fix - PowerShell Host doesn't show colorization overrides - see [#674](https://github.com/chocolatey/choco/issues/674)
  * [POSH Host] Fix - $profile is empty string when installing packages - does not automatically install the ChocolateyProfile - see [#667](https://github.com/chocolatey/choco/issues/667)
  * [POSH Host] Fix - Getting LCID doesn't work properly with the built-in PowerShell - see [#741](https://github.com/chocolatey/choco/issues/741)
+ * [POSH Host] Fix - Host.Version should return actual PowerShell version - see [#708](https://github.com/chocolatey/choco/issues/708)
  * Fix - Verbose shows in output on debug switch - see [#611](https://github.com/chocolatey/choco/issues/611)
  * Fix - Get-ChocolateyUnzip captures files that don't belong to the package / Unzip should not do a full disk scan - see [#616](https://github.com/chocolatey/choco/issues/616) and [#155](https://github.com/chocolatey/choco/issues/155)
  * Fix - Package succeeds but software install silently fails when Install-ChocolateyInstallPackage has the wrong arguments - see [#629](https://github.com/chocolatey/choco/issues/629)
@@ -111,6 +113,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Fix - Package params are also applied to dependent package - see [#733](https://github.com/chocolatey/choco/issues/733)
  * Fix - Use package name/version from environment, not parameters - see [#751](https://github.com/chocolatey/choco/issues/751)
  * Fix - Get-WebFileName Does Not Match on Invalid Characters - see [#753](https://github.com/chocolatey/choco/issues/753)
+ * Fix - `choco new` cannot introduce multistage folder hierarchy template - see [#706](https://github.com/chocolatey/choco/issues/706)
 
 ### IMPROVEMENTS
 
@@ -149,6 +152,14 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Clean up any temp nuget folder actions after NuGet operations - see [#622](https://github.com/chocolatey/choco/issues/622)
  * Ensure Web Requests and Responses Do Not Timeout - make configurable - see [#732](https://github.com/chocolatey/choco/issues/732)
  * Combine timeout from push and execution timeout as one parameter - see [#752](https://github.com/chocolatey/choco/issues/752)
+ * Override autouninstaller / failonautouninstaller fail with switches for uninstall  - see [#515](https://github.com/chocolatey/choco/issues/515)
+ * Offer to remove actual package (*.install/*.portable) when removing meta/virtual package - see [#735](https://github.com/chocolatey/choco/issues/735)
+ * Provide more info in package summary - see [#455](https://github.com/chocolatey/choco/issues/455)
+ * Report install location - see [#689](https://github.com/chocolatey/choco/issues/689)
+ * Track MSI Information Better - see [#755](https://github.com/chocolatey/choco/issues/755)
+ * Support for client certificates - see [#399](https://github.com/chocolatey/choco/issues/399)
+ * choco feature list formatting enhancements - see [#742](https://github.com/chocolatey/choco/issues/742)
+ * choco new --original-template - see [#737](https://github.com/chocolatey/choco/issues/737)
  * Pro/Business - Also check for license in User Profile location - see [#606](https://github.com/chocolatey/choco/issues/606)
  * Pro/Business - Set download cache information if available - see [#562](https://github.com/chocolatey/choco/issues/562)
  * Pro/Business - Allow commands to be added - see [#583](https://github.com/chocolatey/choco/issues/583)
@@ -157,6 +168,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Pro/Business - Add switch to fail on invalid or missing license - see [#596](https://github.com/chocolatey/choco/issues/596)
  * Pro/Business - add ignore invalid switches/parameters - see [#586](https://github.com/chocolatey/choco/issues/586)
  * Pro/Business - Don't prompt to upload file for virus scanning if it is too large - see [#695](https://github.com/chocolatey/choco/issues/695)
+ * Pro/Business - add 'support' command - see [#745](https://github.com/chocolatey/choco/issues/745)
  * API - Add the ability to retrieve package count for a Source - see [#431](https://github.com/chocolatey/choco/issues/431)
  * API - Chocolatey Lib still marks vital package information as internal - see [#433](https://github.com/chocolatey/choco/issues/433)
  * API - Add paging to list command - see [#427](https://github.com/chocolatey/choco/issues/427)

diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
@@ -111,6 +111,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Provide PowerShell tab completion for Chocolatey - see [#412](https://github.com/chocolatey/choco/issues/412)
  * [Security] Sign the powershell scripts and assemblies - see [#501](https://github.com/chocolatey/choco/issues/501)
  * Add a `choco info` command to show info for one package - see [#644](https://github.com/chocolatey/choco/issues/644)
+ * Mark packages pending until install completes successfully - see [#198](https://github.com/chocolatey/choco/issues/198)
  * Resolve sources by name - see [#356](https://github.com/chocolatey/choco/issues/356)
  * Pro/Business - Ubiquitous Install Directory Switch - see [#258](https://github.com/chocolatey/choco/issues/258)
  * Pro/Business - Runtime Virus Scanning - see [virus scanning](https://chocolatey.org/docs/features-virus-check)
@@ -146,6 +147,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * [POSH Host] Fix - PowerShell Host doesn't show colorization overrides - see [#674](https://github.com/chocolatey/choco/issues/674)
  * [POSH Host] Fix - $profile is empty string when installing packages - does not automatically install the ChocolateyProfile - see [#667](https://github.com/chocolatey/choco/issues/667)
  * [POSH Host] Fix - Getting LCID doesn't work properly with the built-in PowerShell - see [#741](https://github.com/chocolatey/choco/issues/741)
+ * [POSH Host] Fix - Host.Version should return actual PowerShell version - see [#708](https://github.com/chocolatey/choco/issues/708)
  * Fix - Verbose shows in output on debug switch - see [#611](https://github.com/chocolatey/choco/issues/611)
  * Fix - Get-ChocolateyUnzip captures files that don't belong to the package / Unzip should not do a full disk scan - see [#616](https://github.com/chocolatey/choco/issues/616) and [#155](https://github.com/chocolatey/choco/issues/155)
  * Fix - Package succeeds but software install silently fails when Install-ChocolateyInstallPackage has the wrong arguments - see [#629](https://github.com/chocolatey/choco/issues/629)
@@ -166,6 +168,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Fix - Package params are also applied to dependent package - see [#733](https://github.com/chocolatey/choco/issues/733)
  * Fix - Use package name/version from environment, not parameters - see [#751](https://github.com/chocolatey/choco/issues/751)
  * Fix - Get-WebFileName Does Not Match on Invalid Characters - see [#753](https://github.com/chocolatey/choco/issues/753)
+ * Fix - `choco new` cannot introduce multistage folder hierarchy template - see [#706](https://github.com/chocolatey/choco/issues/706)
 
 ### IMPROVEMENTS
 
@@ -204,6 +207,14 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Clean up any temp nuget folder actions after NuGet operations - see [#622](https://github.com/chocolatey/choco/issues/622)
  * Ensure Web Requests and Responses Do Not Timeout - make configurable - see [#732](https://github.com/chocolatey/choco/issues/732)
  * Combine timeout from push and execution timeout as one parameter - see [#752](https://github.com/chocolatey/choco/issues/752)
+ * Override autouninstaller / failonautouninstaller fail with switches for uninstall  - see [#515](https://github.com/chocolatey/choco/issues/515)
+ * Offer to remove actual package (*.install/*.portable) when removing meta/virtual package - see [#735](https://github.com/chocolatey/choco/issues/735)
+ * Provide more info in package summary - see [#455](https://github.com/chocolatey/choco/issues/455)
+ * Report install location - see [#689](https://github.com/chocolatey/choco/issues/689)
+ * Track MSI Information Better - see [#755](https://github.com/chocolatey/choco/issues/755)
+ * Support for client certificates - see [#399](https://github.com/chocolatey/choco/issues/399)
+ * choco feature list formatting enhancements - see [#742](https://github.com/chocolatey/choco/issues/742)
+ * choco new --original-template - see [#737](https://github.com/chocolatey/choco/issues/737)
  * Pro/Business - Also check for license in User Profile location - see [#606](https://github.com/chocolatey/choco/issues/606)
  * Pro/Business - Set download cache information if available - see [#562](https://github.com/chocolatey/choco/issues/562)
  * Pro/Business - Allow commands to be added - see [#583](https://github.com/chocolatey/choco/issues/583)
@@ -212,6 +223,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
  * Pro/Business - Add switch to fail on invalid or missing license - see [#596](https://github.com/chocolatey/choco/issues/596)
  * Pro/Business - add ignore invalid switches/parameters - see [#586](https://github.com/chocolatey/choco/issues/586)
  * Pro/Business - Don't prompt to upload file for virus scanning if it is too large - see [#695](https://github.com/chocolatey/choco/issues/695)
+ * Pro/Business - add 'support' command - see [#745](https://github.com/chocolatey/choco/issues/745)
  * API - Add the ability to retrieve package count for a Source - see [#431](https://github.com/chocolatey/choco/issues/431)
  * API - Chocolatey Lib still marks vital package information as internal - see [#433](https://github.com/chocolatey/choco/issues/433)
  * API - Add paging to list command - see [#427](https://github.com/chocolatey/choco/issues/427)

diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1
@@ -161,5 +161,6 @@ param(
     default { throw "7-Zip signalled an unknown error (code $exitCode)" }
   }
 
+  $env:ChocolateyPackageInstallLocation = $destination
   return $destination
 }
diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1
@@ -82,6 +82,8 @@ param(
     Write-Warning "Unable to generate `'$ignoreFile`'"
   }
 
+  $env:ChocolateyInstallerType = $fileType
+
   $additionalInstallArgs = $env:chocolateyInstallArguments;
   if ($additionalInstallArgs -eq $null) { 
     $additionalInstallArgs = ''; 

diff --git a/src/chocolatey.tests/infrastructure.app/services/TemplateServiceSpecs.cs b/src/chocolatey.tests/infrastructure.app/services/TemplateServiceSpecs.cs
@@ -364,6 +364,7 @@ public override void BeforeEachSpec()
             }
 
             [Fact]
+            [WindowsOnly]
             public void should_generate_all_files_and_directories()
             {
                 because();
@@ -383,7 +384,8 @@ public void should_generate_all_files_and_directories()
                 MockLogger.MessagesFor(LogLevel.Info).Last().ShouldEqual(string.Format(@"Successfully generated Bob package specification files{0} at 'c:\chocolatey\Bob'", Environment.NewLine));
             }
 
-            [Fact]
+            [Fact]
+            [WindowsOnly]
             public void should_generate_all_files_and_directories_even_with_outputdirectory()
             {
                 config.OutputDirectory = "c:\\packages";

diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -439,6 +439,9 @@ private static void set_environment_options(ChocolateyConfiguration config)
 
         public static void set_environment_variables(ChocolateyConfiguration config)
         {
+            Environment.SetEnvironmentVariable("ChocolateyPackageInstallLocation", null);
+            Environment.SetEnvironmentVariable("ChocolateyInstallerType", null);
+
             Environment.SetEnvironmentVariable(ApplicationParameters.ChocolateyInstallEnvironmentVariableName, ApplicationParameters.InstallLocation);
             Environment.SetEnvironmentVariable("CHOCOLATEY_VERSION", config.Information.ChocolateyVersion);
             Environment.SetEnvironmentVariable("CHOCOLATEY_VERSION_PRODUCT", config.Information.ChocolateyProductVersion);
@@ -474,7 +477,7 @@ public static void set_environment_variables(ChocolateyConfiguration config)
                 Environment.SetEnvironmentVariable("https_proxy", "{0}{1}".format_with(proxyCreds, config.Proxy.Location));
                 Environment.SetEnvironmentVariable("chocolateyProxyLocation", config.Proxy.Location);
             }
-
+            
             if (config.Features.UsePowerShellHost) Environment.SetEnvironmentVariable("ChocolateyPowerShellHost", "true");
             if (config.Force) Environment.SetEnvironmentVariable("ChocolateyForce", "true");
         }

diff --git a/src/chocolatey/infrastructure.app/domain/RegistryApplicationKey.cs b/src/chocolatey/infrastructure.app/domain/RegistryApplicationKey.cs
@@ -63,6 +63,7 @@ public class RegistryApplicationKey : IEquatable<RegistryApplicationKey>
         public bool NoRepair { get; set; }
         public string ReleaseType { get; set; } //hotfix, securityupdate, update rollup, servicepack
         public string ParentKeyName { get; set; }
+        public string LocalPackage { get; set; }
 
         /// <summary>
         ///   Is an application listed in ARP (Programs and Features)?