bivouac 0.2.3 → 0.2.4

data/README

@@ -20,17 +20,26 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.2.4:
+
+* Add rc file for script/console
+* script/generate view is deprecated.
+* controller generator now support view :
+	ruby script/generate controller my_controller my_view_one my_view_two ...
+* Add RemoveColumnsFromTable-like migration
+* Rewrite generators help
+* cookies_sessions move from lib to lib/camping
+* Improved support for multiple layouts: add the layout helper for controller. You can use 'layout :mylayout' instead of '@layout = "mylayout"' in your controller. Use 'layout :none' if you don't want to use a layout.
+
 === 0.2.3:
 
 * Ruby 1.9... not yet !
 * Database configuration use YAML
 * Add not_found controller and view
 * Remove :id column definition in migrate.rb
-* Add helper FormView#editable_content from
-	http://blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous/
-	Example at http://bivouac.rubyforge.org/svn/trunk/bivouac/examples/bivouac_sample/
+* Add helper FormView#editable_content from http://blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous/ Example at http://bivouac.rubyforge.org/svn/trunk/bivouac/examples/bivouac_sample/
 * model generator now work with column name and type. Example :	
-		ruby script/generate model user name:string mail:string 
+	ruby script/generate model user name:string mail:string 
 * Add Multiple Layouts support (see http://rubyforge.org/pipermail/camping-list/2008-May/000729.html)
 * Thin is not more the default server (because layouts don't work with Thin :()
 * Add Cookie session support. Use -S to specify session type (db or cookie - default).
@@ -164,8 +173,10 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
   for ruby 1.8.6 (2007-06-07) [universal-darwin9.0]
 
   Specific options:
+    -d, --database NAME              Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).
     -P, --port PORT                  Which port to bind to (3301)
     -a, --address ADDR               Address to bind to (0.0.0.0)
+    -S, --session TYPE               Session type (db|cookie). Default : cookie
 
   Common options:
     -?, --help                       Show this message

data/bin/bivouac

@@ -125,6 +125,7 @@ createDir( "#{@conf.appdir}/app/controllers" )
 createDir( "#{@conf.appdir}/app/helpers" )
 createDir( "#{@conf.appdir}/app/models" )
 createDir( "#{@conf.appdir}/app/views" )
+createDir( "#{@conf.appdir}/app/views/layouts" )
 createDir( "#{@conf.appdir}/db" )
 createDir( "#{@conf.appdir}/db/migrate" )
 createDir( "#{@conf.appdir}/public" )
@@ -177,6 +178,11 @@ createFile( "#{@conf.appdir}/script/console", true ) { |io|
   io.puts template( "console" )
 }
 
+# Create console.rc view
+createFile( "#{@conf.appdir}/script/console.rc" ) { |io|
+  io.puts template( "static/console_rc" )
+}
+
 # Create plugin script
 createFile( "#{@conf.appdir}/script/plugin", true ) { |io| 
   io.puts template( "plugin" )
@@ -211,6 +217,6 @@ createFile( "#{@conf.appdir}/app/views/not_found.rb" ) { |io|
 }
 
 # Create default_layout view
-createFile( "#{@conf.appdir}/app/views/default_layout.rb" ) { |io|
+createFile( "#{@conf.appdir}/app/views/layouts/default_layout.rb" ) { |io|
   io.puts template( "static/default_layout_view" )
 }

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Tue, 03 Jun 2008 16:18:13 +0200
+Fri, 06 Jun 2008 00:06:38 +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 / Tue Jun 03 16:17:16 +0200 2008</div>
+  <div class="path">README / Fri Jun 06 00:06:06 +0200 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -130,6 +130,36 @@ href="http://code.whytheluckystiff.net/camping">camping</a>.
 </li>
 </ul>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.2.4:</h3>
+<ul>
+<li>Add rc file for script/console
+
+</li>
+<li>script/generate view is deprecated.
+
+</li>
+<li>controller generator now support view :
+
+<pre>
+      ruby script/generate controller my_controller my_view_one my_view_two ...
+</pre>
+</li>
+<li>Add RemoveColumnsFromTable-like migration
+
+</li>
+<li>Rewrite generators help
+
+</li>
+<li>cookies_sessions move from lib to lib/camping
+
+</li>
+<li>Improved support for multiple layouts: add the layout helper for
+controller. You can use &#8216;layout :mylayout&#8217; instead of
+&#8217;@layout = &quot;mylayout&quot;&#8217; in your controller. Use
+&#8216;layout :none&#8217; if you don&#8216;t want to use a layout.
+
+</li>
+</ul>
 <h3>0.2.3:</h3>
 <ul>
 <li>Ruby 1.9&#8230; not yet !
@@ -144,17 +174,16 @@ href="http://code.whytheluckystiff.net/camping">camping</a>.
 <li>Remove :id column definition in migrate.rb
 
 </li>
-<li>Add helper FormView#editable_content from
+<li>Add helper FormView#editable_content from <a
+href="http://blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous">blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous</a>/
+Example at <a
+href="http://bivouac.rubyforge.org/svn/trunk/bivouac/examples/bivouac_sample">bivouac.rubyforge.org/svn/trunk/bivouac/examples/bivouac_sample</a>/
 
-<pre>
-      http://blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous/
-      Example at http://bivouac.rubyforge.org/svn/trunk/bivouac/examples/bivouac_sample/
-</pre>
 </li>
 <li>model generator now work with column name and type. Example :
 
 <pre>
-              ruby script/generate model user name:string mail:string
+      ruby script/generate model user name:string mail:string
 </pre>
 </li>
 <li>Add Multiple Layouts support (see <a
@@ -471,8 +500,10 @@ change <tt>do_GET(req, res)</tt> to <tt>do_GET(req, resp)</tt>
   for ruby 1.8.6 (2007-06-07) [universal-darwin9.0]
 
   Specific options:
+    -d, --database NAME              Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).
     -P, --port PORT                  Which port to bind to (3301)
     -a, --address ADDR               Address to bind to (0.0.0.0)
+    -S, --session TYPE               Session type (db|cookie). Default : cookie
 
   Common options:
     -?, --help                       Show this message

data/lib/bivouac/commands/generate.rb

@@ -10,6 +10,7 @@ require 'bivouac/utils'
 require 'active_support'
 require 'active_record'
 require 'find'
+require 'fileutils'
 require File.dirname($0) + '/../config/environment.rb'
 
 module Bivouac
@@ -61,7 +62,7 @@ module Bivouac
       puts "Usage: script/generate generator [options] [args]"
     	puts ""
       puts "Generators"
-      puts "  Builtin: controller, model, migration, view, test"
+      puts "  Builtin: controller, model, migration, test"
       puts "  Plugins: " + @@plugins_generators.join(", ") if @@plugins_generators.size > 0
       puts ""
     	puts "Commun options:"
@@ -79,13 +80,7 @@ module Bivouac
       	opts.on("-v", "--no-view", "Do not generate any view for the controller") { |controller_options.noview|
     	    controller_options.noview = true
       	}
-      	opts.on("-d", "--no-route", "Do not add the default route to the controller (/controller_name)") { |controller_options.default_route|
-    	    controller_options.default_route = false
-      	}
-      	opts.on("-r", "--route ROUTE,ROUTE,...", "Add ROUTES to the controller") { |routes|
-      	  controller_options.routes = routes.split(',')
-      	}
-        opts.on("-t", "--no-test", "Do not generate any test for the controller") { |controller_options.notest|
+      	opts.on("-t", "--no-test", "Do not generate any test for the controller") { |controller_options.notest|
     	    controller_options.notest = true
       	}
         
@@ -93,6 +88,13 @@ module Bivouac
       	opts.on_tail("-h", "--help", "Show this message") do
       	  help
       	  puts opts
+        	puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new controller and its views. Pass the controller name, either"
+        	puts "  CamelCased or under_scored, and a list of views as arguments."
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate controller my_controller my_view_one my_view_two ..."
       	  exit
       	end
       end
@@ -102,44 +104,75 @@ module Bivouac
       if @script_arguments.length < 1
         help
         puts argument_options
+        puts ""
+      	puts "Description:"
+      	puts "  Stubs out a new controller and its views. Pass the controller name, either"
+      	puts "  CamelCased or under_scored, and a list of views as arguments."
+      	puts ""
+      	puts "Example:"
+      	puts "    ruby script/generate controller my_controller my_view_one my_view_two ..."
         exit
       end
-
-      @script_arguments.each do |controller_name|
-        # Controller class name, passed to the template
-        @controller_class_name = controller_name.classify
-        # File name for the template
-        controller_file_name = @controller_class_name.underscore
-        
-        # Destination file
-        destination_file = File.dirname( $0 ) + "/../app/controllers/" + controller_file_name + ".rb"
+      
+      # List of routes for test
+      routes = []
+      
+      # Get controller
+      controller = @script_arguments.shift
+      # File name for the template
+      controller_file_name = controller.underscore
+      
+      # Views directory
+      views_directory = File.dirname( $0 ) + "/../app/views/" + controller_file_name
+      # Create views directory
+      createDir( views_directory )
+      
+      # Destination file
+      controller_file = File.dirname( $0 ) + "/../app/controllers/" + controller_file_name + ".rb"
+      
+      # Create controller
+      createFile( controller_file ) do |io|
+        io.puts template( "generate/controller_begin", binding )
+      
+        # Create views
+        @script_arguments.each do |view|
+          # Controller class name, passed to the template
+          @controller_class_name = controller.classify + view.classify
+          
+          # Set view name, passed to the template
+          @view_name = @controller_class_name.underscore
+          
+          # File name for the view
+          @view_file = views_directory + "/" + view.underscore + ".rb"
+          
+          # Set controller route
+          new_route = controller.underscore + "/" + view.underscore
+          routes << new_route
+          @controller_routes = " < R '/" + new_route + "'"
         
-        # Set view name, passed to the template
-        @view_name = @controller_class_name.underscore
-
-        # Set routes, passed to the template
-        default_route = @view_name
-        controller_options.routes << default_route if controller_options.default_route and controller_options.routes.include?( default_route ) == false
-        @controller_routes = if controller_options.routes.size > 0
-          " < R '/" + controller_options.routes.join("', '/") + "'"
-        else
-          ""
-        end
-
-        # Create controller
-        createFile( destination_file ) do |io|
-          io.puts template( "generate/controller", binding )
+          # Update controller
+          io.puts template( "generate/controller_action", binding )
+          
+          # Create view view_name
+          createFile( @view_file ) do |io_view|
+            io_view.puts template( "generate/view", binding )
+          end
+          
         end
 
-        # Create view @view_name
-        view( @view_name ) if controller_options.noview == false
-        
         # Create test for @view_name with routes controller_options.routes
-        test( @view_name, controller_options.routes ) if controller_options.notest == false
+        test( controller, routes ) if controller_options.notest == false
+
+        # Write controller end
+        io.puts template( "generate/controller_end", binding )
       end
     end
     
+    # DEPRECATED
     def view( view_name = nil )
+      warn "View generator is deprecated."
+      return
+      
       if @app.environment.orgtype.downcase == "erb"
         raise "ERB applications are no longer supported. Sorry!"
       end
@@ -191,6 +224,13 @@ module Bivouac
       	opts.on_tail("-h", "--help", "Show this message") do
       	  help
       	  puts opts
+      	  puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new test. Pass the name of the test, either"
+          puts "  CamelCased or under_scored, as an argument."
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate test my_test /route/one /route/two ..."
       	  exit
       	end
       end
@@ -201,6 +241,13 @@ module Bivouac
         if @script_arguments.length < 1
           help
           puts argument_options
+          puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new test. Pass the name of the test, either"
+          puts "  CamelCased or under_scored, as an argument."
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate test my_test /route/one /route/two ..."
           exit
         end
         
@@ -213,7 +260,9 @@ module Bivouac
       createFile( destination_file ) do |io|
         io.puts template( "generate/test_begin", binding )
         
-        routes.each do |@test_route|
+        routes.each do |route|
+          @route = route
+          @test_name = route.gsub( /\//, '_' )
           io.puts template( "generate/test_views", binding )
         end
         
@@ -229,6 +278,16 @@ module Bivouac
       	opts.on_tail("-h", "--help", "Show this message") do
       	  help
       	  puts opts
+      	  puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new model. Pass the model name, either CamelCased or"
+          puts "  under_scored, and an optional list of attribute pairs as arguments."
+          puts ""
+          puts "  Attribute pairs are column_name:sql_type arguments specifying the"
+          puts "  model's attributes."
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate model MyModel name:string age:integer ..."
       	  exit
       	end
       end
@@ -239,6 +298,16 @@ module Bivouac
         if @script_arguments.length < 1
           help
           puts argument_options
+          puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new model. Pass the model name, either CamelCased or"
+          puts "  under_scored, and an optional list of attribute pairs as arguments."
+          puts ""
+          puts "  Attribute pairs are column_name:sql_type arguments specifying the"
+          puts "  model's attributes."
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate model MyModel name:string age:integer ..."
           exit
         end
         model_list = @script_arguments
@@ -268,7 +337,18 @@ module Bivouac
       	opts.on_tail("-h", "--help", "Show this message") do
       	  help
       	  puts opts
-      	  exit
+      	  puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new database migration. Pass the migration name, either"
+          puts "  CamelCased or under_scored, and an optional list of attribute pairs as arguments."
+          puts ""
+          puts "  You can name your migration in either of these formats to generate add/remove"
+          puts "  column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable"
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate migration AddTrucToPost truc:string"
+      	  puts "    ruby script/generate migration RemoveTrucFromPost truc:string"
+          exit
       	end
       end
       
@@ -278,6 +358,17 @@ module Bivouac
         if @script_arguments.length < 1
           help
           puts argument_options
+      	  puts ""
+        	puts "Description:"
+        	puts "  Stubs out a new database migration. Pass the migration name, either"
+          puts "  CamelCased or under_scored, and an optional list of attribute pairs as arguments."
+          puts ""
+          puts "  You can name your migration in either of these formats to generate add/remove"
+          puts "  column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable"
+        	puts ""
+        	puts "Example:"
+        	puts "    ruby script/generate migration AddTrucToPost truc:string"
+      	  puts "    ruby script/generate migration RemoveTrucFromPost truc:string"
           exit
         end
         
@@ -338,15 +429,33 @@ module Bivouac
             # Model table name
             @model_table_name = (@app.environment.appname.downcase + "_" + (model_name.underscore.split( /_/ ))[-1]).tableize
             io.puts template( "generate/migration_begin", binding )
-            model.each do |column|
-              @model_data_name, @model_data_type = column.split( /:/ )
-              io.puts template( "generate/migration_add", binding )
-            end
-            io.puts template( "generate/migration_middle", binding )
-            model.each do |column|
-              @model_data_name, @model_data_type = column.split( /:/ )
-              io.puts template( "generate/migration_remove", binding )
-            end
+            
+            # AddColumnsToTable
+            if r = /add_([^_]*)_to_([^_]*)/.match( model_name.underscore )
+              model.each do |column|
+                @model_data_name, @model_data_type = column.split( /:/ )
+                io.puts template( "generate/migration_add", binding )
+              end
+              io.puts template( "generate/migration_middle", binding )
+              model.each do |column|
+                @model_data_name, @model_data_type = column.split( /:/ )
+                io.puts template( "generate/migration_remove", binding )
+              end
+            # RemoveColumnsToTable
+            elsif r = /remove_([^_]*)_from_([^_]*)/.match( model_name.underscore )
+              model.each do |column|
+                @model_data_name, @model_data_type = column.split( /:/ )
+                io.puts template( "generate/migration_remove", binding )
+              end
+              io.puts template( "generate/migration_middle", binding )
+              model.each do |column|
+                @model_data_name, @model_data_type = column.split( /:/ )
+                io.puts template( "generate/migration_add", binding )
+              end
+            # Nor Add or Remove
+            else
+              io.puts template( "generate/migration_middle", binding )
+            end 
             io.puts template( "generate/migration_end", binding )
           end
         end

data/lib/bivouac/template/Rakefile.rb

@@ -19,12 +19,9 @@ task :environment do
   # Load models from app/models
   files( 'models' ) { |file| require( file ) }
   
-  # Load create
+  # Load create and database schema
   files( '../db' ) { |file| require( file ) }
 
-  # Load database schema from db/migrate
-  files( '../db/migrate' ) { |file| require( file ) }
-  
   require "#{ENV['BIVOUAC_ROOT']}/config/environment.rb"
   config = Bivouac::Environment.new( )
   database_connection = config.environment.db

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

@@ -147,9 +147,7 @@ class <%= @conf.appname %>Daemon < SimpleDaemon::Base
     
     require 'irb'
     require 'irb/completion'
-    if File.exists? ".irbrc"
-      ENV['IRBRC'] = ".irbrc"
-    end
+    ENV['IRBRC'] = DIRNAME + "/console.rc"
     IRB.start
   end
 end

data/lib/bivouac/template/application_goh.rb

@@ -20,7 +20,7 @@ module <%= @conf.appname %>
   include Camping::Session
 end
 <% else %>
-require 'cookies_sessions'
+require 'camping/cookies_sessions'
 module <%= @conf.appname %>
   include Camping::CookieSessions
   @@state_secret = "You want a really really long string of rubbish nobody could ever ever guess! Don't tell anyone! Not even your girlfriend or dog!"
@@ -47,7 +47,7 @@ files( 'helpers' ) { |file| require( file ) }
 # Load models from app/models
 files( 'models' ) { |file| require( file ) }
 
-# Load database schema from db/migrate
+# Load create and database schema from db/migrate
 files( '../db/migrate' ) { |file| require( file ) }
 
 # Load views from app/views
@@ -80,8 +80,27 @@ module <%= @conf.appname %>::Controllers
   end
 end
 
-# Load create
-files( '../db' ) { |file| require( file ) }
+# Multiple Layout support. Add 
+#   layout :my_layout 
+# in your controller else, default_layout will be used
+# If you don't want to use layout add 
+#   layout :none
+# in your controller
+module <%= @conf.appname %>::Helpers
+  def layout( l )
+    @layout = l
+  end
+end
+module <%= @conf.appname %>::Views
+  def layout
+    @layout ||= :default
+    unless @layout == :none
+      send("#{@layout.to_s}_layout") { yield } 
+    else
+      yield
+    end
+  end
+end
 
 # Load postamble and configuration
 if __FILE__ == $0

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

@@ -0,0 +1,8 @@
+  class <%= @controller_class_name %><%= @controller_routes %>
+    def get
+      render :<%= @view_name %>
+    end
+    def post
+      render :<%= @view_name %>
+    end
+  end

data/lib/bivouac/template/generate/{controller.rb → controller_begin.rb}

@@ -6,12 +6,3 @@
 #
 
 module <%= @app.environment.appname %>::Controllers
-  class <%= @controller_class_name %><%= @controller_routes %>
-    def get
-      render :<%= @view_name %>
-    end
-    def post
-      render :<%= @view_name %>
-    end
-  end
-end

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

@@ -0,0 +1 @@
+end

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

@@ -14,4 +14,4 @@ require ENV['BIVOUAC_ROOT'] + "/app/<%= @app.environment.appdir %>"
 <%= @app.environment.appname %>.create if <%= @app.environment.appname %>.respond_to? :create
 include <%= @app.environment.appname %>::Models
 
-class Test<%= @app.environment.appname %> < Camping::FunctionalTest
+class Tests<%= @app.environment.appname %> < Camping::FunctionalTest

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

@@ -1,4 +1,4 @@
-  def test_<%= @test_route %>
-    get '/<%= @test_route %>'
+  def test_<%= @test_name %>
+    get '/<%= @route %>'
     assert_response :success
   end

data/lib/bivouac/template/generate/{view_goh.rb → view.rb}

@@ -8,6 +8,6 @@
 module <%= @app.environment.appname %>::Views
   def <%= @view_name %>
     h1.header { "<%= @app.environment.appname %>::Views#<%= @view_name %>" }
-    p "Find me in <%= @destination_file.gsub( /script\/\.\.\//, "" ) %>"
+    p "Find me in <%= @view_file.gsub( /script\/\.\.\//, "" ) %>"
   end
 end

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

@@ -0,0 +1,12 @@
+#
+#  Project <%= @conf.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+IRB.conf[:PROMPT_MODE] = :SIMPLE
+IRB.conf[:AUTO_INDENT] = true
+
+## DO NOT REMOVE OR CHANGE LINES BELLOW
+include <%= @conf.appname %>::Models

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

@@ -21,13 +21,5 @@ module <%= @conf.appname %>::Views
       end
     end
   end
-  
-  # Multiple Layout support :
-  # add @layout = "my_layout" in your controller else, default_layout will be used
-  # If you don't want to use layout, remove this file'
-  def layout
-    @layout ||= 'default'
-    send("#{@layout}_layout") { yield }
-  end
 
 end

data/lib/bivouac/template.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'erb'
 
 module Bivouac

data/lib/bivouac.rb

@@ -3,12 +3,12 @@ module Bivouac
   @@_plugins_controller_helpers = []
   
   def files( xPath, *options, &block )
-    path = File.dirname($0) + "/" + xPath.to_s + "/*.rb"
+    path = File.dirname($0) + "/" + xPath.to_s
     if ENV['BIVOUAC_ROOT']
-      path = ENV['BIVOUAC_ROOT'] + "/app/" + xPath.to_s + "/*.rb"
+      path = ENV['BIVOUAC_ROOT'] + "/app/" + xPath.to_s
     end
     
-    Dir[path].each do |file|
+    Dir.glob("#{path}/**/*.rb").each do |file|
       if options[0]
         if options[0].keys.include?( :except ) 
           if options[0][:except].include?(File.basename(file)) == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-03 00:00:00 +02:00
+date: 2008-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,6 @@ files:
 - lib/bivouac
 - lib/bivouac/commands
 - lib/bivouac/commands/generate.rb
-- lib/bivouac/commands/generate.rb_OLD
 - lib/bivouac/commands/plugin.rb
 - lib/bivouac/helpers
 - lib/bivouac/helpers/view
@@ -134,7 +133,9 @@ files:
 - lib/bivouac/template/console.rb
 - lib/bivouac/template/environment.rb
 - lib/bivouac/template/generate
-- lib/bivouac/template/generate/controller.rb
+- lib/bivouac/template/generate/controller_action.rb
+- lib/bivouac/template/generate/controller_begin.rb
+- lib/bivouac/template/generate/controller_end.rb
 - lib/bivouac/template/generate/create.rb
 - lib/bivouac/template/generate/migrate.rb
 - lib/bivouac/template/generate/migrate_begin.rb
@@ -150,7 +151,7 @@ files:
 - lib/bivouac/template/generate/test_begin.rb
 - lib/bivouac/template/generate/test_end.rb
 - lib/bivouac/template/generate/test_views.rb
-- lib/bivouac/template/generate/view_goh.rb
+- lib/bivouac/template/generate/view.rb
 - lib/bivouac/template/generate.rb
 - lib/bivouac/template/plugin.rb
 - lib/bivouac/template/Rakefile.rb
@@ -159,6 +160,7 @@ files:
 - lib/bivouac/template/static/autocomplete.css
 - lib/bivouac/template/static/builder.js
 - lib/bivouac/template/static/camping.png
+- lib/bivouac/template/static/console_rc.rb
 - lib/bivouac/template/static/controls.js
 - lib/bivouac/template/static/default_layout_view.rb
 - lib/bivouac/template/static/dragdrop.js
@@ -176,7 +178,8 @@ files:
 - lib/bivouac/template.rb
 - lib/bivouac/utils.rb
 - lib/bivouac.rb
-- lib/cookies_sessions.rb
+- lib/camping
+- lib/camping/cookies_sessions.rb
 - examples/bivouac_sample
 - examples/bivouac_sample/app
 - examples/bivouac_sample/app/bivouac_sample.rb

data/lib/bivouac/commands/generate.rb_OLD

@@ -1,342 +0,0 @@
-#!/usr/bin/env ruby
-# bivouac
-# (c)2007, 2008 Grégoire Lejeune
-
-require 'rubygems'
-require 'optparse'
-require 'ostruct'
-require 'bivouac/template'
-require 'bivouac/utils'
-require 'active_support'
-require 'active_record'
-require 'find'
-require File.dirname($0) + '/../config/environment.rb'
-
-module Bivouac
-  class Generate
-    include Bivouac::Template
-    # Initialize the optionnal generators table
-    add_generator []
-    
-    def initialize( argv )
-      # Generator type (controller, model, migration, view, ...)
-      @generator_type = argv.shift 
-      
-      # Display help if asked
-      if ['-h', '--help'].include?( @generator_type )
-        help
-        exit
-      end
-      
-      # Generator arguments.
-      # Example :
-      #   script/generate controller Hello World
-      # @script_arguments = ['Hello', 'World']
-      @script_arguments = argv.dup
-      
-      # Application environment
-      @app = Bivouac::Environment.new( )
-      
-      # Database configuration
-      @database_configuration = @app.environment.db
-      if @database_configuration[:adapter] =~ /sqlite/
-        @database_configuration[:database] = File.expand_path( File.dirname( $0 ) + "/../" + @database_configuration[:database] )
-      end        
-    end
-    
-    def run
-      # If the générator is not installed, display help and exit
-      unless ( ["controller", "model", "migration", "view", "test"] + @@plugins_generators ).include?( @generator_type )
-        help
-        exit
-      end
-      
-      # Call generator
-      send( @generator_type.to_sym )
-      return
-    end
-    
-    private
-    def help
-      puts "Usage: script/generate generator [options] [args]"
-    	puts ""
-      puts "Generators"
-      puts "  Builtin: controller, model, migration, view, test"
-      puts "  Plugins: " + @@plugins_generators.join(", ") if @@plugins_generators.size > 0
-      puts ""
-    	puts "Commun options:"
-    	puts "    -h, --help                    Show general help message"
-    end
-    
-    def controller
-      # controller generator options
-      controller_options = OpenStruct.new( :noview => false, :notest => false, :default_route => true, :routes => [] )
-      
-      # Controller options
-      argument_options = OptionParser.new do |opts|
-      	opts.banner = ""
-      	opts.separator "controller generator options:"
-      	opts.on("-v", "--no-view", "Do not generate any view for the controller") { |controller_options.noview|
-    	    controller_options.noview = true
-      	}
-      	opts.on("-d", "--no-route", "Do not add the default route to the controller (/controller_name)") { |controller_options.default_route|
-    	    controller_options.default_route = false
-      	}
-      	opts.on("-r", "--route ROUTE,ROUTE,...", "Add ROUTES to the controller") { |routes|
-      	  controller_options.routes = routes.split(',')
-      	}
-        opts.on("-t", "--no-test", "Do not generate any test for the controller") { |controller_options.notest|
-    	    controller_options.notest = true
-      	}
-        
-      	opts.separator ""
-      	opts.on_tail("-h", "--help", "Show this message") do
-      	  help
-      	  puts opts
-      	  exit
-      	end
-      end
-      
-      # parse options
-      argument_options.parse! @script_arguments
-      if @script_arguments.length < 1
-        help
-        puts argument_options
-        exit
-      end
-
-      @script_arguments.each do |controller_name|
-        # Controller class name, passed to the template
-        @controller_class_name = controller_name.classify
-        # File name for the template
-        controller_file_name = @controller_class_name.underscore
-        
-        # Destination file
-        destination_file = File.dirname( $0 ) + "/../app/controllers/" + controller_file_name + ".rb"
-        
-        # Set view name, passed to the template
-        @view_name = @controller_class_name.underscore
-
-        # Set routes, passed to the template
-        default_route = @view_name
-        controller_options.routes << default_route if controller_options.default_route and controller_options.routes.include?( default_route ) == false
-        @controller_routes = if controller_options.routes.size > 0
-          " < R '/" + controller_options.routes.join("', '/") + "'"
-        else
-          ""
-        end
-
-        # Create controller
-        createFile( destination_file ) do |io|
-          io.puts template( "generate/controller", binding )
-        end
-
-        # Create view @view_name
-        view( @view_name ) if controller_options.noview == false
-        
-        # Create test for @view_name with routes controller_options.routes
-        test( @view_name, controller_options.routes ) if controller_options.notest == false
-      end
-    end
-    
-    def view( view_name = nil )
-      if @app.environment.orgtype.downcase == "erb"
-        raise "ERB applications are no longer supported. Sorry!"
-      end
-      
-      # View options
-      argument_options = OptionParser.new do |opts|
-      	opts.banner = ""
-        opts.separator "view generator options:"
-      	opts.on_tail("-h", "--help", "Show this message") do
-      	  help
-      	  puts opts
-      	  exit
-      	end
-      end
-      
-      # parse options if view name is not passed
-      if view_name.nil?
-        argument_options.parse! @script_arguments
-        if @script_arguments.length < 1
-          help
-          puts argument_options
-          exit
-        end
-        
-        view_name = @script_arguments
-      else 
-        view_name = [ view_name ]
-      end
-      
-      view_name.each do |view|
-        # Set view name, passed to the template
-        @view_name = view.underscore
-        
-        # Set destination file, passed to the template
-        @destination_file = File.dirname( $0 ) + "/../app/views/" + @view_name.underscore + ".rb"
-      
-        # Create view file
-        createFile( @destination_file ) do |io|
-          io.puts template( "generate/view_goh", binding )
-        end
-      end
-    end
-    
-    def test( test_name = nil, routes = nil )
-      # Test options
-      argument_options = OptionParser.new do |opts|
-      	opts.banner = ""
-        opts.separator "test generator options:"
-      	opts.on_tail("-h", "--help", "Show this message") do
-      	  help
-      	  puts opts
-      	  exit
-      	end
-      end
-      
-      # parse options if view name is not passed
-      if test_name.nil?
-        argument_options.parse! @script_arguments
-        if @script_arguments.length < 1
-          help
-          puts argument_options
-          exit
-        end
-        
-        test_name = @script_arguments.shift
-        routes = @script_arguments
-      end
-      
-      # Create test file
-      destination_file = File.dirname( $0 ) + "/../test/test_" + test_name.underscore + ".rb"
-      createFile( destination_file ) do |io|
-        io.puts template( "generate/test_begin", binding )
-        
-        routes.each do |@test_route|
-          io.puts template( "generate/test_views", binding )
-        end
-        
-        io.puts template( "generate/test_end", binding )
-      end
-    end
-    
-    def model( model = nil )
-      # Model options
-      argument_options = OptionParser.new do |opts|
-      	opts.banner = ""
-        opts.separator "model generator options:"
-      	opts.on_tail("-h", "--help", "Show this message") do
-      	  help
-      	  puts opts
-      	  exit
-      	end
-      end
-      
-      # parse options
-      if model.nil?
-        argument_options.parse! @script_arguments
-        if @script_arguments.length < 1
-          help
-          puts argument_options
-          exit
-        end
-        model_list = @script_arguments
-      else
-        model_list = [ model ]
-      end
-        
-      model_list.each do |model_name|
-        # Model class name, passed to the template
-        @model_class_name = model_name.classify
-      
-        destination_file = File.dirname( $0 ) + "/../app/models/" + @model_class_name.underscore + ".rb"
-        createFile( destination_file ) do |io|
-          io.puts template( "generate/model", binding )
-        end
-      
-        migration( model_name )
-      end
-    end
-    
-    def migration( model = nil )
-      # Test options
-      argument_options = OptionParser.new do |opts|
-      	opts.banner = ""
-        opts.separator "migration generator options:"
-      	opts.on_tail("-h", "--help", "Show this message") do
-      	  help
-      	  puts opts
-      	  exit
-      	end
-      end
-      
-      # parse options if view name is not passed
-      if model.nil?
-        argument_options.parse! @script_arguments
-        if @script_arguments.length < 1
-          help
-          puts argument_options
-          exit
-        end
-        
-        model = @script_arguments
-        from_model = false
-      else
-        model = [ model ]
-        from_model = true
-      end
-      
-      # Get old and new version
-      old_version = 0.0
-      begin
-        ActiveRecord::Base.establish_connection @database_configuration
-        conn = ActiveRecord::Base.connection
-        table = nil
-        conn.tables.each { |t| table = t if t =~ /_schema_infos$/ }
-        version_info = conn.select_all( "select * from #{table}" )
-        old_version = version_info[0]['version'].to_f
-      rescue
-      end
-      @new_version = old_version + 1
-      
-      # Get prefix for file
-      files = []
-      Find.find( File.dirname( $0 ) + "/../db/migrate/" ) do |f|
-        fn = File.basename( f )
-        files << fn if fn =~ /^\d\d\d/
-      end
-      file_prefix = "001"
-      if files.size > 0
-        files = files.sort {|x,y| y[0,3] <=> x[0,3]}
-        file_prefix = sprintf( "%03d", (files[0][0,3].to_i + 1) )
-      end
-      
-      puts "\t* Migration from version #{old_version} to version #{@new_version}" if old_version > 0.0
-      
-      model.each do |model_name|
-        # Model class name
-        @model_class_name = model_name.classify
-        
-        # Model class name
-        @model_table_name = (@app.environment.appname.downcase + "_" + model_name).tableize
-      
-        destination_file = File.dirname( $0 ) + "/../db/migrate/" + file_prefix + "_" + model_name.underscore + ".rb"
-        createFile( destination_file ) do |io|
-          if from_model
-            io.puts template( "generate/migrate", binding )
-          else
-            io.puts template( "generate/migration", binding )
-          end
-        end
-      end
-      
-      destination_file = File.dirname( $0 ) + "/../db/create.rb"
-      createFile( destination_file, false, false ) do |io|
-        io.puts template( "generate/create", binding )
-      end
-    end
-  end
-end
-
-Bivouac::Generate.new( ARGV ).run( )