From 3d606e273d18edbf98e689de516e127c09e2b69c Mon Sep 17 00:00:00 2001
From: Hedgehog <hedgehogshiatus@gmail.com>
Date: Fri, 4 Nov 2011 12:36:10 +1100
Subject: [PATCH] Load config from .tmuxinator beneath current dir: closes GH
 issue #31

---
 Gemfile               | 2 +-
 Gemfile.lock          | 2 +-
 lib/tmuxinator/cli.rb | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4f773e5c..83a2a950 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 group :development do
   gem "rspec",   "~> 2.6.0"
-  gem "bundler", "~> 1.0.18"
+  gem "bundler", "~> 1.1.rc"
   gem "jeweler", "~> 1.6.4"
   gem "rcov",    "~> 0.9.10"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index eea008f5..a20cf064 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,7 +22,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.18)
+  bundler (~> 1.1.rc)
   jeweler (~> 1.6.4)
   rcov (~> 0.9.10)
   rspec (~> 2.6.0)
diff --git a/lib/tmuxinator/cli.rb b/lib/tmuxinator/cli.rb
index 52eef5c6..5df6cecc 100644
--- a/lib/tmuxinator/cli.rb
+++ b/lib/tmuxinator/cli.rb
@@ -157,7 +157,12 @@ def method_missing method, *args, &block
       def root_dir
         # create ~/.tmuxinator directory if it doesn't exist
         Dir.mkdir("#{ENV["HOME"]}/.tmuxinator/") unless File.directory?(File.expand_path("~/.tmuxinator"))
-        "#{ENV["HOME"]}/.tmuxinator/"
+        sub_dir = File.join(File.expand_path(Dir.pwd), '.tmuxinator/')
+        if File.directory?(sub_dir)
+          return sub_dir
+        else
+          return "#{ENV["HOME"]}/.tmuxinator/"
+        end
       end
 
       def sample_config