Work on ActiveSupport 3.0 compatibility

drnic · Nov 6, 2010 · 70f836e · 70f836e
1 parent a845fa0
commit 70f836e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Rakefile b/Rakefile
@@ -12,7 +12,7 @@ Hoe.plugin :git
 Hoe.spec 'rubigen' do
   developer 'Dr Nic Williams', 'drnicwilliams@gmail.com'
   developer 'Jeremy Kemper', 'jeremy@bitsweat.net'
-  extra_deps << ['activesupport','~> 2.3.5']
+  extra_deps << ['activesupport','>= 2.3.5']
   extra_dev_deps << ['mocha','>= 0.9.8']
   extra_dev_deps << ['cucumber','>= 0.6.2']
   extra_dev_deps << ['shoulda','>= 2.10.3']

diff --git a/lib/rubigen.rb b/lib/rubigen.rb
@@ -1,13 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-begin
-  # if you are using rubygems, fix to 2.3.5
-  gem 'activesupport', '~> 2.3.5'
-rescue
-end
-
-require 'active_support' 
+require 'active_support/all' 
 
 module RubiGen
   VERSION = '1.5.5'

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,8 +1,7 @@
 require 'rubygems'
+require 'shoulda'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/rubigen'
 require 'rubigen/helpers/generator_test_helper'
 include RubiGen
-require "shoulda"
-require "shoulda/test_unit"
-require 'mocha'
+require 'mocha'