RubyGems - ramaze - Versions diffs - 0.1.0 → 0.1.1 - Mend

ramaze 0.1.0 → 0.1.1

Files changed (195) hide show

data/Rakefile +4 -12
data/bin/ramaze +95 -171
data/doc/CHANGELOG +387 -4
data/doc/README +81 -13
data/doc/meta/announcement.txt +51 -8
data/doc/meta/configuration.txt +17 -34
data/doc/meta/internals.txt +34 -4
data/doc/migrate/1110_to_1111.txt +131 -0
data/doc/readme_chunks/features.txt +81 -12
data/doc/readme_chunks/installing.txt +0 -1
data/doc/tutorial/todolist.html +293 -65
data/doc/tutorial/{todolist.txt → todolist.mkd} +251 -51
data/examples/blog/main.rb +1 -1
data/examples/blog/src/model.rb +0 -1
data/examples/hello.rb +2 -5
data/examples/templates/template/external.haml +5 -5
data/examples/templates/template/external.liquid +1 -1
data/examples/templates/template/external.mab +8 -8
data/examples/templates/template/external.rem +30 -0
data/examples/templates/template/external.rhtml +6 -7
data/examples/templates/template/external.zmr +13 -9
data/examples/templates/template_amrita2.rb +8 -8
data/examples/templates/template_erubis.rb +11 -11
data/examples/templates/template_ezamar.rb +9 -11
data/examples/templates/template_haml.rb +13 -13
data/examples/templates/template_liquid.rb +10 -10
data/examples/templates/template_markaby.rb +13 -10
data/examples/templates/template_remarkably.rb +59 -0
data/examples/todolist/main.rb +1 -7
data/examples/todolist/src/controller/main.rb +26 -13
data/examples/todolist/src/element/page.rb +5 -0
data/examples/whywiki/main.rb +1 -1
data/lib/proto/main.rb +0 -8
data/lib/proto/public/css/ramaze_error.css +12 -4
data/lib/proto/public/error.zmr +6 -25
data/lib/ramaze.rb +35 -245
data/lib/ramaze/action.rb +21 -0
data/lib/ramaze/adapter.rb +94 -29
data/lib/ramaze/adapter/base.rb +57 -0
data/lib/ramaze/adapter/mongrel.rb +12 -19
data/lib/ramaze/adapter/webrick.rb +21 -20
data/lib/ramaze/cache.rb +47 -3
data/lib/ramaze/cache/memcached.rb +22 -0
data/lib/ramaze/cache/yaml_store.rb +19 -0
data/lib/ramaze/controller.rb +47 -271
data/lib/ramaze/controller/error.rb +43 -0
data/lib/ramaze/controller/render.rb +90 -0
data/lib/ramaze/controller/resolve.rb +147 -0
data/lib/ramaze/dispatcher.rb +41 -9
data/lib/ramaze/dispatcher/file.rb +1 -1
data/lib/ramaze/global.rb +73 -158
data/lib/ramaze/global/dsl.rb +29 -0
data/lib/ramaze/global/globalstruct.rb +90 -0
data/lib/ramaze/helper.rb +1 -1
data/lib/ramaze/helper/aspect.rb +39 -179
data/lib/ramaze/helper/cache.rb +8 -9
data/lib/ramaze/helper/cgi.rb +23 -0
data/lib/ramaze/helper/file.rb +3 -0
data/lib/ramaze/helper/inform.rb +3 -0
data/lib/ramaze/helper/link.rb +56 -63
data/lib/ramaze/helper/nitroform.rb +4 -0
data/lib/ramaze/helper/redirect.rb +1 -1
data/lib/ramaze/inform.rb +6 -2
data/lib/ramaze/inform/analogger.rb +5 -1
data/lib/ramaze/inform/hub.rb +1 -1
data/lib/ramaze/inform/informing.rb +7 -0
data/lib/ramaze/snippets/kernel/aquire.rb +2 -0
data/lib/ramaze/snippets/kernel/constant.rb +2 -0
data/lib/ramaze/snippets/kernel/pretty_inspect.rb +2 -0
data/lib/ramaze/snippets/object/traits.rb +4 -0
data/lib/ramaze/snippets/openstruct/temp.rb +3 -0
data/lib/ramaze/snippets/string/DIVIDE.rb +2 -0
data/lib/ramaze/snippets/string/camel_case.rb +2 -0
data/lib/ramaze/snippets/string/color.rb +2 -0
data/lib/ramaze/snippets/string/each.rb +2 -0
data/lib/ramaze/snippets/string/snake_case.rb +3 -0
data/lib/ramaze/snippets/struct/fill.rb +8 -2
data/lib/ramaze/snippets/struct/values_at.rb +16 -0
data/lib/ramaze/snippets/symbol/to_proc.rb +3 -0
data/lib/ramaze/sourcereload.rb +89 -0
data/lib/ramaze/template.rb +21 -12
data/lib/ramaze/template/amrita2.rb +6 -6
data/lib/ramaze/template/erubis.rb +4 -9
data/lib/ramaze/template/ezamar.rb +13 -57
data/lib/ramaze/template/ezamar/element.rb +10 -12
data/lib/ramaze/template/ezamar/engine.rb +40 -101
data/lib/ramaze/template/ezamar/morpher.rb +3 -3
data/lib/ramaze/template/haml.rb +3 -6
data/lib/ramaze/template/liquid.rb +4 -9
data/lib/ramaze/template/markaby.rb +16 -22
data/lib/ramaze/template/remarkably.rb +28 -0
data/lib/ramaze/tool/mime.rb +2 -0
data/lib/ramaze/tool/record.rb +6 -0
data/lib/ramaze/trinity/request.rb +44 -54
data/lib/ramaze/trinity/response.rb +1 -1
data/lib/ramaze/trinity/session.rb +15 -37
data/lib/ramaze/version.rb +1 -1
data/rake_tasks/gem.rake +2 -2
data/rake_tasks/maintaince.rake +42 -1
data/rake_tasks/spec.rake +45 -0
data/spec/examples/caching.rb +1 -1
data/spec/examples/simple.rb +1 -1
data/spec/examples/templates/template_amrita2.rb +1 -0
data/spec/examples/templates/template_erubis.rb +2 -1
data/spec/examples/templates/template_ezamar.rb +1 -1
data/spec/examples/templates/template_haml.rb +2 -1
data/spec/examples/templates/template_liquid.rb +2 -1
data/spec/examples/templates/template_markaby.rb +2 -1
data/spec/examples/templates/template_remarkably.rb +22 -0
data/spec/examples/todolist.rb +125 -0
data/spec/helper.rb +2 -23
data/spec/helper/minimal.rb +20 -0
data/spec/helper/mock_http.rb +24 -30
data/spec/helper/simple_http.rb +2 -2
data/spec/helper/wrap.rb +6 -9
data/spec/ramaze/adapter.rb +1 -1
data/spec/ramaze/adapter/record.rb +31 -0
data/spec/ramaze/cache.rb +41 -54
data/spec/ramaze/controller.rb +121 -137
data/spec/ramaze/controller/template/list.xhtml +1 -0
data/spec/ramaze/controller/template/other/greet/other.xhtml +1 -0
data/spec/ramaze/controller/template_resolving.rb +27 -3
data/spec/ramaze/element.rb +11 -7
data/spec/ramaze/error.rb +1 -1
data/spec/ramaze/gestalt.rb +2 -0
data/spec/ramaze/helper/aspect.rb +30 -21
data/spec/ramaze/helper/auth.rb +1 -1
data/spec/ramaze/helper/cache.rb +2 -1
data/spec/ramaze/helper/form.rb +14 -11
data/spec/ramaze/helper/link.rb +18 -41
data/spec/ramaze/localize.rb +29 -2
data/spec/ramaze/morpher.rb +23 -12
data/spec/ramaze/params.rb +46 -24
data/spec/ramaze/request.rb +6 -2
data/spec/ramaze/store/yaml.rb +5 -0
data/spec/ramaze/template.rb +22 -27
data/spec/ramaze/template/amrita2.rb +1 -2
data/spec/ramaze/template/erubis.rb +1 -1
data/spec/ramaze/template/ezamar.rb +1 -2
data/spec/ramaze/template/haml.rb +2 -2
data/spec/ramaze/template/haml/with_vars.haml +1 -1
data/spec/ramaze/template/liquid.rb +1 -1
data/spec/ramaze/template/markaby.rb +1 -1
data/spec/ramaze/template/remarkably.rb +56 -0
data/spec/ramaze/template/remarkably/external.rem +8 -0
data/spec/ramaze/template/remarkably/sum.rem +1 -0
metadata +38 -63
data/doc/README.html +0 -637
data/doc/allison/LICENSE +0 -184
data/doc/allison/README +0 -37
data/doc/allison/allison.css +0 -299
data/doc/allison/allison.gif +0 -0
data/doc/allison/allison.js +0 -307
data/doc/allison/allison.rb +0 -287
data/doc/allison/cache/BODY +0 -588
data/doc/allison/cache/CLASS_INDEX +0 -4
data/doc/allison/cache/CLASS_PAGE +0 -1
data/doc/allison/cache/FILE_INDEX +0 -4
data/doc/allison/cache/FILE_PAGE +0 -1
data/doc/allison/cache/FONTS +0 -1
data/doc/allison/cache/FR_INDEX_BODY +0 -1
data/doc/allison/cache/IMGPATH +0 -1
data/doc/allison/cache/INDEX +0 -1
data/doc/allison/cache/JAVASCRIPT +0 -307
data/doc/allison/cache/METHOD_INDEX +0 -4
data/doc/allison/cache/METHOD_LIST +0 -1
data/doc/allison/cache/SRC_PAGE +0 -1
data/doc/allison/cache/STYLE +0 -321
data/doc/allison/cache/URL +0 -1
data/doc/changes.txt +0 -3375
data/doc/changes.xml +0 -3378
data/examples/todolist/conf/benchmark.yaml +0 -35
data/examples/todolist/conf/debug.yaml +0 -34
data/examples/todolist/conf/live.yaml +0 -33
data/examples/todolist/conf/silent.yaml +0 -31
data/examples/todolist/conf/stage.yaml +0 -33
data/examples/todolist/public/css/coderay.css +0 -105
data/examples/todolist/public/css/ramaze_error.css +0 -42
data/lib/proto/conf/benchmark.yaml +0 -21
data/lib/proto/conf/debug.yaml +0 -21
data/lib/proto/conf/live.yaml +0 -21
data/lib/proto/conf/silent.yaml +0 -21
data/lib/proto/conf/stage.yaml +0 -21
data/lib/proto/public/css/coderay.css +0 -105
data/lib/ramaze/http_status.rb +0 -66
data/lib/ramaze/snippets/hash/keys_to_sym.rb +0 -19
data/lib/ramaze/snippets/kernel/method.rb +0 -26
data/lib/ramaze/snippets/method/name.rb +0 -22
data/lib/ramaze/snippets/ramaze/autoreload.rb +0 -135
data/lib/ramaze/snippets/rdoc/usage_no_exit.rb +0 -65
data/spec/all.rb +0 -32
data/spec/ramaze/conf/locale_de.yaml +0 -6
data/spec/ramaze/conf/locale_en.yaml +0 -6
data/spec/ramaze/dependencies.rb +0 -16
data/spec/ramaze/global.rb +0 -44

data/examples/templates/template_remarkably.rb ADDED

@@ -0,0 +1,59 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+require 'ramaze'
+include Ramaze
+class MainController < Controller
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  trait :engine => Template::Remarkably
+  include Remarkably::Common
+  def index
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
+  end
+  def internal *args
+    @place = :internal
+    html do
+      head do
+        title "Template::Remarkably internal"
+      end
+      body do
+        h1 "The #@place Template for Remarkably"
+        a("Home", :href => R(:/))
+        P do
+          text "Here you can pass some stuff if you like, parameters are just passed like this:"
+          br
+          a("#@place/one", :href => Rs( @place, :one))
+          br
+          a("#@place/one/two/three", :href => Rs( @place, :one, :two, :three))
+          br
+          a("#@place/one?foo=bar", :href => Rs( @place, :one, :foo => :bar))
+          br
+        end
+        div do
+          text "The arguments you have passed to this action are:"
+          if args.empty?
+            "none"
+          else
+            args.each do |arg|
+              span arg
+            end
+          end
+        end
+        div request.params.inspect
+      end
+    end
+  end
+  def external *args
+    @args = args
+    @place = :external
+    @request = request
+  end
+end
+Ramaze.start

data/examples/todolist/main.rb CHANGED

@@ -9,10 +9,4 @@ require 'src/controller/main'
 require 'src/element/page'
 require 'src/model'
-# mode selects the config-file.
-# benchmark | debug | stage | live | silent
-mode = 'debug'
-Global.setup YAML.load_file("conf/#{mode}.yaml")
-start
+Ramaze.start

data/examples/todolist/src/controller/main.rb CHANGED

@@ -3,53 +3,66 @@
 class MainController < Controller
-  trait :engine => Template::Ezamar
+  helper :aspect
   def index
     @tasks = []
     TodoList.original.each do |title, parameters|
       if parameters[:done]
         status = 'done'
-        toggle = link( R( self, :open, CGI.escape(title) ), :title => 'Open Task' )
+        toggle = A('Open Task', :href => Rs(:open, title))
       else
         status = 'not done'
-        toggle = link( R( self, :close, CGI.escape(title) ), :title => 'Close Task' )
+        toggle = A('Close Task', :href => Rs(:close, title))
       end
-      delete = link( R( self, :delete, CGI.escape(title) ), :title => 'Delete' )
+      delete = A('Delete', :href => Rs(:delete, title))
       @tasks << [title, status, toggle, delete]
     end
     @tasks.sort!
   end
   def create
-    title = request['title']
-    TodoList[title] = {:done => false}
-    redirect R(self)
+    if title = request['title']
+      title.strip!
+      if title.empty?
+        error("Please enter a title")
+        redirect '/new'
+      end
+      TodoList[title] = {:done => false}
+    end
   end
   def open title
     task_status title, false
-    redirect R(self)
   end
   def close title
     task_status title, true
-    redirect R(self)
   end
   def delete title
     TodoList.delete title
-    redirect R(self)
   end
-  def error
-    @foo = 'bar'
+  after(:create, :open, :close, :delete){ redirect_index }
+  def redirect_index
+    redirect(Rs())
   end
   private
+  def error(message)
+    flash[:error] = message
+  end
   def task_status title, status
-    task = TodoList[title]
+    p title
+    unless task = TodoList[title]
+      error "No such Task: `#{title}'"
+      redirect_referer
+    end
     task[:done] = status
     TodoList[title] = task
   end

data/examples/todolist/src/element/page.rb CHANGED

@@ -18,6 +18,11 @@ class Page < Ezamar::Element
       </head>
       <body>
         <h1>#{@title}</h1>
+        <?r if flash[:error] ?>
+          <div class="error">
+            \#{flash[:error]}
+          </div>
+        <?r end ?>
         #{content}
       </body>
     </html>

data/examples/whywiki/main.rb CHANGED

@@ -48,4 +48,4 @@ Global.adapter = :mongrel
 #Global.tidy = true
 Global.mapping = {'/' => WikiController}
-start
+Ramaze.start

data/lib/proto/main.rb CHANGED

@@ -8,11 +8,3 @@ include Ramaze
 require 'src/controller/main'
 require 'src/element/page'
 require 'src/model'
-# mode selects the config-file.
-# benchmark | debug | stage | live | silent
-mode = 'debug'
-Global.setup YAML.load_file("conf/#{mode}.yaml")
-start

data/lib/proto/public/css/ramaze_error.css CHANGED

@@ -1,7 +1,3 @@
-img#logo {
-  float:left;
-}
 h1.main {
   text-align: center;
 }
@@ -40,3 +36,15 @@ tr.source_container div table tr.source {
 div.source {
   background: #fff;
 }
+tr.source {
+  font-size: 1.0em;
+}
+tr.source td.lineno {
+  font-size: 0.8em;
+}
+tr.source td.code pre {
+  height: 0.1em;
+}

data/lib/proto/public/error.zmr CHANGED

@@ -1,17 +1,10 @@
 <html>
   <head>
     <title>#{@title}</title>
-    <?r if @coderay ?>
-      <style>
-        #{CodeRay::Encoders[:html]::CSS.new.stylesheet}
-      </style>
-    <?r end ?>
     <link rel="stylesheet" href="/css/ramaze_error.css" />
     <script type="text/javascript" src="/js/jquery.js"></script>
   </head>
   <body>
-    <img id="logo" alt="Ramaze" src="/ramaze.png" />
     <h1>#{@title}</h1>
     <table class="main">
@@ -27,25 +20,13 @@
             <div class="source">
               <table style="width:100%;">
                 <tr>
-                  <td colspan="2">vim #{file} +#{lineno}</td>
+                  <td colspan="2">#{@editor} #{file} +#{lineno}</td>
                 </tr>
-                <?r
-                  if @coderay
-                    code = lines.map{|no, code, cur| code}.join("\n")
-                    options = {
-                      :wrap => :div,
-                      :line_numbers => :inline,
-                      :line_number_start => (lineno.to_i - Global.backtrace_size)
-                      }
-                     ?>
-                     #{CodeRay.scan(code, :ruby).html(options)}
-                <?r else ?>
-                  <?r lines.each do |llineno, lcode, lcurrent| ?>
-                    <tr class="source" #{'style="background:#faa;"' if lcurrent}>
-                      <td>#{llineno}</td>
-                      <td><pre>#{lcode.to_s.rstrip}</pre></td>
-                    </tr>
-                  <?r end ?>
+                <?r lines.each do |llineno, lcode, lcurrent| ?>
+                  <tr class="source" #{'style="background:#faa;"' if lcurrent}>
+                    <td class="lineno">#{llineno}</td>
+                    <td class="code"><pre>#{lcode.to_s.rstrip}</pre></td>
+                  </tr>
                 <?r end ?>
               </table>
             </div>

data/lib/ramaze.rb CHANGED

@@ -4,276 +4,66 @@
 # The main namespace for Ramaze
 module Ramaze
   BASEDIR = File.dirname(File.expand_path(__FILE__))
+  $:.unshift BASEDIR
 end
-$:.unshift Ramaze::BASEDIR
-require 'timeout'
-require 'ostruct'
-require 'socket'
-require 'yaml'
-require 'set'
-require 'pp'
+Thread.abort_on_exception = true
+# Bootstrap
+require 'ramaze/version'
 require 'ramaze/snippets'
-require 'ramaze/error'
-require 'ramaze/cache'
 require 'ramaze/inform'
 require 'ramaze/global'
-require 'ramaze/dispatcher'
-require 'ramaze/helper'
+require 'ramaze/cache'
+# Startup
 require 'ramaze/controller'
-require 'ramaze/template/ezamar'
-require 'ramaze/http_status'
-require 'ramaze/gestalt'
-require 'ramaze/version'
+require 'ramaze/adapter'
+require 'ramaze/sourcereload'
-Thread.abort_on_exception = true
+# Complete
+require 'ramaze/dispatcher'
+require 'ramaze/template/ezamar'
 module Ramaze
-  # This initializes all the other stuff, Controller, Adapter and Global
-  # which in turn kickstart Ramaze into duty.
-  # additionally it starts up the autoreload , which reloads all the stuff every
-  # second in case it has changed.
-  # please note that Ramaze will catch SIGINT (^C) and kill the running adapter
-  # at that event, this provides a nice and clean way to shut down.
-  #
-  # The start might be a bit odd, but i think it is a quite decent hack, what
-  # it does is following.
-  # It looks up who called the start-method, and if the method that called it
-  # is not the file that was run first, it will return without doing anything
-  # The use of this is:
-  # If you start ramaze over the CLI, using ruby main.rb
-  # and the start-method is called in your main.rb, it will run, using the
-  # configuration from you without any modifcation (just with the defaults)
-  # In case you start it via the ramaze-command however, you may pass options
-  # that could be overwritten by your application, but you just want to use
-  # these options temporarily - in this case the start-call from your main.rb
-  # will simply be ignored, the start from bin/ramaze is invoked which in turn
-  # sets the options you passed on the commandline.
-  # If you pertout want to run with bin/ramaze, pass commandline-options _and_
-  # use the start-method your own application, use start(:force => true)
-  # This also applies if your start is in another file than the file you
-  # called first, therefor giving you the option to layout your application
-  # as it pleases you.
-  def start options = {}
-    starter = caller[0].split(':').first
-    return unless ($0 == starter or options.delete(:force))
-    init_global options
-    return if options.delete(:fake_start)
-    startup
-  end
-  alias run start
+  # Each of these classes will be called ::startup upon Ramaze.startup
-  # same as start(:force => true)
+  trait :essentials => [
+    Global, Controller, Session, SourceReload, Adapter
+  ]
-  def force_start(options = {})
-    start options.merge(:force => true)
-  end
-  alias force_run force_start
-  # Execute the tasks specified in Global.startup
-  # (where you can define your own tasks)
-  # and afterwards the ones in Global.ramaze_startup
-  # (reserved for the usage of Ramaze itself)
-  def startup
-    tasks = Global.startup + Global.ramaze_startup
-    execute(*tasks)
-  end
+  class << self
-  # Execute the tasks specified in Global.shutdown
-  # (where you can define your own tasks)
-  # and afterwards the ones in Global.ramaze_shutdown
-  # (reserved for the usage of Ramaze itself)
+    # The one place to start Ramaze, takes an Hash of options to pass on to
+    # each class in trait[:essentials] by calling ::startup on them.
-  def shutdown
-    tasks = Global.shutdown + Global.ramaze_shutdown
-    execute(*tasks)
-  end
-  # executes a list of tasks, depending on the task-object, if it responds to
-  # :call it will be called upon, otherwise the task is sent to self ( the
-  # module Ramaze ).
-  def execute *tasks
-    tasks.flatten.each do |task|
-      begin
-        if task.respond_to?(:call)
-          task.call
-        else
-          send(task)
-        end
-      rescue Object => ex
-        exit if ex.is_a?(SystemExit)
-        Inform.error(ex)
-      end
-    end
-  end
+    def startup options = {}
+      Inform.info("Starting up Ramaze (Version #{VERSION})")
-  # kill all threads except Thread.main before #shutdown
+      starter = caller[0].split(':').first
+      return unless ($0 == starter or options.delete(:force))
-  def kill_threads
-    Inform.info("Killing the Threads")
-    Global.adapter_klass.stop rescue nil
-    (Thread.list - [Thread.main]).each do |thread|
-      Timeout.timeout(2) do
-        if thread[:adapter] and thread[:adapter].respond_to?(:shutdown)
-          thread[:adapter].shutdown
-        end
-        thread.kill
+      trait[:essentials].each do |obj|
+        obj.startup(options)
       end
     end
-  end
-  # Setup the Controllers
-  # This autogenerates a mapping and does some munging/validation on the way
+    # This will be called when you hit ^C or send SIGINT.
+    # It sends ::shutdown to every class in trait[:essentials] and informs you
+    # when it is done
-  def setup_controllers
-    Global.mapping ||= {}
-    Global.mapping.dup.each do |route, controller|
-      Global.mapping[route] = constant(controller.to_s)
-    end
-    Global.controllers.each do |controller|
-      if map = controller.mapping
-        Global.mapping[map] ||= controller
-        Inform.debug("mapped #{map} => #{controller}")
+    def shutdown
+      trait[:essentials].each do |obj|
+        obj.shutdown if obj.respond_to?(:shutdown)
       end
-    end
-    Inform.debug("found Controllers: #{Global.controllers.inspect}")
-    Inform.debug("mapped Controllers: #{Global.mapping.inspect}")
-  end
-  # Initialize the Kernel#autoreload with the value of Global.autoreload
+      puts("Shutdown Ramaze (it's safe to kill me now if i hang)")
-  def init_autoreload
-    return unless Global.autoreload
-    Ramaze.autoreload Global.autoreload
-  end
-  # initialize the Global, setting a default-mapping if none is given yet.
-  #
-  # You may pass :force_setup => true in your options if you want your options
-  # to override everything else set till now.
-  def init_global options = {}
-    tmp_mapping = Global.mapping || {}
-    if options.delete(:force_setup)
-      Global.setup(options)
-    else
-      Global.update(options)
-    end
-    Global.mapping = tmp_mapping.merge(Global.mapping)
-  end
-  # Finally decide wether to use a main-thread to run Ramaze
-  # so that further stuff can be done outside (very useful for testcases)
-  # or we run it in standalone-mode, which is the default and waits
-  # until the adapter is finished. (hopefully never ;)
-  # change this behaviour by setting Global.run_loose = (true|false)
-  # In every case the running adapter-thread is assigned to
-  # Global.running_adapter
-  def init_adapter
-    unless Global.adapter
-      Inform.info "No adapter will be used."
-      return
-    end
-    (Thread.list - [Thread.current]).each do |thread|
-      thread.kill if thread[:task] == :adapter
-    end
-    Thread.new do
-      Thread.current.priority = 99
-      Thread.current[:task] = :adapter
-      Global.running_adapter = run_adapter
-      trap(Global.shutdown_trap){ shutdown } rescue nil
-    end
-    Timeout.timeout(3) do
-      sleep 0.1 until Global.running_adapter
-    end
-    Global.running_adapter.join unless Global.run_loose
-  rescue Object => ex
-    Inform.debug(ex.message) unless ex.is_a? Interrupt
-    shutdown
-  end
-  # This first picks the right adapter according to Global.adapter
-  # It also looks for Global.host and Global.port and passes it on
-  # to the class-method of the adapter ::start
-  def run_adapter
-    adapter, host, port = Global.values_at(:adapter, :host, :port)
-    require_adapter(adapter)
-    adapter_klass = Ramaze::Adapter.const_get(adapter.to_s.capitalize)
-    Global.adapter_klass = adapter_klass
-    Inform.info("Found adapter: #{adapter_klass}, trying to connect to #{host}:#{port} ...")
-    parse_port(port)
-    shutdown unless test_connections(host, Global.ports)
-    Inform.info("and we're running: #{host}:#{port}")
-    adapter_klass.start host, Global.ports
-  end
-  # require the specified adapter from 'ramaze/adapter/name.to_s.downcase'
-  def require_adapter adapter
-    require "ramaze/adapter" / adapter.to_s.downcase
-  rescue LoadError => ex
-    Inform.error(ex)
-    puts "Please make sure you have an adapter called #{adapter}"
-    shutdown
-  end
-  # convert ports given as string (7000..7007) to an actual range.
-  # sets Global.port to the first of the ports given
-  # sets Global.ports to the range (if one port given just a range from
-  # that to the same (7000..7000)
-  def parse_port port
-    from_port, to_port = port.to_s.split('..')
-    if from_port and to_port
-      Global.ports = (from_port.to_i..to_port.to_i)
-    else
-      Global.ports = (from_port.to_i..from_port.to_i)
+      exit!
     end
-    Global.port = Global.ports.begin
-  end
-  # test if a connection can be made at the specified host/ports.
-  def test_connections host, ports
-    return true unless Global.test_connections
-    ports.map{|port| connection_possible(host, port) }.all?
-  end
-  # check connectivity to a specific host/port
-  def connection_possible host, port
-    Timeout.timeout(1) do
-      TCPServer.open(host, port){ true }
-    end
-  rescue => ex
-    Inform.error(ex)
-    false
+    alias start startup
+    alias stop shutdown
   end
-  extend self
 end