Fixed an issue where binaries paths would be shared between connections

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Fixed incorrect replacing of slashs and backslashes outside of paths
 - Fixed ability to pass an unexisting release to the Rollback task
 - Fixed a bug where using SVN would cause Rocketeer to execute empty commands during cloning
+- Fixed an issue where binaries paths would be shared between connections
 
 2.0.3 - 2014-11-12
 ------------------

src/Rocketeer/Traits/BashModules/Binaries.php

@@ -84,7 +84,7 @@ public function artisan()
 	public function which($binary, $fallback = null, $prompt = true)
 	{
 		$locations = array(
-			$this->localStorage->get('paths.'.$binary),
+			$this->localStorage->get($this->getBinaryStoragePath($binary)),
 			$this->paths->getPath($binary),
 			$binary,
 		);
@@ -137,9 +137,9 @@ protected function whichFrom($binary, array $locations)
 		// Store found location or remove it if invalid
 		if (!$this->local) {
 			if ($location) {
-				$this->localStorage->set('paths.'.$binary, $location);
+				$this->localStorage->set($this->getBinaryStoragePath($binary), $location);
 			} else {
-				$this->localStorage->forget('paths.'.$binary);
+				$this->localStorage->forget($this->getBinaryStoragePath($binary));
 			}
 		}
 
@@ -180,4 +180,16 @@ protected function versionCheck($version, $operator = '>=')
 
 		return false;
 	}
+
+	/**
+	 * Get the path in which to store/retrieve a binary's path
+	 *
+	 * @param string $binary
+	 *
+	 * @return string
+	 */
+	protected function getBinaryStoragePath($binary)
+	{
+		return 'paths.'.$this->connections->getConnection().'.'.$binary;
+	}
 }

tests/Traits/BashModules/BinariesTest.php

@@ -37,10 +37,33 @@ public function testStoredPathsAreInvalidatedIfIncorrect()
 				->shouldReceive('runRaw')->andReturn('false');
 		}, false);
 
-		$this->localStorage->set('paths.composer', 'foobar');
+		$this->localStorage->set('paths.production.composer', 'foobar');
 
 		$this->assertEquals('composer', $this->task->which('composer'));
-		$this->assertNull($this->localStorage->get('paths.composer'));
+		$this->assertNull($this->localStorage->get('paths.production.composer'));
+	}
+
+	public function testPathsAreScopedToConnection()
+	{
+		$this->mock('rocketeer.remote', 'Remote', function ($mock) {
+			return $mock
+				->shouldReceive('run')->with(['which'], Mockery::any())->andReturn(null)
+				->shouldReceive('run')->with(['which composer'], Mockery::any())->andReturn(null)
+				->shouldReceive('run')->with(['which production'], Mockery::any())->andReturnUsing(function ($a, $b) {
+					$b('production');
+				})
+				->shouldReceive('run')->with(['which staging'], Mockery::any())->andReturnUsing(function ($a, $b) {
+					$b('staging');
+				})
+				->shouldReceive('runRaw')->andReturn('false');
+		}, false);
+
+		$this->localStorage->set('paths.production.composer', 'production');
+		$this->localStorage->set('paths.staging.composer', 'staging');
+
+		$this->assertEquals('production', $this->task->which('composer'));
+		$this->connections->setConnection('staging');
+		$this->assertEquals('staging', $this->task->which('composer'));
 	}
 
 	public function testCanSetPathToPhpAndArtisan()