Merge branch 'main' into pr/99

* main:
  Add another assertion for `escape_shell_value`
  Add tests for `Mrsk::Utils`
  Fix indentation
  Don't report exception here too
  Don't report exception
  Add CLI tests for remaining commands that are not tested yet
  Minor: Properly require active_support

test/cli/app_test.rb

@@ -9,8 +9,8 @@ class CliAppTest < CliTestCase
       .returns("123") # old version
 
     run_command("boot").tap do |output|
-      assert_match /#{Regexp.escape("docker run --detach --restart unless-stopped")}/, output
-      assert_match /#{Regexp.escape("docker container ls --all --filter name=app-web-123 --quiet | xargs docker stop")}/, output
+      assert_match "docker run --detach --restart unless-stopped", output
+      assert_match "docker container ls --all --filter name=app-web-123 --quiet | xargs docker stop", output
     end
   end
 
@@ -26,10 +26,10 @@ class CliAppTest < CliTestCase
       .returns([ :docker, :run ])
 
     run_command("boot").tap do |output|
-      assert_match /#{Regexp.escape("Rebooting container with same version 999 already deployed")}/, output # Can't start what's already running
-      assert_match /#{Regexp.escape("docker container ls --all --filter name=app-web-999 --quiet | xargs docker stop")}/, output # Stop old running
-      assert_match /#{Regexp.escape("docker container ls --all --filter name=app-web-999 --quiet | xargs docker container rm")}/, output # Remove old container
-      assert_match /#{Regexp.escape("docker run on 1.1.1.1")}/, output # Start new container
+      assert_match "Rebooting container with same version 999 already deployed", output # Can't start what's already running
+      assert_match "docker container ls --all --filter name=app-web-999 --quiet | xargs docker container rm", output # Stop old running
+      assert_match "docker container ls --all --filter name=app-web-999 --quiet | xargs docker container rm", output # Remove old container
+      assert_match "docker run", output # Start new container
     end
   ensure
     Thread.report_on_exception = true
@@ -37,19 +37,19 @@ class CliAppTest < CliTestCase
 
   test "start" do
     run_command("start").tap do |output|
-      assert_match /#{Regexp.escape("docker start app-web-999")}/, output
+      assert_match "docker start app-web-999", output
     end
   end
 
   test "stop" do
     run_command("stop").tap do |output|
-      assert_match /#{Regexp.escape("docker ps --quiet --filter label=service=app --filter label=role=web | xargs docker stop")}/, output
+      assert_match "docker ps --quiet --filter label=service=app --filter label=role=web | xargs docker stop", output
     end
   end
 
   test "details" do
     run_command("details").tap do |output|
-      assert_match /#{Regexp.escape("docker ps --filter label=service=app --filter label=role=web")}/, output
+      assert_match "docker ps --filter label=service=app --filter label=role=web", output
     end
   end
 
@@ -69,14 +69,72 @@ class CliAppTest < CliTestCase
 
   test "exec" do
     run_command("exec", "ruby -v").tap do |output|
-      assert_match /#{Regexp.escape("docker run --rm dhh/app:999 ruby -v")}/, output
+      assert_match "docker run --rm dhh/app:999 ruby -v", output
     end
   end
 
   test "exec with reuse" do
     run_command("exec", "--reuse", "ruby -v").tap do |output|
-      assert_match /#{Regexp.escape("docker ps --filter label=service=app --format \"{{.Names}}\" | sed 's/-/\\n/g' | tail -n 1")}/, output
-      assert_match /#{Regexp.escape("docker exec app-web-999 ruby -v")}/, output
+      assert_match "docker ps --filter label=service=app --format \"{{.Names}}\" | sed 's/-/\\n/g' | tail -n 1", output # Get current version
+      assert_match "docker exec app-web-999 ruby -v", output
+    end
+  end
+
+  test "containers" do
+    run_command("containers").tap do |output|
+      assert_match "docker container ls --all --filter label=service=app", output
+    end
+  end
+
+  test "images" do
+    run_command("images").tap do |output|
+      assert_match "docker image ls dhh/app", output
+    end
+  end
+
+  test "logs" do
+    SSHKit::Backend::Abstract.any_instance.stubs(:exec)
+      .with("ssh -t root@1.1.1.1 'docker ps --quiet --filter label=service=app | xargs docker logs --timestamps --tail 10 2>&1'")
+
+    assert_match "docker ps --quiet --filter label=service=app | xargs docker logs --tail 100 2>&1", run_command("logs")
+  end
+
+  test "logs with follow" do
+    SSHKit::Backend::Abstract.any_instance.stubs(:exec)
+      .with("ssh -t root@1.1.1.1 'docker ps --quiet --filter label=service=app | xargs docker logs --timestamps --tail 10 --follow 2>&1'")
+
+    assert_match "docker ps --quiet --filter label=service=app | xargs docker logs --timestamps --tail 10 --follow 2>&1", run_command("logs", "--follow")
+  end
+
+  test "remove" do
+    Mrsk::Cli::App.any_instance.expects(:stop)
+    Mrsk::Cli::App.any_instance.expects(:remove_containers)
+    Mrsk::Cli::App.any_instance.expects(:remove_images)
+
+    run_command("remove")
+  end
+
+  test "remove_container" do
+    run_command("remove_container", "1234567").tap do |output|
+      assert_match "docker container ls --all --filter name=app-1234567 --quiet | xargs docker container rm", output
+    end
+  end
+
+  test "remove_containers" do
+    run_command("remove_containers").tap do |output|
+      assert_match "docker container prune --force --filter label=service=app", output
+    end
+  end
+
+  test "remove_images" do
+    run_command("remove_images").tap do |output|
+      assert_match "docker image prune --all --force --filter label=service=app", output
+    end
+  end
+
+  test "version" do
+    run_command("version").tap do |output|
+      assert_match "docker ps --filter label=service=app --format \"{{.Names}}\" | sed 's/-/\\n/g' | tail -n 1", output
     end
   end