Permalink
Browse files

Use local.rack as override config instead of rack.local.

  • Loading branch information...
1 parent 01b377d commit e728e8e4e77c23e6b683796459bf749950f51791 @josevalim josevalim committed Mar 19, 2012
Showing with 10 additions and 10 deletions.
  1. +2 −2 lib/bundler/settings.rb
  2. +8 −8 spec/install/git_spec.rb
View
@@ -37,8 +37,8 @@ def all
def local_overrides
repos = {}
all.each do |k|
- if k =~ /\.local$/
- repos[$`] = self[k]
+ if k =~ /^local\./
+ repos[$'] = self[k]
end
end
repos
View
@@ -170,7 +170,7 @@
gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
G
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
bundle :install
out.should =~ /at #{lib_path('local-rack')}/
@@ -192,7 +192,7 @@
gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
G
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
run "require 'rack'"
out.should == "LOCAL"
end
@@ -214,7 +214,7 @@
s.add_dependency "nokogiri", "1.4.2"
end
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
run "require 'rack'"
lockfile1 = File.read(bundled_app("Gemfile.lock"))
@@ -234,7 +234,7 @@
FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
update_git "rack", "0.8", :path => lib_path('local-rack')
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
bundle :install
lockfile1 = File.read(bundled_app("Gemfile.lock"))
@@ -249,7 +249,7 @@
gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
G
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
bundle :install
out.should =~ /Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/
end
@@ -263,7 +263,7 @@
gem "rack", :git => "#{lib_path('rack-0.8')}"
G
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
bundle :install
out.should =~ /because :branch is not specified in Gemfile/
end
@@ -282,7 +282,7 @@
gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
G
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
bundle :install
out.should =~ /is using branch another but Gemfile specifies master/
end
@@ -299,7 +299,7 @@
gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
G
- bundle %|config rack.local #{lib_path('local-rack')}|
+ bundle %|config local.rack #{lib_path('local-rack')}|
bundle :install
out.should =~ /The Gemfile lock is pointing to revision \w+/
end

0 comments on commit e728e8e

Please sign in to comment.