Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Dev: Updates to support binstubs getting generated.

  • Loading branch information...
commit 0a4c46cc9e933a1d200574085bc38a01b5e93bc2 1 parent 9fde587
@dchelimsky dchelimsky authored
Showing with 12 additions and 30 deletions.
  1. +0 −1  .gitignore
  2. +4 −4 .travis.yml
  3. +6 −25 Rakefile
  4. +2 −0  gemfiles/.bundle/config
View
1  .gitignore
@@ -2,7 +2,6 @@ tmp
doc
pkg
vendor
-.bundle
*.gem
Gemfile
Gemfile.lock
View
8 .travis.yml
@@ -1,11 +1,11 @@
-script: "rake ci --trace 2>&1"
+script: "rake --trace 2>&1"
rvm:
- 1.8.7
- 1.9.1
- 1.9.2
gemfile:
- - gemfiles/rails-3.0.6
- - gemfiles/rails-3-0-stable
- - gemfiles/rails-master
+ - $PWD/gemfiles/rails-3.0.7
+ - $PWD/gemfiles/rails-3-0-stable
+ - $PWD/gemfiles/rails-master
env:
- USE_GIT_REPOS=true
View
31 Rakefile
@@ -1,30 +1,9 @@
-unless File.exist?("./.gemfile")
- warn <<-MESSAGE
-=============================================================================
-You must set the version of rails you want to run against. The simplest way
-to accomplish this is to install thor (if you don't already have it) and run:
-
- thor rails:use 3.0.6
-
-You can use any of the following versions/branches:
-
- 3.0.0 .. 3.0.6
- master
- 3-0-stable
-
-See the README_DEV.md file for more information.
-=============================================================================
-
-MESSAGE
- exit 1
-end
-
require 'pathname'
ENV["BUNDLE_GEMFILE"] ||= begin
version = if File.exist?("./.gemfile")
File.read("./.gemfile").chomp
else
- "rails-3.0.6"
+ "rails-3.0.7"
end
File.expand_path("../gemfiles/#{version}", __FILE__)
end
@@ -83,10 +62,12 @@ namespace :generate do
desc "generate a fresh app with rspec installed"
task :app do |t|
unless File.directory?('./tmp/example_app')
- sh "bin/rails new ./tmp/example_app"
+ sh "rails new ./tmp/example_app"
bindir = File.expand_path("gemfiles/bin")
- Dir.chdir("./tmp/example_app") do
- sh "ln -s #{bindir}"
+ if test ?d, bindir
+ Dir.chdir("./tmp/example_app") do
+ sh "ln -s #{bindir}"
+ end
end
end
end
View
2  gemfiles/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin
Please sign in to comment.
Something went wrong with that request. Please try again.