0
@@ -9,55 +9,21 @@ require 'spec/rake/spectask'
0
 require 'fileutils'
0
 require 'merb-core'
0
 require 'rubigen'
0
-
0
-$RAKE_ENV = true
0
-
0
-init_file = File.join(File.dirname(__FILE__) / "config" / "init")
0
-
0
-Merb.load_dependencies(init_file)
0
-           
0
 include FileUtils
0
-# # # Get Merb plugins and dependencies
0
-Merb::Plugins.rakefiles.each {|r| require r } 
0
 
0
-# 
0
-#desc "Packages up Merb."
0
-#task :default => [:package]
0
-
0
-desc "load merb_init.rb"
0
-task :merb_init do
0
-  require 'merb-core'
0
-  require File.dirname(__FILE__)+'/config/init.rb'
0
-end  
0
-
0
-task :uninstall => [:clean] do
0
-  sh %{sudo gem uninstall #{NAME}}
0
-end
0
-
0
-desc 'Run all tests, specs and finish with rcov'
0
-task :aok do
0
-  sh %{rake rcov}
0
-  sh %{rake specs}
0
-end
0
-
0
-unless Gem.cache.search("haml").empty?
0
-  namespace :haml do
0
-    desc "Compiles all sass files into CSS"
0
-    task :compile_sass do
0
-      gem 'haml'
0
-      require 'sass'
0
-      puts "*** Updating stylesheets"
0
-      Sass::Plugin.update_stylesheets
0
-      puts "*** Done"      
0
-    end
0
-  end
0
+# Load the basic runtime dependencies; this will include 
0
+# any plugins and therefore plugin rake tasks.
0
+init_env = ENV['MERB_ENV'] || 'rake'
0
+Merb.load_dependencies(:environment => init_env)
0
+     
0
+# Get Merb plugins and dependencies
0
+Merb::Plugins.rakefiles.each { |r| require r } 
0
+
0
+desc "start runner environment"
0
+task :merb_env do
0
+  Merb.start_environment(:environment => init_env, :adapter => 'runner')
0
 end
0
 
0
 ##############################################################################
0
-# SVN
0
+# ADD YOUR CUSTOM TASKS BELOW
0
 ##############################################################################
0
-
0
-desc "Add new files to subversion"
0
-task :svn_add do
0
-   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
0
-end

0
@@ -1,6 +1,6 @@
0
 Merb.logger.info("Loaded TEST Environment...")
0
 Merb::Config.use { |c|
0
+  c[:testing] = true
0
   c[:exception_details] = true
0
-  c[:reload_classes] = true
0
-  c[:reload_time] = 0.5
0
+  c[:reload_classes] = false
0
 }

0
@@ -1,12 +1,7 @@
0
-$TESTING=true
0
 require 'rubygems'
0
 require 'merb-core'
0
 
0
-
0
-# TODO: Boot Merb, via the Test Rack adapter
0
-Merb.start :environment => (ENV['MERB_ENV'] || 'test'),
0
-           :merb_root  => File.join(File.dirname(__FILE__), ".." )
0
-
0
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
0
 
0
 Spec::Runner.configure do |config|
0
   config.include(Merb::Test::ViewHelper)