Extract executions into separate concern

lib/mrsk/commands/concerns/executions.rb

@@ -0,0 +1,27 @@
+module Mrsk::Commands::Concerns::Executions
+  def execute_in_existing_container(*command, interactive: false)
+    docker :exec,
+      ("-it" if interactive),
+      config.service_with_version,
+      *command
+  end
+
+  def execute_in_new_container(*command, interactive: false)
+    docker :run,
+      ("-it" if interactive),
+      "--rm",
+      *rails_master_key_arg,
+      *config.env_args,
+      *config.volume_args,
+      config.absolute_image,
+      *command
+  end
+
+  def execute_in_existing_container_over_ssh(*command, host:)
+    run_over_ssh execute_in_existing_container(*command, interactive: true).join(" "), host: host
+  end
+
+  def execute_in_new_container_over_ssh(*command, host:)
+    run_over_ssh execute_in_new_container(*command, interactive: true).join(" "), host: host
+  end
+end

lib/mrsk/commands/concerns/repository.rb

@@ -1,21 +1,19 @@
-module Mrsk::Commands::Concerns
-  module Repository
-    def container_id_for(container_name:)
-      docker :container, :ls, "-a", "-f", "name=#{container_name}", "-q"
-    end
+module Mrsk::Commands::Concerns::Repository
+  def container_id_for(container_name:)
+    docker :container, :ls, "-a", "-f", "name=#{container_name}", "-q"
+  end
 
-    def current_running_version
-      # FIXME: Find more graceful way to extract the version from "app-version" than using sed and tail!
-      pipe \
-        docker(:ps, "--filter", "label=service=#{config.service}", "--format", '"{{.Names}}"'),
-        %(sed 's/-/\\n/g'),
-        "tail -n 1"
-    end
+  def current_running_version
+    # FIXME: Find more graceful way to extract the version from "app-version" than using sed and tail!
+    pipe \
+      docker(:ps, "--filter", "label=service=#{service_name}", "--format", '"{{.Names}}"'),
+      %(sed 's/-/\\n/g'),
+      "tail -n 1"
+  end
 
-    def most_recent_version_from_available_images
-      pipe \
-        docker(:image, :ls, "--format", '"{{.Tag}}"', config.repository),
-        "head -n 1"
-    end
+  def most_recent_version_from_available_images
+    pipe \
+      docker(:image, :ls, "--format", '"{{.Tag}}"', config.repository),
+      "head -n 1"
   end
 end