RubyGems - merb - Versions diffs - 0.0.8 → 0.0.9 - Mend

merb 0.0.8 → 0.0.9

Files changed (95) hide show

data/README +64 -80
data/Rakefile +25 -12
data/bin/merb +2 -223
data/examples/README_EXAMPLES +10 -0
data/examples/skeleton.tar +0 -0
data/lib/merb.rb +48 -21
data/lib/merb/core_ext.rb +12 -2
data/lib/merb/core_ext/merb_class.rb +21 -21
data/lib/merb/core_ext/merb_kernel.rb +60 -0
data/lib/merb/core_ext/merb_object.rb +14 -0
data/lib/merb/core_ext/merb_string.rb +3 -13
data/lib/merb/generators/merb_app/merb_app.rb +33 -0
data/lib/merb/merb_constants.rb +7 -0
data/lib/merb/merb_controller.rb +31 -23
data/lib/merb/merb_drb_server.rb +6 -60
data/lib/merb/merb_exceptions.rb +162 -2
data/lib/merb/merb_handler.rb +8 -19
data/lib/merb/merb_mailer.rb +60 -0
data/lib/merb/merb_router.rb +1 -1
data/lib/merb/merb_server.rb +240 -0
data/lib/merb/merb_upload_handler.rb +1 -1
data/lib/merb/merb_view_context.rb +11 -6
data/lib/merb/mixins/basic_authentication_mixin.rb +11 -13
data/lib/merb/mixins/controller_mixin.rb +12 -6
data/lib/merb/mixins/form_control_mixin.rb +94 -0
data/lib/merb/mixins/render_mixin.rb +50 -24
data/lib/merb/mixins/view_context_mixin.rb +122 -0
data/lib/merb/session/merb_ar_session.rb +13 -14
data/lib/merb/session/merb_memory_session.rb +105 -0
metadata +13 -132
data/examples/app_skeleton/Rakefile +0 -82
data/examples/app_skeleton/dist/app/helpers/global_helper.rb +0 -6
data/examples/app_skeleton/dist/conf/merb.yml +0 -11
data/examples/app_skeleton/dist/conf/merb_init.rb +0 -16
data/examples/app_skeleton/dist/conf/mup.conf +0 -5
data/examples/app_skeleton/dist/conf/router.rb +0 -19
data/examples/app_skeleton/scripts/merb_stop +0 -13
data/examples/app_skeleton/scripts/new_migration +0 -21
data/examples/app_skeleton/test/test_helper.rb +0 -1
data/examples/sample_app/Rakefile +0 -82
data/examples/sample_app/dist/app/controllers/files.rb +0 -31
data/examples/sample_app/dist/app/controllers/posts.rb +0 -71
data/examples/sample_app/dist/app/controllers/test.rb +0 -40
data/examples/sample_app/dist/app/helpers/global_helper.rb +0 -7
data/examples/sample_app/dist/app/helpers/posts_helper.rb +0 -4
data/examples/sample_app/dist/app/models/comment.rb +0 -3
data/examples/sample_app/dist/app/models/post.rb +0 -4
data/examples/sample_app/dist/app/views/files/progress.jerb +0 -3
data/examples/sample_app/dist/app/views/files/start.herb +0 -62
data/examples/sample_app/dist/app/views/files/upload.herb +0 -6
data/examples/sample_app/dist/app/views/layout/application.herb +0 -61
data/examples/sample_app/dist/app/views/layout/foo.herb +0 -6
data/examples/sample_app/dist/app/views/posts/_comments.herb +0 -11
data/examples/sample_app/dist/app/views/posts/comment.jerb +0 -1
data/examples/sample_app/dist/app/views/posts/list.herb +0 -5
data/examples/sample_app/dist/app/views/posts/new.herb +0 -37
data/examples/sample_app/dist/app/views/posts/show.herb +0 -37
data/examples/sample_app/dist/app/views/posts/xml_test.xerb +0 -3
data/examples/sample_app/dist/app/views/shared/_test.herb +0 -1
data/examples/sample_app/dist/app/views/test/foo.herb +0 -2
data/examples/sample_app/dist/app/views/test/hello.herb +0 -5
data/examples/sample_app/dist/app/views/test/json.jerb +0 -1
data/examples/sample_app/dist/conf/merb.yml +0 -11
data/examples/sample_app/dist/conf/merb_init.rb +0 -24
data/examples/sample_app/dist/conf/mup.conf +0 -5
data/examples/sample_app/dist/conf/router.rb +0 -19
data/examples/sample_app/dist/public/images/bg.jpg +0 -0
data/examples/sample_app/dist/public/images/book.gif +0 -0
data/examples/sample_app/dist/public/images/booksmall.gif +0 -0
data/examples/sample_app/dist/public/images/greenright.jpg +0 -0
data/examples/sample_app/dist/public/images/louiecon.gif +0 -0
data/examples/sample_app/dist/public/images/menu.gif +0 -0
data/examples/sample_app/dist/public/images/menuleft.gif +0 -0
data/examples/sample_app/dist/public/images/menuright.gif +0 -0
data/examples/sample_app/dist/public/images/mountain.jpg +0 -0
data/examples/sample_app/dist/public/images/n3.jpg +0 -0
data/examples/sample_app/dist/public/images/nautica.jpg +0 -0
data/examples/sample_app/dist/public/javascripts/application.js +0 -0
data/examples/sample_app/dist/public/javascripts/effects.js +0 -975
data/examples/sample_app/dist/public/javascripts/mup.js +0 -113
data/examples/sample_app/dist/public/javascripts/prototype.js +0 -2264
data/examples/sample_app/dist/public/stylesheets/merb.css +0 -277
data/examples/sample_app/dist/public/test.html +0 -5
data/examples/sample_app/dist/schema/migrations/001_add_comments_to_posts.rb +0 -22
data/examples/sample_app/dist/schema/migrations/002_add_sessions_table.rb +0 -14
data/examples/sample_app/dist/schema/schema.rb +0 -28
data/examples/sample_app/foo.txt +0 -0
data/examples/sample_app/log/merb.4000.pid +0 -1
data/examples/sample_app/script/merb_stop +0 -13
data/examples/sample_app/script/new_migration +0 -21
data/examples/sample_app/test/test_helper.rb +0 -1
data/lib/merb/mixins/javascript_mixin.rb +0 -147
data/lib/merb/session/merb_drb_session.rb +0 -65
data/test/test_helper.rb +0 -1
data/test/unit/route_matcher_test.rb +0 -46

data/lib/merb/merb_drb_server.rb CHANGED

@@ -3,72 +3,18 @@ require File.dirname(__FILE__)+'/merb_upload_progress'
 module Merb
-  class DRbSession
+  class DrbServiceProvider
     include DRbUndumped
     class << self
-      def setup(opts={})
-        @opts = opts
-        @sessions = Hash.new
-        @timestamps = Hash.new
-        @mutex = Mutex.new
-        @session_ttl = opts.fetch(:session_ttl, 15*60) # default 15 minutes
-        start_timer
-        self
-      end
-      def create(opts={})
-        self[opts[:sess_id]] = opts[:data]
-      end
-      def [](key)
-        @mutex.synchronize {
-          @timestamps[key] = Time.now
-          @sessions[key]
-        }
-      end
-      def []=(key, val)
-        @mutex.synchronize {
-          @timestamps[key] = Time.now
-          @sessions[key] = val
-        }
-      end
-      def delete(key)
-        @mutex.synchronize {
-          @sessions.delete(key)
-        }
-      end
-      def reap_old_sessions
-        @timestamps.each do |key,stamp|
-          if stamp + @session_ttl < Time.now
-            delete(key)
-          end
-        end
-        GC.start
-      end
-      def start_timer
-        Thread.new do
-          sleep @session_ttl
-          reap_old_sessions
-        end
-      end
-      def sessions
-        @sessions
-      end
       def upload_progress
-        ::Merb::UploadProgress.new
-      end
+        @upload_progress ||= ::Merb::UploadProgress.new
+      end
-    end # end singleton class
+    end
-  end # end DRbSession
+  end
 end

data/lib/merb/merb_exceptions.rb CHANGED

@@ -1,4 +1,164 @@
+begin
+  require 'coderay'
+rescue LoadError => ex
+end
 module Merb
-  class Noroutefound < RuntimeError; end
-  class MissingControllerFile < RuntimeError; end
+  class MerbError < StandardError; end
+  class Noroutefound < MerbError; end
+  class MissingControllerFile < MerbError; end
+  class MerbControllerError < MerbError; end
+  # format exception message for browser display
+  def self.html_exception(e)
+    ::Merb::Server.show_error ? ErrorResponse.new(e).out : "500 Internal Server Error!"
+  end
+  def self.exception(e)
+    "#{ e.message } - (#{ e.class })\n" <<
+    "#{(e.backtrace or []).join("\n")}"
+  end
+  class ErrorResponse
+    def initialize error
+      @error = error
+    end
+    def out
+      error = @error
+      backtrace = @error.backtrace
+      colors = []
+      min = 104
+      max = 255
+      step = -((max - min) / backtrace.size).abs
+      max.step(min, step) do |color|
+        colors << color
+      end
+      backtrace.map! do |line|
+        file, lineno, meth = line.scan(/(.*?):(\d+)(?::in `(.*?)')?/).first
+        lines = __caller_lines__(file, lineno, 5)
+        [ lines, lines.object_id.abs, file, lineno, meth ]
+      end
+      error_page(colors, error, *backtrace)
+    end
+    # this method offers highlighting for the sourcecode-chunks from the
+    # traceback, just gem install coderay
+    def error_page(colors, title, *backtrace)
+      @backtrace = backtrace
+      @colors = colors
+      @title = title
+      @coderay = Object.constants.include?('CodeRay')
+      template =
+          <<-HEREDOC
+<html>
+  <head>
+    <title><%= @title %></title>
+    <style type="text/css">
+      <!--
+      h1.main {
+        text-align: center;
+        }
+      table.main {
+        background: #000;
+        }
+      table.main tr.head {
+        background: #fee;
+        width:      100%;
+        }
+      table.main tr.source_container {
+        display:    none;
+        }
+      tr.source_container div {
+        width:      100%;
+        overflow:   auto;
+        }
+      tr.source_container div table {
+        background: #ddd;
+        width:      100%;
+        }
+      tr.source_container div table tr {
+        text-align:center;
+        }
+      tr.source_container div table tr.source {
+        text-align:left;
+        }
+      tr a {
+        color: black;
+      }
+      div.source {
+        background: #fff;
+        }
+      -->
+      <% if @coderay %>
+        <%= CodeRay::Encoders[:html]::CSS.new.stylesheet %>
+      <% end %>
+    </style>
+    <script type="text/javascript">
+    $ = function(el){
+      if(el === null || el === undefined)
+        throw("Argument for $() must be a domRef/domId");
+      if( el.constructor === String )
+        el = document.getElementById(el);
+      if(el === null || !el.nodeType)
+        throw("Argument for $() not found in document tree.");
+      return el;
+    }
+    var toggle = function(el){
+      el = $(el);
+      var visible = el.style.display != 'none';  // visible? boolean
+      if(visible){
+        el.style.display = 'none'; // hide
+      }else{
+        el.style.display = '';  // unhide
+      }
+    }
+    </script>
+  </head>
+  <body>
+    <span style="float:left;">
+      <img src="data:image/jpg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAJQAA/+4ADkFk\nb2JlAGTAAAAAAf/bAIQADQkJCQoJDQoKDRMMCwwTFhENDREWGhUVFhUVGhkU\nFhUVFhQZGR0fIB8dGScnKionJzk4ODg5QEBAQEBAQEBAQAEODAwOEA4RDw8R\nFA4RDhQVERISERUgFRUXFRUgKB0ZGRkZHSgjJiAgICYjLCwoKCwsNzc1NzdA\nQEBAQEBAQEBA/8AAEQgAJgAtAwEiAAIRAQMRAf/EAT8AAAEFAQEBAQEBAAAA\nAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoL\nEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVS\nwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePz\nRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAIC\nAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLh\ncoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSF\ntJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMR\nAD8A9OVDK6xRQYa02axuEBvnB7x8Fm/W36x19HqoxmAvyswkMraHFwY2N7va\nCe/5Vy/Seu29RvdXaI2CW6EBw4OhGnZAk9Einrbuvn03Oaw1lvmCCP8ANXPW\n9Zz7shlrM9zKBLnN3Fmg1gnj8An61m14eCbAN9j4ZVWJJc5x2gQPivO3ZnUM\nXLtfY8by73sDmuHw9pPCZRPVNgdH13F+teJU51WbZpX9O4xpPEho4juug9Wr\n0vW3t9Lbv9SRt2xO7dxEL5+blW5I2W2FrdsSJJgdj4r0P1W/+Nf6Un1p9PZJ\nnf8AaPU2+P0fwThdVaLF3TlfXZvUsr63ZIpZY4Y9VDKTWwuIY5vqEe3uXFx+\nSn0XBupy9t+loqDXy1zTJLST7tefJbVDLsjLycwO9Sy/09ANQafUJP8A4IrG\nQGufXltEAjZYPA900kkeCRoXA+sHSeoTXn41xJxnB9bY3e4HRcTbVsfB2h7j\ntDWkkAT7jrPjC9FzCMfpJZU5wDGgN7wNI4HZcJdiNrvP2t+62SNg9vedxnRO\nj2WyQfZy2oOA5kbfGedF0jb8w/Uq2ra/25NcGD9F1dk6/BqrYNODY5rrve4+\n2rGpBcR3Mr0j9iVf83vscD1J3bZMep/NelM+Hsn5oqa3RG0uuf6b9j9dsCRI\n+lx4haGT9g1FgZ6nc0n/AKrSEkko/Kg7vO9XtsxzV+y6a8xjtxu+hWWwPY0f\npBMnv2XN52ZmbyLunYocCZNl1bpdENmS0wOdUkkPsT9rL6rfbf8AnJiPzvT+\nzfpPVrZ6ezb6Ttv0e26OTzC9U3uk+z88ACRu+hz8YSSR6q6P/9k=\n"/>
+    </span>
+    <h1><%= @title %></h1>
+    <table class="main">
+      <tr class="head">
+        <td>File</td><td>Line</td><td>Method</td>
+      </tr>
+      <% @backtrace.each do |lines, hash, file, lineno, meth| %>
+        <tr id="line_<%= hash %>" style="background:rgb(104,104,<%= @colors.shift %>);">
+          <td><a href='#' onclick="toggle('source_<%= hash %>'); return false"><%= file %></a></td><td><%= lineno %></td><td><%= meth %></td>
+        </tr>
+        <tr id="source_<%= hash %>" <%= @coderay? " class='CodeRay' " : ''%> style="display:none;">
+          <td colspan="3">
+            <div class="source">
+              <table>
+                <tr><td colspan='2'><a href='txmt://open?url=file://<%=file%>&line=<%=lineno%>'>Open in TextMate</a></td></tr>
+                <% lines.each do |llineno, lcode, lcurrent| %>
+                  <tr class="source"<%=  'style="background:#faa;"' if lcurrent %>>
+                    <td><%= llineno %></td>
+                    <td>
+                      <%= @coderay ? CodeRay.scan(lcode, :ruby).html : "<pre>\#{lcode}</pre>" %>
+                    </td>
+                  </tr>
+                <% end %>
+              </table>
+            </div>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </body>
+</html>
+        HEREDOC
+      tmpl = Erubis::MEruby.new template
+      tmpl.result(binding)
+    end
+  end
 end

data/lib/merb/merb_handler.rb CHANGED

@@ -67,18 +67,17 @@ class MerbHandler < Mongrel::HttpHandler
         @guard.synchronize {
           controller.dispatch(action)
         }
-      rescue Exception => e
+      rescue Object => e
         response.start(500) do |head,out|
           head["Content-Type"] = "text/html"
-          MERB_LOGGER.info(exception(e))
-          out << html_exception(e)
+          MERB_LOGGER.info(Merb.exception(e))
+          out << Merb.html_exception(e)
         end
         return
       end
       sendfile, clength = nil
       response.status = controller.status
       # check for the X-SENDFILE header from your Merb::Controller
       # and serve the file directly instead of buffering.
       controller.headers.each do |k, v|
@@ -117,9 +116,10 @@ class MerbHandler < Mongrel::HttpHandler
       else
         MERB_LOGGER.info("Response status: #{response.status}\nComplete Request took: #{Time.now - start} seconds\n\n")
         # render response from successful controller
-        response.send_status((controller.body||='').length)
+        body = (controller.body.to_s rescue '')
+        response.send_status(body.length)
         response.send_header
-        response.write(controller.body)
+        response.write(body)
       end
     end
   end
@@ -131,7 +131,7 @@ class MerbHandler < Mongrel::HttpHandler
   # [controller, action]
   def handle(request)
     path = request.params[Mongrel::Const::PATH_INFO].sub(/\/+/, '/')
-    path = path[0..-2] if (path[-1] == ?/)
+    path = path[0..-2] if (path[-1] == ?/) && path.size > 1
     route = Merb::RouteMatcher.new.route_request(path)
     [ instantiate_controller(route[:controller], request.body, request.params, route),
       route[:action] ]
@@ -142,7 +142,7 @@ class MerbHandler < Mongrel::HttpHandler
   # into a new object passing in the request and response.
   # this is where your Merb::Controller is instantiated.
   def instantiate_controller(controller_name, req, env, params)
-    if !File.exist?(Merb::Server.config[:dist_root]+"/app/controllers/#{controller_name.snake_case}.rb")
+    if !File.exist?(DIST_ROOT+"/app/controllers/#{controller_name.snake_case}.rb")
       raise Merb::MissingControllerFile
     end
     begin
@@ -154,15 +154,4 @@ class MerbHandler < Mongrel::HttpHandler
     end
   end
-  # format exception message for browser display
-  def html_exception(e)
-    "<html><body><h2>Merb Error!</h2><p>#{ e.message } - (#{ e.class })\n" <<
-    "#{(e.backtrace or []).join('<br />')}</p></body></html>"
-  end
-  def exception(e)
-    "#{ e.message } - (#{ e.class })\n" <<
-    "#{(e.backtrace or []).join("\n")}"
-  end
 end

data/lib/merb/merb_mailer.rb ADDED

@@ -0,0 +1,60 @@
+require 'net/smtp'
+begin
+  require 'mailfactory'
+rescue LoadError
+  puts "You need to install the mailfactory gem to use Merb::Mailer"
+  MERB_LOGGER.fatal "You need to install the mailfactory gem to use Merb::Mailer"
+end
+module Merb
+  class Mailer
+    shared_accessor :config
+    def sendmail
+      sendmail = IO.popen("sendmail #{@mail.to}", 'w+')
+      sendmail.puts @mail.to_s
+      sendmail.close
+    end
+    # :plain, :login, or :cram_md5
+    def net_smtp
+      Net::SMTP.start(config[:host], config[:port].to_i, config[:domain],
+                      config[:user], config[:pass], (config[:auth].intern||:plain)) { |smtp|
+        smtp.send_message(@mail.to_s, @mail.from, @mail.to)
+      }
+    end
+    def deliver!
+      config == :sendmail ? sendmail : net_smtp
+    end
+    def initialize(o={})
+      self.config = :sendmail if config.nil?
+      @mail = returning MailFactory.new() do |m|
+        m.to = o[:to]
+        m.from = o[:from]
+        m.subject = o[:subject]
+        m.text = o[:body]
+        m.html = o[:html] if o[:html]
+      end
+    end
+  end
+end
+=begin
+m = Merb::Mailer.new :to => 'foo@bar.com',
+                     :from => 'bar@foo.com',
+                     :subject => 'Welcome to whatever!',
+                     :body => partial(:sometemplate)
+m.deliver!
+Merb::Mailer.config = {
+  :host=>'smtp.yourserver.com',
+  :port=>'25',
+  :user=>'user',
+  :pass=>'pass',
+  :auth=>:plain # :plain, :login, or :cram_md5, default :plain
+}
+=end

data/lib/merb/merb_router.rb CHANGED

@@ -69,7 +69,7 @@ module Merb
         return '  when /\A\/([^\/;.,?]+)(?:\/?\Z|\/([^\/;.,?]+)\/?)(?:\/?\Z|\/([^\/;.,?]+)\/?)\Z/
       @sections[:controller] = $1
       @sections[:action] = $2 || \'index\'
-      @sections[:id] = $3 || nil
+      @sections[:id] = $3 if $3
       return @sections'<<"\n"
       end
       code, count = '', 0

data/lib/merb/merb_server.rb ADDED

@@ -0,0 +1,240 @@
+require 'optparse'
+require 'ostruct'
+require 'fileutils'
+require 'yaml'
+require 'erubis'
+module Merb
+  class Config
+    def self.setup
+      defaults = {
+        :host => "0.0.0.0",
+        :port => "4000",
+        :allow_reloading => true,
+        :merb_root => Dir.pwd,
+        :template_ext => {:html => :herb, :js => :jerb, :xml => :xerb},
+        :cache_templates => false
+      }
+      begin
+        options = defaults.merge(YAML.load(Erubis::Eruby.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
+      rescue
+        options = defaults
+      end
+      options
+    end
+  end
+  class Server
+    class << self
+      def merb_config
+        options = Merb::Config.setup
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: merb [fdcphmisl] [argument]"
+          opts.define_head "Merb Mongrel+ Erb. Lightweight replacement for ActionPack"
+          opts.separator '*'*80
+          opts.separator 'If no flags are given, Merb starts in the foreground on port 4000'
+          opts.separator '*'*80
+          opts.on("-f", "--config-file FILENAME", "This flag is for adding extra config files for things like the upload progress module") do |config|
+            options[:config] = config
+          end
+          opts.on("-d", "--daemonize", "This will run a single merb in the background") do |config|
+            options[:daemonize] = true
+          end
+          opts.on("-c", "--cluster-nodes NUM_MERBS", "Number of merb daemons to run") do |nodes|
+            options[:cluster] = nodes
+          end
+          opts.on("-p", "--port PORTNUM", "Port to run merb on, defaults to 4000") do |port|
+            options[:port] = port
+          end
+          opts.on("-h", "--host HOSTNAME", "Host to bind to(default is all IP's)") do |host|
+            options[:host] = host
+          end
+          opts.on("-m", "--merb-root MERB_ROOT", "the path to the MERB_ROOT for the app you want to run") do |merb_root|
+            options[:merb_root] = File.expand_path(merb_root)
+          end
+          opts.on("-i", "--irb-console", "This flag will start merb in irb console mode. All your models and other classes will be available for you in an irb session.") do |console|
+            options[:console] = true
+          end
+          opts.on("-s", "--drb-server-port PORTNUM", "This is the port number to run the drb daemon on for sessions and uplod progress monitoring.") do |drb_port|
+            options[:drb_server_port] = drb_port
+          end
+          opts.on("-l", "--log-level LEVEL", "Log levels can be set to any of these options: DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN") do |loglevel|
+            options[:log_level] = loglevel
+          end
+          opts.on("-e", "--environment STRING", "Run merb in the correct mode(development, production, testing)") do |env|
+            options[:environment] = env
+          end
+          opts.on("-g", "--generate-app PATH", "Generate a fresh merb app at PATH") do |path|
+            options[:generate] = path || Dir.pwd
+          end
+          opts.on("-?", "--help", "Show this help message") do
+            puts opts
+            exit
+          end
+        end
+        opts.parse!(@@merb_raw_opts)
+        @@merb_opts = options
+        unless options[:generate] || options[:console]
+          puts %{Merb started with these options:}
+          puts @@merb_opts.to_yaml; puts
+        end
+      end
+      def initialize_merb
+        require 'merb'
+        require @@merb_opts[:merb_root]+'/dist/conf/router.rb'
+        require @@merb_opts[:merb_root]+'/dist/conf/merb_init.rb'
+      end
+      def run
+        @@merb_raw_opts = ARGV
+        merb_config
+        case @@merb_opts[:environment].to_s
+        when 'development'
+          @@merb_opts[:allow_reloading] ||= true
+          @@merb_opts[:show_error] ||= true
+        when 'production'
+          @@merb_opts[:allow_reloading] = false
+          @@merb_opts[:show_error] ||= false
+          @@merb_opts[:cache_templates] = true
+        when 'test'
+          @@merb_opts[:allow_reloading] ||= true
+          @@merb_opts[:show_error] ||= true
+        else
+          @@merb_opts[:allow_reloading] ||= true
+          @@merb_opts[:show_error] ||= true
+        end
+        @@merb_opts[:dist_root] = @@merb_opts[:merb_root]+'/dist'
+        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/controllers') )
+        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/models') )
+        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/lib') )
+        if @@merb_opts[:generate]
+          require 'merb/generators/merb_app/merb_app'
+          ::Merb::AppGenerator.run @@merb_opts[:generate]
+          exit!
+        end
+        if @@merb_opts[:console]
+          initialize_merb
+          ARGV.clear # Avoid passing args to IRB
+          require 'irb'
+          require 'irb/completion'
+          def exit
+            exit!
+          end
+          if File.exists? ".irbrc"
+            ENV['IRBRC'] = ".irbrc"
+          end
+          IRB.start
+          exit!
+        end
+        if @@merb_opts[:drb_server_port]
+          puts "Starting merb drb server on port: #{@@merb_opts[:drb_server_port]}"
+          start(@@merb_opts[:drb_server_port], :drbserver_start)
+        end
+        if @@merb_opts[:cluster]
+          delete_pidfiles
+          @@merb_opts[:port].to_i.upto(@@merb_opts[:port].to_i+@@merb_opts[:cluster].to_i-1) do |port|
+            puts "Starting merb server on port: #{port}"
+            start(port)
+          end
+        elsif @@merb_opts[:daemonize]
+          delete_pidfiles(@@merb_opts[:port])
+          start(@@merb_opts[:port])
+        else
+          initialize_merb
+          trap('TERM') { exit }
+          mongrel_start(@@merb_opts[:port])
+        end
+      end
+      def store_pid(pid,port)
+        File.open("#{@@merb_opts[:merb_root]}/log/merb.#{port}.pid", 'w'){|f| f.write("#{Process.pid}\n")}
+      end
+      def start(port,what=:mongrel_start)
+        fork do
+          Process.setsid
+          exit if fork
+          if what == :mongrel_start
+            store_pid(Process.pid, port)
+          else
+            store_pid(Process.pid, "drb.#{port}")
+          end
+          Dir.chdir @@merb_opts[:merb_root]
+          File.umask 0000
+          STDIN.reopen "/dev/null"
+          STDOUT.reopen "/dev/null", "a"
+          STDERR.reopen STDOUT
+          trap("TERM") { exit }
+          send(what, port)
+        end
+      end
+      def delete_pidfiles(portor_star='*')
+        Dir["#{@@merb_opts[:merb_root]}/log/merb.#{portor_star}.pid"].each do |pid|
+          FileUtils.rm(pid)  rescue nil
+        end
+      end
+      def drbserver_start(port)
+        puts "Starting merb drb server on port: #{port}"
+        require 'merb/merb_drb_server'
+        DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DrbServiceProvider)
+        DRb.thread.join
+      end
+      def mongrel_start(port)
+        @@merb_opts[:port] = port
+        initialize_merb
+        mconfig = Mongrel::Configurator.new :host => (@@merb_opts[:host]||"0.0.0.0"), :port => (port ||4000) do
+          yconfig = YAML.load(Erubis::Eruby.new(IO.read(File.expand_path(@@merb_opts[:config]))).result) if @@merb_opts[:config]
+          listener do
+            uri( "/", :handler => MerbUploadHandler.new(yconfig), :in_front => true) if @@merb_opts[:config]
+            uri "/", :handler => MerbHandler.new(@@merb_opts[:dist_root]+'/public')
+            uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("")
+          end
+          trap("INT") { stop }
+          run
+        end
+        mconfig.join
+      end
+      def config
+        @@merb_opts
+      end
+    end
+  end # Server
+end # Merb