bivouac 0.1.1 → 0.1.2

data/README

@@ -12,6 +12,10 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.1.2:
+* You can now use 
+	$ ruby script/server webrick [options]
+
 === 0.1.1:
 * Mineur bug correction in postamble to be really ready for Rails 2.0 !!!!!
 * the index class is no longer Root (but Index)

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Wed, 09 Jan 2008 17:49:05 +0100
+Wed, 09 Jan 2008 18:24:26 +0100

data/doc/rdoc/files/README.html

@@ -87,7 +87,7 @@ end</strong>
     <div id="README" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">README / Wed Jan 09 17:48:08 +0100 2008</div>
+  <div class="path">README / Wed Jan 09 18:23:37 +0100 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -112,6 +112,15 @@ Bivouac is a simple generator for <a
 href="http://code.whytheluckystiff.net/camping">camping</a>.
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.1.2:</h3>
+<ul>
+<li>You can now use
+
+<pre>
+      $ ruby script/server webrick [options]
+</pre>
+</li>
+</ul>
 <h3>0.1.1:</h3>
 <ul>
 <li>Mineur bug correction in postamble to be really ready for Rails 2.0 !!!!!

data/lib/bivouac/template/application/postamble.rb

@@ -12,6 +12,11 @@ SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
 
 class <%= @appname %>Daemon < SimpleDaemon::Base
   @@server = nil
+  @@use = nil
+  
+  def self.use=(x)
+    @@use=x
+  end
   
   def self.start
     config = Bivouac::Environment.new( )
@@ -30,11 +35,15 @@ class <%= @appname %>Daemon < SimpleDaemon::Base
     end
     
     begin
-      require 'mongrel/camping'
+      if @@use.nil?
+        require 'mongrel/camping'
       
-      @@server = Mongrel::Camping.start( config.environment.address, config.environment.port, "/", <%= @appname %>)
-      puts "** <%= @appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
-      @@server.run.join
+        @@server = Mongrel::Camping.start( config.environment.address, config.environment.port, "/", <%= @appname %>)
+        puts "** <%= @appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
+        @@server.run.join
+      else
+        raise LoadError, "I want to use WEBrick please!"
+      end
     rescue LoadError => e
       require 'webrick/httpserver'
       require 'camping/webrick'
@@ -56,13 +65,27 @@ class <%= @appname %>Daemon < SimpleDaemon::Base
   end
 end
 
-deamonize = ARGV.shift
-case deamonize
-when '-d'
-  <%= @appname %>Daemon.daemonize
-when '-h'
-  puts "script/server [-d start|stop|restart] [-h]"
-  exit
-else
-  <%= @appname %>Daemon.start
+while ARGV.size > 0
+  deamonize = ARGV.shift
+  case deamonize
+  when 'webrick'
+    <%= @appname %>Daemon.use='webrick'
+  when '-d'
+    <%= @appname %>Daemon.daemonize
+    break
+  when '-h'
+    begin
+      require 'mongrel/camping'
+      puts "=> Booting Mongrel (use 'script/server webrick [options]' to force WEBrick)"
+    rescue LoadError => e
+      puts "=> Booting WEBrick"
+    end
+    puts "script/server [-d start|stop|restart] [-h]"
+    exit
+  when '--'
+    <%= @appname %>Daemon.start
+    break
+  else
+    puts "Ignore unknown option '#{deamonize}' !"
+  end
 end

data/lib/bivouac/template/server.rb

@@ -3,4 +3,4 @@ require 'rubygems'
 app = File.dirname(__FILE__) + "/../app/<%= @conf.appdir %>.rb"
 
 ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
-system "ruby #{app} #{ARGV.join(' ')}"
+system "ruby #{app} #{ARGV.join(' ')} --"

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 date: 2008-01-09 00:00:00 +01:00
 summary: Developpe with Camping like you do with Rails
 require_paths: