Gemfile: simplify loading plugins' Gemfiles

Antonio Terceiro
1 parent 0ee3ff4d
Showing 1 changed file with 5 additions and 4 deletions Show diff stats
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
...	...	@@ -41,8 +41,9 @@ group :cucumber do
41	41	gem 'selenium-webdriver', '~> 2.39.0'
42	42	end
43	43
44		-# include plugin gemfiles
45		-Dir.glob(File.join('config', 'plugins', '*')).each do \|plugin\|
46		- plugin_gemfile = File.join(plugin, 'Gemfile')
47		- eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile)
	44	+# include gemfiles from enabled plugins
	45	+# plugins in baseplugins/ are not included on purpose. They should not have any
	46	+# dependencies.
	47	+Dir.glob('config/plugins/*/Gemfile').each do \|gemfile\|
	48	+ eval File.read(gemfile)
48	49	end
...	...