Move .matirxeval/Gemfile.lock.* to .matrixeval/gemfile_locks/*

Author: hoppergee

lib/matrixeval/ruby/context.rb

@@ -53,7 +53,7 @@ def docker_compose_service_name
       end
 
       def gemfile_lock_path
-        Matrixeval.working_dir.join(".matrixeval/Gemfile.lock.#{id}")
+        Matrixeval.working_dir.join(".matrixeval/gemfile_locks/#{id}")
       end
 
       def docker_compose_file_path

lib/matrixeval/ruby/docker_compose/file.rb

@@ -99,7 +99,7 @@ def mounts(variant)
           [
             "../..:/app:cached",
             "#{variant.bundle_volume_name}:/bundle",
-            "../Gemfile.lock.#{context.id}:/app/Gemfile.lock"
+            "../gemfile_locks/#{context.id}:/app/Gemfile.lock"
           ] + extra_mounts
         end
 

lib/matrixeval/ruby/gemfile_locks.rb

@@ -4,7 +4,7 @@ class GemfileLocks
       class << self
 
         def create
-          FileUtils.mkdir_p dot_matrixeval_folder
+          FileUtils.mkdir_p gemfile_lock_folder
 
           Context.all.each do |context|
             FileUtils.touch context.gemfile_lock_path
@@ -13,8 +13,8 @@ def create
 
         private
 
-        def dot_matrixeval_folder
-          Matrixeval.working_dir.join(".matrixeval")
+        def gemfile_lock_folder
+          Matrixeval.working_dir.join(".matrixeval/gemfile_locks")
         end
 
       end

lib/matrixeval/ruby/gitignore.rb

@@ -41,7 +41,7 @@ def docker_compose_yaml
         end
 
         def gemfile_locks
-          ".matrixeval/Gemfile.lock.*"
+          ".matrixeval/gemfile_locks"
         end
 
         def gitignore_path

test/matrixeval/ruby/context_test.rb

@@ -61,7 +61,7 @@ def test_docker_compose_service_name
   def test_gemfile_lock_path
     Matrixeval.stubs(:working_dir).returns(Pathname.new("working_dir"))
 
-    assert_equal "working_dir/.matrixeval/Gemfile.lock.ruby_3_0_rails_6_1_sidekiq_5_0", @context.gemfile_lock_path.to_s
+    assert_equal "working_dir/.matrixeval/gemfile_locks/ruby_3_0_rails_6_1_sidekiq_5_0", @context.gemfile_lock_path.to_s
   end
 
   def test_docker_compose_file_path

test/matrixeval/ruby/docker_compose/file_test.rb

@@ -13,7 +13,7 @@ def test_create_all
     refute File.exist?(dummy_gem_docker_compose_folder_path)
 
     Matrixeval::Ruby::Config::YAML.stubs(:yaml).returns({
-      "version" => "0.2",
+      "version" => "0.3",
       "target" => "ruby",
       "project_name" => "Dummy_gem",
       "mounts" => ["/a/b:/app/c/d"],
@@ -76,7 +76,7 @@ def test_create_all
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_0_0:/bundle
-          - "../Gemfile.lock.ruby_3_0_active_model_6_1:/app/Gemfile.lock"
+          - "../gemfile_locks/ruby_3_0_active_model_6_1:/app/Gemfile.lock"
           - "/a/b:/app/c/d"
           - "../schema/rails_6_1.rb:/app/test/dummy/db/schema.rb"
           environment:
@@ -112,7 +112,7 @@ def test_create_all
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_0_0:/bundle
-          - "../Gemfile.lock.ruby_3_0_active_model_7_0:/app/Gemfile.lock"
+          - "../gemfile_locks/ruby_3_0_active_model_7_0:/app/Gemfile.lock"
           - "/a/b:/app/c/d"
           - "../schema/rails_7_0.rb:/app/test/dummy/db/schema.rb"
           environment:
@@ -148,7 +148,7 @@ def test_create_all
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_1_0:/bundle
-          - "../Gemfile.lock.ruby_3_1_active_model_6_1:/app/Gemfile.lock"
+          - "../gemfile_locks/ruby_3_1_active_model_6_1:/app/Gemfile.lock"
           - "/a/b:/app/c/d"
           - "../schema/rails_6_1.rb:/app/test/dummy/db/schema.rb"
           environment:
@@ -184,7 +184,7 @@ def test_create_all
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_1_0:/bundle
-          - "../Gemfile.lock.ruby_3_1_active_model_7_0:/app/Gemfile.lock"
+          - "../gemfile_locks/ruby_3_1_active_model_7_0:/app/Gemfile.lock"
           - "/a/b:/app/c/d"
           - "../schema/rails_7_0.rb:/app/test/dummy/db/schema.rb"
           environment:

test/matrixeval/ruby/gemfile_locks_test.rb

@@ -5,13 +5,13 @@
 class Matrixeval::Ruby::GemfileLocksTest < MatrixevalTest
 
   def setup
-    FileUtils.rm Dir.glob(dummy_gem_working_dir.join(".matrixeval/Gemfile.lock.*"))
+    FileUtils.rm Dir.glob(dummy_gem_working_dir.join(".matrixeval/gemfile_locks/*"))
     Matrixeval.stubs(:working_dir).returns(dummy_gem_working_dir)
   end
 
   def test_create
     Matrixeval::Ruby::Config::YAML.stubs(:yaml).returns({
-      "version" => "0.2",
+      "version" => "0.3",
       "target" => "ruby",
       "matrix" => {
         "ruby" => {
@@ -42,8 +42,8 @@ def test_create
     assert File.exist? gemfile_lock("ruby_3_1_rails_6_1")
   end
 
-  def gemfile_lock(suffix)
-    dummy_gem_working_dir.join(".matrixeval/Gemfile.lock.#{suffix}")
+  def gemfile_lock(filename)
+    dummy_gem_working_dir.join(".matrixeval/gemfile_locks/#{filename}")
   end
 
 end

test/matrixeval/ruby/gitignore_test.rb

@@ -16,7 +16,7 @@ def test_create
 
     expected_gitignore_content = <<~GITIGNORE
       .matrixeval/docker-compose.yml
-      .matrixeval/Gemfile.lock.*
+      .matrixeval/gemfile_locks
       GITIGNORE
     gitignore_content = File.read dummy_gem_working_dir.join(".gitignore")
     assert_equal expected_gitignore_content, gitignore_content
@@ -32,7 +32,7 @@ def test_update
     expected_gitignore_content = <<~GITIGNORE
       .env
       .matrixeval/docker-compose.yml
-      .matrixeval/Gemfile.lock.*
+      .matrixeval/gemfile_locks
       GITIGNORE
     gitignore_content = File.read dummy_gem_working_dir.join(".gitignore")
     assert_equal expected_gitignore_content, gitignore_content
@@ -41,14 +41,14 @@ def test_update
   def test_update_duplicate_check
     File.open(dummy_gem_working_dir.join(".gitignore"), 'w+') do |file|
       file.puts ".env"
-      file.puts ".matrixeval/Gemfile.lock.*"
+      file.puts ".matrixeval/gemfile_locks"
     end
 
     Matrixeval::Ruby::Gitignore.update
 
     expected_gitignore_content = <<~GITIGNORE
       .env
-      .matrixeval/Gemfile.lock.*
+      .matrixeval/gemfile_locks
       .matrixeval/docker-compose.yml
       GITIGNORE
     gitignore_content = File.read dummy_gem_working_dir.join(".gitignore")

test/matrixeval/ruby/runner_test.rb

@@ -10,7 +10,7 @@ def setup
     FileUtils.rm(dummy_gem_docker_compose_file_path) rescue nil
     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.*"))
+    FileUtils.rm Dir.glob(dummy_gem_working_dir.join(".matrixeval/gemfile_locks/*"))
   end
 
   def test_start_with_init