Fix secrets adapters failing fetch on Windows

lib/kamal/secrets/adapters/aws_secrets_manager.rb

@@ -36,7 +36,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `aws --version 2> /dev/null`
+      system("aws --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/bitwarden.rb

@@ -75,7 +75,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `bw --version 2> /dev/null`
+      system("bw --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/bitwarden_secrets_manager.rb

@@ -66,7 +66,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `bws --version 2> /dev/null`
+      system("bws --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/doppler.rb

@@ -12,7 +12,7 @@ def login(*)
     end
 
     def loggedin?
-      `doppler me --json 2> /dev/null`
+      system("doppler me --json", err: File::NULL)
       $?.success?
     end
 
@@ -51,7 +51,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `doppler --version 2> /dev/null`
+      system("doppler --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/enpass.rb

@@ -27,7 +27,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `enpass-cli version 2> /dev/null`
+      system("enpass-cli version", err: File::NULL)
       $?.success?
     end
 

lib/kamal/secrets/adapters/gcp_secret_manager.rb

@@ -94,7 +94,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `gcloud --version 2> /dev/null`
+      system("gcloud --version", err: File::NULL)
       $?.success?
     end
 

lib/kamal/secrets/adapters/last_pass.rb

@@ -34,7 +34,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `lpass --version 2> /dev/null`
+      system("lpass --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/one_password.rb

@@ -11,7 +11,7 @@ def login(account)
     end
 
     def loggedin?(account)
-      `op account get --account #{account.shellescape} 2> /dev/null`
+      system("op account get --account #{account.shellescape}", err: File::NULL)
       $?.success?
     end
 
@@ -64,7 +64,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `op --version 2> /dev/null`
+      system("op --version", err: File::NULL)
       $?.success?
     end
 end

test/secrets/aws_secrets_manager_adapter_test.rb

@@ -2,8 +2,8 @@
 
 class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   test "fails when errors are present" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list unknown1 unknown2 --profile default")
       .returns(<<~JSON)
         {
@@ -31,8 +31,8 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret/KEY1 secret/KEY2 secret2/KEY3 --profile default")
       .returns(<<~JSON)
         {
@@ -74,8 +74,8 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch with string value" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret secret2/KEY1 --profile default")
       .returns(<<~JSON)
         {
@@ -116,8 +116,8 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch with secret names" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret/KEY1 secret/KEY2 --profile default")
       .returns(<<~JSON)
         {
@@ -148,7 +148,7 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch without CLI installed" do
-    stub_ticks_with("aws --version 2> /dev/null", succeed: false)
+    stub_command_with("aws --version", false, :system)
 
     error = assert_raises RuntimeError do
       JSON.parse(shellunescape(run_command("fetch", "SECRET1")))

test/secrets/bitwarden_adapter_test.rb

@@ -2,10 +2,10 @@
 
 class BitwardenAdapterTest < SecretAdapterTestCase
   test "fetch" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
     stub_unlocked
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw sync").returns("")
     stub_mypassword
 
     json = JSON.parse(shellunescape(run_command("fetch", "mypassword")))
@@ -16,10 +16,10 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch with no login" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
     stub_unlocked
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw sync").returns("")
     stub_noteitem
 
     error = assert_raises RuntimeError do
@@ -29,10 +29,10 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch with from" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
     stub_unlocked
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw sync").returns("")
     stub_myitem
 
     json = JSON.parse(shellunescape(run_command("fetch", "--from", "myitem", "field1", "field2", "field3")))
@@ -45,10 +45,10 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch all with from" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
     stub_unlocked
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw sync").returns("")
     stub_noteitem_with_fields
 
     json = JSON.parse(shellunescape(run_command("fetch", "mynotefields")))
@@ -62,15 +62,15 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch with multiple items" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
     stub_unlocked
 
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw sync").returns("")
     stub_mypassword
     stub_myitem
 
-    stub_ticks
+    stub_command
     .with("bw get item myitem2")
     .returns(<<~JSON)
       {
@@ -105,19 +105,19 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch unauthenticated" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
-    stub_ticks
+    stub_command
       .with("bw status")
       .returns(
         '{"serverUrl":null,"lastSync":null,"status":"unauthenticated"}',
         '{"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"locked"}',
         '{"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"unlocked"}'
       )
 
-    stub_ticks.with("bw login email@example.com").returns("1234567890")
-    stub_ticks.with("bw unlock --raw").returns("")
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw login email@example.com").returns("1234567890")
+    stub_command.with("bw unlock --raw").returns("")
+    stub_command.with("bw sync").returns("")
     stub_mypassword
 
     json = JSON.parse(shellunescape(run_command("fetch", "mypassword")))
@@ -128,23 +128,23 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch locked" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
-    stub_ticks
+    stub_command
       .with("bw status")
       .returns(
         '{"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"locked"}'
       )
 
-    stub_ticks
+    stub_command
       .with("bw status")
       .returns(
         '{"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"unlocked"}'
       )
 
-    stub_ticks.with("bw login email@example.com").returns("1234567890")
-    stub_ticks.with("bw unlock --raw").returns("")
-    stub_ticks.with("bw sync").returns("")
+    stub_command.with("bw login email@example.com").returns("1234567890")
+    stub_command.with("bw unlock --raw").returns("")
+    stub_command.with("bw sync").returns("")
     stub_mypassword
 
     json = JSON.parse(shellunescape(run_command("fetch", "mypassword")))
@@ -155,23 +155,24 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch locked with session" do
-    stub_ticks.with("bw --version 2> /dev/null")
+    stub_command(:system).with("bw --version", err: File::NULL)
 
-    stub_ticks
+
+    stub_command
       .with("bw status")
       .returns(
         '{"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"locked"}'
       )
 
-    stub_ticks
+    stub_command
       .with("BW_SESSION=0987654321 bw status")
       .returns(
         '{"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"unlocked"}'
       )
 
-    stub_ticks.with("bw login email@example.com").returns("1234567890")
-    stub_ticks.with("bw unlock --raw").returns("0987654321")
-    stub_ticks.with("BW_SESSION=0987654321 bw sync").returns("")
+    stub_command.with("bw login email@example.com").returns("1234567890")
+    stub_command.with("bw unlock --raw").returns("0987654321")
+    stub_command.with("BW_SESSION=0987654321 bw sync").returns("")
     stub_mypassword(session: "0987654321")
 
     json = JSON.parse(shellunescape(run_command("fetch", "mypassword")))
@@ -182,7 +183,7 @@ class BitwardenAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch without CLI installed" do
-    stub_ticks_with("bw --version 2> /dev/null", succeed: false)
+    stub_command_with("bw --version", false, :system)
 
     error = assert_raises RuntimeError do
       JSON.parse(shellunescape(run_command("fetch", "mynote")))
@@ -202,15 +203,15 @@ def run_command(*command)
     end
 
     def stub_unlocked
-      stub_ticks
+      stub_command
         .with("bw status")
         .returns(<<~JSON)
           {"serverUrl":null,"lastSync":"2024-09-04T10:11:12.433Z","userEmail":"email@example.com","userId":"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee","status":"unlocked"}
         JSON
     end
 
     def stub_mypassword(session: nil)
-      stub_ticks
+      stub_command
         .with("#{"BW_SESSION=#{session} " if session}bw get item mypassword")
         .returns(<<~JSON)
           {
@@ -233,7 +234,7 @@ def stub_mypassword(session: nil)
     end
 
   def stub_noteitem(session: nil)
-    stub_ticks
+    stub_command
       .with("#{"BW_SESSION=#{session} " if session}bw get item mynote")
       .returns(<<~JSON)
           {
@@ -257,7 +258,7 @@ def stub_noteitem(session: nil)
       end
 
       def stub_noteitem_with_fields(session: nil)
-      stub_ticks
+      stub_command
         .with("#{"BW_SESSION=#{session} " if session}bw get item mynotefields")
         .returns(<<~JSON)
             {
@@ -287,7 +288,7 @@ def stub_noteitem_with_fields(session: nil)
       end
 
     def stub_myitem
-      stub_ticks
+      stub_command
         .with("bw get item myitem")
         .returns(<<~JSON)
           {