Permalink
Browse files

Move from git submodule to gem bundle

  • Loading branch information...
jeremy committed Oct 14, 2009
1 parent 5da109d commit 4cbd3f050b5db2a1164b1071753d72bea7234ff0
Showing with 14 additions and 4 deletions.
  1. +0 −3 .gitmodules
  2. +10 −0 activerecord/Gemfile
  3. +1 −0 activerecord/activerecord.gemspec
  4. +3 −0 activerecord/test/cases/helper.rb
  5. +0 −1 arel
View
@@ -1,3 +0,0 @@
-[submodule "arel"]
- path = arel
- url = git://github.com/miloops/arel.git
View
@@ -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
@@ -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'
@@ -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'
1 arel
Submodule arel deleted from 927d8b

0 comments on commit 4cbd3f0

Please sign in to comment.