From 919c72eed8c9958301900172996ac4b6fc8876cd Mon Sep 17 00:00:00 2001
From: Juan Ibiapina <juanibiapina@gmail.com>
Date: Tue, 24 Jun 2014 19:24:15 -0300
Subject: [PATCH] Reorganize directories.

modules path became cellar. It will be used for modules and to have only
one path with linked binaries.
---
 .gitignore                   | 2 +-
 {modules => cellar}/.gitkeep | 0
 cellar/bin/.gitkeep          | 0
 cellar/modules/.gitkeep      | 0
 libexec/basher-install       | 2 +-
 runtime/require.bash         | 2 +-
 tests/basher-install.bats    | 2 +-
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename {modules => cellar}/.gitkeep (100%)
 create mode 100644 cellar/bin/.gitkeep
 create mode 100644 cellar/modules/.gitkeep

diff --git a/.gitignore b/.gitignore
index 52146d6..d11b97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-modules/
+cellar/
diff --git a/modules/.gitkeep b/cellar/.gitkeep
similarity index 100%
rename from modules/.gitkeep
rename to cellar/.gitkeep
diff --git a/cellar/bin/.gitkeep b/cellar/bin/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/cellar/modules/.gitkeep b/cellar/modules/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/libexec/basher-install b/libexec/basher-install
index b73eaed..a1d6b28 100755
--- a/libexec/basher-install
+++ b/libexec/basher-install
@@ -15,4 +15,4 @@ if [ -z "$module" ]; then
   exit 1
 fi
 
-git clone "git://github.com/$username/$module.git" "$BASHER_ROOT/modules/$module"
+git clone "git://github.com/$username/$module.git" "$BASHER_ROOT/cellar/modules/$module"
diff --git a/runtime/require.bash b/runtime/require.bash
index 0412d0a..8ee1e87 100644
--- a/runtime/require.bash
+++ b/runtime/require.bash
@@ -2,5 +2,5 @@
 
 require() {
   local module_name="$1"
-  source "$BASHER_ROOT/modules/$module_name/lib/$module_name.bash"
+  source "$BASHER_ROOT/cellar/modules/$module_name/lib/$module_name.bash"
 }
diff --git a/tests/basher-install.bats b/tests/basher-install.bats
index e598050..aa9e18c 100644
--- a/tests/basher-install.bats
+++ b/tests/basher-install.bats
@@ -19,5 +19,5 @@ load test_helper
 
   run basher-install username module
   assert_success
-  assert_line "git clone git://github.com/username/module.git $BASHER_ROOT/modules/module"
+  assert_line "git clone git://github.com/username/module.git $BASHER_ROOT/cellar/modules/module"
 }