Merge 9aecbb8 into f83ccd8

lib/xgit/repository/on_disk.ex

@@ -33,11 +33,20 @@ defmodule Xgit.Repository.OnDisk do
 
   @impl true
   def init(opts) when is_list(opts) do
-    work_dir = Keyword.get(opts, :work_dir)
-
-    if is_binary(work_dir),
-      do: {:ok, %{work_dir: work_dir}},
-      else: {:stop, :missing_arguments}
+    # TO DO: Be smarter about bare repos and non-standard git_dir locations.
+    # https://github.com/elixir-git/xgit/issues/44
+
+    with {:work_dir_arg, work_dir} when is_binary(work_dir) <-
+           {:work_dir_arg, Keyword.get(opts, :work_dir)},
+         {:work_dir, true} <- {:work_dir, File.dir?(work_dir)},
+         git_dir <- Path.join(work_dir, ".git"),
+         {:git_dir, true} <- {:git_dir, File.dir?(git_dir)} do
+      {:ok, %{work_dir: work_dir, git_dir: git_dir}}
+    else
+      {:work_dir_arg, _} -> {:stop, :missing_arguments}
+      {:work_dir, _} -> {:stop, :work_dir_doesnt_exist}
+      {:git_dir, _} -> {:stop, :git_dir_doesnt_exist}
+    end
   end
 
   @doc ~S"""

test/xgit/repository/on_disk_test.exs

@@ -29,5 +29,21 @@ defmodule Xgit.Repository.OnDiskTest do
       Process.flag(:trap_exit, true)
       assert {:error, :missing_arguments} = OnDisk.start_link([])
     end
+
+    test "error: work_dir doesn't exist", %{xgit: xgit} do
+      Process.flag(:trap_exit, true)
+
+      assert {:error, :work_dir_doesnt_exist} =
+               OnDisk.start_link(work_dir: Path.join(xgit, "random"))
+    end
+
+    test "error: git_dir doesn't exist", %{xgit: xgit} do
+      Process.flag(:trap_exit, true)
+
+      temp_dir = Path.join(xgit, "blah")
+      File.mkdir_p!(temp_dir)
+
+      assert {:error, :git_dir_doesnt_exist} = OnDisk.start_link(work_dir: temp_dir)
+    end
   end
 end