bivouac 0.2.4 → 0.2.5

data/README

@@ -16,10 +16,17 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 * Roo's Tent
 * Scaffold's Tent
 * Tooltip
-* Will Paginate
+* Will Paginate	
 
 == FEATURES/PROBLEMS:
 
+=== 0.2.5:
+
+* Bugs corrections for DB sessions
+* New parameter in environment.rb to force the use of a specific server: :server_force
+* Bug correction when loading create and database schema 
+* Humanize app path 
+
 === 0.2.4:
 
 * Add rc file for script/console

data/bin/bivouac

@@ -14,6 +14,10 @@ require 'yaml'
 require 'bivouac/template'
 include Bivouac::Template
 
+class << Gem; attr_accessor :loaded_specs; end
+@BIVOUAC_VERSION = Gem.loaded_specs['bivouac'].version
+@CAMPING_VERSION = Gem.loaded_specs['camping'].version
+
 # Default configuration
 database_configuration = {
   :adapter => "sqlite3"
@@ -89,7 +93,8 @@ opts = OptionParser.new do |opts|
 	# Another typical switch to print the version.
 	opts.on_tail("-v", "--version", "Show version") do
 	  class << Gem; attr_accessor :loaded_specs; end
-	  puts Gem.loaded_specs['bivouac'].version
+	  puts "Bivouac version #{@BIVOUAC_VERSION}"
+	  puts "Camping version #{@CAMPING_VERSION}"
 	  exit
 	end
 end
@@ -107,7 +112,8 @@ name = ARGV.dup
 # Add APP name to config
 @conf.appname = name[0].classify
 # Add APP path to config
-@conf.appdir  = @conf.appname.underscore
+@conf.appdir  = name[0] # @conf.appname.underscore
+@conf.appfile = @conf.appname.underscore
 
 # Add DataBase configuration to config
 if database_configuration[:adapter] =~ /sqlite/
@@ -154,7 +160,7 @@ createFile( "#{@conf.appdir}/config/postamble.rb" ) { |io|
 }
 
 # Create Application file
-createFile( "#{@conf.appdir}/app/#{@conf.appdir}.rb" ) { |io|
+createFile( "#{@conf.appdir}/app/#{@conf.appfile}.rb" ) { |io|
   io.puts template( "application_#{@conf.orgtype.downcase}" ) 
 }
 
@@ -219,4 +225,11 @@ createFile( "#{@conf.appdir}/app/views/not_found.rb" ) { |io|
 # Create default_layout view
 createFile( "#{@conf.appdir}/app/views/layouts/default_layout.rb" ) { |io|
   io.puts template( "static/default_layout_view" )
-}
+}
+
+# Create create.rb if we use DB Sessions
+if @conf.session.to_s == "db"
+  createFile( "#{@conf.appdir}/db/create.rb" ) { |io|
+    io.puts template( "static/create_for_sessions" )
+  }
+end

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Fri, 06 Jun 2008 00:06:38 +0200
+Sun, 29 Jun 2008 18:53:32 +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 Jun 06 00:06:06 +0200 2008</div>
+  <div class="path">README / Sun Jun 29 18:52:22 +0200 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -130,6 +130,22 @@ href="http://code.whytheluckystiff.net/camping">camping</a>.
 </li>
 </ul>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.2.5:</h3>
+<ul>
+<li>Bugs corrections for DB sessions
+
+</li>
+<li>New parameter in environment.rb to force the use of a specific server:
+:server_force
+
+</li>
+<li>Bug correction when loading create and database schema
+
+</li>
+<li>Humanize app path
+
+</li>
+</ul>
 <h3>0.2.4:</h3>
 <ul>
 <li>Add rc file for script/console

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

@@ -60,6 +60,10 @@ class <%= @conf.appname %>Daemon < SimpleDaemon::Base
     ## Load configuration
     config = Bivouac::Environment.new( )
     
+    if config.environment.server_force
+      @@force_use = config.environment.server_force
+    end
+    
     ## Initialize database connection
     database_connection = config.environment.db
     if database_connection[:adapter] =~ /sqlite/

data/lib/bivouac/template/application_goh.rb

@@ -48,7 +48,7 @@ files( 'helpers' ) { |file| require( file ) }
 files( 'models' ) { |file| require( file ) }
 
 # Load create and database schema from db/migrate
-files( '../db/migrate' ) { |file| require( file ) }
+files( '../db' ) { |file| require( file ) }
 
 # Load views from app/views
 files( 'views' ) { |file| require( file ) }

data/lib/bivouac/template/console.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-app = File.dirname(__FILE__) + "/../app/<%= @conf.appdir %>.rb"
+app = File.dirname(__FILE__) + "/../app/<%= @conf.appfile %>.rb"
 
 ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
 system "ruby #{app} -c #{ARGV.join(' ')}"

data/lib/bivouac/template/environment.rb

@@ -21,7 +21,12 @@ module Bivouac
         # Application port
         :port     => <%= @conf.port %>,
         
+        # To force using a specific server, uncomment the line below
+        # You can use "mongrel", "thin" or "webrick"
+        #:server_force => "mongrel",
+        
         # Database configuration
+        # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
         :db       => open("#{File.dirname( __FILE__ )}/database.yml") {|f| YAML.load(f)},
         
         # Name of the application
@@ -32,6 +37,10 @@ module Bivouac
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
         :appdir   => "<%= @conf.appdir %>",
 
+        # File of the application
+        # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
+        :appfile  => "<%= @conf.appfile %>",
+
         # Organisation type of the application
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
         :orgtype  => "<%= @conf.orgtype %>",

data/lib/bivouac/template/generate/create.rb

@@ -6,7 +6,7 @@
 #
 
 def <%= @app.environment.appname %>.create
-  <% if @app.environment.session_type == :db %>
+  <% if @app.environment.session_type.to_s == "db" %>
     Camping::Models::Session.create_schema
   <% end %>
   <%= @app.environment.appname %>::Models.create_schema 

data/lib/bivouac/template/server.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-app = File.dirname(__FILE__) + "/../app/<%= @conf.appdir %>.rb"
+app = File.dirname(__FILE__) + "/../app/<%= @conf.appfile %>.rb"
 
 ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
 system "ruby #{app} #{ARGV.join(' ')} --"

data/lib/bivouac/template/static/create_for_sessions.rb

@@ -0,0 +1,13 @@
+#
+#  Project <%= @conf.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+def <%= @conf.appname %>.create
+  <% if @conf.session.to_s == "db" %>
+  Camping::Models::Session.create_schema
+  <% end %>
+  <%= @conf.appname %>::Models.create_schema 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-06 00:00:00 +02:00
+date: 2008-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: camping
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: extra
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: simple-daemon
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -50,6 +54,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: mosquito
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -162,6 +167,7 @@ files:
 - lib/bivouac/template/static/camping.png
 - lib/bivouac/template/static/console_rc.rb
 - lib/bivouac/template/static/controls.js
+- lib/bivouac/template/static/create_for_sessions.rb
 - lib/bivouac/template/static/default_layout_view.rb
 - lib/bivouac/template/static/dragdrop.js
 - lib/bivouac/template/static/effects.js
@@ -344,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bivouac
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Developpe with Camping like you do with Rails