Merge branch 'release/3.0.1'

eloquent · Feb 22, 2016 · 8bcaa15 · 8bcaa15
2 parents c9a4c52 + 2aebbe8
commit 8bcaa15
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 108 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Composer NPM bridge changelog
 
+## 3.0.1 (2016-02-22)
+
+- **[FIXED]** Fixed bug where Isolator was unable to be autoloaded ([#11]).
+
+[#11]: https://github.com/eloquent/composer-npm-bridge/issues/11
+
 ## 3.0.0 (2016-02-12)
 
 - **[BC BREAK]** Stripped down implementation, many public methods removed.

diff --git a/README.md b/README.md
@@ -13,10 +13,13 @@
 [current version]: https://packagist.org/packages/eloquent/composer-npm-bridge
 [version-image]: https://img.shields.io/packagist/v/eloquent/composer-npm-bridge.svg?style=flat-square "This project uses semantic versioning"
 
-## Installation and documentation
+## Installation
 
 * Available as [Composer] package [eloquent/composer-npm-bridge].
 
+[composer]: http://getcomposer.org/
+[eloquent/composer-npm-bridge]: https://packagist.org/packages/eloquent/composer-npm-bridge
+
 ## Requirements
 
 * The `npm` executable must be available in PATH.
@@ -26,7 +29,7 @@
 To utilize the *Composer NPM bridge*, simply add `eloquent/composer-npm-bridge`
 to the `require` section of the project's Composer configuration:
 
-    composer require eloquent/composer-npm-bridge:~2
+    composer require eloquent/composer-npm-bridge:^3
 
 NPM dependencies are specified via a [package.json] configuration file in the
 root directory of the Composer package. Source control should be configured to

diff --git a/composer.json b/composer.json
@@ -14,8 +14,7 @@
     "type": "composer-plugin",
     "require": {
         "php": ">=5.3",
-        "composer-plugin-api": "^1",
-        "icecave/isolator": "^2|^3"
+        "composer-plugin-api": "^1"
     },
     "require-dev": {
         "composer/composer": "dev-master",

diff --git a/composer.lock b/composer.lock
diff --git a/src/NpmClient.php b/src/NpmClient.php
@@ -14,7 +14,6 @@
 use Composer\Util\ProcessExecutor;
 use Eloquent\Composer\NpmBridge\Exception\NpmCommandFailedException;
 use Eloquent\Composer\NpmBridge\Exception\NpmNotFoundException;
-use Icecave\Isolator\Isolator;
 use Symfony\Component\Process\ExecutableFinder;
 
 /**
@@ -29,11 +28,7 @@ class NpmClient
      */
     public static function create()
     {
-        return new self(
-            new ProcessExecutor(),
-            new ExecutableFinder(),
-            Isolator::get()
-        );
+        return new self(new ProcessExecutor(), new ExecutableFinder());
     }
 
     /**
@@ -43,16 +38,19 @@ public static function create()
      *
      * @param ProcessExecutor  $processExecutor  The process executor to use.
      * @param ExecutableFinder $executableFinder The executable finder to use.
-     * @param Isolator         $isolator         The isolator to use.
+     * @param callable         $getcwd           The getcwd() implementation to use.
+     * @param callable         $chdir            The chdir() implementation to use.
      */
     public function __construct(
         ProcessExecutor $processExecutor,
         ExecutableFinder $executableFinder,
-        Isolator $isolator
+        $getcwd = 'getcwd',
+        $chdir = 'chdir'
     ) {
         $this->processExecutor = $processExecutor;
         $this->executableFinder = $executableFinder;
-        $this->isolator = $isolator;
+        $this->getcwd = $getcwd;
+        $this->chdir = $chdir;
     }
 
     /**
@@ -111,14 +109,14 @@ private function executeNpm($arguments, $workingDirectoryPath)
         $command = implode(' ', array_map('escapeshellarg', $arguments));
 
         if (null !== $workingDirectoryPath) {
-            $previousWorkingDirectoryPath = $this->isolator->getcwd();
-            $this->isolator->chdir($workingDirectoryPath);
+            $previousWorkingDirectoryPath = call_user_func($this->getcwd);
+            call_user_func($this->chdir, $workingDirectoryPath);
         }
 
         $exitCode = $this->processExecutor->execute($command);
 
         if (null !== $workingDirectoryPath) {
-            $this->isolator->chdir($previousWorkingDirectoryPath);
+            call_user_func($this->chdir, $previousWorkingDirectoryPath);
         }
 
         if (0 !== $exitCode) {
@@ -141,6 +139,7 @@ private function npmPath()
 
     private $processExecutor;
     private $executableFinder;
-    private $isolator;
+    private $getcwd;
+    private $chdir;
     private $npmPath;
 }
diff --git a/test/suite/NpmClientTest.php b/test/suite/NpmClientTest.php
@@ -22,13 +22,14 @@ protected function setUp()
     {
         $this->processExecutor = Phony::mock('Composer\Util\ProcessExecutor');
         $this->executableFinder = Phony::mock('Symfony\Component\Process\ExecutableFinder');
-        $this->isolator = Phony::mock('Icecave\Isolator\Isolator');
+        $this->getcwd = Phony::stub();
+        $this->chdir = Phony::stub();
         $this->client =
-            new NpmClient($this->processExecutor->mock(), $this->executableFinder->mock(), $this->isolator->mock());
+            new NpmClient($this->processExecutor->mock(), $this->executableFinder->mock(), $this->getcwd, $this->chdir);
 
-        $this->executableFinder->find('npm')->returns('/path/to/npm');
-        $this->isolator->getcwd()->returns('/path/to/cwd');
         $this->processExecutor->execute('*')->returns(0);
+        $this->executableFinder->find('npm')->returns('/path/to/npm');
+        $this->getcwd->returns('/path/to/cwd');
     }
 
     public function testInstall()
@@ -37,12 +38,12 @@ public function testInstall()
         $this->assertNull($this->client->install('/path/to/project'));
         Phony::inOrder(
             $this->executableFinder->find->calledWith('npm'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'install'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/cwd'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'install'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd')
+            $this->chdir->calledWith('/path/to/cwd')
         );
     }
 
@@ -51,9 +52,9 @@ public function testInstallProductionMode()
         $this->assertNull($this->client->install('/path/to/project', false));
         Phony::inOrder(
             $this->executableFinder->find->calledWith('npm'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'install' '--production'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd')
+            $this->chdir->calledWith('/path/to/cwd')
         );
     }
 
@@ -79,12 +80,12 @@ public function testUpdate()
         $this->assertNull($this->client->update('/path/to/project'));
         Phony::inOrder(
             $this->executableFinder->find->calledWith('npm'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'update'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/cwd'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'update'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd')
+            $this->chdir->calledWith('/path/to/cwd')
         );
     }
 
@@ -110,12 +111,12 @@ public function testShrinkwrap()
         $this->assertNull($this->client->shrinkwrap('/path/to/project'));
         Phony::inOrder(
             $this->executableFinder->find->calledWith('npm'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'shrinkwrap'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd'),
-            $this->isolator->chdir->calledWith('/path/to/project'),
+            $this->chdir->calledWith('/path/to/cwd'),
+            $this->chdir->calledWith('/path/to/project'),
             $this->processExecutor->execute->calledWith("'/path/to/npm' 'shrinkwrap'"),
-            $this->isolator->chdir->calledWith('/path/to/cwd')
+            $this->chdir->calledWith('/path/to/cwd')
         );
     }