Permalink
Browse files

start rails server in a new bundler context

  • Loading branch information...
1 parent ff40d9d commit 804e20a29ecba9b227e83b98573b2c4fdbb68929 @rubys committed Oct 22, 2011
Showing with 7 additions and 9 deletions.
  1. +1 −0 Manifest
  2. +0 −6 Rakefile
  3. +4 −1 lib/gorp/rails.rb
  4. +2 −2 lib/version.rb
View
@@ -1,6 +1,7 @@
Manifest
README
Rakefile
+gorp.gemspec
lib/gorp.rb
lib/gorp/commands.rb
lib/gorp/edit.rb
View
@@ -21,15 +21,9 @@ Echoe.new('gorp', Gorp::VERSION::STRING) do |p|
p.dependencies = %w(
builder
bundler
- erubis
i18n
rack
- rack-mount
- rack-test
rake
- thor
- sqlite3-ruby
- tzinfo
)
# Does not include mail -- as it depends on active_support
# test-unit -- incompatible with i18n one hash required (testrunner.rb:116)
View
@@ -251,7 +251,10 @@ def restart_server
end
end
else
- #
+ # start a new bundler context
+ ENV.keys.dup.each { |key| ENV.delete key if key =~ /^BUNDLE_/ }
+ ENV.delete('RUBYOPT')
+
# For unknown reason, when run as CGI, the below produces:
# undefined method `chomp' for nil:NilClass (NoMethodError)
# from rails/actionpack/lib/action_dispatch/middleware/static.rb:13
View
@@ -1,8 +1,8 @@
module Gorp
module VERSION #:nodoc:
MAJOR = 0
- MINOR = 26
- TINY = 1
+ MINOR = 28
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
end

0 comments on commit 804e20a

Please sign in to comment.