From 64a617d5a263078ec597fc2e7c7534af39ad7b02 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 9 Jun 2010 10:53:17 -0300 Subject: [PATCH] Making `rake gems:install` actually work --- config/environment.rb | 2 +- config/environments/cucumber.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/environment.rb b/config/environment.rb index 001ee2f..8c8f61e 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -56,7 +56,7 @@ Rails::Initializer.run do |config| # config.active_record.observers = :cacher, :garbage_collector # don't load the sweepers while loading the database - unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load' + unless $PROGRAM_NAME =~ /rake$/ && (ARGV.first == 'db:schema:load' || ARGV.first == 'gems:install') config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper, :category_sweeper end # Make Active Record use UTC-base instead of local time diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb index 53ad859..cc00783 100644 --- a/config/environments/cucumber.rb +++ b/config/environments/cucumber.rb @@ -19,8 +19,8 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'cucumber', :lib => false, :version => '>=0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) -config.gem 'webrat', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) +config.gem 'cucumber', :lib => false, :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) +config.gem 'webrat', :lib => false, :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) config.gem 'rspec', :lib => 'spec', :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) config.gem 'rspec-rails', :lib => 'spec/rails', :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium')) -- libgit2 0.21.2