Remove the concept of standalone application as it is redundant

"standalone" application were supposed to be those apps that one wants
to run alongside others but they may not need to necessarely interact
with each other.

Ultimately I came to the conclusion that they were no different than a
normal "app" and was only making things more confused, therefore I
removed it.

Author: pmarino90

.formatter.exs

@@ -2,7 +2,6 @@
 
 locals_without_parens = [
   server: 1,
-  standalone: 1,
   app: 2,
   from_docker_image: 1,
   docker_registry: 1,

lib/makina/applications.ex

@@ -17,7 +17,7 @@ defmodule Makina.Applications do
   Connection is established before triggering applications deployment
   and disconnection happens when all applications have been deployed.
   """
-  def deploy_standalone_applications(servers, applications)
+  def deploy_applications(servers, applications)
       when is_list(servers) and is_list(applications) do
     for server <- servers do
       Servers.with_connection!(server, fn s ->
@@ -27,13 +27,13 @@ defmodule Makina.Applications do
   end
 
   @doc """
-  Stops all provided standalone applications in all servers
+  Stops all provided applications in all servers
 
   `servers` should be a list of servers to stop applications into.
 
   Servers and applications are processed sequentially.
   """
-  def stop_standalone_applications(servers, applications)
+  def stop_applications(servers, applications)
       when is_list(servers) and is_list(applications) do
     for server <- servers do
       Servers.with_connection!(server, fn s ->
@@ -43,13 +43,13 @@ defmodule Makina.Applications do
   end
 
   @doc """
-  Removes all provided standalone applications in all servers
+  Removes all provided applications in all servers
 
   `servers` should be a list of servers to stop applications into.
 
   Servers and applications are processed sequentially.
   """
-  def remove_standalone_applications(servers, applications)
+  def remove_applications(servers, applications)
       when is_list(servers) and is_list(applications) do
     for server <- servers do
       Servers.with_connection!(server, fn s ->

lib/makina/cli.ex

@@ -9,7 +9,7 @@ defmodule Makina.Cli do
       init: Commands.Init,
       server: Commands.Server,
       debug: Commands.Debug,
-      standalone: Commands.Standalone
+      app: Commands.App
     }
   end
 

lib/makina/cli/commands/standalone.ex lib/makina/cli/commands/app.exlib/makina/cli/commands/standalone.ex renamed to lib/makina/cli/commands/app.ex

@@ -1,4 +1,4 @@
-defmodule Makina.Cli.Commands.Standalone do
+defmodule Makina.Cli.Commands.App do
   @behaviour Makina.Cli.Command
 
   import Makina.Cli.Utils
@@ -8,26 +8,29 @@ defmodule Makina.Cli.Commands.Standalone do
 
   @sub_commands ~w[deploy stop remove]a
 
-  def name(), do: "standalone"
+  def name(), do: "app"
 
   def short_description(),
-    do: "Manage standalone applications defined in the Makinafile"
+    do: "Manage applications defined in the Makinafile"
 
   def help,
     do: """
     Makina
-    Standalone applications management command
+    Applications management command
 
-    Manages all standalone applications found in the current Makinafile.
+    Manages all applications found in the current Makinafile.
 
     Usage:
-    makina standalone <SUB COMMAND> [OPTIONS]
+    makina app <SUB COMMAND> [OPTIONS]
 
     Sub-commands:
-    deploy    Deploys all standalone applications defined in the Makinafile.
+    deploy    Deploys all applications defined in the Makinafile.
+    stop      Stops all applications.
+    remove    Removes containers of applications from servers.
 
     Options:
-    * --file - The path to a Makinafile, if not provided the command will look for it in the current folder.
+    * --app   Specifies which app to apply the command to.
+    * --file  The path to a Makinafile, if not provided the command will look for it in the current folder.
     """
 
   def exec(arguments, options) do
@@ -45,7 +48,7 @@ defmodule Makina.Cli.Commands.Standalone do
       |> fetch_context()
 
     servers = ctx.servers
-    apps = filter_apps_from_options(ctx.standalone_applications, options)
+    apps = filter_apps_from_options(ctx.applications, options)
     deployment_result = do_deploy(servers, apps)
 
     case deployment_errors?(deployment_result) do
@@ -67,7 +70,7 @@ defmodule Makina.Cli.Commands.Standalone do
       |> fetch_context()
 
     servers = ctx.servers
-    apps = filter_apps_from_options(ctx.standalone_applications, options)
+    apps = filter_apps_from_options(ctx.applications, options)
     deployment_result = do_stop(servers, apps)
 
     case deployment_errors?(deployment_result) do
@@ -89,7 +92,7 @@ defmodule Makina.Cli.Commands.Standalone do
       |> fetch_context()
 
     servers = ctx.servers
-    apps = filter_apps_from_options(ctx.standalone_applications, options)
+    apps = filter_apps_from_options(ctx.applications, options)
     deployment_result = do_remove(servers, apps)
 
     case deployment_errors?(deployment_result) do
@@ -118,7 +121,7 @@ defmodule Makina.Cli.Commands.Standalone do
   end
 
   defp do_deploy(servers, apps) do
-    Applications.deploy_standalone_applications(servers, apps)
+    Applications.deploy_applications(servers, apps)
   end
 
   defp do_stop(_servers, []) do
@@ -128,7 +131,7 @@ defmodule Makina.Cli.Commands.Standalone do
   end
 
   defp do_stop(servers, apps) when is_list(apps) do
-    Applications.stop_standalone_applications(servers, apps)
+    Applications.stop_applications(servers, apps)
   end
 
   defp do_remove(_servers, []) do
@@ -138,7 +141,7 @@ defmodule Makina.Cli.Commands.Standalone do
   end
 
   defp do_remove(servers, apps) when is_list(apps) do
-    Applications.remove_standalone_applications(servers, apps)
+    Applications.remove_applications(servers, apps)
   end
 
   defp filter_apps_from_options(apps, options) do

lib/makina/dsl.ex

@@ -60,28 +60,11 @@ defmodule Makina.DSL do
     end
   end
 
-  @doc """
-  Defines a block of applications that are standalone
-
-  Applications defined inside this block are deployed, or removed, in the remote server
-  independently from others, this means that dependencies cannot be defined between these.
-
-  Can be useful if you want to deploy a standalone application that doesn't have other moving pieces.
-
-  For cases where the application might require other services (for example a webapp + a database) then `stack` is the correct option.
-  """
-  defmacro standalone(do: block) do
-    quote do
-      unquote(set_scope(:standalone))
-      unquote(block)
-    end
-  end
-
   @app_opts [name: [type: :string, required: true]]
 
   @doc """
   Defines an application
-  Within this block you can configure the application that you want to deploy, can be used within a `standalone` block or `stack` block.
+  Within this block you can configure the application that you want to deploy.
 
   Depending on the context some configurations might not be available
   """
@@ -103,7 +86,7 @@ defmodule Makina.DSL do
 
           unquote(block)
 
-          @standalone_applications @current_application
+          @applications @current_application
           Module.delete_attribute(__MODULE__, :current_application)
 
           unquote(pop_scope(2))
@@ -181,7 +164,7 @@ defmodule Makina.DSL do
     quote do
       Module.register_attribute(__MODULE__, :scope, accumulate: true)
       Module.register_attribute(__MODULE__, :servers, accumulate: true)
-      Module.register_attribute(__MODULE__, :standalone_applications, accumulate: true)
+      Module.register_attribute(__MODULE__, :applications, accumulate: true)
       Module.register_attribute(__MODULE__, :proxy_config, accumulate: false)
     end
   end
@@ -193,7 +176,7 @@ defmodule Makina.DSL do
           id: @context_id,
           servers: @servers,
           proxy_config: @proxy_config,
-          standalone_applications: @standalone_applications
+          applications: @applications
         )
       end
     end

lib/makina/models/context.ex

@@ -7,12 +7,12 @@ defmodule Makina.Models.Context do
   alias Makina.Models.ProxyConfig
 
   @derive JSON.Encoder
-  defstruct id: nil, servers: [], standalone_applications: [], proxy_config: nil
+  defstruct id: nil, servers: [], applications: [], proxy_config: nil
 
   @type t() :: %Context{
           id: nonempty_binary(),
           servers: list(),
-          standalone_applications: list(),
+          applications: list(),
           proxy_config: ProxyConfig.t()
         }
 

lib/makina/server_initializer.ex

@@ -31,7 +31,7 @@ defmodule Makina.ServerInitializer do
       reverse_proxy(ctx.proxy_config)
     ]
 
-    Applications.deploy_standalone_applications([server], system_applications)
+    Applications.deploy_applications([server], system_applications)
 
     server
   end

mix.exs

@@ -4,7 +4,7 @@ defmodule Makina.MixProject do
   def project do
     [
       app: :makina,
-      version: "0.1.18",
+      version: "0.1.20",
       elixir: "~> 1.18",
       start_permanent: Mix.env() == :prod,
       deps: deps(),

test/makina/applications_test.exs

@@ -0,0 +1,38 @@
+# defmodule Makina.ApplicationsTest do
+#   use ExUnit.Case, async: true
+
+#   import Mox
+
+#   alias Makina.Applications
+#   alias Makina.Models.Server
+#   alias Makina.Models.Application
+
+#   describe "deploy_applications/2" do
+#     test "launces commands to deploy a list of applications on all servers" do
+#       expect(TestRemoteCommandExecutor, :execute, fn
+#         %{cmd: "docker run " <> rest} ->
+#           assert rest =~ "test_"
+
+#           dbg(rest)
+
+#           {:ok, %{}}
+#       end)
+
+#       servers = [
+#         Server.new(host: "example1.com", user: "foo"),
+#         Server.new(host: "example1.com", user: "foo")
+#       ]
+
+#       apps = [get_dummy_application(), get_dummy_application()]
+
+#       Applications.deploy_applications(servers, apps)
+
+#       verify!()
+#     end
+#   end
+
+#   defp get_dummy_application() do
+#     Application.new(name: "test_#{DateTime.utc_now()}")
+#     |> Application.set_docker_image(name: "foo")
+#   end
+# end