(GH-255) Add updateProcessPath to CommandExecutor

In many cases when reaching out, you do not want to try to get the full path to a command that is available based on PATH variables, so don't attmept to get the full path.
chocolatey · Apr 22, 2015 · fd1936e · fd1936e
1 parent c8bec44
commit fd1936e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/src/chocolatey.tests/infrastructure.app/services/AutomaticUninstallerServiceSpecs.cs b/src/chocolatey.tests/infrastructure.app/services/AutomaticUninstallerServiceSpecs.cs
@@ -108,7 +108,7 @@ public void should_not_get_package_information()
             [Fact]
             public void should_not_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }
 
@@ -134,7 +134,7 @@ public void should_log_why_it_skips_auto_uninstaller()
             [Fact]
             public void should_not_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }
 
@@ -160,7 +160,7 @@ public void should_log_why_it_skips_auto_uninstaller()
             [Fact]
             public void should_not_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }
 
@@ -187,7 +187,7 @@ public void should_log_why_it_skips_auto_uninstaller()
             [Fact]
             public void should_not_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }
 
@@ -214,7 +214,7 @@ public void should_log_why_it_skips_auto_uninstaller()
             [Fact]
             public void should_not_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }
 
@@ -243,7 +243,7 @@ public void should_log_why_it_skips_auto_uninstaller()
             [Fact]
             public void should_not_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }
 
@@ -263,7 +263,7 @@ public void should_call_get_package_information()
             [Fact]
             public void should_call_command_executor()
             {
-                commandExecutor.Verify(c => c.execute(expectedUninstallString, installerType.build_uninstall_command_arguments().trim_safe(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(expectedUninstallString, installerType.build_uninstall_command_arguments().trim_safe(), It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
         }    
 
@@ -299,7 +299,7 @@ private void test_installertype(IInstaller installer,bool useInstallerDefaultArg
 
                 var uninstallArgs = useInstallerDefaultArgs ? installer.build_uninstall_command_arguments().trim_safe() : registryUninstallArgs.trim_safe();
 
-                commandExecutor.Verify(c => c.execute(expectedUninstallString, uninstallArgs, It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>()), Times.Never);
+                commandExecutor.Verify(c => c.execute(expectedUninstallString, uninstallArgs, It.IsAny<int>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<Action<object, DataReceivedEventArgs>>(), It.IsAny<bool>()), Times.Never);
             }
 
             [Fact]

diff --git a/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs b/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs
@@ -128,7 +128,8 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                         {
                             if (e == null || string.IsNullOrWhiteSpace(e.Data)) return;
                             this.Log().Error(() => " [AutoUninstaller] {0}".format_with(e.Data));
-                        });
+                        },
+                    updateProcessPath: false);
 
                 if (exitCode != 0)
                 {

diff --git a/src/chocolatey/infrastructure.app/services/ShimGenerationService.cs b/src/chocolatey/infrastructure.app/services/ShimGenerationService.cs
@@ -113,7 +113,8 @@ public void install(ChocolateyConfiguration configuration, PackageResult package
                         {
                             if (string.IsNullOrWhiteSpace(e.Data)) return;
                             this.Log().Error(() => " [ShimGen] {0}".format_with(e.Data));
-                        }
+                        },
+                    updateProcessPath: true
                     );
 
                 if (exitCode != 0)

diff --git a/src/chocolatey/infrastructure.app/services/WebPiService.cs b/src/chocolatey/infrastructure.app/services/WebPiService.cs
@@ -135,7 +135,8 @@ private void set_webpi_install_dictionary()
                         {
                             if (string.IsNullOrWhiteSpace(e.Data)) return;
                             this.Log().Error(() => "{0}".format_with(e.Data));
-                        }
+                        },
+                    updateProcessPath: false
                     );
 
                 if (exitCode != 0)

diff --git a/src/chocolatey/infrastructure/commands/CommandExecutor.cs b/src/chocolatey/infrastructure/commands/CommandExecutor.cs
@@ -57,7 +57,8 @@ public int execute(string process, string arguments, int waitForExitInSeconds)
             string arguments,
             int waitForExitInSeconds,
             Action<object, DataReceivedEventArgs> stdOutAction,
-            Action<object, DataReceivedEventArgs> stdErrAction
+            Action<object, DataReceivedEventArgs> stdErrAction,
+            bool updateProcessPath = true
             )
         {
             return execute(process,
@@ -66,7 +67,7 @@ public int execute(string process, string arguments, int waitForExitInSeconds)
                            file_system.get_directory_name(Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", string.Empty)),
                            stdOutAction,
                            stdErrAction,
-                           updateProcessPath: true
+                           updateProcessPath
                 );
         }
 

diff --git a/src/chocolatey/infrastructure/commands/ICommandExecutor.cs b/src/chocolatey/infrastructure/commands/ICommandExecutor.cs
@@ -28,7 +28,8 @@ public interface ICommandExecutor
             string arguments,
             int waitForExitInSeconds,
             Action<object, DataReceivedEventArgs> stdOutAction,
-            Action<object, DataReceivedEventArgs> stdErrAction
-            );
+            Action<object, DataReceivedEventArgs> stdErrAction,
+            bool updateProcessPath
+            ); 
     }
 }