@@ -31,7 +31,7 @@ require 'builder' require 'builder/xmlmarkup' require 'fileutils' require 'uri' -require 'activesupport' +#require 'activesupport' # Yikes require 'config' @@ -42,7 +42,7 @@ require 'state' include GetText Ramaze::Global.public_root = File.join File.dirname(__FILE__), 'public' -Ramaze::Global.template_root = File.join File.dirname(__FILE__), 'views' +Ramaze::Global.view_root = File.join File.dirname(__FILE__), 'views' ### Helper Classes lib/controllers.rb @@ -192,7 +192,7 @@ class Yikes < Logger::Application Thread.new do # The :force is there because otherwise, Ramaze cleverly decides that if # we're in a spec file, we shouldn't actually start the web server - Ramaze.start :adaptor => :webrick, :port => port, :force => true + Ramaze.start :port => port, :force => true end @@port = port end lib/main.rb @@ -6,6 +6,9 @@ require 'lib/controllers' require 'stringio' require 'net/http' +# NOTE: Uncomment this to make Ramaze noisy +Ramaze::Log.loggers = [] + def hook_stdio(in_str = "") # Hook stdio for the call in_p, out_p, err_p = [$stdin, $stdout, $stderr] spec/main_spec.rb 2bff6c035d3a4b98e2caef2da5a7278d6bd0606a Paul Betts paul@paulbetts.org http://github.com/xpaulbettsx/yikes/commit/6eee4d6b2cd83930db2ac1df6df43cf63d6bc333 6eee4d6b2cd83930db2ac1df6df43cf63d6bc333 2008-07-08T07:45:16-07:00 2008-07-08T07:45:16-07:00 Fixes to run on latest version of Ramaze, ActiveSupport is borked for no reason 9b560d953c329db188d1b0e97c0ace7770b146cb Paul Betts paul@paulbetts.org