Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Get enough old merb out of the way to run

  • Loading branch information...
commit b8fd4d335a40a319b1eefef1d31641c6b89503ca 1 parent 2dda56f
@shayarnett authored
Showing with 8 additions and 9 deletions.
  1. +6 −7 Rakefile
  2. +2 −2 config/init.rb
View
13 Rakefile
@@ -1,14 +1,13 @@
require 'rubygems'
-Gem.clear_paths
-Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
+# Gem.clear_paths
+# Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'spec/rake/spectask'
+# require 'rake/rdoctask'
+# require 'rake/testtask'
require 'fileutils'
require 'merb-core'
-require 'rubigen'
+# require 'rubigen'
include FileUtils
begin
@@ -24,7 +23,7 @@ init_env = ENV['MERB_ENV'] || 'rake'
Merb.load_dependencies(:environment => init_env)
# Get Merb plugins and dependencies
-Merb::Plugins.rakefiles.each { |r| require r }
+Merb::Plugins.rakefiles.each { |r| next if r.match(/test/); require r }
desc "start runner environment"
task :merb_env do
View
4 config/init.rb
@@ -33,8 +33,8 @@
# Remember that bundling of dependencies as gems with your application
# makes it independent of the environment it runs in and is a very
# good, encouraged practice to follow.
-Gem.clear_paths
-Gem.path.unshift(Merb.root / "gems")
+# Gem.clear_paths
+# Gem.path.unshift(Merb.root / "gems")
# If you want modules and classes from libraries organized like
# merbapp/lib/magicwand/lib/magicwand.rb to autoload,
Please sign in to comment.
Something went wrong with that request. Please try again.