From 7992de9d64c7d3c3c6aa8631caaa4dcbbb6826ed Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Fri, 7 Nov 2014 17:54:45 -0200
Subject: [PATCH] Gemfile: simplify loading plugins' Gemfiles

---
 Gemfile |  9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index c4f79a8..59e60b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,8 +41,9 @@ group :cucumber do
   gem 'selenium-webdriver',     '~> 2.39.0'
 end
 
-# include plugin gemfiles
-Dir.glob(File.join('config', 'plugins', '*')).each do |plugin|
-  plugin_gemfile = File.join(plugin, 'Gemfile')
-  eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
+# include gemfiles from enabled plugins
+# plugins in baseplugins/ are not included on purpose. They should not have any
+# dependencies.
+Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
+  eval File.read(gemfile)
 end
--
libgit2 0.21.2