Merge pull request tmuxinator#34 from hedgehog/3d606e273d18edbf98e689…

…de516e127c09e2b69c Load config from .tmuxinator beneath current dir: closes GH issue tmuxinator#31
rtyler · Nov 7, 2011 · 53c4fe2 · 53c4fe2
2 parents d65d29f + 3d606e2
commit 53c4fe2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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