bivouac 0.2.1 → 0.2.2

data/README

@@ -20,6 +20,18 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.2.2:
+* Postamble has been completely rewritten. So :
+
+  Usage: server [thin|mongrel|webrick] [option]
+	  -p port                : Runs Bivouac on the specified port (default 3301)
+	  -b ip                  : Binds Bivouac to the specified ip (default 0.0.0.0)
+	  -d start|stop|restart  : Make server run as a Daemon.
+
+* Bivouac::Template#copyTemplate and Bivouac::Template#template have been modified to support backpack, the new plugin generator
+
+	gem install backpack
+
 === 0.2.1:
 * Add addControllerHelperModule and controllerHelperModule
 * iUI's Tent Plugin beta

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Fri, 04 Apr 2008 20:24:50 +0200
+Wed, 09 Apr 2008 20:08:28 +0200

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 / Fri Apr 04 19:52:44 +0200 2008</div>
+  <div class="path">README / Wed Apr 09 20:07:58 +0200 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -130,6 +130,27 @@ href="http://code.whytheluckystiff.net/camping">camping</a>.
 </li>
 </ul>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.2.2:</h3>
+<ul>
+<li>Postamble has been completely rewritten. So :
+
+<p>
+Usage: server [thin|mongrel|webrick] [option]
+</p>
+<pre>
+        -p port                : Runs Bivouac on the specified port (default 3301)
+        -b ip                  : Binds Bivouac to the specified ip (default 0.0.0.0)
+        -d start|stop|restart  : Make server run as a Daemon.
+</pre>
+</li>
+<li>Bivouac::Template#copyTemplate and Bivouac::Template#template have been
+modified to support backpack, the new plugin generator
+
+<pre>
+      gem install backpack
+</pre>
+</li>
+</ul>
 <h3>0.2.1:</h3>
 <ul>
 <li>Add addControllerHelperModule and controllerHelperModule

data/lib/bivouac/template.rb

@@ -54,12 +54,12 @@ module Bivouac
       end
     end
     
-    def copyTemplate( file, dest )
+    def copyTemplate( file, dest, from = File.dirname(__FILE__) )
       if File.exist?( dest + "/" + File.basename( file ) )
         puts "\tskip #{File.expand_path( dest + "/" + File.basename( file ) )}: already exist"
       else
         puts "\tcreate #{File.expand_path( dest ) + "/" + File.basename( file )}"
-        src = File.dirname(__FILE__) + "/template/" + file
+        src = from + "/template/" + file
         FileUtils::cp( src, dest )
       end
     end
@@ -73,8 +73,8 @@ module Bivouac
       return( result )
     end
     
-    def template( template_name, b = nil )
-      template_file = File.dirname(__FILE__) + "/template/" + template_name + ".rb"
+    def template( template_name, b = nil, from = File.dirname(__FILE__) )
+      template_file = from + "/template/" + template_name + ".rb"
       
       return plugin_template( template_file, b )
     end

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

@@ -7,6 +7,8 @@
 #  DO NOT EDIT THIS FILE OR YOU REALLY KNOW WHAT YOU ARE DOING
 #  USE script/generate helper my_helper
 #
+
+## If the app run on Windows, check if win32/process is installed
 windows_process = false
 if /Windows/.match( ENV['OS'] )
   begin
@@ -23,54 +25,103 @@ DIRNAME = File.expand_path( File.dirname(__FILE__) )
 SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
 
 class <%= @conf.appname %>Daemon < SimpleDaemon::Base
+  begin
+    begin
+      require 'thin'
+      @@loaded_server = 'thin'
+    rescue LoadError
+      require 'mongrel/camping'
+      @@loaded_server = 'mongrel'
+    end
+  rescue LoadError
+    require 'webrick/httpserver'
+    require 'camping/webrick'
+    @@loaded_server = 'webrick'
+  end
+  
   @@server = nil
-  @@use = nil
+  @@force_use = nil
+  @@server_ip = nil
+  @@server_port = nil
   
   def self.use=(x)
-    @@use=x
+    @@force_use=x
+  end
+  
+  def self.ip=(x)
+    @@server_ip=x
+  end
+  
+  def self.port=(x)
+    @@server_port=x
   end
   
   def self.start
+    ## Load configuration
     config = Bivouac::Environment.new( )
     
+    ## Initialize database connection
     database_connection = config.environment.db
     if database_connection[:adapter] =~ /sqlite/
       database_connection[:database] = DIRNAME + "/../" + database_connection[:database]
     end
     <%= @conf.appname %>::Models::Base.establish_connection database_connection
+    
+    ## Define log
     <%= @conf.appname %>::Models::Base.logger = Logger.new(DIRNAME + "/../log/<%= @conf.appname %>.log")
-    # -- DON'T WORK WITH RAILS 2 -- # <%= @conf.appname %>::Models::Base.threaded_connections = false
+    
+    ## Migrate database if needed
     <%= @conf.appname %>.create if <%= @conf.appname %>.respond_to? :create
     
+    ## Initialize trap
     trap(:INT) do
       stop
     end
     
+    ## Set server to use
+    if @@force_use.nil?
+      @@use_server = @@loaded_server
+    else
+      @@use_server = @@force_use
+    end
+    
+    ## Set ip and port
+    @@server_port = config.environment.port if @@server_port.nil?
+    @@server_ip = config.environment.address if @@server_ip.nil?
+    
     begin
-      if @@use.nil?
-        begin
-          require 'thin' 
-          
-          Rack::Handler::Thin.run Rack::Adapter::Camping.new( <%= @conf.appname %> ), :Host => config.environment.address, :Port => config.environment.port
-          puts "** <%= @conf.appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
-        rescue LoadError
+      case @@use_server
+      when 'thin'
+        if @@loaded_server != @@use_server
+          require 'thin'
+        end
+        
+        # Rack::Handler::Thin.run Rack::Adapter::Camping.new( <%= @conf.appname %> ), :Host => @@server_ip, :Port => @@server_port
+        @@server = Thin::Server.new( @@server_ip, @@server_port.to_i, Rack::Adapter::Camping.new( <%= @conf.appname %> ) )
+        puts "** <%= @conf.appname %> is running at http://#{@@server_ip}:#{@@server_port}"
+        @@server.start
+      when 'mongrel'
+        if @@loaded_server != @@use_server
           require 'mongrel/camping'
-      
-          @@server = Mongrel::Camping.start( config.environment.address, config.environment.port, "/", <%= @conf.appname %>)
-          puts "** <%= @conf.appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
-          @@server.run.join
         end
+        
+        @@server = Mongrel::Camping.start( @@server_ip, @@server_port, "/", <%= @conf.appname %>)
+        puts "** <%= @conf.appname %> is running at http://#{@@server_ip}:#{@@server_port}"
+        @@server.run.join
+      when 'webrick'
+        if @@loaded_server != @@use_server
+          require 'webrick/httpserver'
+          require 'camping/webrick'
+        end
+        
+        @@server = WEBrick::HTTPServer.new :BindAddress => @@server_ip, :Port => @@server_port
+        puts "** <%= @conf.appname %> is running at http://#{@@server_ip}:#{@@server_port}"
+        @@server.mount "/", WEBrick::CampingHandler, <%= @conf.appname %>
+        @@server.start
       else
-        raise LoadError, "I want to use WEBrick please!"
+        puts "Don't know how to use server `#{@@use_server}'!"
+        exit 0
       end
-    rescue LoadError => e
-      require 'webrick/httpserver'
-      require 'camping/webrick'
-      
-      @@server = WEBrick::HTTPServer.new :BindAddress => config.environment.address, :Port => config.environment.port
-      puts "** <%= @conf.appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
-      @@server.mount "/", WEBrick::CampingHandler, <%= @conf.appname %>
-      @@server.start
     end
   end
   
@@ -82,16 +133,8 @@ class <%= @conf.appname %>Daemon < SimpleDaemon::Base
     end
     @@server = nil
   end
-end
-
-while ARGV.size > 0
-  deamonize = ARGV.shift
-  case deamonize
-  when 'webrick'
-    <%= @conf.appname %>Daemon.use='webrick'
-  when '-c'
-    ARGV.clear
-    
+  
+  def self.console
     include <%= @conf.appname %>::Models
     
     config = Bivouac::Environment.new( )
@@ -108,24 +151,39 @@ while ARGV.size > 0
       ENV['IRBRC'] = ".irbrc"
     end
     IRB.start
+  end
+end
+
+while ARGV.size > 0
+  deamonize = ARGV.shift
+  case deamonize
+  when 'webrick'
+    <%= @conf.appname %>Daemon.use='webrick'
+  when 'mongrel'
+    <%= @conf.appname %>Daemon.use='mongrel'
+  when 'thin'
+    <%= @conf.appname %>Daemon.use='thin'
+  when '-c'
+    ARGV.clear
+    <%= @conf.appname %>Daemon.console
+    break
+  when '-h'
+    puts "Usage: server [thin|mongrel|webrick] [option]"
+    puts "  -p port                : Runs Bivouac on the specified port (default 3301)"
+    puts "  -b ip                  : Binds Bivouac to the specified ip (default 0.0.0.0)"
+    puts "  -d start|stop|restart  : Make server run as a Daemon."
     break
+  when '-p'
+    <%= @conf.appname %>Daemon.port=ARGV.shift
+  when '-b'
+    <%= @conf.appname %>Daemon.ip=ARGV.shift
   when '-d'
     if /Windows/.match( ENV['OS'] ) and windows_process == false
       warn "You must install `win32-process' to daemonize this app."
       exit 1
     end
-    
     <%= @conf.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 '--'
     <%= @conf.appname %>Daemon.start
     break

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-04 00:00:00 +02:00
+date: 2008-04-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency