Skip to content

Commit 0a4c46c

Browse files
committed
Dev: Updates to support binstubs getting generated.
1 parent 9fde587 commit 0a4c46c

File tree

4 files changed

+12
-30
lines changed

4 files changed

+12
-30
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ tmp
22
doc
33
pkg
44
vendor
5-
.bundle
65
*.gem
76
Gemfile
87
Gemfile.lock

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
script: "rake ci --trace 2>&1"
1+
script: "rake --trace 2>&1"
22
rvm:
33
- 1.8.7
44
- 1.9.1
55
- 1.9.2
66
gemfile:
7-
- gemfiles/rails-3.0.6
8-
- gemfiles/rails-3-0-stable
9-
- gemfiles/rails-master
7+
- $PWD/gemfiles/rails-3.0.7
8+
- $PWD/gemfiles/rails-3-0-stable
9+
- $PWD/gemfiles/rails-master
1010
env:
1111
- USE_GIT_REPOS=true

Rakefile

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,9 @@
1-
unless File.exist?("./.gemfile")
2-
warn <<-MESSAGE
3-
=============================================================================
4-
You must set the version of rails you want to run against. The simplest way
5-
to accomplish this is to install thor (if you don't already have it) and run:
6-
7-
thor rails:use 3.0.6
8-
9-
You can use any of the following versions/branches:
10-
11-
3.0.0 .. 3.0.6
12-
master
13-
3-0-stable
14-
15-
See the README_DEV.md file for more information.
16-
=============================================================================
17-
18-
MESSAGE
19-
exit 1
20-
end
21-
221
require 'pathname'
232
ENV["BUNDLE_GEMFILE"] ||= begin
243
version = if File.exist?("./.gemfile")
254
File.read("./.gemfile").chomp
265
else
27-
"rails-3.0.6"
6+
"rails-3.0.7"
287
end
298
File.expand_path("../gemfiles/#{version}", __FILE__)
309
end
@@ -83,10 +62,12 @@ namespace :generate do
8362
desc "generate a fresh app with rspec installed"
8463
task :app do |t|
8564
unless File.directory?('./tmp/example_app')
86-
sh "bin/rails new ./tmp/example_app"
65+
sh "rails new ./tmp/example_app"
8766
bindir = File.expand_path("gemfiles/bin")
88-
Dir.chdir("./tmp/example_app") do
89-
sh "ln -s #{bindir}"
67+
if test ?d, bindir
68+
Dir.chdir("./tmp/example_app") do
69+
sh "ln -s #{bindir}"
70+
end
9071
end
9172
end
9273
end

gemfiles/.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_BIN: bin

0 commit comments

Comments
 (0)