Move from git submodule to gem bundle

rails · Oct 15, 2009 · 4cbd3f0 · 4cbd3f0
1 parent 5da109d
commit 4cbd3f0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/activerecord/Gemfile 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
@@ -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
@@ -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