firespring_dev_commands 3.1.6.pre.alpha.1 → 3.1.6.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81ab668b62c9ac2cf9615ccb7825acf33dc803317e90a8baf69d0dd6991e3099
-  data.tar.gz: 3ef0122f0e88583501519c36f5efaa11f3ff2f10ee8329536118c032dd0f71d8
+  metadata.gz: 92230376b44b914a2e4f5f1cbc0ccd76e44356e7acd7dd91402598cb945bad4f
+  data.tar.gz: 1c1159f881470ea08ed64bbd95f144a34ce01c958dfe04814592d1238e8e7b6b
 SHA512:
-  metadata.gz: 18590d3465b700eeb8db34b21fe89f994c2a6fdf60b3af0b068519f3ce50f371b3621898ce5362450e46423be227fd8c29311d4dea0afbd8eb53b24dc8857882
-  data.tar.gz: 194a7d9f2202447ca6c7ef64fff15c3a403d8a21d4a46b7ec101ebfe83ff85a694133a268899ca3bda06c0451b6ed230340d168209bcef111755e028121edabb
+  metadata.gz: 111ff6f71498547adc5e7d477ca9970fa4289de65dc047fdfc693123be82ea90fc5baa7139cf2d2ad4155cba5bebf77e480fd98cd9fc106e046a91cf4a8f3a53
+  data.tar.gz: 35ae0cbe8edf002fb3fa77301ae91e0db61191855ee85f29f6edb3eec98c524746d231bfa8912ef4702df066a801f2211219da89f5c57ff243e9b0af8553f462

data/lib/firespring_dev_commands/docker.rb

@@ -94,6 +94,22 @@ module Dev
       end
     end
 
+    def stop_project_containers(project_name:)
+      project_name = project_name.to_s.strip
+      raise 'No project name defined' if project_name.empty?
+
+      ::Docker::Container.all(filters: {status: %w(restarting running)}.to_json).each do |container|
+        next unless container.info&.dig('Names')&.map { |name| name.split('/').last }&.any? { |it| it.start_with?(project_name) }
+
+        begin
+          container.stop
+          LOG.info "Stopped container #{container.id[0, 12]}"
+        rescue => e
+          LOG.error "Error stopping container #{contianer.id[0, 12]}: #{e}"
+        end
+      end
+    end
+
     # Prunes/removes all unused images
     def prune_images
       _prune('images')

data/lib/firespring_dev_commands/templates/docker/application.rb

@@ -118,24 +118,6 @@ module Dev
           end
         end
 
-        # Create the rake task which runs a docker compose exec bash for the application name
-        def create_sh_empty_task!
-          application = @name
-          exclude = @exclude
-
-          DEV_COMMANDS_TOP_LEVEL.instance_eval do
-            namespace application do
-              return if exclude.include?(:sh_empty)
-
-              desc "Open a shell into an empty #{application} container"
-              task sh_empty: %W(init_docker #{application}:up_empty_no_deps _pre_sh_hooks) do
-                Dev::Docker::Compose.new(services: [application]).sh
-                Rake::Task[:_post_sh_hooks].execute
-              end
-            end
-          end
-        end
-
         # Create the rake task which runs a docker compose logs for the application name
         def create_logs_task!
           application = @name

data/lib/firespring_dev_commands/templates/docker/node/application.rb

@@ -106,7 +106,8 @@ module Dev
             node = @node
             exclude = @exclude
             test_isolation = @test_isolation
-            up_cmd = @start_container_dependencies_on_test ? :up_empty : :up_empty_no_deps
+            up_prefix = @test_isolation ? :up_empty : :up # NOTE: This should maybe be it's own variable at some point?
+            up_cmd = @start_container_dependencies_on_test ? :"#{up_prefix}" : :"#{up_prefix}_no_deps"
             test_artifacts = @test_artifacts
             return if exclude.include?(:test)
 
@@ -145,10 +146,28 @@ module Dev
                   ensure
                     # Clean up resources if we are on an isolated project name
                     if test_isolation
+                      # Need to call stop before down because other the "run" containers aren't stopped
+                      Dev::Docker.new.stop_project_containers(project_name: Dev::Docker::Compose.config.project_name)
                       Dev::Docker::Compose.new.down
                       Dev::Docker.new.prune_project_volumes(project_name: Dev::Docker::Compose.config.project_name)
                     end
                   end
+
+                  # If using test isolation then give users a way to 'sh' into the isolated container
+                  if test_isolation
+                    namespace :test do
+                      desc "Open a shell into a test #{application} container"
+                      task sh: %W(test_init_docker #{up_cmd} _pre_sh_hooks) do
+                        Dev::Docker::Compose.new(services: @default_service).sh
+                        Rake::Task[:_post_sh_hooks].execute
+                      ensure
+                        # Need to call stop before down because other the "run" containers aren't stopped
+                        Dev::Docker.new.stop_project_containers(project_name: Dev::Docker::Compose.config.project_name)
+                        Dev::Docker::Compose.new.down
+                        Dev::Docker.new.prune_project_volumes(project_name: Dev::Docker::Compose.config.project_name)
+                      end
+                    end
+                  end
                 end
               end
             end

data/lib/firespring_dev_commands/templates/docker/php/application.rb

@@ -151,7 +151,8 @@ module Dev
             php = @php
             exclude = @exclude
             test_isolation = @test_isolation
-            up_cmd = @start_container_dependencies_on_test ? :up_empty : :up_empty_no_deps
+            up_prefix = @test_isolation ? :up_empty : :up # NOTE: This should maybe be it's own variable at some point?
+            up_cmd = @start_container_dependencies_on_test ? :"#{up_prefix}" : :"#{up_prefix}_no_deps"
             test_artifacts = @test_artifacts
             return if exclude.include?(:test)
 
@@ -190,10 +191,28 @@ module Dev
                   ensure
                     # Clean up resources if we are on an isolated project name
                     if test_isolation
+                      # Need to call stop before down because other the "run" containers aren't stopped
+                      Dev::Docker.new.stop_project_containers(project_name: Dev::Docker::Compose.config.project_name)
                       Dev::Docker::Compose.new.down
                       Dev::Docker.new.prune_project_volumes(project_name: Dev::Docker::Compose.config.project_name)
                     end
                   end
+
+                  # If using test isolation then give users a way to 'sh' into the isolated container
+                  if test_isolation
+                    namespace :test do
+                      desc "Open a shell into a test #{application} container"
+                      task sh: %W(test_init_docker #{up_cmd} _pre_sh_hooks) do
+                        Dev::Docker::Compose.new(services: @default_service).sh
+                        Rake::Task[:_post_sh_hooks].execute
+                      ensure
+                        # Need to call stop before down because other the "run" containers aren't stopped
+                        Dev::Docker.new.stop_project_containers(project_name: Dev::Docker::Compose.config.project_name)
+                        Dev::Docker::Compose.new.down
+                        Dev::Docker.new.prune_project_volumes(project_name: Dev::Docker::Compose.config.project_name)
+                      end
+                    end
+                  end
                 end
               end
             end

data/lib/firespring_dev_commands/templates/docker/ruby/application.rb

@@ -107,7 +107,8 @@ module Dev
             ruby = @ruby
             exclude = @exclude
             test_isolation = @test_isolation
-            up_cmd = @start_container_dependencies_on_test ? :up_empty : :up_empty_no_deps
+            up_prefix = @test_isolation ? :up_empty : :up # NOTE: This should maybe be it's own variable at some point?
+            up_cmd = @start_container_dependencies_on_test ? :"#{up_prefix}" : :"#{up_prefix}_no_deps"
             test_artifacts = @test_artifacts
             return if exclude.include?(:test)
 
@@ -145,10 +146,28 @@ module Dev
                   ensure
                     # Clean up resources if we are on an isolated project name
                     if test_isolation
+                      # Need to call stop before down because other the "run" containers aren't stopped
+                      Dev::Docker.new.stop_project_containers(project_name: Dev::Docker::Compose.config.project_name)
                       Dev::Docker::Compose.new.down
                       Dev::Docker.new.prune_project_volumes(project_name: Dev::Docker::Compose.config.project_name)
                     end
                   end
+
+                  # If using test isolation then give users a way to 'sh' into the isolated container
+                  if test_isolation
+                    namespace :test do
+                      desc "Open a shell into a test #{application} container"
+                      task sh: %W(test_init_docker #{up_cmd} _pre_sh_hooks) do
+                        Dev::Docker::Compose.new(services: @default_service).sh
+                        Rake::Task[:_post_sh_hooks].execute
+                      ensure
+                        # Need to call stop before down because other the "run" containers aren't stopped
+                        Dev::Docker.new.stop_project_containers(project_name: Dev::Docker::Compose.config.project_name)
+                        Dev::Docker::Compose.new.down
+                        Dev::Docker.new.prune_project_volumes(project_name: Dev::Docker::Compose.config.project_name)
+                      end
+                    end
+                  end
                 end
               end
             end

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '3.1.6.pre.alpha.1'.freeze
+    VERSION = '3.1.6.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 3.1.6.pre.alpha.1
+  version: 3.1.6.pre.alpha.2
 platform: ruby
 authors:
 - Firespring