Implemented versions:remove

OParl · Sep 9, 2015 · 3e2be27 · 3e2be27
1 parent e0929cd
commit 3e2be27
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 47 deletions.
diff --git a/app/Console/Commands/ListVersionsCommand.php b/app/Console/Commands/ListVersionsCommand.php
@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use OParl\Spec\Version;
 use OParl\Spec\VersionRepository;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -34,10 +35,8 @@ protected function getOptions()
      *
      * @return mixed
      */
-    public function handle()
+    public function handle(VersionRepository $versionRepository)
     {
-      $versionRepository = app('VersionRepository');
-
       $versions = collect();
       $counts = [
         'extra' => 0,

diff --git a/app/Console/Commands/RemoveVersionCommand.php b/app/Console/Commands/RemoveVersionCommand.php
diff --git a/app/Console/Commands/RemoveVersionsCommand.php b/app/Console/Commands/RemoveVersionsCommand.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use OParl\Spec\VersionRepository;
+
+class RemoveVersionsCommand extends Command
+{
+  /**
+   * The name and signature of the console command.
+   *
+   * @var string
+   */
+  protected $signature = 'versions:remove {--all?} {--extraneous?}';
+
+  /**
+   * The console command description.
+   *
+   * @var string
+   */
+  protected $description = 'Remove either all (except preserved) or extraneous spec versions.';
+
+  /**
+   * Create a new command instance.
+   *
+   * @return void
+   */
+  public function __construct()
+  {
+    parent::__construct();
+  }
+
+  /**
+   * Execute the console command.
+   *
+   * @return mixed
+   */
+  public function handle(VersionRepository $versionRepository)
+  {
+    $mode = $this->argument('mode');
+
+    switch ($mode)
+    {
+      case 'all':
+      case 'extraneous':
+        $this->line("Removing {$mode} stored versions.");
+        $versionRepository->clean($mode);
+        return true;
+
+      default:
+        $this->line("Unknown mode: {$mode}");
+        return false;
+    }
+  }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -20,7 +20,7 @@ class Kernel extends ConsoleKernel {
     Commands\ListVersionsCommand::class,
     Commands\UpdateVersionsCommand::class,
     Commands\GetVersionCommand::class,
-    Commands\RemoveVersionCommand::class
+    Commands\RemoveVersionsCommand::class
   ];
 
   protected function schedule(Schedule $schedule)

diff --git a/lib/Spec/VersionRepository.php b/lib/Spec/VersionRepository.php
@@ -151,7 +151,7 @@ protected function cleanExtra()
 
   protected function cleanAll()
   {
-    $this->fs->directories(static::ARCHIVE_DIRECTORY . '*')->each(function ($dir) {
+    collect($this->fs->directories(static::ARCHIVE_DIRECTORY . '*'))->each(function ($dir) {
       if (!$this->isPreserved($dir, 'dir'))
       {
         $this->fs->deleteDirectory($dir);