@@ -13,5 +13,5 @@ puts "Loading Application..." Merb::BootLoader.load_application # Load environment-specific configuration -environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment) +environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment + '.rb') require environment_config if File.exist?(environment_config) config/merb_init.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby APP_ROOT = File.join(File.dirname(__FILE__), '..') +# required to overcome a callback in rspec def at_exit end script/destroy @@ -1,6 +1,10 @@ #!/usr/bin/env ruby APP_ROOT = File.join(File.dirname(__FILE__), '..') +# required to overcome a callback in rspec +def at_exit +end + begin require 'rubigen' rescue LoadError script/generate 198d574c985e0f8f43e2e3d577376d1be22b67b7 Jeff Whitmire jeff@jwhitmire.com http://github.com/hornbeck/blerb/commit/0f375c032197dd8c284e8d037a05cfbf83019d6f 0f375c032197dd8c284e8d037a05cfbf83019d6f 2008-01-29T07:12:38-08:00 2008-01-29T07:12:38-08:00 small changes from switch to merb 0.5.3 3b617e6d945afd3179f6704c18f9f4373030e061 Jeff Whitmire jeff@jwhitmire.com