Fix provider and dist removal (#168)

repman-io · May 21, 2020 · ba6ac23 · ba6ac23
1 parent a2481e8
commit ba6ac23
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 11 deletions.
diff --git a/src/MessageHandler/Organization/RemoveOrganizationHandler.php b/src/MessageHandler/Organization/RemoveOrganizationHandler.php
@@ -31,7 +31,8 @@ public function __invoke(RemoveOrganization $message): void
         foreach ($organization->synchronizedPackages() as $package) {
             $this
                 ->packageManager
-                ->removeProvider($package->organizationAlias(), (string) $package->name());
+                ->removeProvider($package->organizationAlias(), (string) $package->name())
+                ->removeDist($package->organizationAlias(), (string) $package->name());
         }
 
         $this->packageManager->removeOrganizationDir($organization->alias());

diff --git a/src/MessageHandler/Organization/RemovePackageHandler.php b/src/MessageHandler/Organization/RemovePackageHandler.php
@@ -36,7 +36,8 @@ public function __invoke(RemovePackage $message): void
         if ($package->isSynchronized()) {
             $this
                 ->packageManager
-                ->removeProvider($package->organizationAlias(), (string) $package->name());
+                ->removeProvider($package->organizationAlias(), (string) $package->name())
+                ->removeDist($package->organizationAlias(), (string) $package->name());
         }
     }
 }
diff --git a/src/Service/Organization/PackageManager.php b/src/Service/Organization/PackageManager.php
@@ -63,13 +63,16 @@ public function saveProvider(array $json, string $organizationAlias, string $pac
     public function removeProvider(string $organizationAlias, string $packageName): self
     {
         $file = $this->filepath($organizationAlias, $packageName);
-        $names = explode('/', $packageName);
-        $distDir = $this->baseDir.'/'.$organizationAlias.'/dist/'.$names[0];
-
         if (is_file($file)) {
-            $this->filesystem->remove(dirname($file));
+            $this->filesystem->remove($file);
         }
 
+        return $this;
+    }
+
+    public function removeDist(string $organizationAlias, string $packageName): self
+    {
+        $distDir = $this->baseDir.'/'.$organizationAlias.'/dist/'.$packageName;
         if (is_dir($distDir)) {
             $this->filesystem->remove($distDir);
         }

diff --git a/tests/Unit/Service/Organization/PackageManagerTest.php b/tests/Unit/Service/Organization/PackageManagerTest.php
@@ -73,16 +73,44 @@ public function testRemoveProvider(): void
         );
 
         $org = 'buddy';
-        $package = 'hello/world';
+        $package1 = 'vendor/package1';
+        $package2 = 'vendor/package2';
 
-        $manager->saveProvider([], $org, $package);
+        $manager->saveProvider([], $org, $package1);
+        $manager->saveProvider([], $org, $package2);
 
-        self::assertTrue(is_dir($this->baseDir.'/buddy/p/hello'));
+        self::assertTrue(file_exists($this->baseDir.'/buddy/p/'.$package1.'.json'));
+        self::assertTrue(file_exists($this->baseDir.'/buddy/p/'.$package2.'.json'));
+
+        $manager->removeProvider($org, $package1);
+
+        self::assertTrue(is_dir($this->baseDir.'/buddy'));
+        self::assertTrue(is_dir(dirname($this->baseDir.'/buddy/p/'.$package1)));
+        self::assertFalse(file_exists($this->baseDir.'/buddy/p/'.$package1.'.json'));
+        self::assertTrue(file_exists($this->baseDir.'/buddy/p/'.$package2.'.json'));
+    }
+
+    public function testRemoveDist(): void
+    {
+        $manager = new PackageManager(
+            new FileStorage($this->baseDir, new FakeDownloader()),
+            $this->baseDir,
+            $this->filesystem
+        );
+
+        $org = 'buddy';
+        $package1 = 'vendor/package1';
+        $package2 = 'vendor/package2';
+
+        @mkdir($this->baseDir.'/buddy/dist/'.$package1, 0777, true);
+        @mkdir($this->baseDir.'/buddy/dist/'.$package2, 0777, true);
 
-        $manager->removeProvider($org, $package);
+        $manager->removeDist($org, $package1);
 
         self::assertTrue(is_dir($this->baseDir.'/buddy'));
-        self::assertFalse(is_dir($this->baseDir.'/buddy/p/hello'));
+        self::assertTrue(is_dir($this->baseDir.'/buddy/dist/vendor'));
+        self::assertFalse(is_dir($this->baseDir.'/buddy/dist/'.$package1));
+        self::assertTrue(is_dir($this->baseDir.'/buddy/dist/'.$package2));
     }
 
     public function testRemoveOrganizationDir(): void