more migrating

Author: jszobody

src/Commands/Concerns/InteractsWithFilesystem.php

@@ -2,6 +2,7 @@
 
 namespace STS\Keep\Commands\Concerns;
 
+use STS\Keep\Facades\Keep;
 use function Laravel\Prompts\confirm;
 
 trait InteractsWithFilesystem
@@ -35,11 +36,13 @@ protected function writeToFile(string $path, string $content, $overwrite = false
 
     protected function findStageOverlayTemplate(): ?string
     {
-        if (! config('keep.stage_templates')) {
+        $stageTemplatesPath = Keep::getSetting('stage_templates');
+        
+        if (! $stageTemplatesPath) {
             return null;
         }
 
-        $path = config('keep.stage_templates').'/'.$this->stage().'.env';
+        $path = $stageTemplatesPath.'/'.$this->stage().'.env';
 
         return file_exists($path) && is_readable($path) ? $path : null;
     }

src/Commands/ImportCommand.php

@@ -25,9 +25,7 @@ class ImportCommand extends BaseCommand
     public function process()
     {
         if ($this->option('overwrite') && $this->option('skip-existing')) {
-            $this->error('You cannot use --overwrite and --skip-existing together.');
-
-            return self::FAILURE;
+            return $this->error('You cannot use --overwrite and --skip-existing together.');
         }
 
         $envFilePath = $this->argument('from') ?? text('Path to .env file', required: true);

src/Commands/MergeCommand.php

@@ -27,7 +27,7 @@ class MergeCommand extends BaseCommand
 
     protected Template $overlayTemplate;
 
-    public function process(): int
+    public function process()
     {
         if (! $this->prepareTemplateContents()) {
             return self::FAILURE;
@@ -117,7 +117,7 @@ protected function loadSecretsFromAllReferencedVaults($context): SecretCollectio
         $allSecrets = new SecretCollection();
 
         foreach ($vaultNames as $vaultSlug) {
-            $vault = Keep::vault($vaultSlug)->forStage($context->stage);
+            $vault = Keep::vault($vaultSlug, $context->stage);
             $vaultSecrets = $vault->list();
             $allSecrets = $allSecrets->merge($vaultSecrets);
         }

src/KeepApplication.php

@@ -49,7 +49,9 @@ public function __construct(protected KeepInstall $install)
         $this->add((new Commands\HistoryCommand()));
 
         $this->add((new Commands\ListCommand()));
+        $this->add((new Commands\ImportCommand()));
         $this->add((new Commands\ExportCommand()));
+        $this->add((new Commands\MergeCommand()));
 
         $this->add((new Commands\DiffCommand()));
         $this->add((new Commands\VerifyCommand()));