diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | activerecord/Gemfile | 10 | ||||
| -rw-r--r-- | activerecord/activerecord.gemspec | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 3 | ||||
| m--------- | arel | 6 |
5 files changed, 14 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 30755285a1..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "arel"] - path = arel - url = git://github.com/miloops/arel.git diff --git a/activerecord/Gemfile b/activerecord/Gemfile new file mode 100644 index 0000000000..9cf37b0af0 --- /dev/null +++ b/activerecord/Gemfile @@ -0,0 +1,10 @@ +Gem.sources.each { |uri| source uri } +sibling = "#{File.dirname(__FILE__)}/.." + +gem "activesupport", "3.0.pre", :vendored_at => "#{sibling}/activesupport" +gem "activemodel", "3.0.pre", :vendored_at => "#{sibling}/activemodel" +gem "arel", :git => "git://github.com/rails/arel.git", :branch => 'master' + +only :test do + gem "mocha" +end diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 7b6791adc8..bae027bd2a 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -9,6 +9,7 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', '= 3.0.pre') s.add_dependency('activemodel', '= 3.0.pre') + s.add_dependency('arel', '~> 0.1.0') s.require_path = 'lib' s.autorequire = 'active_record' diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index aa09c7061f..67591640da 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -1,6 +1,9 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') +bundler = "#{File.dirname(__FILE__)}/../../vendor/gems/environment" +require bundler if File.exist?("#{bundler}.rb") + require 'config' require 'rubygems' diff --git a/arel b/arel deleted file mode 160000 -Subproject 927d8b8cde930244a16215c57896c8e45f616d0 |