Relative symlinks

src/main/Monorepo/Build.php

@@ -82,18 +82,23 @@ public function build($rootDirectory, $optimize = false, $noDevMode = false)
             );
 
             $binDir = $config['path'] . '/vendor/bin';
+            $fullBinDir = $rootDirectory . '/' . $binDir;
+            $relativeRootDirectory = str_repeat('../', substr_count($binDir, '/')+1);
+
+            if (! is_dir($fullBinDir)) {
+                mkdir($fullBinDir, 0755, true);
+            }
+
             // remove old symlinks
-            array_map('unlink', glob($binDir . '/*'));
+            array_map('unlink', glob($fullBinDir . '/*'));
 
             foreach ($localRepo->getPackages() as $package) {
-                foreach ($package->getBinaries() as $binary) {
 
-                    if (! is_dir($binDir)) {
-                        mkdir($binDir, 0755, true);
-                    }
 
-                    $binFile = $binDir . '/' . basename($binary);
-                    symlink($rootDirectory . '/' . $binary, $binFile);
+                foreach ($package->getBinaries() as $binary) {
+
+                    $binFile = $fullBinDir . '/' . basename($binary);
+                    symlink($relativeRootDirectory . $binary, $binFile);
                 }
             }
         }

tests/Monorepo/BuildTest.php

@@ -77,12 +77,33 @@ public function testBuildWithAdvancedExampleProject()
         $this->assertContains('composerRequireOnce', $barAutoloadReal);
     }
 
+    public function testBuildWithBinExampleProject()
+    {
+        $exampleDir = realpath(__DIR__ . '/../_fixtures/example-bin');
+        chdir($exampleDir);
+        $build = new Build();
+        $build->build($exampleDir);
+
+        $this->assertTrue(file_exists("$exampleDir/bar/vendor/bin/test-bin"));
+        $link = readlink("$exampleDir/bar/vendor/bin/test-bin");
+        $this->assertEquals('../../../vendor/test/bin/test-bin', $link);
+
+        $this->assertTrue(file_exists("$exampleDir/foo/baz/vendor/bin/test-bin"));
+        $link = readlink("$exampleDir/foo/baz/vendor/bin/test-bin");
+        $this->assertEquals('../../../../vendor/test/bin/test-bin', $link);
+    }
+
     protected function tearDown()
     {
         $fs = new Filesystem();
         $dirs = glob(__DIR__ . '/../_fixtures/*/*/vendor');
         foreach ($dirs as $dir) {
             $fs->removeDirectoryPhp($dir);
         }
+
+        $dirs = glob(__DIR__ . '/../_fixtures/*/*/*/vendor');
+        foreach ($dirs as $dir) {
+            $fs->removeDirectoryPhp($dir);
+        }
     }
 }

tests/_fixtures/example-bin/bar/monorepo.json

@@ -0,0 +1,3 @@
+{
+    "deps": ["vendor/test/bin"]
+}

tests/_fixtures/example-bin/bin-repo/composer.json

@@ -0,0 +1,4 @@
+{
+    "name": "test/bin",
+    "bin": ["test-bin"]
+}

tests/_fixtures/example-bin/composer.json

@@ -0,0 +1,12 @@
+{
+    "minimum-stability": "dev",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "./bin-repo"
+        }
+    ],
+    "require": {
+        "test/bin": "*"
+    }
+}

tests/_fixtures/example-bin/foo/baz/monorepo.json

@@ -0,0 +1,3 @@
+{
+    "deps": ["vendor/test/bin"]
+}

tests/_fixtures/example-bin/vendor/autoload.php

@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit0b3564936dd6d0ecbdc019c9453b7f18::getLoader();

tests/_fixtures/example-bin/vendor/bin/test-bin

@@ -0,0 +1 @@
+../test/bin/test-bin