Merge branch 'pr880' into stable

* pr880: (GH-878) Installation with .config file prints packages in file
chocolatey · Aug 3, 2016 · 66b0107 · 66b0107
2 parents 00c7b88 + 75375b1
commit 66b0107
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/Scenarios.md b/Scenarios.md
@@ -1,6 +1,6 @@
 ## Chocolatey Usage Scenarios
 
-### ChocolateyInstallCommand [ 35 Scenario(s), 291 Observation(s) ]
+### ChocolateyInstallCommand [ 35 Scenario(s), 293 Observation(s) ]
 
 #### when force installing a package that depends on an unavailable newer version of an installed dependency forcing dependencies
 
@@ -362,6 +362,8 @@
  * should not have a successful package result for missing package
  * should not have inconclusive package result
  * should not have warning package result
+ * should print out package from config file in message
+ * should specify config file is being used in message
 
 #### when noop installing a package
 

diff --git a/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs b/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
@@ -435,6 +435,30 @@ public void should_not_have_warning_package_result()
                     packageResult.Value.Warning.ShouldBeFalse();
                 }
             }
+
+            [Fact]
+            public void should_specify_config_file_is_being_used_in_message()
+            {
+                bool expectedMessage = false;
+                foreach (var message in MockLogger.MessagesFor(LogLevel.Info).or_empty_list_if_null())
+                {
+                    if (message.Contains("Installing from config file:")) expectedMessage = true;
+                }
+
+                expectedMessage.ShouldBeTrue();
+            }
+
+            [Fact]
+            public void should_print_out_package_from_config_file_in_message()
+            {
+                bool expectedMessage = false;
+                foreach (var message in MockLogger.MessagesFor(LogLevel.Info).or_empty_list_if_null())
+                {
+                    if (message.Contains("installpackage")) expectedMessage = true;
+                }
+
+                expectedMessage.ShouldBeTrue();
+            }
         }
 
         [Concern(typeof(ChocolateyInstallCommand))]

diff --git a/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs b/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs
@@ -422,7 +422,7 @@ private string capture_arguments(ChocolateyConfiguration config, PackageResult p
 
         public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfiguration config)
         {
-            this.Log().Info(@"Installing the following packages:");
+            this.Log().Info(is_packages_config_file(config.PackageNames) ? @"Installing from config file:" : @"Installing the following packages:");
             this.Log().Info(ChocolateyLoggers.Important, @"{0}".format_with(config.PackageNames));
 
             var packageInstalls = new ConcurrentDictionary<string, PackageResult>();
@@ -446,6 +446,7 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu
                 {
                     action = (packageResult) => handle_package_result(packageResult, packageConfig, CommandNameType.install);
                 }
+
                 var results = perform_source_runner_function(packageConfig, r => r.install_run(packageConfig, action));
 
                 foreach (var result in results)
@@ -524,13 +525,23 @@ private IEnumerable<ChocolateyConfiguration> set_config_from_package_names_and_p
 
                 foreach (var packageConfig in get_packages_from_config(packageConfigFile, config, packageInstalls).or_empty_list_if_null())
                 {
-                    yield return packageConfig;
+                   yield return packageConfig;
                 }
             }
 
             yield return config;
         }
 
+        private bool contains_packages_config_file(string packageNames)
+        {
+            return packageNames.to_string().Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Any(p => p.EndsWith(".config", StringComparison.OrdinalIgnoreCase));
+        } 
+
+        private bool is_packages_config_file(string packageNames)
+        {
+            return packageNames.to_string().EndsWith(".config", StringComparison.OrdinalIgnoreCase) && !packageNames.to_string().contains(";");
+        }
+
         private IEnumerable<ChocolateyConfiguration> get_packages_from_config(string packageConfigFile, ChocolateyConfiguration config, ConcurrentDictionary<string, PackageResult> packageInstalls)
         {
             IList<ChocolateyConfiguration> packageConfigs = new List<ChocolateyConfiguration>();
@@ -546,6 +557,7 @@ private IEnumerable<ChocolateyConfiguration> get_packages_from_config(string pac
             }
 
             var settings = _xmlService.deserialize<PackagesConfigFileSettings>(_fileSystem.get_full_path(packageConfigFile));
+            this.Log().Info(@"Installing the following packages:");
             foreach (var pkgSettings in settings.Packages.or_empty_list_if_null())
             {
                 if (!pkgSettings.Disabled)
@@ -560,6 +572,7 @@ private IEnumerable<ChocolateyConfiguration> get_packages_from_config(string pac
                     if (pkgSettings.AllowMultipleVersions) packageConfig.AllowMultipleVersions = true;
                     if (pkgSettings.IgnoreDependencies) packageConfig.IgnoreDependencies = true;
 
+                    this.Log().Info(ChocolateyLoggers.Important, @"{0}".format_with(packageConfig.PackageNames));
                     packageConfigs.Add(packageConfig);
                 }
             }