RubyGems - ramaze - Versions diffs - 2009.04 → 2009.05 - Mend

ramaze 2009.04 → 2009.05

Files changed (69) hide show

data/CHANGELOG +168 -0
data/MANIFEST +16 -6
data/{README.markdown → README.md} +0 -14
data/Rakefile +20 -20
data/benchmark/bench_templates/bench.rb +67 -0
data/benchmark/bench_templates/view/large.erb +79 -0
data/benchmark/bench_templates/view/large.haml +41 -0
data/benchmark/bench_templates/view/large.xhtml +79 -0
data/benchmark/bench_templates/view/small.erb +21 -0
data/benchmark/bench_templates/view/small.haml +12 -0
data/benchmark/bench_templates/view/small.xhtml +21 -0
data/benchmark/run.rb +14 -21
data/benchmark/suite/minimal.rb +3 -5
data/benchmark/suite/no_informer.rb +0 -2
data/benchmark/suite/no_sessions.rb +3 -4
data/benchmark/suite/no_template.rb +1 -3
data/benchmark/suite/simple.rb +1 -3
data/benchmark/suite/template_erubis.rb +0 -2
data/benchmark/suite/template_etanni.rb +8 -0
data/benchmark/suite/template_ezamar.rb +1 -3
data/benchmark/suite/template_haml.rb +0 -2
data/benchmark/suite/template_liquid.rb +0 -2
data/benchmark/suite/template_markaby.rb +0 -2
data/benchmark/suite/template_nagoro.rb +1 -3
data/benchmark/suite/template_redcloth.rb +0 -2
data/benchmark/suite/template_tenjin.rb +0 -2
data/bin/ramaze +7 -300
data/doc/AUTHORS +11 -7
data/examples/app/chat/layout/{default.nag → default.xhtml} +0 -0
data/examples/app/chat/view/{chat.nag → chat.xhtml} +0 -0
data/examples/app/chat/view/{index.nag → index.xhtml} +0 -0
data/examples/helpers/cache.rb +6 -4
data/lib/ramaze.rb +2 -3
data/lib/ramaze/cache/sequel.rb +17 -5
data/lib/ramaze/gestalt.rb +3 -0
data/lib/ramaze/helper/gestalt.rb +32 -0
data/lib/ramaze/helper/paginate.rb +1 -0
data/lib/ramaze/helper/ultraviolet.rb +2 -0
data/lib/ramaze/log/rotatinginformer.rb +10 -10
data/lib/ramaze/request.rb +1 -4
data/lib/ramaze/tool/bin.rb +330 -0
data/lib/ramaze/version.rb +1 -1
data/lib/ramaze/view.rb +3 -13
data/lib/ramaze/view/erubis.rb +2 -2
data/lib/ramaze/view/ezamar.rb +2 -2
data/lib/ramaze/view/gestalt.rb +14 -0
data/lib/ramaze/view/haml.rb +1 -1
data/lib/ramaze/view/liquid.rb +2 -2
data/lib/ramaze/view/maruku.rb +2 -1
data/lib/ramaze/view/sass.rb +1 -1
data/lib/ramaze/view/tenjin.rb +7 -4
data/lib/vendor/route_exceptions.rb +8 -9
data/ramaze.gemspec +6 -9
data/spec/examples/caching.rb +2 -4
data/spec/examples/element.rb +1 -0
data/spec/examples/templates/template_ezamar.rb +1 -0
data/spec/examples/templates/template_nagoro.rb +1 -0
data/spec/ramaze/error.rb +1 -1
data/spec/ramaze/gestalt.rb +22 -16
data/spec/ramaze/helper/localize.rb +10 -8
data/spec/ramaze/helper/sequel_form.rb +2 -0
data/spec/ramaze/helper/user.rb +2 -2
data/spec/ramaze/view/gestalt.rb +94 -0
data/spec/ramaze/view/gestalt/external.ges +8 -0
data/tasks/install_dependencies.rake +1 -1
data/tasks/release.rake +5 -4
metadata +20 -20
data/benchmark/suite/template_builder.rb +0 -12
data/lib/ramaze/snippets/kernel/constant.rb +0 -41

data/benchmark/bench_templates/view/large.haml ADDED

@@ -0,0 +1,41 @@
+%html
+  %head
+    %title
+      - if @title
+        = @title
+  %body
+    %h1
+      - if @h1
+        = @h1
+    %div
+      -  if @v1
+        -  if @v2
+          -  if @v3
+            -  if @v4
+              -  if @v5
+                -  if @v6
+                  -  if @v7
+                    -  if @v8
+                      -  if @v9
+                        -  if @v10
+                          -  if @v11
+                            -  if @v12
+                              -  if @v13
+                                -  if @v14
+                                  -  if @v15
+                                    -  if @v16
+                                      -  if @v17
+                                        -  if @v18
+                                          -  if @v19
+                                            -  if @v20
+                                              -  if @v21
+                                                -  if @v22
+                                                  -  if @v23
+                                                    -  if @v24
+                                                      -  if @v25
+                                                        -  if @v26
+                                                          -  if @v27
+                                                            -  if @v28
+                                                              -  if @v29
+                                                                -  if @v30
+                                                                  = stuff

data/benchmark/bench_templates/view/large.xhtml ADDED

@@ -0,0 +1,79 @@
+<html>
+  <head>
+    <title>
+      <?r if @title ?>
+        #{@title}
+      <?r end ?>
+    </title>
+  </head>
+  <body>
+    <h1>
+      <?r if @h1 ?>
+        #{@h1}
+      <?r end ?>
+    </h1>
+    <div>
+      <?r if @v1 ?>
+        <?r if @v2 ?>
+          <?r if @v3 ?>
+            <?r if @v4 ?>
+              <?r if @v5 ?>
+                <?r if @v6 ?>
+                  <?r if @v7 ?>
+                    <?r if @v8 ?>
+                      <?r if @v9 ?>
+                        <?r if @v10 ?>
+                          <?r if @v11 ?>
+                            <?r if @v12 ?>
+                              <?r if @v13 ?>
+                                <?r if @v14 ?>
+                                  <?r if @v15 ?>
+                                    <?r if @v16 ?>
+                                      <?r if @v17 ?>
+                                        <?r if @v18 ?>
+                                          <?r if @v19 ?>
+                                            <?r if @v20 ?>
+                                              <?r if @v21 ?>
+                                                <?r if @v22 ?>
+                                                  <?r if @v23 ?>
+                                                    <?r if @v24 ?>
+                                                      <?r if @v25 ?>
+                                                        <?r if @v26 ?>
+                                                          <?r if @v27 ?>
+                                                            <?r if @v28 ?>
+                                                              <?r if @v29 ?>
+                                                                <?r if @v30 ?>
+                                                                #{stuff}
+                                                                <?r end ?>
+                                                              <?r end ?>
+                                                            <?r end ?>
+                                                          <?r end ?>
+                                                        <?r end ?>
+                                                      <?r end ?>
+                                                    <?r end ?>
+                                                  <?r end ?>
+                                                <?r end ?>
+                                              <?r end ?>
+                                            <?r end ?>
+                                          <?r end ?>
+                                        <?r end ?>
+                                      <?r end ?>
+                                    <?r end ?>
+                                  <?r end ?>
+                                <?r end ?>
+                              <?r end ?>
+                            <?r end ?>
+                          <?r end ?>
+                        <?r end ?>
+                      <?r end ?>
+                    <?r end ?>
+                  <?r end ?>
+                <?r end ?>
+              <?r end ?>
+            <?r end ?>
+          <?r end ?>
+        <?r end ?>
+      <?r end ?>
+    </div>
+  </body>
+</html>

data/benchmark/bench_templates/view/small.erb ADDED

@@ -0,0 +1,21 @@
+<html>
+  <head>
+    <title>
+      <% if @title %>
+        <%= @title %>
+      <% end %>
+    </title>
+  </head>
+  <body>
+    <h1>
+      <% if @h1 %>
+        <%= @h1 %>
+      <% end %>
+    </h1>
+    <div>
+      <% if @div %>
+        <%= @div %>
+      <% end %>
+    </div>
+  </body>
+</html>

data/benchmark/bench_templates/view/small.haml ADDED

@@ -0,0 +1,12 @@
+%html
+  %head
+    %title
+      - if @title
+        = @title
+  %body
+    %h1
+      - if @h1
+        = @h1
+    %div
+      - if @div
+        = @div

data/benchmark/bench_templates/view/small.xhtml ADDED

@@ -0,0 +1,21 @@
+<html>
+  <head>
+    <title>
+      <?r if @title ?>
+        #{@title}
+      <?r end ?>
+    </title>
+  </head>
+  <body>
+    <h1>
+      <?r if @h1 ?>
+        #{@h1}
+      <?r end ?>
+    </h1>
+    <div>
+      <?r if @div ?>
+        #{@div}
+      <?r end ?>
+    </div>
+  </body>
+</html>

data/benchmark/run.rb CHANGED

@@ -144,8 +144,8 @@ class RamazeBenchmark
   end
   attr_accessor :requests, :adapters, :port, :log, :display_code, :target
-  attr_accessor :concurrent, :paths, :benchmarker, :informer, :sessions
-  attr_accessor :show_log, :ignored_tags, :formats
+  attr_accessor :concurrent, :paths, :benchmarker, :informer
+  attr_accessor :mode, :show_log, :formats
   def initialize()
     @adapters = [:webrick]
@@ -157,10 +157,9 @@ class RamazeBenchmark
     @paths = ["/"]
     @target = /.+/
     @informer = true
-    @sessions = true
-    @ignored_tags = [:debug, :dev]
     @formats = ["text"]
     @writers = []
+    @mode = :live
     yield self
   end
@@ -175,8 +174,8 @@ class RamazeBenchmark
     end
     # benchmarks
-    __DIR__ = File.expand_path(File.dirname(__FILE__))
-    Dir[__DIR__('suite/*.rb')].each do |filename|
+    glob = File.expand_path('../suite/*.rb', __FILE__)
+    Dir.glob(glob) do |filename|
       @adapters.each do |adapter|
         @paths.each do |path|
           benchmark(filename, adapter, path) if @target.match(filename)
@@ -199,7 +198,6 @@ class RamazeBenchmark
     l :Concurrent, @concurrent
     l :Path,       path
     l :Informer,   @informer
-    l :Sessions,   @sessions
     if @display_code
       l :Code, "<code ruby>\n#{File.read(filename)}\n</code>\n\n"
     end
@@ -248,17 +246,17 @@ class RamazeBenchmark
   def ramaze(filename, adapter)
     pid = fork do
       begin
-        require filename
-        Ramaze::Log.ignored_tags = @ignored_tags
+        require 'ramaze'
+        Ramaze.options.mode = @mode
         if @informer
           unless @show_log
-            Ramaze::Log.loggers = [Ramaze::Logging::Logger::Informer.new("/dev/null")]
+            require 'ramaze/log/informer'
+            Ramaze::Log.loggers = [Ramaze::Logger::Informer.new("/dev/null")]
           end
         else
           Ramaze::Log.loggers = []
         end
-        Ramaze::Global.sessions = @sessions
-        Ramaze::Global.sourcereload = false
+        require filename
         Ramaze.start :adapter => adapter, :port => @port
       rescue LoadError => ex; l :Error, ex; end
     end
@@ -324,23 +322,18 @@ RamazeBenchmark.new do |bm|
       bm.paths = paths.split(",")
     end
-    opt.on('--no-informer', 'Disable informer') do
-      bm.informer = false
+    opt.on('--mode MODE', '[live] Ramaze mode') do |mode|
+      bm.mode = mode.to_sym
     end
-    opt.on('--ignored-tags TAGS',
-           '[debug,dev] Specify ignored tags for Ramaze::Log') do |tags|
-      bm.ignored_tags = tags.split(",").map{|e| e.to_sym }
+    opt.on('--no-informer', 'Disable informer') do
+      bm.informer = false
     end
     opt.on('--show-log', 'Show log') do
       bm.show_log = true
     end
-    opt.on('--no-sessions', 'Disable sessions') do
-      bm.sessions = false
-    end
     opt.on('--target REGEXP',
            '[/.+/] Specify benchmark scripts to measure') do |name|
       bm.target = Regexp.compile(name)

data/benchmark/suite/minimal.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :None
@@ -8,6 +6,6 @@ class MainController < Ramaze::Controller
   end
 end
-Ramaze::Global.sourcereload = false
-Ramaze::Global.sessions = false
-Ramaze::Log.loggers = []
+Ramaze.middleware!(:bench){|m| m.run(Ramaze::AppMap) }
+Ramaze.options.mode = :bench
+Ramaze::Log.loggers.clear

data/benchmark/suite/no_informer.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   def index
     "Hello, World!"

data/benchmark/suite/no_sessions.rb CHANGED

@@ -1,10 +1,9 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   def index
     "Hello, World!"
   end
 end
-Ramaze::Log.loggers = []
-Ramaze::Global.sessions = false
+Ramaze.middleware!(:nosessions){|m| m.run(Ramaze::AppMap) }
+Ramaze.options.mode = :nosessions
+Ramaze::Log.loggers.clear

data/benchmark/suite/no_template.rb CHANGED

@@ -1,9 +1,7 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :None
   def index
     "Hello, World!"
   end
-end
+end

data/benchmark/suite/simple.rb CHANGED

@@ -1,7 +1,5 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   def index
     "Hello, World!"
   end
-end
+end

data/benchmark/suite/template_erubis.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Erubis

data/benchmark/suite/template_etanni.rb ADDED

@@ -0,0 +1,8 @@
+class MainController < Ramaze::Controller
+  engine :Etanni
+  def index
+    @hello = "Hello, World!"
+    '<html><body><?r 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
+  end
+end

data/benchmark/suite/template_ezamar.rb CHANGED

@@ -1,10 +1,8 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Ezamar
   def index
     @hello = "Hello, World!"
-    '<html><body><? 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
+    '<html><body><?r 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
   end
 end

data/benchmark/suite/template_haml.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Haml

data/benchmark/suite/template_liquid.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Liquid

data/benchmark/suite/template_markaby.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Markaby
   helper :markaby

data/benchmark/suite/template_nagoro.rb CHANGED

@@ -1,10 +1,8 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Nagoro
   def index
     @hello = "Hello, World!"
-    '<html><body><span times=10>#{@hello}</span></body></html>'
+    '<html><body><span times="10">#{@hello}</span></body></html>'
   end
 end

data/benchmark/suite/template_redcloth.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :RedCloth
   layout :layout

data/benchmark/suite/template_tenjin.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Tenjin

data/bin/ramaze CHANGED

@@ -1,303 +1,10 @@
 #!/usr/bin/env ruby
-def include_ramaze
-  begin
-    $:.unshift File.join(File.dirname(__FILE__), '/../lib')
-    require 'ramaze'
-  rescue LoadError
-    $:.shift
-    begin
-      require 'rubygems'
-    rescue LoadError
-    end
-    require 'ramaze'
-  end
-end
-def usage
-  txt = <<-TXT
-  Usage:
-    ramaze <start [PIDFILE]|stop [PIDFILE]|restart [PIDFILE]|status [PIDFILE]|create PROJECT|console> [ruby/rack options]
-    Commands:
-      * All commands which take an optional PIDFILE default to PROJECT.pid if you do not supply one.
-      * All commands which start a ramaze instance will default to webrick on port 7000 unless you supply
-        the rack options -p/--port PORT and/or * -s/--server SERVER.
-      start   - Starts an instance of this application.
-      stop    - Stops a running instance of this application.
-      restart - Stops running instance of this application, then starts it back up.  Pidfile
-                (if supplied) is used for both stop and start.
-      status  - Gives status of a running ramaze instance
-      create  - Creates a new prototype Ramaze application in a directory named PROJECT in
-                the current directory.  ramaze create foo would make ./foo containing an
-                application prototype. Rack options are ignored here.
-      console - Starts an irb console with app.rb (and irb completion) loaded. This command
-                ignores rack options, ARGV is passed on to IRB.
-TXT
-  if is_windows?
-    txt << %x{ruby #{rackup_path} --help}.split("\n").reject { |line| line.match(/^Usage:/) }.join("\n\t")
-  else
-    txt << %x{#{rackup_path} --help}.split("\n").reject { |line| line.match(/^Usage:/) }.join("\n\t")
-  end
-end
-## Methods for commands {{{
-def start
-  # Find the name of this app
-  app_name = default_pidfile.sub(/\.pid$/,'')
-  added_args = []
-  if daemonize = OURARGS.detect { |arg| arg.match(/^(-[dD]|--daemonize)$/) }
-    if pid_arg = OURARGS.detect { |arg| arg.match(/^(-P|--pid)/) }
-      puts "User supplied pid: #{pid_arg}"
-      pid_file = OURARGS[OURARGS.index(pid_arg) + 1]
-      puts "Starting daemon with user defined pidfile: #{pid_file}"
-    else
-      puts "Starting daemon with default pidfile: #{pid_file = default_pidfile}"
-      added_args += ["-P", pid_file]
-    end
-    if check_running?(pid_file)
-      $stderr.puts "Ramaze is already running with pidfile: #{pid_file}"
-      exit 127
-    end
-  end
-  added_args += ["-p", "7000"] unless OURARGS.detect { |arg| arg.match(/^(-p|--port)/) }
-  added_args += ["-s", "webrick"] unless OURARGS.detect { |arg| arg.match(/^(-s|--server)/) }
-  if is_windows?
-    exec("ruby", rackup_path.to_s, "config.ru", *(ARGV + added_args))
-  else
-    exec(rackup_path.to_s, "config.ru", *(ARGV + added_args))
-  end
-end
-def create(command)
-  project_name = OURARGS[OURARGS.index(command) + 1]
-  if project_name.nil?
-    $stderr.puts "Must supply a project name" if project_name.nil?
-    puts usage
-    exit 1
-  end
-  opts = {}
-  if OURARGS.detect { |arg| arg.match(/^(--force)/) }
-    puts "Overwriting any existing files as requested."
-    opts[:force] = true
-  end
-  if OURARGS.detect { |arg| arg.match(/^(--amend)/) }
-    puts "Only amending missing files as requested."
-    opts[:amend] = true
-  end
-  include_ramaze
-  require 'ramaze/tool/create'
-  Ramaze::Tool::Create.create(project_name, opts)
-end
-def stop(command)
-  unless pid_file = find_pid(OURARGS[OURARGS.index(command) + 1])
-    $stderr.puts "No pid_file found!  Cannot stop ramaze (may not be started)."
-    return false
-  end
-  pid = File.read(pid_file).to_i
-  puts "Stopping pid #{pid}"
-  Process.kill("INT", pid)
-  sleep 2
-  if is_running?(pid)
-    $stderr.puts "Process #{pid} did not die, forcing it with -9"
-    Process.kill(9, pid)
-    File.unlink(pid_file) if File.file?(pid_file)
-    true
-  else
-    File.unlink(pid_file) if File.file?(pid_file)
-    true
-  end
-end
-def status(command)
-  unless pid_file = find_pid(OURARGS[OURARGS.index(command) + 1])
-    $stderr.puts "No pid_file found! Ramaze may not be started."
-    exit 1
-  end
-  puts "Pid file #{pid_file} found, PID is #{pid = File.read(pid_file)}"
-  unless is_running?(pid.to_i)
-    $stderr.puts "PID #{pid} is not running"
-    exit 1
-  end
-  if is_windows?
-    wmi = WIN32OLE.connect("winmgmts://")
-    processes, ours = wmi.ExecQuery("select * from win32_process where ProcessId = #{pid}"), []
-    processes.each { |p| ours << [p.Name, p.CommandLine, p.VirtualSize, p.CreationDate, p.ExecutablePath, p.Status ] }
-    puts "Ramaze is running!\n\tName: %s\n\tCommand Line: %s\n\tVirtual Size: %s\n\tStarted: %s\n\tExec Path: %s\n\tStatus: %s" % ours.first
-  else
-    require "pathname"
-    # Check for /proc
-    if File.directory?(proc_dir = Pathname.new("/proc"))
-      proc_dir = proc_dir.join(pid)
-      # If we have a "stat" file, we'll assume linux and get as much info
-      # as we can
-      if File.file?(stat_file = proc_dir.join("stat"))
-        stats = File.read(stat_file).split
-        puts "Ramaze is running!\n\tCommand Line: %s\n\tVirtual Size: %s\n\tStarted: %s\n\tExec Path: %s\n\tStatus: %s" % [
-          File.read(proc_dir.join("cmdline")).split("\000").join(" "),
-          "%s k" % (stats[22].to_f / 1024),
-          File.mtime(proc_dir),
-          File.readlink(proc_dir.join("exe")),
-          stats[2]
-        ]
-        exit
-      end
-    end
-    # Fallthrough status, just print a ps
-    puts "Ramaze process #{pid} is running!"
-    begin
-      puts %x{ps l #{pid}}
-    rescue
-      puts "No further information available"
-    end
-  end
-end
-## End Command methods }}}
-# Helper methods {{{
-def default_pidfile
-  return @default_pidfile if @default_pidfile
+begin
   require "pathname"
-  @default_pidfile = (Pathname.new(".").expand_path.basename.to_s + ".pid").strip
-end
-def is_windows?
-  return @is_win if @is_win
-  begin
-    require "win32ole"
-  rescue LoadError
-  end
-  @is_win ||= Object.const_defined?("WIN32OLE")
-end
-def rackup_path
-  return @rackup_path if @rackup_path
-  # Use the supplied path if the user supplied -R
-  if path_supplied = ARGV.delete("-R")
-    @rackup_path = ARGV.delete(OURARGS[OURARGS.index("-R") + 1])
-    if @rackup_path and File.file?(@rackup_path)
-      return @rackup_path
-    else
-      $stderr.puts "rackup does not exist at #{@rackup_path} (given with -R)"
-    end
-  end
-  # Check with 'which' on platforms which support it
-  unless is_windows?
-    @rackup_path = %x{which rackup}.to_s.chomp
-    if @rackup_path.size > 0 and File.file?(@rackup_path)
-      return @rackup_path
-    end
-  end
-  # check for rackup in RUBYLIB
-  libs = ENV["RUBYLIB"].to_s.split(is_windows? ? ";" : ":")
-  if rack_lib = libs.detect { |r| r.match %r<(\\|/)rack\1> }
-    require "pathname"
-    @rackup_path = Pathname.new(rack_lib).parent.join("bin").join("rackup").expand_path
-    return @rackup_path if File.file?(@rackup_path)
-  end
-  begin
-    require "rubygems"
-    require "rack"
-    require "pathname"
-    @rackup_path = Pathname.new(Gem.bindir).join("rackup").to_s
-    return @rackup_path if File.file?(@rackup_path)
-  rescue LoadError
-    nil
-  end
-  @rackup_path = nil
-  raise "Cannot find path to rackup, please supply full path to rackup with -R"
-end
-def is_running?(pid)
-  if is_windows?
-    wmi = WIN32OLE.connect("winmgmts://")
-    processes, ours = wmi.ExecQuery("select * from win32_process where ProcessId = #{pid}"), []
-    processes.each { |process| ours << process.Name }
-    ours.first.nil?
-  else
-    begin
-      prio = Process.getpriority(Process::PRIO_PROCESS, pid)
-      true
-    rescue Errno::ESRCH
-      false
-    end
-  end
-end
-def check_running?(pid_file)
-  return false unless File.file?(pid_file)
-  is_running?(File.read(pid_file).to_i)
-end
-def find_pid(pid_file)
-  if pid_file.nil? or not File.file?(pid_file)
-    pid_file = default_pidfile
-  end
-  unless File.file?(pid_file)
-    $stderr.puts "Could not find running process id."
-    return false
-  end
-  pid_file
-end
-## End helper methods }}}
-OURARGS = ARGV.dup
-command = ARGV.detect { |arg| arg.match(/^(?:--?)?(?:start|stop|restart|create|h(?:elp)?|v(?:ersion)?|console|status)/) }
-if command.nil?
-  command = ""
-else
-  ARGV.delete(command)
-end
-case command
-when /^(?:--?)?status$/
-  status(command)
-when /^(?:--?)?restart$/
-  stop(command)
-  start
-when /^(?:--?)?start$/
-  start
-when /^(?:--?)?create$/
-  create(command)
-when /^(?:--?)?stop$/
-  if stop(command)
-    puts "Ramazement has ended, go in peace."
-    $stdout.flush
-  else
-    puts "Ramaze failed to stop (or was not running)"
-  end
-when /^(?:--?)?console$/
-  require "ramaze"
-  require "irb"
-  require "irb/completion"
-  Ramaze.options.started = true
-  require "start"
-  IRB.start
-  puts "Ramazement has ended, go in peace."
-when /^(?:--?)?h(elp)?$/
-  puts usage
-when /^(?:--?)?v(ersion)?$/
-  include_ramaze
-  puts Ramaze::VERSION
-  exit
-when /^$/
-  puts "Must supply a valid command"
-  puts usage
-  exit 1
-else
-  puts "#{command} not implemented"
-  puts usage
-  exit 1
+  require Pathname.new(__FILE__).expand_path.dirname.join("..", "lib", "ramaze")
+  require "ramaze/bin_ramaze"
+rescue LoadError
+  require "rubygems"
+  require "ramaze/tool/bin"
 end
+Ramaze::Tool::Bin::Cmd.run(ARGV)