Permalink
Browse files

slightly revert 5426bfd

jruby embedded vm bundler 1.0 compatibility
  • Loading branch information...
1 parent 9e31637 commit c8007a0f112e357e9df87d6e92e391f1641c6480 @kares committed Mar 13, 2012
Showing with 4 additions and 10 deletions.
  1. +2 −6 test/integration/app.rb
  2. +2 −4 test/integration_helper.rb
View
@@ -1,6 +1,4 @@
-logger = File.new('log/app.log', "w")
-logger.sync = true
-logger.puts "loading"
+$stderr.puts "loading"
require 'sinatra'
@@ -62,6 +60,4 @@ class Subclass < Sinatra::Base
use Subclass
-use Rack::CommonLogger, logger # to set a custom logger
-
-logger.puts "starting"
+$stderr.puts "starting"
@@ -82,9 +82,7 @@ def get(url)
open("http://127.0.0.1:#{port}#{url}").read
end
- def log
- File.read('log/app.log') rescue ""
- end
+ def log; err; end
def err
@err ||= ""
@@ -178,7 +176,7 @@ def start_vm
# This ensures processing of RUBYOPT which activates Bundler
vm.provider.ruby_instance_config.process_arguments []
vm.run_scriptlet "require 'rubygems'; require 'bundler'"
- vm.run_scriptlet "Bundler.load.setup_environment" # bundle exec
+ vm.run_scriptlet "Bundler.setup" # bundle exec
vm.argv = command_args # TODO does not set ARGV ?!
vm.run_scriptlet "ARGV.replace #{command_args.inspect}"

0 comments on commit c8007a0

Please sign in to comment.