Merge branch 'master' of git@github.com:wycats/merb-more

Rakefile

@@ -9,14 +9,14 @@ spec = Gem::Specification.new do |s|
   s.author       = "Ezra Zygmuntowicz"
   s.email        = "ez@engineyard.com"
   s.homepage     = "http://www.merbivore.com"
-  s.summary      = "Merb == Mongrel + Erb. Pocket rocket web framework."
+  s.summary      = "Adds a 'new merb project' generator and mailer plugin to merb-core."
   s.description  = s.summary
-  s.require_path = "lib"
-  s.files        = %w( LICENSE README Rakefile TODO ) + Dir["{spec,lib}/**/*"]
+  #s.require_path = "lib"
+  #s.files        = %w( LICENSE README Rakefile TODO ) + Dir["{spec,lib}/**/*"]
 
   # rdoc
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w( README LICENSE TODO )
+  #s.has_rdoc         = true
+  #s.extra_rdoc_files = %w( README LICENSE TODO )
 
   # Dependencies
   s.add_dependency "merb-core"
@@ -25,19 +25,27 @@ end
 windows = (PLATFORM =~ /win32|cygwin/) rescue nil
 
 SUDO = windows ? "" : "sudo"
+sub_gems = %w(merb-gen merb-mailer)
+
+desc "Installs Merb More."
+task :default => :install
 
 Rake::GemPackageTask.new(spec) do |package|
   package.gem_spec = spec
 end
 
-desc "Run :package and install the resulting .gem"
-task :install => :package do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+desc "Install the merb-more sub-gems"
+task :install do
+  sub_gems.each do |dir|
+    sh %{cd #{dir}; #{SUDO} rake install}
+  end
 end
 
-desc "Run :clean and uninstall the .gem"
-task :uninstall => :clean do
-  sh %{#{SUDO} gem uninstall #{NAME}}
+desc "Uninstall the merb-more sub-gems"
+task :uninstall do
+  sub_gems.each do |sub_gem|
+    sh %{#{SUDO} gem uninstall #{sub_gem}}
+  end
 end
 
 # SPECS