0
@@ -19,17 +19,13 @@ NAME = "merb-core"
0
 
0
 require "lib/merb-core/version"
0
 require "lib/merb-core/test/run_specs"
0
+require 'lib/merb-core/tasks/merb_rake_helper'
0
 
0
 ##############################################################################
0
 # Packaging & Installation
0
 ##############################################################################
0
 CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache"]
0
 
0
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
-SUDO = windows ? "" : "sudo"
0
-
0
 desc "Packages up Merb."
0
 task :default => :package
0
 
0
@@ -72,17 +68,17 @@ end
0
 
0
 desc "Run :package and install the resulting .gem"
0
 task :install => :package do
0
-  sh %{#{SUDO} gem install #{install_home} --local pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
+  sh %{#{sudo} gem install #{install_home} --local pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
 end
0
 
0
 desc "Run :package and install the resulting .gem with jruby"
0
 task :jinstall => :package do
0
-  sh %{#{SUDO} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
+  sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
 end
0
 
0
 desc "Run :clean and uninstall the .gem"
0
 task :uninstall => :clean do
0
-  sh %{#{SUDO} gem uninstall #{NAME}}
0
+  sh %{#{sudo} gem uninstall #{NAME}}
0
 end
0
 
0
 namespace :github do
0
@@ -143,7 +139,7 @@ namespace :doc do
0
   desc "rdoc to rubyforge"
0
   task :rubyforge do
0
     # sh %{rake doc}
0
-    sh %{#{SUDO} chmod -R 755 doc} unless windows
0
+    sh %{#{sudo} chmod -R 755 doc} unless windows?
0
     sh %{/usr/bin/scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
0
   end
0
 

0
@@ -1,2 +1 @@
0
-Dir[File.dirname(__FILE__) / '*.rake'].each { |ext| load ext }
0
-
0
+Dir[File.dirname(__FILE__) / '*.rake'].each { |ext| load ext }
0
\ No newline at end of file

0
@@ -1,5 +1,12 @@
0
 def sudo
0
-  windows = (PLATFORM =~ /win32|cygwin/) rescue nil
0
   ENV['MERB_SUDO'] ||= "sudo"
0
-  sudo = windows ? "" : ENV['MERB_SUDO']
0
+  sudo = windows? ? "" : ENV['MERB_SUDO']
0
+end
0
+
0
+def windows?
0
+  (PLATFORM =~ /win32|cygwin/) rescue nil
0
+end
0
+
0
+def install_home
0
+  ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
 end
0
\ No newline at end of file