Permalink
Browse files

Detect missing dependencies and automatically run bundler

  • Loading branch information...
1 parent ef38e67 commit fff3f0ae0cec1061f8b3e5cb44e189e94a4ad44f @josh josh committed Sep 13, 2009
Showing with 32 additions and 13 deletions.
  1. +0 −1 activesupport/Gemfile
  2. +0 −10 activesupport/Rakefile
  3. +2 −2 activesupport/test/abstract_unit.rb
  4. +30 −0 activesupport/test/bundler_helper.rb
View
1 activesupport/Gemfile
@@ -13,7 +13,6 @@ gem 'i18n', '0.1.3', :vendored_at => vendor_dir.join('i18n-0.1.3')
only :test do
gem 'mocha', '>= 0.9.7'
- gem 'ruby-prof', '>= 0.6.1'
end
disable_rubygems
View
10 activesupport/Rakefile
@@ -28,16 +28,6 @@ task :isolated_test do
end or raise "Failures"
end
-task :bundle do
- puts "Checking if the bundled testing requirements are up to date..."
- result = system "gem bundle"
- unless result
- puts "The gem bundler is not installed. Installing."
- system "gem install bundler"
- system "gem bundle"
- end
-end
-
# Create compressed packages
dist_dirs = [ "lib", "test"]
View
4 activesupport/test/abstract_unit.rb
@@ -1,7 +1,7 @@
ORIG_ARGV = ARGV.dup
-bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
-require bundler if File.exist?("#{bundler}.rb")
+require 'bundler_helper'
+ensure_requirable %w( builder memcache tzinfo mocha )
require 'test/unit'
View
30 activesupport/test/bundler_helper.rb
@@ -0,0 +1,30 @@
+BUNDLER_ENV_FILE = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
+
+def load_bundled_gems
+ load_bundled_gems! if File.exist?("#{BUNDLER_ENV_FILE}.rb")
+end
+
+def load_bundled_gems!
+ puts "Checking if the bundled testing requirements are up to date..."
+
+ result = system "gem bundle"
+ unless result
+ puts "The gem bundler is not installed. Installing."
+ system "gem install bundler"
+ system "gem bundle"
+ end
+
+ require BUNDLER_ENV_FILE
+end
+
+def ensure_requirable(libs)
+ load_bundled_gems
+
+ begin
+ libs.each { |lib| require lib }
+ rescue LoadError => e
+ puts "Missing required libs to run test"
+ puts e.message
+ load_bundled_gems!
+ end
+end

0 comments on commit fff3f0a

Please sign in to comment.