fix: point to executable but use build directory as working directory

carlalexander · carlalexander · commit f1151f61ebd5 · 2020-12-12T22:05:52.000-05:00
diff --git a/src/Build/EnsurePluginIsInstalledStep.php b/src/Build/EnsurePluginIsInstalledStep.php
@@ -20,18 +20,18 @@
 class EnsurePluginIsInstalledStep implements BuildStepInterface
 {
     /**
-     * The bin directory where the WP-CLI was installed.
+     * The build directory where the project files are copied to.
      *
      * @var string
      */
-    private $binDirectory;
+    private $buildDirectory;
 
     /**
      * Constructor.
      */
     public function __construct(string $buildDirectory)
     {
-        $this->binDirectory = rtrim($buildDirectory, '/').'/bin';
+        $this->buildDirectory = rtrim($buildDirectory, '/');
     }
 
     /**
@@ -47,7 +47,7 @@ public function getDescription(): string
      */
     public function perform(string $environment, ProjectConfiguration $projectConfiguration)
     {
-        if (!WpCli::isYmirPluginInstalled($this->binDirectory.'/wp')) {
+        if (!WpCli::isYmirPluginInstalled($this->buildDirectory, $this->buildDirectory.'/bin/wp')) {
             throw new RuntimeException('Ymir plugin not found');
         }
     }
diff --git a/src/WpCli.php b/src/WpCli.php
@@ -30,19 +30,19 @@ public static function isInstalledGlobally(): bool
     /**
      * Checks if the Ymir plugin is installed.
      */
-    public static function isYmirPluginInstalled(string $executable = ''): bool
+    public static function isYmirPluginInstalled(string $cwd = null, string $executable = ''): bool
     {
-        return self::listPlugins($executable)->contains(function (array $plugin) {
+        return self::listPlugins($cwd, $executable)->contains(function (array $plugin) {
             return !empty($plugin['file']) && 1 === preg_match('/\/ymir\.php$/', $plugin['file']);
         });
     }
 
     /**
      * List all the installed plugins.
      */
-    public static function listPlugins(string $executable = ''): Enumerable
+    public static function listPlugins(string $cwd = null, string $executable = ''): Enumerable
     {
-        $process = Process::fromShellCommandline(sprintf('%s plugin list --fields=name,status,version,file --format=json', self::getExecutable($executable)));
+        $process = Process::fromShellCommandline(sprintf('%s plugin list --fields=name,status,version,file --format=json', self::getExecutable($executable)), $cwd);
         $process->run();
 
         if (!$process->isSuccessful()) {

Original file line number	Diff line number	Diff line change
`@@ -20,18 +20,18 @@`
`20`	`20`	`class EnsurePluginIsInstalledStep implements BuildStepInterface`
`21`	`21`	`{`
`22`	`22`	`/**`
`23`		`- * The bin directory where the WP-CLI was installed.`
	`23`	`+ * The build directory where the project files are copied to.`
`24`	`24`	`*`
`25`	`25`	`* @var string`
`26`	`26`	`*/`
`27`		`- private $binDirectory;`
	`27`	`+ private $buildDirectory;`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* Constructor.`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(string $buildDirectory)`
`33`	`33`	`{`
`34`		`- $this->binDirectory = rtrim($buildDirectory, '/').'/bin';`
	`34`	`+ $this->buildDirectory = rtrim($buildDirectory, '/');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`@@ -47,7 +47,7 @@ public function getDescription(): string`
`47`	`47`	`*/`
`48`	`48`	`public function perform(string $environment, ProjectConfiguration $projectConfiguration)`
`49`	`49`	`{`
`50`		`- if (!WpCli::isYmirPluginInstalled($this->binDirectory.'/wp')) {`
	`50`	`+ if (!WpCli::isYmirPluginInstalled($this->buildDirectory, $this->buildDirectory.'/bin/wp')) {`
`51`	`51`	`throw new RuntimeException('Ymir plugin not found');`
`52`	`52`	`}`
`53`	`53`	`}`