Feature tests

config/config.exs

@@ -1,3 +1,3 @@
 # This file is responsible for configuring your application
-# and its dependencies with the aid of the Mix.Config module.
-use Mix.Config
+# and its dependencies with the aid of the Config module.
+import Config

lib/bootleg/config.ex

@@ -51,13 +51,19 @@ defmodule Bootleg.Config do
   """
   @spec load(binary | charlist) :: :ok | {:error, :enoent}
   def load(file) do
-    case File.regular?(file) do
+    extension = Path.extname(file)
+    case extension in [".swp", ".swo", ".swn"] do
       true ->
-        Code.eval_file(file)
-        :ok
-
-      false ->
         {:error, :enoent}
+      false ->
+        case File.regular?(file) do
+          true ->
+            Code.eval_file(file)
+            :ok
+
+          false ->
+            {:error, :enoent}
+        end
     end
   end
 

lib/bootleg/dsl.ex

@@ -132,8 +132,8 @@ defmodule Bootleg.DSL do
   end
 
   defp add_callback(task, position, caller, do: block) do
-    file = caller.file()
-    line = caller.line()
+    file = caller.file
+    line = caller.line
 
     quote do
       hook_number = Bootleg.Config.Agent.increment(:next_hook_number)
@@ -262,8 +262,8 @@ defmodule Bootleg.DSL do
   end
   """
   defmacro task(task, options \\ [], do: block) when is_atom(task) and is_list(options) do
-    file = __CALLER__.file()
-    line = __CALLER__.line()
+    file = __CALLER__.file
+    line = __CALLER__.line
     module_name = module_for_task(task)
 
     quote do
@@ -297,7 +297,7 @@ defmodule Bootleg.DSL do
 
   @doc false
   def warn_task_redefined({:module, _}, task, macro, override) do
-    {orig_file, orig_line} = macro.location
+    {orig_file, orig_line} = macro.location()
 
     unless override do
       UI.warn(

lib/bootleg/ssh.ex

@@ -101,7 +101,9 @@ defmodule Bootleg.SSH do
 
       conn
       |> SSHKitSSH.run(cmd, fun: &capture(&1, &2, host), acc: {:cont, {[], nil, %{}}})
-      |> Tuple.append(host)
+      |> Tuple.to_list
+      |> Enum.concat([host])
+      |> List.to_tuple()
     end
 
     Enum.map(context.hosts, run)

lib/bootleg/tasks/build/remote.exs

@@ -60,6 +60,7 @@ end
 task :remote_generate_release do
   mix_env = config({:mix_env, "prod"})
   source_path = config({:ex_path, ""})
+  app_name = Config.app()
 
   release_args =
     {:release_args, ["--quiet"]}
@@ -69,7 +70,17 @@ task :remote_generate_release do
   UI.info("Generating release...")
 
   remote :build, cd: source_path do
-    "MIX_ENV=#{mix_env} mix distillery.release #{release_args}"
+    "MIX_ENV=#{mix_env} mix release #{release_args}"
+  end
+
+  source_path =
+    Path.join([
+      config({:ex_path, ""}),
+      "/_build/#{mix_env}/rel/"
+    ])
+
+  remote :build, cd: source_path  do
+    "tar -czvf #{app_name}.tar.gz #{app_name}/"
   end
 end
 
@@ -120,7 +131,7 @@ task :download_release do
   remote_path =
     Path.join(
       source_path,
-      "_build/#{mix_env}/rel/#{app_name}/releases/#{app_version}/#{app_name}.tar.gz"
+      "_build/#{mix_env}/rel/#{app_name}.tar.gz"
     )
 
   local_archive_folder = "#{File.cwd!()}/releases"

lib/bootleg/tasks/deploy.exs

@@ -35,6 +35,14 @@ task :upload_release do
   upload(:app, local_path, remote_path)
 end
 
+#
+# TODO: Prepare for Rollback
+# * create releases/ directory
+# * fetch timestamp
+# * unpack into releases/[timestamp]
+# * create revisions.log file
+# * create shared/ directory
+#
 task :unpack_release do
   remote_path = "#{Config.app()}.tar.gz"
   UI.info("Unpacking release archive")

lib/ui.ex

@@ -122,9 +122,6 @@ defmodule Bootleg.UI do
     end)
   end
 
-  @doc """
-  Output a command destined for a single SSHKit host.
-  """
   def puts_send(%SSHKit.Host{} = host, command) do
     prefix = "[" <> String.pad_trailing(host.name, 10) <> "] "
 
@@ -140,28 +137,22 @@ defmodule Bootleg.UI do
     Enum.each(outputs, &puts_recv/1)
   end
 
-  @doc """
-  Individually handle output tuple.
-  """
+  # Individually handle output tuple.
   def puts_recv(output) when is_tuple(output) do
     case output do
       {:ok, [stdout: out], _status, host} -> split_received_lines(host, out)
       {:ok, [normal: out], _status, host} -> split_received_lines(host, out)
     end
   end
 
-  @doc """
-  Convenience function when wanting to output as if we'd received something
-  from a particular set of hosts, e.g. git+ssh output.
-  """
+  # Convenience function when wanting to output as if we'd received something
+  # from a particular set of hosts, e.g. git+ssh output.
   def puts_recv(%SSHKit.Context{} = context, output) when is_binary(output) do
     Enum.each(context.hosts, &puts_recv(&1, output))
   end
 
-  @doc """
-  Convenience function when wanting to output as if we'd received something
-  from a particular host, e.g. git+ssh output.
-  """
+  # Convenience function when wanting to output as if we'd received something
+  # from a particular host, e.g. git+ssh output.
   def puts_recv(%SSHKit.Host{} = host, output) when is_binary(output) do
     split_received_lines(host, output)
   end

mix.exs

@@ -41,15 +41,14 @@ defmodule Bootleg.Mixfile do
   defp deps do
     [
       {:sshkit, "0.3.0"},
-      {:ssh_client_key_api, "~> 0.2.1"},
-      {:credo, "~> 0.10", only: [:dev, :test]},
+      {:ssh_client_key_api, github: "spinlock99/ssh_client_key_api"},
+      {:credo, "~> 1.7", only: [:dev, :test], runtime: false},
       {:dialyxir, "~> 1.0.0-rc.6", only: [:dev], runtime: false},
       {:ex_doc, "~> 0.18", only: [:docs], runtime: false},
-      {:excoveralls, "~> 0.10", only: [:test]},
+      {:excoveralls, "~> 0.18", only: [:test]},
       {:mock, "~> 0.3.3", only: [:test]},
-      {:junit_formatter, "~> 2.0", only: [:test]},
-      {:temp, "~> 0.4.3", only: [:test]},
-      {:distillery, ">= 2.1.0", runtime: false}
+      {:junit_formatter, "~> 3.0", only: [:test]},
+      {:temp, "~> 0.4.3", only: [:test]}
     ]
   end
 

mix.lock

@@ -1,20 +1,21 @@
 %{
   "artificery": {:hex, :artificery, "0.4.2", "3ded6e29e13113af52811c72f414d1e88f711410cac1b619ab3a2666bbd7efd4", [:mix], [], "hexpm", "514586f4312ef3709a3ccbd8e55f69455add235c1729656687bb781d10d0afdb"},
-  "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
+  "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
   "certifi": {:hex, :certifi, "2.4.2", "75424ff0f3baaccfd34b1214184b6ef616d89e420b258bb0a5ea7d7bc628f7f0", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "01d479edba0569a7b7a2c8bf923feeb6dc6a358edc2965ef69aea9ba288bb243"},
-  "credo": {:hex, :credo, "0.10.2", "03ad3a1eff79a16664ed42fc2975b5e5d0ce243d69318060c626c34720a49512", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "539596b6774069260d5938aa73042a2f5157e1c0215aa35f5a53d83889546d14"},
+  "credo": {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"},
   "dialyxir": {:hex, :dialyxir, "1.0.0-rc.6", "78e97d9c0ff1b5521dd68041193891aebebce52fc3b93463c0a6806874557d7d", [:mix], [{:erlex, "~> 0.2.1", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "49496d63267bc1a4614ffd5f67c45d9fc3ea62701a6797975bc98bc156d2763f"},
   "distillery": {:hex, :distillery, "2.1.1", "f9332afc2eec8a1a2b86f22429e068ef35f84a93ea1718265e740d90dd367814", [:mix], [{:artificery, "~> 0.2", [hex: :artificery, repo: "hexpm", optional: false]}], "hexpm", "bbc7008b0161a6f130d8d903b5b3232351fccc9c31a991f8fcbf2a12ace22995"},
   "earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm", "b42a23e9bd92d65d16db2f75553982e58519054095356a418bb8320bbacb58b1"},
   "erlex": {:hex, :erlex, "0.2.3", "102b4f90156f59fd323be9864f7613b3f40e55d73a4cc69bcbd5cb259e0ec2bf", [:mix], [], "hexpm", "aa05904e17ebef33214d5233c3f86f1eeaac2c050116043a1fa4484d7efa51f3"},
   "ex_doc": {:hex, :ex_doc, "0.18.4", "4406b8891cecf1352f49975c6d554e62e4341ceb41b9338949077b0d4a97b949", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm", "9dbe1ce1d711dc5362e3b3280e92989ad61413ce423bc4e9f76d5fcc51ab8d6b"},
-  "excoveralls": {:hex, :excoveralls, "0.10.0", "a4508bdd408829f38e7b2519f234b7fd5c83846099cda348efcb5291b081200c", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "74d87b5642251722b94a5bcf493a409c01ebba8962ff79b47365172b11c0280d"},
+  "excoveralls": {:hex, :excoveralls, "0.18.5", "e229d0a65982613332ec30f07940038fe451a2e5b29bce2a5022165f0c9b157e", [:mix], [{:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "523fe8a15603f86d64852aab2abe8ddbd78e68579c8525ae765facc5eae01562"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm"},
+  "file_system": {:hex, :file_system, "1.1.1", "31864f4685b0148f25bd3fbef2b1228457c0c89024ad67f7a81a3ffbc0bbad3a", [:mix], [], "hexpm", "7a15ff97dfe526aeefb090a7a9d3d03aa907e100e262a0f8f7746b78f8f87a5d"},
   "hackney": {:hex, :hackney, "1.14.0", "66e29e78feba52176c3a4213d42b29bdc4baff93a18cfe480f73b04677139dee", [:rebar3], [{:certifi, "2.4.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "ac2d3e5e8c93778e3b6a7ea3bd5859bfc7d7e80051fcdc1a2d99a5b561d4fd8a"},
   "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"},
-  "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fdf843bca858203ae1de16da2ee206f53416bbda5dc8c9e78f43243de4bc3afe"},
+  "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm"},
-  "junit_formatter": {:hex, :junit_formatter, "2.2.0", "da6093f0740c58a824f9585ebb7cb1b960efaecf48d1fa969e95d9c47c6b19dd", [:mix], [], "hexpm", "ea23078f6bfc36acd4cefbf01cae6680b2a65919d10647403da04a13c9929f01"},
+  "junit_formatter": {:hex, :junit_formatter, "3.4.0", "d0e8db6c34dab6d3c4154c3b46b21540db1109ae709d6cf99ba7e7a2ce4b1ac2", [:mix], [], "hexpm", "bb36e2ae83f1ced6ab931c4ce51dd3dbef1ef61bb4932412e173b0cfa259dacd"},
   "makeup": {:hex, :makeup, "0.5.5", "9e08dfc45280c5684d771ad58159f718a7b5788596099bdfb0284597d368a882", [:mix], [{:nimble_parsec, "~> 0.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.10.0", "0f09c2ddf352887a956d84f8f7e702111122ca32fbbc84c2f0569b8b65cbf7fa", [:mix], [{:makeup, "~> 0.5.5", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
   "meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm", "d34f013c156db51ad57cc556891b9720e6a1c1df5fe2e15af999c84d6cebeb1a"},
@@ -24,7 +25,7 @@
   "nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"},
   "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm"},
-  "ssh_client_key_api": {:hex, :ssh_client_key_api, "0.2.1", "335427ffda26fe5c3f1ed1011e601aba03ca2cd30623e94c6a089a068c575258", [:mix], [], "hexpm", "fe09f55a69b977816beb7a588e3eec795bb790ea6ac254f872ee9e11b5a48be6"},
+  "ssh_client_key_api": {:git, "https://github.com/spinlock99/ssh_client_key_api.git", "ca3e69c01650b94cdb8f664907e896bf97d145dd", []},
   "sshkit": {:hex, :sshkit, "0.3.0", "4c100e3c3ebd261b6b7de811ade713f425fb06eb730a96d583da18d29a6fca26", [:mix], [], "hexpm", "f5dba2ee21e2ddc7c1432e3329ecf7316a1032e9ce911597e1e56823ee10285c"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm", "603561dc0fd62f4f2ea9b890f4e20e1a0d388746d6e20557cafb1b16950de88c"},
   "temp": {:hex, :temp, "0.4.5", "c62ee92c778ddebb2738212fecea372f1a9beba10bacbd7e54e7efe29357a82e", [:mix], [], "hexpm", "850bc152a934c6b4eb47730bf3aaae7e7bc98bd0820073b9540e3e4c8c6fab86"},

test/bootleg/config_test.exs

@@ -46,8 +46,8 @@ defmodule Bootleg.ConfigTest do
   test "use Bootleg.Config warns about deprecation" do
     assert capture_io(:stderr, fn ->
              use Bootleg.Config
-           end) ==
-             "\e[33mwarning: \e[0m`use Bootleg.Config` is deprecated; call `use Bootleg.DSL` instead.\n  test/bootleg/config_test.exs:48: Bootleg.ConfigTest.\"test use Bootleg.Config warns about deprecation\"/1\n\n"
+           end) =~
+             "`use Bootleg.Config` is deprecated; call `use Bootleg.DSL` instead."
   end
 
   test "get_role/1", %{local_user: local_user} do

test/bootleg/dsl_test.exs

@@ -230,7 +230,7 @@ defmodule Bootleg.DSLTest do
     before_task(:before_task_test, :some_other_task)
     hooks = Config.Agent.get(:before_hooks)
     assert [[module, :execute]] = hooks[:before_task_test]
-    assert {file, line} = module.location
+    assert {file, line} = module.location()
     assert file == __ENV__.file
     assert line
   end
@@ -241,7 +241,7 @@ defmodule Bootleg.DSLTest do
     after_task(:after_task_test, :some_other_task)
     hooks = Config.Agent.get(:after_hooks)
     assert [[module, :execute]] = hooks[:after_task_test]
-    assert {file, line} = module.location
+    assert {file, line} = module.location()
     assert file == __ENV__.file
     assert line
   end
@@ -253,7 +253,7 @@ defmodule Bootleg.DSLTest do
 
     module = Bootleg.DynamicTasks.TaskTest
     assert apply(module, :execute, [])
-    assert {file, line} = module.location
+    assert {file, line} = apply(module, :location, [])
     assert file == __ENV__.file
     assert line
     refute called(UI.warn(:_))

test/bootleg/tasks/manage_tasks_test.exs

@@ -42,6 +42,7 @@ defmodule Bootleg.Tasks.ManageTasksTest do
     end)
   end
 
+  @tag skip: "the build_me archive needs to be updated at fixtures/build.tar.gz"
   test "invoke stop", %{conn: conn} do
     capture_io(fn ->
       SSH.run!(conn, "launch-app build_me")
@@ -55,6 +56,7 @@ defmodule Bootleg.Tasks.ManageTasksTest do
     end)
   end
 
+  @tag skip: "the build_me archive needs to be updated at fixtures/build.tar.gz"
   test "invoke restart", %{conn: conn} do
     capture_io(fn ->
       SSH.run!(conn, "launch-app build_me")
@@ -68,6 +70,7 @@ defmodule Bootleg.Tasks.ManageTasksTest do
     end)
   end
 
+  @tag skip: "the build_me archive needs to be updated at fixtures/build.tar.gz"
   test "invoke ping", %{conn: conn} do
     capture_io(fn ->
       SSH.run!(conn, "launch-app build_me")

test/fixtures/build_me/config/config.exs

@@ -1,6 +1,6 @@
 # This file is responsible for configuring your application
 # and its dependencies with the aid of the Mix.Config module.
-use Mix.Config
+import Config
 
 # This configuration is loaded before any dependency and is restricted
 # to this project. If another project depends on this project, this

test/support/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM bitwalker/alpine-elixir:1.7.3
+FROM bitwalker/alpine-elixir:latest
 
 # Set up an Alpine Linux machine running an SSH server.
 # Autogenerate missing host keys.