bug fixes.

Author: ljonesfl

src/Cli/Commands/Secrets/EditCommand.php

@@ -56,7 +56,17 @@ public function execute(): int
 	{
 		$configPath = $this->input->getOption( 'config', 'config' );
 		$env = $this->input->getOption( 'env' );
-		$editor = $this->input->getOption( 'editor' ) ?? getenv( 'EDITOR' ) ?: 'vi';
+
+		// Handle editor option - could be null, true (flag without value), or a string
+		$editorOption = $this->input->getOption( 'editor' );
+		if( is_string( $editorOption ) && $editorOption !== '' )
+		{
+			$editor = $editorOption;
+		}
+		else
+		{
+			$editor = getenv( 'EDITOR' ) ?: 'vi';
+		}
 
 		// Determine paths based on environment
 		if( $env )
@@ -106,8 +116,10 @@ public function execute(): int
 			{
 				$this->output->success( "Secrets saved to: {$credentialsPath}" );
 
-				// First time setup reminder
-				if( !$env && !file_exists( $configPath . '/.gitignore' ) )
+				// First time setup reminder - check for .gitignore in project root
+				$projectRoot = dirname( $configPath );
+				$gitignorePath = $projectRoot . '/.gitignore';
+				if( !$env && !file_exists( $gitignorePath ) )
 				{
 					$this->output->newLine();
 					$this->output->warning( "Remember to:" );

src/Cli/Commands/Secrets/ShowCommand.php

@@ -103,10 +103,12 @@ public function execute(): int
 		}
 
 		// Create SecretManager and decrypt
+		// Note: SecretManager::show() internally calls readKey() which handles both file and environment variable sources
 		$this->secretManager = new SecretManager();
 
 		try
 		{
+			// The show() method will read the key from either the file or environment variable
 			$decrypted = $this->secretManager->show( $credentialsPath, $keyPath );
 			$data = Yaml::parse( $decrypted );
 

tests/Cli/Commands/Secrets/EditCommandTest.php

@@ -207,6 +207,70 @@ public function testExecuteCreatesEnvironmentDirectory(): void
 		$this->assertStringContainsString( "Secrets saved to: {$credentialsPath}", $outputContent );
 	}
 
+	/**
+	 * Test editor option handling with various input types
+	 */
+	public function testEditorOptionHandling(): void
+	{
+		// Create a key file first
+		$keyPath = $this->testConfigPath . '/master.key';
+		$secretManager = new SecretManager();
+		$secretManager->generateKey( $keyPath );
+
+		// Create initial credentials file
+		$credentialsPath = $this->testConfigPath . '/secrets.yml.enc';
+		$tempPlaintextPath = $this->testConfigPath . '/temp.yml';
+		file_put_contents( $tempPlaintextPath, "test: value" );
+		$secretManager->encrypt( $tempPlaintextPath, $credentialsPath, $keyPath );
+		unlink( $tempPlaintextPath );
+
+		// Test 1: Editor option with value
+		$input1 = new Input( [
+			'--config=' . $this->testConfigPath,
+			'--editor=echo'  // Use echo as a no-op editor
+		] );
+		$input1->parse( $this->command );
+
+		$output1 = new Output( false );
+		$this->command->setInput( $input1 );
+		$this->command->setOutput( $output1 );
+
+		// This should use 'echo' as editor
+		ob_start();
+		$result1 = $this->command->execute();
+		$outputContent1 = ob_get_clean();
+
+		// Should succeed with echo editor
+		$this->assertEquals( 0, $result1 );
+		$this->assertStringContainsString( "Secrets saved to", $outputContent1 );
+
+		// Test 2: Editor option without value (becomes boolean true)
+		$input2 = new Input( [
+			'--config=' . $this->testConfigPath,
+			'--editor'  // No value - becomes boolean true
+		] );
+		$input2->parse( $this->command );
+
+		$output2 = new Output( false );
+		$this->command->setInput( $input2 );
+		$this->command->setOutput( $output2 );
+
+		// This should fall back to EDITOR env var or 'vi'
+		// Set a test editor to avoid vi
+		putenv( 'EDITOR=echo' );
+
+		ob_start();
+		$result2 = $this->command->execute();
+		$outputContent2 = ob_get_clean();
+
+		// Should succeed with fallback to env var
+		$this->assertEquals( 0, $result2 );
+		$this->assertStringContainsString( "Secrets saved to", $outputContent2 );
+
+		// Clean up env var
+		putenv( 'EDITOR' );
+	}
+
 	/**
 	 * Test that error is handled gracefully
 	 */