0
@@ -9,16 +9,17 @@ end
0
 
0
 require "rake/clean"
0
 require "rake/gempackagetask"
0
-require "merb_rake_helper"
0
+require 'merb-core/tasks/merb_rake_helper'
0
 require 'fileutils'
0
 include FileUtils
0
 
0
 gems = %w[
0
   merb-action-args merb-assets merb-gen merb-haml
0
-  merb-builder merb-mailer merb-parts merb-cache merb-freezer
0
+  merb-builder merb-mailer merb-parts merb-cache merb-freezer merb-slices
0
 ]
0
 
0
 merb_more_spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name         = "merb-more"
0
   s.version      = Merb::MORE_VERSION
0
   s.platform     = Gem::Platform::RUBY
0
@@ -35,6 +36,7 @@ merb_more_spec = Gem::Specification.new do |s|
0
 end
0
 
0
 merb_spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name         = "merb"
0
   s.version      = Merb::MORE_VERSION
0
   s.platform     = Gem::Platform::RUBY
0
@@ -51,7 +53,6 @@ end
0
 
0
 CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
0
 
0
-
0
 Rake::GemPackageTask.new(merb_more_spec) do |package|
0
   package.gem_spec = merb_more_spec
0
 end
0
@@ -61,8 +62,6 @@ Rake::GemPackageTask.new(merb_spec) do |package|
0
 end
0
 
0
 gem_home = ENV['GEM_HOME'] ? "GEM_HOME=#{ENV['GEM_HOME']}" : ""
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 desc "Install it all"
0
 task :install => [:install_gems, :package] do
0
   sh %{#{sudo} gem install #{install_home} --local pkg/merb-more-#{Merb::MORE_VERSION}.gem  --no-update-sources}
0
@@ -109,9 +108,6 @@ task :bundle => [:package, :build_gems] do
0
   cp "pkg/merb-#{Merb::MORE_VERSION}.gem", "bundle"
0
   cp "pkg/merb-more-#{Merb::MORE_VERSION}.gem", "bundle"
0
   gems.each do |gem|
0
-    File.open("#{gem}/Rakefile") do |rakefile|
0
-      rakefile.read.detect {|l| l =~ /^VERSION\s*=\s*"(.*)"$/ }
0
-      sh %{cp #{gem}/pkg/#{gem}-#{$1}.gem bundle/}
0
-    end
0
+    sh %{cp #{gem}/pkg/#{gem}-#{Merb::MORE_VERSION}.gem bundle/}
0
   end
0
 end

0
@@ -1,18 +1,18 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-action-args"
0
 NAME = "merb-action-args"
0
-VERSION = "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Yehuda Katz"
0
 EMAIL = "ykatz@engineyard.com"
0
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
0
+HOMEPAGE = "http://merbivore.com/"
0
 SUMMARY = "Merb plugin that provides support for ActionArgs"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -24,7 +24,6 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency('merb-core', '>= 0.9.4')
0
   s.add_dependency('ruby2ruby', '>= 1.1.8')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -32,17 +31,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :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}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -1,18 +1,18 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-assets"
0
 NAME = "merb-assets"
0
-VERSION = "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Ezra Zygmuntowicz"
0
 EMAIL = "ez@engineyard.com"
0
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-assets/"
0
+HOMEPAGE = "http://merbivore.com/"
0
 SUMMARY = "Merb plugin that provides the helpers for assets and asset bundling"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -23,7 +23,6 @@ spec = Gem::Specification.new do |s|
0
   s.homepage = HOMEPAGE
0
   s.add_dependency('merb-core', '>= 0.9.4')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -32,14 +31,14 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
 end
0
 
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :package do
0
-    sh %{#{sudo} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -1,18 +1,18 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-builder"
0
 NAME = "merb-builder"
0
-VERSION = "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Jonathan Younger"
0
 EMAIL = "jonathan@daikini.com"
0
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-builder/"
0
+HOMEPAGE = "http://merbivore.com/"
0
 SUMMARY = "Merb plugin that provides Builder support"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -24,7 +24,6 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency('merb-core', '>= 0.9.4')
0
   s.add_dependency('builder', '>= 2.0.0')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -32,17 +31,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :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}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -2,19 +2,19 @@ require 'rubygems'
0
 require "rake/rdoctask"
0
 require 'rake/gempackagetask'
0
 require "spec/rake/spectask"
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-cache"
0
 NAME = "merb-cache"
0
-MERB_CACHE_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Alex Boussinet"
0
 EMAIL = "alex.boussinet@gmail.com"
0
 HOMEPAGE = "http://www.merbivore.com"
0
 SUMMARY = "Merb plugin that provides caching (page, action, fragment, object)"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = MERB_CACHE_VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -25,7 +25,6 @@ spec = Gem::Specification.new do |s|
0
   s.homepage = HOMEPAGE
0
   s.add_dependency('merb-core', '>= 0.9.4')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 
0
   # rdoc
0
@@ -64,17 +63,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{MERB_CACHE_VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :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}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -1,18 +1,19 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
 require "spec/rake/spectask"
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-freezer"
0
 NAME = "merb-freezer"
0
-VERSION = "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Matt Aimonetti"
0
 EMAIL = "mattaimonetti@gmail.com"
0
 HOMEPAGE = "http://www.merbivore.com"
0
 SUMMARY = "Merb plugin that let's you freeze Merb"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -24,7 +25,6 @@ spec = Gem::Specification.new do |s|
0
   s.require_path = 'lib'
0
   s.bindir = "bin"
0
   s.executables = %w( frozen-merb )
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -32,22 +32,16 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-def sudo
0
-  windows = (PLATFORM =~ /win32|cygwin/) rescue nil
0
-  ENV['MERB_SUDO'] ||= "sudo"
0
-  sudo = windows ? "" : ENV['MERB_SUDO']
0
-end
0
-
0
 desc "install merb-freezer"
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :package do
0
-    sh %{#{sudo} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -1,5 +1,5 @@
0
 require 'find'
0
-#require '../../../merb_rake_helper'
0
+#require 'merb-core/tasks/merb_rake_helper'
0
 module FreezerMode
0
   
0
   def sudo

0
@@ -1,17 +1,18 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-GEM = "merb-gen"
0
-VERSION = "0.9.4"
0
+NAME = "merb-gen"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Yehuda Katz"
0
 EMAIL = "wycats@gmail.com"
0
 HOMEPAGE = "http://www.merbivore.com"
0
 SUMMARY = "Merb More: Merb's Application and Plugin Generators"
0
 
0
 spec = Gem::Specification.new do |s|
0
-  s.name = GEM
0
-  s.version = VERSION
0
+  s.rubyforge_project = 'merb'
0
+  s.name = NAME
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -28,7 +29,6 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency "rubigen", ">= 1.2.4"
0
 
0
   s.require_path = 'lib'
0
-  s.autorequire = GEM
0
   s.files = %w(LICENSE README Rakefile TODO) +
0
           Dir.glob("{lib,bin,spec,app_generators,merb_default_generators,merb_generators,rspec_generators,test_unit_generators}/**/*")
0
 end
0
@@ -37,15 +37,14 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
+task :install => [:package] do
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
+end
0
 
0
 namespace :jruby do
0
   task :install do
0
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM}-#{VERSION} --no-update-sources}
0
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 end
0
 
0
-task :install => [:package] do
0
-  sh %{#{sudo} gem install #{install_home} pkg/#{GEM}-#{VERSION} --no-update-sources}
0
-end
0
+

0
@@ -2,17 +2,18 @@ require 'rubygems'
0
 require 'rake/gempackagetask'
0
 require 'rubygems/specification'
0
 require 'date'
0
-require '../merb_rake_helper'
0
+require 'merb-core/version'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "<%= base_name %>"
0
 NAME = "<%= base_name %>"
0
 GEM_VERSION = "0.0.1"
0
 AUTHOR = "Your Name"
0
 EMAIL = "Your Email"
0
-HOMEPAGE = "http://merb-plugins.rubyforge.org/<%= base_name %>/"
0
+HOMEPAGE = "http://merbivore.com/"
0
 SUMMARY = "Merb plugin that provides ..."
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
   s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
@@ -23,9 +24,8 @@ spec = Gem::Specification.new do |s|
0
   s.author = AUTHOR
0
   s.email = EMAIL
0
   s.homepage = HOMEPAGE
0
-  s.add_dependency('merb', '>= 0.4.0')
0
+  s.add_dependency('merb', '>= <%= Merb::VERSION %>')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec<%= bin ? ',bin' : '' %>}/**/*")
0
   <% if bin %>
0
   s.bindir = "bin"
0
@@ -39,7 +39,7 @@ end
0
 
0
 desc "install the plugin locally"
0
 task :install => [:package] do
0
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 desc "create a gemspec file"
0
@@ -53,7 +53,7 @@ namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :package do
0
-    sh %{#{sudo} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -1,18 +1,18 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-haml"
0
 NAME = "merb-haml"
0
-VERSION = "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Yehuda Katz"
0
 EMAIL = "ykatz@engineyard.com"
0
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
0
+HOMEPAGE = "http://merbivore.com/"
0
 SUMMARY = "Merb plugin that provides HAML support"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -24,7 +24,6 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency('merb-core', '>= 0.9.4')
0
   s.add_dependency('haml', '>= 1.8.2')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -32,17 +31,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :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}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end

0
@@ -1,17 +1,17 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
 
0
-PLUGIN = "merb-jquery"
0
 NAME = "merb-jquery"
0
-VERSION = "0.9.3"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Michael D. Ivey"
0
 EMAIL = "ivey@gweezlebur.com"
0
 HOMEPAGE = "http://merbivore.com"
0
 SUMMARY = "Merb plugin that provides jQuery support"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -22,7 +22,6 @@ spec = Gem::Specification.new do |s|
0
   s.homepage = HOMEPAGE
0
   s.add_dependency('merb-core', '>= 0.9.3')
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -30,17 +29,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 task :install => [:package] do
0
-  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :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}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
   
0
 end

0
@@ -1,19 +1,19 @@
0
 require 'rubygems'
0
 require 'rake/gempackagetask'
0
 require "spec/rake/spectask"
0
-require '../merb_rake_helper'
0
+require 'merb-core/tasks/merb_rake_helper'
0
 
0
-PLUGIN = "merb-mailer"
0
 NAME = "merb-mailer"
0
-VERSION = "0.9.4"
0
+GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
 AUTHOR = "Yehuda Katz"
0
 EMAIL = "wycats@gmail.com"
0
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-mailer/"
0
+HOMEPAGE = "http://merbivore.com/"
0
 SUMMARY = "Merb plugin that provides mailer functionality to Merb"
0
 
0
 spec = Gem::Specification.new do |s|
0
+  s.rubyforge_project = 'merb'
0
   s.name = NAME
0
-  s.version = VERSION
0
+  s.version = GEM_VERSION
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -25,7 +25,6 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency('merb-core', '>= 0.9.4')
0
   s.add_dependency("mailfactory", ">= 1.2.3")
0
   s.require_path = 'lib'
0
-  s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
 end
0
 
0
@@ -33,17 +32,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.gem_spec = spec
0
 end
0
 
0
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
0
-
0
 task :install => [:package] do
0
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
0
+  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
 end
0
 
0
 namespace :jruby do
0
 
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :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}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
   end
0
 
0
 end