Remove interactivity support from "Repository\Command" class

Closes console-helpers#44

Author: Alexander Obuhovich

src/SVNBuddy/Repository/Connector/Command.php

@@ -127,7 +127,6 @@ public function setCacheDuration($duration)
 	 */
 	public function run($callback = null)
 	{
-		$this->_patchProcess();
 		$command_line = $this->_process->getCommandLine();
 		$cache_key = $this->_getCacheKey();
 
@@ -159,29 +158,6 @@ public function run($callback = null)
 		return $output;
 	}
 
-	/**
-	 * Patches process command line for interactivity.
-	 *
-	 * @return void
-	 */
-	private function _patchProcess()
-	{
-		$interactivity_part = ' --non-interactive ';
-		$command_line = $this->_process->getCommandLine();
-
-		if ( $this->_isInteractive ) {
-			$command_line = str_replace($interactivity_part, ' ', $command_line);
-			$this->_process->setInput(STDIN);
-		}
-		elseif ( strpos($command_line, $interactivity_part) === false ) {
-			$parts = explode(' ', $command_line, 2);
-			$command_line = $parts[0] . ' --non-interactive ' . $parts[1];
-			$this->_process->setInput('');
-		}
-
-		$this->_process->setCommandLine($command_line);
-	}
-
 	/**
 	 * Returns cache key for a command.
 	 *

src/SVNBuddy/Repository/Connector/Connector.php

@@ -101,6 +101,8 @@ protected function prepareSvnCommand()
 		$username = $this->_configEditor->get('repository-connector.username');
 		$password = $this->_configEditor->get('repository-connector.password');
 
+		$this->_svnCommand .= ' --non-interactive';
+
 		if ( $username ) {
 			$this->_svnCommand .= ' --username ' . $username;
 		}

tests/SVNBuddy/Repository/Connector/CommandTest.php

@@ -58,20 +58,12 @@ protected function setUp()
 
 	public function testRunWithoutCallback()
 	{
-		$this->_process->getCommandLine()->willReturn('svn log --limit 5')->shouldBeCalled();
-		$this->_process->setInput('')->shouldBeCalled();
+		$this->_process->getCommandLine()->willReturn('svn --non-interactive log --limit 5')->shouldBeCalled();
 		$this->_process->mustRun(null)->shouldBeCalled();
 		$this->_process->getOutput()->willReturn('OK')->shouldBeCalled();
 
 		$this->_io->isVerbose()->willReturn(false);
 
-		$this->_process
-			->setCommandLine('svn --non-interactive log --limit 5')
-			->will(function ($args, $process) {
-				$process->getCommandLine()->willReturn($args[0])->shouldBeCalled();
-			})
-			->shouldBeCalled();
-
 		$this->assertEquals('OK', $this->_command->run());
 	}
 

tests/SVNBuddy/Repository/Connector/ConnectorTest.php

@@ -101,52 +101,52 @@ public function testConfigUsernameUsed()
 	{
 		$repository_connector = $this->_createRepositoryConnector('user', '');
 
-		$this->_expectCommand('svn --username user --version', 'OK');
+		$this->_expectCommand('svn --non-interactive --username user --version', 'OK');
 		$this->assertEquals('OK', $repository_connector->getCommand('--version')->run());
 	}
 
 	public function testConfigPasswordUsed()
 	{
 		$repository_connector = $this->_createRepositoryConnector('', 'pass');
 
-		$this->_expectCommand('svn --password pass --version', 'OK');
+		$this->_expectCommand('svn --non-interactive --password pass --version', 'OK');
 		$this->assertEquals('OK', $repository_connector->getCommand('--version')->run());
 	}
 
 	public function testSimpleCommand()
 	{
-		$this->_expectCommand('svn --version', 'OK');
+		$this->_expectCommand('svn --non-interactive --version', 'OK');
 		$this->assertEquals('OK', $this->_repositoryConnector->getCommand('--version')->run());
 	}
 
 	public function testCommandWithParams()
 	{
-		$this->_expectCommand('svn log -r 12', 'OK');
+		$this->_expectCommand('svn --non-interactive log -r 12', 'OK');
 		$this->assertEquals('OK', $this->_repositoryConnector->getCommand('log', '-r 12')->run());
 	}
 
 	public function testCommandWithPath()
 	{
-		$this->_expectCommand("svn log 'path/to/folder'", 'OK');
+		$this->_expectCommand("svn --non-interactive log 'path/to/folder'", 'OK');
 		$this->assertEquals('OK', $this->_repositoryConnector->getCommand('log', '{path/to/folder}')->run());
 	}
 
 	public function testCommandWithPathAndLeadingSlash()
 	{
-		$this->_expectCommand("svn log '/path/to/folder'", 'OK');
+		$this->_expectCommand("svn --non-interactive log '/path/to/folder'", 'OK');
 		$this->assertEquals('OK', $this->_repositoryConnector->getCommand('log', '{/path/to/folder}')->run());
 	}
 
 	public function testCommandWithPathAndParams()
 	{
-		$this->_expectCommand("svn log -r 12 'path/to/folder'", 'OK');
+		$this->_expectCommand("svn --non-interactive log -r 12 'path/to/folder'", 'OK');
 		$this->assertEquals('OK', $this->_repositoryConnector->getCommand('log', '-r 12 {path/to/folder}')->run());
 	}
 
 	public function testCommandThatFails()
 	{
 		$thrown_exception = null;
-		$this->_expectCommand('svn any', '', false);
+		$this->_expectCommand('svn --non-interactive any', '', false);
 
 		try {
 			$this->_repositoryConnector->getCommand('any')->run();
@@ -173,7 +173,7 @@ public function testCommandThatFails()
 
 	public function testGetPropertyFound()
 	{
-		$this->_expectCommand("svn propget test-p 'the/path'", 'OK');
+		$this->_expectCommand("svn --non-interactive propget test-p 'the/path'", 'OK');
 
 		$this->assertEquals(
 			'OK',
@@ -196,32 +196,23 @@ public function testGetPropertyNotFound()
 			0
 		);
 
-		$this->_expectCommand("svn propget test-p 'the/path'", '', false);
+		$this->_expectCommand("svn --non-interactive propget test-p 'the/path'", '', false);
 
 		$this->_repositoryConnector->getProperty('test-p', 'the/path');
 	}
 
 	/**
 	 * Sets expectation for specific command.
 	 *
-	 * @param string  $command        Command.
-	 * @param string  $output         Output.
-	 * @param boolean $is_successful  Should command be successful.
-	 * @param boolean $is_interactive Is interactive.
+	 * @param string  $command       Command.
+	 * @param string  $output        Output.
+	 * @param boolean $is_successful Should command be successful.
 	 *
 	 * @return void
 	 */
-	private function _expectCommand($command, $output, $is_successful = true, $is_interactive = false)
+	private function _expectCommand($command, $output, $is_successful = true)
 	{
-		if ( !$is_interactive ) {
-			$this->_process->setInput('')->shouldBeCalled();
-		}
-
-		$patched_command = preg_replace('/^svn /', 'svn --non-interactive ', $command);
 		$this->_process->getCommandLine()->willReturn($command)->shouldBeCalled();
-		$this->_process->setCommandLine($patched_command)->will(function ($args, $process) {
-			$process->getCommandLine()->willReturn($args[0]);
-		})->shouldBeCalled();
 
 		$expectation = $this->_process->mustRun(null)->shouldBeCalled();