Refactor DockerCompose to use context specific docker compose file

Author: hoppergee

lib/matrixeval/ruby/docker_compose.rb

@@ -6,12 +6,6 @@ module Matrixeval
   module Ruby
     class DockerCompose
 
-      class << self
-        def clean_containers
-          system("docker compose -f .matrixeval/docker-compose.yml rm --all -f >> /dev/null 2>&1")
-        end
-      end
-
       attr_reader :context
 
       def initialize(context)
@@ -23,30 +17,29 @@ def run(arguments)
 
         system(
           <<~DOCKER_COMPOSE_COMMAND
-          docker compose -f .matrixeval/docker-compose.yml \
+          docker compose -f #{yaml_file} \
           run --rm \
-          #{env} \
-          #{gemfile_mount} \
-          #{docker_compose_service_name} \
+          #{context.docker_compose_service_name} \
           #{forward_arguments}
           DOCKER_COMPOSE_COMMAND
         )
+      ensure
+        turn_on_stty_opost
+        clean_linked_containers
       end
 
       private
 
-      def env
-        context.env.map do |k, v|
-          "-e #{k}='#{v}'"
-        end.join(" ")
+      def clean_linked_containers
+        system("docker compose -f #{yaml_file} down >> /dev/null 2>&1")
       end
 
-      def gemfile_mount
-        "-v ./.matrixeval/Gemfile.lock.#{context.id}:/app/Gemfile.lock"
+      def yaml_file
+        ".matrixeval/docker-compose/#{context.id}.yml"
       end
 
-      def docker_compose_service_name
-        context.docker_compose_service_name
+      def turn_on_stty_opost
+        system("stty opost")
       end
 
     end

lib/matrixeval/ruby/runner.rb

@@ -45,7 +45,6 @@ def start
         exit
       ensure
         turn_on_stty_opost
-        DockerCompose.clean_containers
       end
 
       private

test/matrixeval/ruby/docker_compose_test.rb

@@ -41,22 +41,18 @@ def test_run
       ]
     )
     docker_compose = Matrixeval::Ruby::DockerCompose.new(context)
+
     expected_docker_compose_command = <<~COMMAND
-      docker compose -f .matrixeval/docker-compose.yml \
-      run --rm \
-      -e RAILS_VERSION='6.0.0' \
-      -e SIDEKIQ_VERSION='5.0.0' \
-      -v ./.matrixeval/Gemfile.lock.ruby_3_0_rails_6_0_sidekiq_5_0:/app/Gemfile.lock \
-      ruby_3_0 \
-      rake test
+      docker compose -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml \
+      run --rm ruby_3_0 rake test
       COMMAND
     docker_compose.expects(:system).with(expected_docker_compose_command)
-    docker_compose.run(["rake", "test"])
-  end
 
-  def test_clean_containers
-    Matrixeval::Ruby::DockerCompose.expects(:system).with("docker compose -f .matrixeval/docker-compose.yml rm --all -f >> /dev/null 2>&1")
-    Matrixeval::Ruby::DockerCompose.clean_containers
+    docker_compose.expects(:system).with("stty opost")
+
+    docker_compose.expects(:system).with("docker compose -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml down >> /dev/null 2>&1")
+
+    docker_compose.run(["rake", "test"])
   end
 
 end

test/matrixeval/ruby/runner_test.rb

@@ -11,8 +11,6 @@ def setup
     FileUtils.rm(dummy_gem_matrixeval_file_path) rescue nil
     FileUtils.rm(dummy_gem_working_dir.join(".gitignore")) rescue nil
     FileUtils.rm Dir.glob(dummy_gem_working_dir.join(".matrixeval/Gemfile.lock.*"))
-
-    Matrixeval::Ruby::DockerCompose.stubs(:clean_containers)
   end
 
   def test_start_with_init