fix up merb-gen to make a good new merb-core 0.9 app

Rakefile

@@ -1,5 +1,5 @@
 require "rake/gempackagetask"
-
+require "merb-core"
 NAME = "merb-more"
 
 spec = Gem::Specification.new do |s|
@@ -22,6 +22,10 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "merb-core"
 end
 
+windows = (PLATFORM =~ /win32|cygwin/) rescue nil
+
+SUDO = windows ? "" : "sudo"
+
 Rake::GemPackageTask.new(spec) do |package|
   package.gem_spec = spec
 end

merb-gen/Rakefile

@@ -27,7 +27,7 @@ spec = Gem::Specification.new do |s|
 
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app_generators}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,bin,spec,app_generators}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

merb-gen/app_generators/merb/templates/app/views/exeptions/not_acceptable.html.erb

@@ -0,0 +1,38 @@
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg">
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= params[:exception] %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Why am I seeing this page?</h3>
+    <p>Merb couldn't find an appropriate content_type to return,
+      based on what you said was available via provides() and
+      what the client requested.  For more information, visit
+      http://merbivore.com/fixing_406_issues
+    </p> 
+
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
+      feel free to come chat at irc.freenode.net, channel #merb.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You can change what people see when this happens byy editing <tt>app/views/exceptions/not_found.html.erb</tt>.</p> 
+
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2007 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>

merb-gen/app_generators/merb/templates/app/views/exeptions/not_found.html.erb

@@ -0,0 +1,40 @@
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg">
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= params[:exception] %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Welcome to Merb!</h3>
+    <p>Merb is a light-weight MVC framework written in Ruby.  We hope you enjoy it.</p>
+
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merb.devjavu.com/"> project development page</a> or,
+      feel free to come chat at irc.freenode.net, channel #merb.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You're seeing this page because you need to edit the following files:
+      <ul>
+        <li>config/merb.yml <strong><em>(optional)</em></strong></li>
+        <li>config/router.rb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
+      </ul>
+    </p>
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2007 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>