bivouac 0.1.6 → 0.2.0

data/README

@@ -12,6 +12,13 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.2.0:
+* Class Bivouac::Generate has been completely rewritten
+* Scaffold generator is no longer un Bivouac Core, use scaffold_s_tent plugin
+* Add Generator plugins support
+* iUI's Tent Plugin (alpha-2)
+* Add Scaffols's Tent Plugin
+
 === 0.1.6: 
 * Plugins now support Rake tasks
 * Add plugin:list task

data/bin/bivouac

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin
 bivouac
-(c)2007 Grégoire Lejeune
+(c)2007, 2008 Grégoire Lejeune
 =end
 
 require 'rubygems'
@@ -13,6 +13,7 @@ require 'fileutils'
 require 'bivouac/template'
 include Bivouac::Template
 
+# Default configuration
 database_configuration = {
   :adapter => "sqlite3"
 }
@@ -51,14 +52,10 @@ opts = OptionParser.new do |opts|
 
     @conf.db = "{\n\t:adapter => '#{dbtype}'\n\t:database => 'db/bivouac.db'\n}"
   }
+
 	opts.on("-P", "--port PORT", "Which port to bind to (3301)") { |@conf.port| }
+
 	opts.on("-a", "--address ADDR", "Address to bind to (0.0.0.0)") { |@conf.address| }
-  # opts.on("-o", "--organize TYPE", "Type or organisation (options: JOF:Just On File/GOH:Get Out of Hand/ERB:use Eruby or Erb)") { |@conf.orgtype|
-	#   unless %w{jof goh erb}.include?( @conf.orgtype.downcase )
-	#     puts opts
-  # 	  exit
-	#   end
-	# }
 	
 	opts.separator ""
 	opts.separator "Common options:"
@@ -78,17 +75,22 @@ opts = OptionParser.new do |opts|
 	end
 end
 
+# Parse options
 opts.parse! ARGV
 if ARGV.length < 1
     puts opts
     exit
 end
 
+# Get APP name
 name = ARGV.dup
 
+# Add APP name to config
 @conf.appname = name[0].classify
+# Add APP path to config
 @conf.appdir  = @conf.appname.underscore
 
+# Add DataBase configuration to config
 if database_configuration[:adapter] =~ /sqlite/
   database_configuration[:database] = "db/" + @conf.appdir + ".db"
 else
@@ -96,8 +98,9 @@ else
 end
 @conf.db = database_configuration.inspect
 
-@appname = @conf.appname
+## REMOVE ME ## ---------------- @appname = @conf.appname
 
+# Create Application Directories
 createDir( @conf.appdir )
 createDir( "#{@conf.appdir}/config" )
 createDir( "#{@conf.appdir}/app" )
@@ -117,48 +120,60 @@ createDir( "#{@conf.appdir}/test" )
 createDir( "#{@conf.appdir}/lib" )
 createDir( "#{@conf.appdir}/plugins" )
 
+# Create Application Environment file
 createFile( "#{@conf.appdir}/config/environment.rb" ) { |io|
   io.puts template( "environment" )
 }
 
+# Create Application Postamble file
 createFile( "#{@conf.appdir}/config/postamble.rb" ) { |io|
   io.puts template( "application/postamble" )
 }
 
+# Create Application file
 createFile( "#{@conf.appdir}/app/#{@conf.appdir}.rb" ) { |io|
   io.puts template( "application_#{@conf.orgtype.downcase}" ) 
 }
 
+# Create Application Helpers Loader file
 createFile( "#{@conf.appdir}/app/helpers/_helpers.rb" ) { |io|
   io.puts template( "application/helpers_#{@conf.orgtype.downcase}" )
 }
 
+# Create generate script
 createFile( "#{@conf.appdir}/script/generate", true ) { |io| 
   io.puts template( "generate" )
 }
 
+# Create server script
 createFile( "#{@conf.appdir}/script/server", true ) { |io| 
   io.puts template( "server" )
 }
 
+# Create console script
 createFile( "#{@conf.appdir}/script/console", true ) { |io| 
   io.puts template( "console" )
 }
 
+# Create plugin script
 createFile( "#{@conf.appdir}/script/plugin", true ) { |io| 
   io.puts template( "plugin" )
 }
 
+# Create Rakefile
 createFile( "#{@conf.appdir}/Rakefile", true ) { |io| 
   io.puts template( "Rakefile" )
 }
 
+# Copy statics files
 copyTemplate( "static/index.html", "#{@conf.appdir}/public" )
 copyTemplate( "static/camping.png", "#{@conf.appdir}/public/images" )
 %w{builder.js dragdrop.js prototype.js slider.js unittest.js controls.js effects.js sound.js scriptaculous.js}.each do |f|
   copyTemplate( "static/#{f}", "#{@conf.appdir}/public/javascripts" )
 end
 copyTemplate( "static/autocomplete.css", "#{@conf.appdir}/public/stylesheets" )
+
+# Create index controller
 createFile( "#{@conf.appdir}/app/controllers/index.rb" ) { |io|
   io.puts template( "static/index" )
 }

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Mon, 24 Mar 2008 04:25:25 +0100
+Mon, 31 Mar 2008 12:46:54 +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 / Mon Mar 24 04:25:10 +0100 2008</div>
+  <div class="path">README / Mon Mar 31 12:12:43 +0200 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -112,6 +112,24 @@ Bivouac is a simple generator for <a
 href="http://code.whytheluckystiff.net/camping">camping</a>.
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.2.0:</h3>
+<ul>
+<li>Class Bivouac::Generate has been completely rewritten
+
+</li>
+<li>Scaffold generator is no longer un Bivouac Core, use scaffold_s_tent plugin
+
+</li>
+<li>Add Generator plugins support
+
+</li>
+<li>iUI&#8216;s Tent Plugin (alpha-2)
+
+</li>
+<li>Add Scaffols&#8216;s Tent Plugin
+
+</li>
+</ul>
 <h3>0.1.6:</h3>
 <ul>
 <li>Plugins now support Rake tasks

data/lib/bivouac/commands/generate.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-# bivouac - 0.0.1
-# (c)2007 Grégoire Lejeune
+# 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'
@@ -14,128 +15,278 @@ 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 
       
-      # Generator options
-      @options = OpenStruct.new( :noview => false, :notest => false, :default_route => true, :routes => [] )
-      @opts = OptionParser.new do |opts|
-      	opts.banner = "Usage: script/generate generator [options] [args]"
-
-      	opts.separator ""
-        opts.separator "Generators"
-        opts.separator "  Builtin: controller, model, migration, view, test, scaffold"
-
-        opts.separator ""
+      # 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") { |@options.noview|
-      	  if @generator_type != 'controller'
-      	    puts @opts
-      	    exit
-    	    end
-    	    @options.noview = true
+      	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)") { |@options.default_route|
-      	  if @generator_type != 'controller'
-      	    puts @opts
-      	    exit
-    	    end
-    	    @options.default_route = false
+      	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|
-      	  if @generator_type != 'controller'
-      	    puts @opts
-      	    exit
-    	    end
-      	  @options.routes = routes.split(',')
+      	  controller_options.routes = routes.split(',')
       	}
-        opts.on("-t", "--no-test", "Do not generate any test for the controller") { |@options.notest|
-      	  if @generator_type != 'controller'
-      	    puts @opts
-      	    exit
-    	    end
-    	    @options.notest = true
+        opts.on("-t", "--no-test", "Do not generate any test for the controller") { |controller_options.notest|
+    	    controller_options.notest = true
       	}
         
       	opts.separator ""
-      	opts.separator "Common options:"
       	opts.on_tail("-h", "--help", "Show this message") do
+      	  help
       	  puts opts
       	  exit
       	end
       end
-
-      if ['-h', '--help'].include?( @generator_type )
-        puts @opts
-        exit
-      end
       
       # parse options
-      @opts.parse! argv
-      if argv.length < 1
-          puts @opts
-          exit
+      argument_options.parse! @script_arguments
+      if @script_arguments.length < 1
+        help
+        puts argument_options
+        exit
       end
 
-      # Generator arguments.
-      # Example :
-      #   script/generate controller Hello World
-      # @script_arguments = ['Hello', 'World']
-      @script_arguments = argv.dup
-      
-      # Application environment
-      @app = Bivouac::Environment.new( )
+      @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
       
-      # Application name for the generator, passed to the template
-      @generation_app_name = @app.environment.appname
+      # 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
       
-      @generation_app_dir = @app.environment.appdir
+      # 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
       
-      # Application organisation (goh, jof or erb)
-      @generation_type = @app.environment.orgtype
+      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"
       
-      # Database configuration
-      @database_configuration = @app.environment.db
-      if @database_configuration[:adapter] =~ /sqlite/
-        @database_configuration[:database] = File.expand_path( File.dirname( $0 ) + "/../" + @database_configuration[:database] )
+        # Create view file
+        createFile( @destination_file ) do |io|
+          io.puts template( "generate/view_goh", binding )
+        end
       end
     end
     
-    def run
-      @script_arguments.each do |@generation_name|
-        # Class name passed to the template
-        @generation_class_name = @generation_name.classify
-        # File name for the template
-        @generation_file_name = @generation_class_name.underscore
-        # Call the generator
-        send( @generator_type.to_sym )
+    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
     
-    private
-    def controller
-      @destination_file = File.dirname( $0 ) + "/../app/controllers/" + @generation_file_name.underscore + ".rb"
-      @generation_view_name = @generation_class_name.underscore
+    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
       
-      default_route = @generation_view_name
-      @options.routes << default_route if @options.default_route and @options.routes.include?( default_route ) == false
-      @generation_routes = if @options.routes.size > 0
-        " < R '/" + @options.routes.join("', '/") + "'"
+      # 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
       
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/controller", binding )
-      end
+        destination_file = File.dirname( $0 ) + "/../app/models/" + @model_class_name.underscore + ".rb"
+        createFile( destination_file ) do |io|
+          io.puts template( "generate/model", binding )
+        end
       
-      view( ) if @options.noview == false
-      test( ) if @options.notest == false
+        migration( model_name )
+      end
     end
     
-    def migration( from_model = false )
+    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
@@ -163,98 +314,29 @@ module Bivouac
       
       puts "\t* Migration from version #{old_version} to version #{@new_version}" if old_version > 0.0
       
-      @generation_table_name = (@generation_app_name.downcase + "_" + @generation_name).tableize
+      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 + "_" + @generation_file_name.underscore + ".rb"
-      createFile( @destination_file ) do |io|
-        if from_model
-          io.puts template( "generate/migrate", binding )
-        else
-          io.puts template( "generate/migration", binding )
+        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|
+      destination_file = File.dirname( $0 ) + "/../db/create.rb"
+      createFile( destination_file, false, false ) do |io|
         io.puts template( "generate/create", binding )
       end
     end
-    
-    def model
-      @destination_file = File.dirname( $0 ) + "/../app/models/" + @generation_file_name.underscore + ".rb"
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/model", binding )
-      end
-      
-      migration( true )
-    end
-    
-    def view
-      file_extension = ".rb"
-      if @generation_type.downcase == "erb"
-        raise "ERB applications are no longer supported. Sorry!"
-        file_extension = ".html"
-      end
-      @destination_file = File.dirname( $0 ) + "/../app/views/" + @generation_file_name.underscore + file_extension
-      
-      @generation_view_name = @generation_class_name.underscore
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/view_#{@generation_type.downcase}", binding )
-      end
-    end
-    
-    def test
-      @destination_file = File.dirname( $0 ) + "/../test/test_" + @generation_file_name.underscore + ".rb"
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/test_begin", binding )
-        @options.routes.each do |@test_route|
-          io.puts template( "generate/test_views", binding )
-        end
-        io.puts template( "generate/test_end", binding )
-      end
-    end
-    
-    def scaffold
-      @generation_view_name = @generation_class_name.underscore
-      
-      # Generate model and migrate
-      model( )
-      
-      # Generate scaffold controllers
-      @destination_file = File.dirname( $0 ) + "/../app/controllers/list_" + @generation_file_name + ".rb"
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/scaffold_controller_list", binding )
-      end
-      @destination_file = File.dirname( $0 ) + "/../app/controllers/create_" + @generation_file_name + ".rb"
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/scaffold_controller_create", binding )
-      end
-      @destination_file = File.dirname( $0 ) + "/../app/controllers/view_" + @generation_file_name + ".rb"
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/scaffold_controller_view", binding )
-      end
-      
-      # Generate scaffold views
-      file_extension = ".rb"
-      if @generation_type.downcase == "erb"
-        raise "ERB applications are no longer supported. Sorry!"
-        file_extension = ".html"
-      end
-      @destination_file = File.dirname( $0 ) + "/../app/views/list_" + @generation_file_name + file_extension
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/scaffold_view_list_#{@generation_type.downcase}", binding )
-      end
-      @destination_file = File.dirname( $0 ) + "/../app/views/create_" + @generation_file_name + file_extension
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/scaffold_view_create_#{@generation_type.downcase}", binding )
-      end
-      @destination_file = File.dirname( $0 ) + "/../app/views/view_" + @generation_file_name + file_extension
-      createFile( @destination_file ) do |io|
-        io.puts template( "generate/scaffold_view_view_#{@generation_type.downcase}", binding )
-      end
-    end
   end
 end
 
-
 Bivouac::Generate.new( ARGV ).run( )

data/lib/bivouac/commands/plugin.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
 require 'bivouac/template'
 require 'fileutils'
+require 'open-uri'
 require File.dirname($0) + '/../config/environment.rb'
 
 BASE_URL = "http://bivouac.rubyforge.org/svn/trunk/plugins/"
 
 module Bivouac
   class Plugin
+    @@cmds = [:help, :install, :list]
+
     def initialize( argv )
       # Command (install, list, ...)
       @command = argv.shift
@@ -24,12 +27,30 @@ module Bivouac
     end
     
     def run
-      send( @command.to_sym )
+      begin
+        send( @command.to_sym  )
+      rescue
+        send( :help )
+      end
     end
     
     private
     
-    def install
+    def help( desc = false )
+      return "Display this help" if desc
+
+      puts "Usage : plugin command"
+      puts "Bivouac plugin manager"
+      puts
+      puts "COMMANDS"
+      @@cmds.each do |m|
+        puts " #{(m.to_s + ' :').ljust(15)} #{send(m, true)}"
+      end
+    end
+
+    def install(desc = false)
+      return "Install plugin" if desc
+ 
       FileUtils::cd( File.dirname($0) + '/../plugins' )
       
       r = system "svn", "co", "#{BASE_URL}#{@script_arguments}"
@@ -38,8 +59,14 @@ module Bivouac
       end
     end
     
-    def list
-      puts "Not yet implemented!"
+    def list(desc = false)
+      return "List available plugins" if desc
+
+      open(BASE_URL).read.each do |l|
+        if m = /<li><a href="([^"]*)">(\1)<\/a><\/li>/.match( l )
+          puts "  - " + m[1].gsub( /\//, '' )
+        end
+      end
     end
   end
 end

data/lib/bivouac/template/Rakefile.rb

@@ -1,3 +1,9 @@
+#
+#  Project <%= @conf.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
 require 'rubygems'
 require 'camping'
 require 'camping/session'
@@ -7,7 +13,7 @@ include Bivouac
 ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) )
 
 task :environment do
-  Camping.goes :<%= @appname %>
+  Camping.goes :<%= @conf.appname %>
   
   # Load models from app/models
   files( 'models' ) { |file| require( file ) }
@@ -24,14 +30,14 @@ task :environment do
   if database_connection[:adapter] =~ /sqlite/
     database_connection[:database] = ENV['BIVOUAC_ROOT'] + "/" + database_connection[:database]
   end
-  <%= @appname %>::Models::Base.establish_connection database_connection
+  <%= @conf.appname %>::Models::Base.establish_connection database_connection
 end
 
 namespace :db do
   desc "Migrate the database through scripts in db/migrate."
   task :migrate => :environment do
-    if <%= @appname %>.respond_to? :create
-      <%= @appname %>.create
+    if <%= @conf.appname %>.respond_to? :create
+      <%= @conf.appname %>.create
     else
       puts "Nothing to do!"
     end

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

@@ -1,5 +1,5 @@
 #
-#  Project <%= @appname %>
+#  Project <%= @conf.appname %>
 #
 #  Created using bivouac on <%= Time.now %>.
 #  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
@@ -23,4 +23,4 @@ helpers = [
   BivouacHelpers::SoundView, 
 ] + viewHelperModule
 
-<%= @appname %>.module_eval "class Mab < Markaby::Builder; include #{helpers.join(', ')}; end"
+<%= @conf.appname %>.module_eval "class Mab < Markaby::Builder; include #{helpers.join(', ')}; end"

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

@@ -1,10 +1,12 @@
 #
-#  Project <%= @appname %>
+#  Project <%= @conf.appname %>
 #
 #  Created using bivouac on <%= Time.now %>.
 #  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
 #
-
+#  DO NOT EDIT THIS FILE OR YOU REALLY KNOW WHAT YOU ARE DOING
+#  USE script/generate helper my_helper
+#
 windows_process = false
 if /Windows/.match( ENV['OS'] )
   begin
@@ -20,7 +22,7 @@ require 'simple-daemon'
 DIRNAME = File.expand_path( File.dirname(__FILE__) )
 SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
 
-class <%= @appname %>Daemon < SimpleDaemon::Base
+class <%= @conf.appname %>Daemon < SimpleDaemon::Base
   @@server = nil
   @@use = nil
   
@@ -35,10 +37,10 @@ class <%= @appname %>Daemon < SimpleDaemon::Base
     if database_connection[:adapter] =~ /sqlite/
       database_connection[:database] = DIRNAME + "/../" + database_connection[:database]
     end
-    <%= @appname %>::Models::Base.establish_connection database_connection
-    <%= @appname %>::Models::Base.logger = Logger.new(DIRNAME + "/../log/<%= @appname %>.log")
-    # -- DON'T WORK WITH RAILS 2 -- # <%= @appname %>::Models::Base.threaded_connections = false
-    <%= @appname %>.create if <%= @appname %>.respond_to? :create
+    <%= @conf.appname %>::Models::Base.establish_connection database_connection
+    <%= @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
+    <%= @conf.appname %>.create if <%= @conf.appname %>.respond_to? :create
     
     trap(:INT) do
       stop
@@ -49,13 +51,13 @@ class <%= @appname %>Daemon < SimpleDaemon::Base
         begin
           require 'thin' 
           
-          Rack::Handler::Thin.run Rack::Adapter::Camping.new( <%= @appname %> ), :Host => config.environment.address, :Port => config.environment.port
-          puts "** <%= @appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
+          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
           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 = 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
       else
@@ -66,8 +68,8 @@ class <%= @appname %>Daemon < SimpleDaemon::Base
       require 'camping/webrick'
       
       @@server = WEBrick::HTTPServer.new :BindAddress => config.environment.address, :Port => config.environment.port
-      puts "** <%= @appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
-      @@server.mount "/", WEBrick::CampingHandler, <%= @appname %>
+      puts "** <%= @conf.appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
+      @@server.mount "/", WEBrick::CampingHandler, <%= @conf.appname %>
       @@server.start
     end
   end
@@ -86,19 +88,19 @@ while ARGV.size > 0
   deamonize = ARGV.shift
   case deamonize
   when 'webrick'
-    <%= @appname %>Daemon.use='webrick'
+    <%= @conf.appname %>Daemon.use='webrick'
   when '-c'
     ARGV.clear
     
-    include <%= @appname %>::Models
+    include <%= @conf.appname %>::Models
     
     config = Bivouac::Environment.new( )
     database_connection = config.environment.db
     if database_connection[:adapter] =~ /sqlite/
       database_connection[:database] = DIRNAME + "/../" + database_connection[:database]
     end
-    <%= @appname %>::Models::Base.establish_connection database_connection
-    <%= @appname %>.create if <%= @appname %>.respond_to? :create
+    <%= @conf.appname %>::Models::Base.establish_connection database_connection
+    <%= @conf.appname %>.create if <%= @conf.appname %>.respond_to? :create
     
     require 'irb'
     require 'irb/completion'
@@ -113,7 +115,7 @@ while ARGV.size > 0
       exit 1
     end
     
-    <%= @appname %>Daemon.daemonize
+    <%= @conf.appname %>Daemon.daemonize
     break
   when '-h'
     begin
@@ -125,7 +127,7 @@ while ARGV.size > 0
     puts "script/server [-d start|stop|restart] [-h]"
     exit
   when '--'
-    <%= @appname %>Daemon.start
+    <%= @conf.appname %>Daemon.start
     break
   else
     puts "Ignore unknown option '#{deamonize}' !"

data/lib/bivouac/template/application_goh.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
 #
-#  Project <%= @appname %>
+#  Project <%= @conf.appname %>
 #
 #  Created using bivouac on <%= Time.now %>.
 #  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
 #
-
+#  DO NOT EDIT THIS FILE OR YOU REALLY KNOW WHAT YOU ARE DOING
+#  USE script/generate helper my_helper
+#
 require 'rubygems'
 require 'camping'
 require 'camping/session'
@@ -25,7 +27,7 @@ Dir.glob( filePath( __FILE__, '../plugins/**/init.rb' ) ).each { |p| require p }
 # Indent the code -- See http://code.whytheluckystiff.net/markaby/wiki/TipsAndTrickery
 Markaby::Builder.set(:indent, 2)
 
-Camping.goes :<%= @appname %>
+Camping.goes :<%= @conf.appname %>
 
 # Load helpers from app/helpers
 files( 'helpers' ) { |file| require( file ) }
@@ -42,7 +44,7 @@ files( 'views' ) { |file| require( file ) }
 # Load controllers from app/controllers
 files( 'controllers', :except => [File.basename(__FILE__)] ) { |file| require( file ) }
 
-module <%= @appname %>::Controllers
+module <%= @conf.appname %>::Controllers
   class Public < R '/public/(.+)' 
     PATH = filePath( __FILE__ )
   

data/lib/bivouac/template/environment.rb

@@ -1,5 +1,5 @@
 #
-#  Project <%= @appname %>
+#  Project <%= @conf.appname %>
 #
 #  Created using bivouac on <%= Time.now %>.
 #  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.

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

@@ -1,10 +1,17 @@
-module <%= @generation_app_name %>::Controllers
-  class <%= @generation_class_name %><%= @generation_routes %>
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Controllers
+  class <%= @controller_class_name %><%= @controller_routes %>
     def get
-      render :<%= @generation_view_name %>
+      render :<%= @view_name %>
     end
     def post
-      render :<%= @generation_view_name %>
+      render :<%= @view_name %>
     end
   end
 end

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

@@ -1,9 +1,15 @@
-module <%= @generation_app_name %>
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>
   include Camping::Session
 end
 
-def <%= @generation_app_name %>.create
+def <%= @app.environment.appname %>.create
   Camping::Models::Session.create_schema
-  <%= @generation_app_name %>::Models.create_schema 
-    # :assume => (<%= @generation_app_name %>::Models::<%= @generation_class_name %>.table_exists? ? 1.0 : 0.0)
+  <%= @app.environment.appname %>::Models.create_schema 
 end

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

@@ -1,14 +1,21 @@
-module <%= @generation_app_name %>::Models
-  class Create<%= @generation_class_name %> < V <%= @new_version %>
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Models
+  class Create<%= @model_class_name %> < V <%= @new_version %>
     def self.up
-      create_table :<%= @generation_table_name %> do |t|
+      create_table :<%= @model_table_name %> do |t|
         t.column :id, :integer, :null => false
         # ...
       end
     end
     
     def self.down
-      drop_table :<%= @generation_table_name %>
+      drop_table :<%= @model_table_name %>
     end
   end
 end

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

@@ -1,5 +1,12 @@
-module <%= @generation_app_name %>::Models
-  class <%= @generation_class_name %> < V <%= @new_version %>
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Models
+  class <%= @model_class_name %> < V <%= @new_version %>
     def self.up
     end
     

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

@@ -1,5 +1,12 @@
-module <%= @generation_app_name %>::Models
-  class <%= @generation_class_name %> < Base
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Models
+  class <%= @model_class_name %> < Base
     # ...
   end
 end

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

@@ -1,10 +1,17 @@
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
 require 'rubygems'
 require 'mosquito'
 
 ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
-require ENV['BIVOUAC_ROOT'] + "/app/<%= @generation_app_dir %>"
+require ENV['BIVOUAC_ROOT'] + "/app/<%= @app.environment.appdir %>"
 
-<%= @generation_app_name %>.create if <%= @generation_app_name %>.respond_to? :create
-include <%= @generation_app_name %>::Models
+<%= @app.environment.appname %>.create if <%= @app.environment.appname %>.respond_to? :create
+include <%= @app.environment.appname %>::Models
 
-class Test<%= @generation_app_name %> < Camping::FunctionalTest
+class Test<%= @app.environment.appname %> < Camping::FunctionalTest

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

@@ -1,6 +1,13 @@
-module <%= @generation_app_name %>::Views
-  def <%= @generation_view_name %>
-    h1.header { "<%= @generation_app_name %>::Views#<%= @generation_view_name %>" }
-    p "Find me in <%= @destination_file %>"
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Views
+  def <%= @view_name %>
+    h1.header { "<%= @app.environment.appname %>::Views#<%= @view_name %>" }
+    p "Find me in <%= @destination_file.gsub( /script\/\.\.\//, "" ) %>"
   end
 end

data/lib/bivouac/template/generate.rb

@@ -1,3 +1,9 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+
+def filePath( from, *data )
+  File.join File.expand_path(File.dirname(from)), data
+end
+
+Dir.glob( filePath( __FILE__, '../plugins/**/generators/*.rb' ) ).each { |p| require p }
 require 'bivouac/commands/generate'

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

@@ -1,4 +1,11 @@
-module <%= @appname %>::Controllers
+#
+#  Project <%= @conf.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @conf.appname %>::Controllers
   class Index < R '/', '/index'
     def get
       redirect Public, "index.html"

data/lib/bivouac/template.rb

@@ -64,8 +64,7 @@ module Bivouac
       end
     end
     
-    def template( template_name, b = nil )
-      template_file = File.dirname(__FILE__) + "/template/" + template_name + ".rb"
+    def plugin_template( template_file, b = nil )
       result = if b.nil? 
         ERB.new(File.readlines(template_file).join, nil, '-').result( )
       else
@@ -73,5 +72,11 @@ module Bivouac
       end
       return( result )
     end
+    
+    def template( template_name, b = nil )
+      template_file = File.dirname(__FILE__) + "/template/" + template_name + ".rb"
+      
+      return plugin_template( template_file, b )
+    end
   end
 end

data/lib/bivouac/utils.rb

@@ -0,0 +1,11 @@
+# Bivouac Project
+class Module
+	def add_generator( g ) #:nodoc:
+		if self.class_variable_defined?(:@@plugins_generators)
+		  x = class_variable_get( :@@plugins_generators ) + g.map{|x| x.to_s}
+		  class_variable_set( :@@plugins_generators, x )
+		else
+		  class_variable_set(:@@plugins_generators, g.map{|x| x.to_s})
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 +01:00
+date: 2008-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,12 +138,6 @@ files:
 - lib/bivouac/template/generate/migrate.rb
 - lib/bivouac/template/generate/migration.rb
 - lib/bivouac/template/generate/model.rb
-- lib/bivouac/template/generate/scaffold_controller_create.rb
-- lib/bivouac/template/generate/scaffold_controller_list.rb
-- lib/bivouac/template/generate/scaffold_controller_view.rb
-- lib/bivouac/template/generate/scaffold_view_create_goh.rb
-- lib/bivouac/template/generate/scaffold_view_list_goh.rb
-- lib/bivouac/template/generate/scaffold_view_view_goh.rb
 - lib/bivouac/template/generate/test_begin.rb
 - lib/bivouac/template/generate/test_end.rb
 - lib/bivouac/template/generate/test_views.rb
@@ -162,11 +156,13 @@ files:
 - lib/bivouac/template/static/index.html
 - lib/bivouac/template/static/index.rb
 - lib/bivouac/template/static/prototype.js
+- lib/bivouac/template/static/README
 - lib/bivouac/template/static/scriptaculous.js
 - lib/bivouac/template/static/slider.js
 - lib/bivouac/template/static/sound.js
 - lib/bivouac/template/static/unittest.js
 - lib/bivouac/template.rb
+- lib/bivouac/utils.rb
 - lib/bivouac.rb
 - examples/bivouac_sample
 - examples/bivouac_sample/app

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

@@ -1,15 +0,0 @@
-module <%= @generation_app_name %>::Controllers
-  class Create<%= @generation_class_name %> < R '/<%= @generation_view_name %>/add'
-    def get
-      render :create_<%= @generation_view_name %>
-    end
-    
-    def post
-      @<%= @generation_view_name %> = Models::<%= @generation_class_name %>.create
-      # @<%= @generation_view_name %>.<field> = input.<field> 
-      @<%= @generation_view_name %>.save
-      redirect List<%= @generation_class_name %>
-      # render :view_<%= @generation_view_name %>
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-module <%= @generation_app_name %>::Controllers
-  class List<%= @generation_class_name %> < R '/<%= @generation_view_name %>'
-    def get
-      @<%= @generation_view_name.pluralize %> = Models::<%= @generation_class_name %>.find( :all )
-      render :list_<%= @generation_view_name %>
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-module <%= @generation_app_name %>::Controllers
-  class View<%= @generation_class_name %> < R '/<%= @generation_view_name %>/(\d)'
-    def get(id)
-      @<%= @generation_view_name %> = Models::<%= @generation_class_name %>.find(id)
-      render :view_<%= @generation_view_name %>
-    end
-    def post(id)
-      @<%= @generation_view_name %> = Models::<%= @generation_class_name %>.find(id)
-      # @<%= @generation_view_name %>.<field> = input.<field> 
-      @<%= @generation_view_name %>.save
-      render :view_<%= @generation_view_name %>
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module <%= @generation_app_name %>::Views
-  def create_<%= @generation_view_name %>
-    p "Add a new <%= @generation_class_name %>"
-    div.<%= @generation_view_name %>_form do
-      form(:method => 'post', :action => R(Create<%= @generation_class_name %>)) do
-        # ...
-        input :type => 'submit'
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module <%= @generation_app_name %>::Views
-  def list_<%= @generation_view_name %>
-    a 'add a <%= @generation_class_name %>', :href => R(Create<%= @generation_class_name %>)
-    div.<%= @generation_view_name.pluralize %> do
-      @<%= @generation_view_name.pluralize %>.each do |<%= @generation_view_name %>|
-        #...
-        a 'view', :href => R(View<%= @generation_class_name %>, <%= @generation_view_name %>.id)
-      end
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-module <%= @generation_app_name %>::Views
-  def view_<%= @generation_view_name %>
-    div.<%= @generation_view_name %> do
-      #...
-      a 'List', :href => R(List<%= @generation_class_name %>)
-    end
-    div.<%= @generation_view_name %>_form do
-      form(:method => 'post', :action => R(View<%= @generation_class_name %>, @<%= @generation_view_name %>.id)) do
-        # ...
-        input :type => 'submit'
-      end
-    end
-  end
-end