bunch more

Author: jszobody

src/Commands/DeleteCommand.php

@@ -5,9 +5,9 @@
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\table;
 
-class DeleteCommand extends AbstractCommand
+class DeleteCommand extends BaseCommand
 {
-    public $signature = 'keep:delete {--force : Skip confirmation prompt} '
+    public $signature = 'delete {--force : Skip confirmation prompt} '
         .self::KEY_SIGNATURE
         .self::CONTEXT_SIGNATURE
         .self::VAULT_SIGNATURE

src/Commands/DiffCommand.php

@@ -32,19 +32,25 @@ public function process()
         }
 
         if (empty($vaults)) {
-            return $this->error('No vaults available for comparison.');
+            $this->error('No vaults available for comparison.');
+            return self::FAILURE;
         }
 
         if (empty($stages)) {
-            return $this->error('No stages available for comparison.');
+            $this->error('No stages available for comparison.');
+            return self::FAILURE;
         }
 
         $diffService = new DiffService;
         $diffs = spin(fn () => $diffService->compare($vaults, $stages), 'Gathering secrets for comparison...');
 
-        return $diffs->isNotEmpty()
-            ? $this->displayTable($diffs, $vaults, $stages, $diffService)
-            : $this->info('No secrets found in any of the specified vault/stage combinations.');
+        if ($diffs->isNotEmpty()) {
+            $this->displayTable($diffs, $vaults, $stages, $diffService);
+            return self::SUCCESS;
+        } else {
+            $this->info('No secrets found in any of the specified vault/stage combinations.');
+            return self::SUCCESS;
+        }
     }
 
     protected function getVaultsToCompare(): array
@@ -87,14 +93,14 @@ protected function getStagesToCompare(): array
         return Keep::getStages();
     }
 
-    protected function displayTable(Collection $diffs, array $vaults, array $stages, DiffService $diffService): bool
+    protected function displayTable(Collection $diffs, array $vaults, array $stages, DiffService $diffService): void
     {
         $this->newLine();
         $this->info('Secret Comparison Matrix');
 
         // Build column headers
         $headers = ['Key'];
-        $vaultEnvCombinations = [];
+        $vaultStageCombinations = [];
 
         foreach ($vaults as $vault) {
             foreach ($stages as $stage) {
@@ -124,8 +130,6 @@ protected function displayTable(Collection $diffs, array $vaults, array $stages,
         table($headers, $rows);
 
         $this->displaySummary($diffs, $vaults, $stages, $diffService);
-
-        return true;
     }
 
     protected function displaySummary(Collection $diffs, array $vaults, array $stages, DiffService $diffService): void

src/Commands/ExportCommand.php

@@ -4,9 +4,9 @@
 
 use STS\Keep\Data\Collections\SecretCollection;
 
-class ExportCommand extends AbstractCommand
+class ExportCommand extends BaseCommand
 {
-    public $signature = 'keep:export 
+    public $signature = 'export 
         {--format=env : json|env} 
         {--output= : File where to save the output (defaults to stdout)} 
         {--overwrite : Overwrite the output file if it exists} 
@@ -17,7 +17,7 @@ class ExportCommand extends AbstractCommand
 
     public $description = 'Export all stage secrets in a specified vault';
 
-    public function process(): int
+    public function process()
     {
         $context = $this->context();
         $secrets = $context->createVault()->list();
@@ -32,8 +32,6 @@ public function process(): int
         }
 
         $this->line($this->formatOutput($secrets));
-
-        return self::SUCCESS;
     }
 
     protected function formatOutput(SecretCollection $secrets): string

src/Commands/HistoryCommand.php

@@ -10,9 +10,9 @@
 
 use function Laravel\Prompts\table;
 
-class HistoryCommand extends AbstractCommand
+class HistoryCommand extends BaseCommand
 {
-    public $signature = 'keep:history 
+    public $signature = 'history 
         {--limit=10 : Maximum number of history entries to return} 
         {--format=table : table|json}
         {--user= : Filter by user who modified the secret (partial match)}
@@ -26,7 +26,7 @@ class HistoryCommand extends AbstractCommand
 
     public $description = 'Display change history for a secret';
 
-    public function process(): int
+    public function process()
     {
         $key = $this->key();
         $limit = (int) $this->option('limit');
@@ -66,22 +66,18 @@ public function process(): int
 
             return self::FAILURE;
         }
-
-        return self::SUCCESS;
     }
 
     protected function displayTable(SecretHistoryCollection $historyCollection, string $key): bool
     {
-        $timezone = config('keep.display_timezone', config('app.timezone', 'UTC'));
-
         $this->line("History for secret: <info>{$key}</info>");
 
-        $rows = $historyCollection->map(function (SecretHistory $history) use ($timezone, $historyCollection) {
+        $rows = $historyCollection->map(function (SecretHistory $history) use ($historyCollection) {
             return [
                 'Version'       => $history->version(),
                 'Value'         => $history->value() ?? '<null>',
                 'Type'          => $history->dataType(),
-                'Modified Date' => $history->formattedDate($timezone),
+                'Modified Date' => $history->formattedDate(),
                 'Modified By'   => $history->lastModifiedUser() ?? '<unknown>',
             ];
         })->toArray();

src/Data/SecretHistory.php

@@ -86,16 +86,12 @@ public function isSecure(): bool
         return $this->secure;
     }
 
-    public function formattedDate(?string $timezone = null): ?string
+    public function formattedDate(): ?string
     {
         if (! $this->lastModifiedDate) {
             return null;
         }
 
-        if ($timezone) {
-            return $this->lastModifiedDate->setTimezone($timezone)->format('Y-m-d H:i:s T');
-        }
-
         return $this->lastModifiedDate->format('Y-m-d H:i:s T');
     }
 

src/KeepApplication.php

@@ -44,8 +44,12 @@ public function __construct(protected KeepInstall $install)
 
         $this->add((new Commands\GetCommand()));
         $this->add((new Commands\SetCommand()));
-        $this->add((new Commands\ListCommand()));
         $this->add((new Commands\CopyCommand()));
+        $this->add((new Commands\DeleteCommand()));
+        $this->add((new Commands\HistoryCommand()));
+
+        $this->add((new Commands\ListCommand()));
+        $this->add((new Commands\ExportCommand()));
 
         $this->add((new Commands\DiffCommand()));