lib/souls/cli/docker/index.rb in souls-0.51.2 vs lib/souls/cli/docker/index.rb in souls-0.52.0

@@ -1,43 +1,35 @@
 module Souls
-  module Docker
-    class << self
-      def psql
-        system(
-          "docker run --rm -d \
-            -p 5433:5432 \
-            -v postgres-tmp:/var/lib/postgresql/data \
-            -e POSTGRES_USER=postgres \
-            -e POSTGRES_PASSWORD=postgres \
-            -e POSTGRES_DB=souls_test \
-            postgres:13-alpine"
-        )
-        system("docker ps")
-      end
+  class Docker < Thor
+    desc "psql", "Run PostgreSQL13 Docker Container"
+    def psql
+      system(
+        "docker run --rm -d \
+          -p 5433:5432 \
+          -v postgres-tmp:/var/lib/postgresql/data \
+          -e POSTGRES_USER=postgres \
+          -e POSTGRES_PASSWORD=postgres \
+          -e POSTGRES_DB=souls_test \
+          postgres:13-alpine"
+      )
+      system("docker ps")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-      def mysql
-        system(
-          "docker run --rm -d \
-            -p 3306:3306 \
-            -v mysql-tmp:/var/lib/mysql \
-            -e MYSQL_USER=mysql \
-            -e MYSQL_ROOT_PASSWORD=mysql \
-            -e MYSQL_DB=souls_test \
-            mysql:latest"
-        )
-        system("docker ps")
-      end
-
-      def run
-        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-        port =
-          if current_dir_name == "api"
-            "4000:4000"
-          else
-            "3000:3000"
-          end
-        system("docker build . -t souls-app -f Dockerfile.dev")
-        system("docker run --name souls-app --rm --env-file .env -p #{port} souls-app:latest")
-      end
+    desc "mysql", "Run MySQL Docker Container"
+    def mysql
+      system(
+        "docker run --rm -d \
+          -p 3306:3306 \
+          -v mysql-tmp:/var/lib/mysql \
+          -e MYSQL_USER=mysql \
+          -e MYSQL_ROOT_PASSWORD=mysql \
+          -e MYSQL_DB=souls_test \
+          mysql:latest"
+      )
+      system("docker ps")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
   end
 end