bivouac 0.2.5 → 0.3.0

data/README

@@ -20,6 +20,15 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.3.0:
+
+* script/plugin improvements
+* Add before_filter
+* Move console.rc from script to config (Bug)
+* Rename :session_type to :session in environment.rb
+* Add rake tasks bivouac:update, bivouac:update:all, bivouac:update:app, bivouac:update:configs, bivouac:update:public and bivouac:update:scripts. Use FORCE=1 (or true) to force update
+* Bivouac::Template#copyTemplate has been modified
+
 === 0.2.5:
 
 * Bugs corrections for DB sessions

data/bin/bivouac

@@ -27,7 +27,8 @@ database_configuration = {
   :orgtype => "GOH", 
   :port => 3301, 
   :address => "0.0.0.0",
-  :session => :cookie
+  :session => :cookie,
+  :versions => "{ :scripts => '#{@BIVOUAC_VERSION}', :public => '#{@BIVOUAC_VERSION}', :configs => '#{@BIVOUAC_VERSION}', :app => '#{@BIVOUAC_VERSION}' }"
 )
 
 opts = OptionParser.new do |opts|
@@ -142,6 +143,7 @@ createDir( "#{@conf.appdir}/log" )
 createDir( "#{@conf.appdir}/script" )
 createDir( "#{@conf.appdir}/test" )
 createDir( "#{@conf.appdir}/lib" )
+createDir( "#{@conf.appdir}/lib/tasks" )
 createDir( "#{@conf.appdir}/plugins" )
 
 # Create Application Environment file
@@ -185,7 +187,7 @@ createFile( "#{@conf.appdir}/script/console", true ) { |io|
 }
 
 # Create console.rc view
-createFile( "#{@conf.appdir}/script/console.rc" ) { |io|
+createFile( "#{@conf.appdir}/config/console.rc" ) { |io|
   io.puts template( "static/console_rc" )
 }
 
@@ -195,7 +197,7 @@ createFile( "#{@conf.appdir}/script/plugin", true ) { |io|
 }
 
 # Create Rakefile
-createFile( "#{@conf.appdir}/Rakefile", true ) { |io| 
+createFile( "#{@conf.appdir}/Rakefile" ) { |io| 
   io.puts template( "Rakefile" )
 }
 

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Sun, 29 Jun 2008 18:53:32 +0200
+Thu, 17 Jul 2008 14:49:01 +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 / Sun Jun 29 18:52:22 +0200 2008</div>
+  <div class="path">README / Fri Jul 04 15:13:15 +0200 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -130,6 +130,29 @@ href="http://code.whytheluckystiff.net/camping">camping</a>.
 </li>
 </ul>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.3.0:</h3>
+<ul>
+<li>script/plugin improvements
+
+</li>
+<li>Add before_filter
+
+</li>
+<li>Move console.rc from script to config (Bug)
+
+</li>
+<li>Rename :session_type to :session in environment.rb
+
+</li>
+<li>Add rake tasks bivouac:update, bivouac:update:all, bivouac:update:app,
+bivouac:update:configs, bivouac:update:public and bivouac:update:scripts.
+Use FORCE=1 (or true) to force update
+
+</li>
+<li>Bivouac::Template#copyTemplate has been modified
+
+</li>
+</ul>
 <h3>0.2.5:</h3>
 <ul>
 <li>Bugs corrections for DB sessions

data/lib/bivouac/commands/plugin.rb

@@ -55,18 +55,48 @@ module Bivouac
       
       r = system "svn", "co", "#{BASE_URL}#{@script_arguments}"
       if r == false
-        raise $?
+        get_with_http( BASE_URL, @script_arguments )
       end
     end
     
     def list(desc = false)
       return "List available plugins" if desc
+      
+      plugins_path = File.dirname($0) + "/../plugins/"
+      installed_plugins = Dir.glob( plugins_path + "*" ).map { |p| p.gsub!( plugins_path, "" ) }
 
       open(BASE_URL).read.each do |l|
         if m = /<li><a href="([^"]*)">(\1)<\/a><\/li>/.match( l )
-          puts "  - " + m[1].gsub( /\//, '' )
+          p_name = m[1].gsub( /\//, '' )
+          print "  - " + p_name
+          print " (installed)" if installed_plugins.include?( p_name )
+          puts
+        end
+      end
+    end
+
+    private 
+    def get_with_http( root, dir_name )
+      FileUtils::mkdir( dir_name )
+      FileUtils::cd( dir_name )
+
+      open( root + dir_name ).read.each do |l|
+        if m = /<li><a href="([^"]*)">(\1)<\/a><\/li>/.match( l )
+          file_name = m[1]
+          if file_name[-1].chr == "/"
+            get_with_http( root + dir_name + "/", file_name.gsub( /\//, '' ) )
+          else
+            puts "A    #{root.gsub( BASE_URL, "" )}#{dir_name}/#{file_name}"
+            open( file_name, "w" ) do |fhd|
+              open( "#{root}#{dir_name}/#{file_name}" ).read.each do |lc|
+                fhd.print( lc )
+              end
+            end
+          end
         end
       end
+
+      FileUtils::cd( ".." )
     end
   end
 end

data/lib/bivouac/filter.rb

@@ -0,0 +1,39 @@
+$__filters__ = {}
+def before_filter( action, opts = {} )
+  $__filters__[action] = opts
+end
+
+module Bivouac::Filters
+  def service(*a)
+    current_class_name = self.class.name #.to_s.gsub( /.*::/, '' )
+    apply_filter = nil
+    
+    $__filters__.each do |k, v|
+      if v.size > 0
+        
+        v.each do |only_or_except, klasses|
+          kklasses = klasses.map{|_| _.name}
+          if only_or_except == :only and kklasses.include?( current_class_name ) 
+            apply_filter = k
+          end
+          
+          if only_or_except == :except and not kklasses.include?( current_class_name ) 
+            apply_filter = k
+          end
+        end
+        
+      else
+        apply_filter = k
+      end
+    end
+    
+    s = super(*a)
+    unless apply_filter.nil?
+      r = apply_filter.filter( @state )
+      unless r.nil?
+        redirect r
+      end
+    end
+    s
+  end  
+end

data/lib/bivouac/tasks/bivouac.rb

@@ -0,0 +1,35 @@
+include Bivouac
+include Bivouac::Template
+
+class Hash
+  def <<(h)
+    h.each {|k,v| self[k]=v}
+  end
+  alias :to_str :to_s
+  def to_s
+    "{"+self.map{|k,v|k.inspect+" => "+v.inspect}.join(', ')+"}"
+  end
+end
+
+class << Gem; attr_accessor :loaded_specs; end
+BIVOUAC_VERSION = Gem.loaded_specs['bivouac'].version.to_s
+CAMPING_VERSION = Gem.loaded_specs['camping'].version.to_s
+
+# Load environment
+require "#{BIVOUAC_ROOT}/config/environment.rb"
+config = Bivouac::Environment.new( )
+@app_versions = config.environment.versions || { :scripts => '(unknown)', :public => '(unknown)', :configs => '(unknown)', :app => '(unknown)' }
+@conf = config.environment
+@conf.versions = @app_versions
+@conf.session = config.environment.session_type if config.environment.session_type
+
+def update_version( opts )
+  @conf.versions << opts
+end
+
+# Load Bivouac rakefile extensions
+Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
+
+# Load any custom rakefile extensions
+Dir["#{BIVOUAC_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+

data/lib/bivouac/tasks/framework.rake

@@ -0,0 +1,105 @@
+namespace :bivouac do
+  @force = false
+  desc "Update both configs, scripts and public"
+  task :update => [ "update:do_scripts", "update:do_public", "update:configs" ]
+  
+  namespace :update do    
+    desc "Update both configs, scripts, public and app/#{@conf.appfile}.rb"    
+    task :all => [ "do_scripts", "do_public", "do_app", "configs" ]
+    
+    desc "Update config/environment.rb"
+    task :configs do
+      if @app_versions[:scripts] != BIVOUAC_VERSION or ["true", "1"].include?(ENV['FORCE']) or @force
+        puts "* Update configs from Bivouac #{@app_versions[:configs]} -> #{BIVOUAC_VERSION}"
+        @conf.versions << { :configs => BIVOUAC_VERSION }
+        
+        # Create Application Environment file
+        createFile( "config/environment.rb", false, true ) { |io|
+          io.puts template( "environment" )
+        }
+      end    
+    end
+    
+    desc "Update scripts to the application script/ directory, and Rakefile"
+    task :scripts => [ "do_scripts", "configs" ]
+    task :do_scripts do
+      if @app_versions[:scripts] != BIVOUAC_VERSION or ["true", "1"].include?(ENV['FORCE'])
+        puts "* Update scripts from Bivouac #{@app_versions[:scripts]} -> #{BIVOUAC_VERSION}"
+        @conf.versions << { :scripts => BIVOUAC_VERSION }
+        @force = true
+        
+        # Create generate script
+        createFile( "script/generate", true, true ) { |io| 
+          io.puts template( "generate" )
+        }
+
+        # Create server script
+        createFile( "script/server", true, true ) { |io| 
+          io.puts template( "server" )
+        }
+
+        # Create console script
+        createFile( "script/console", true, true ) { |io| 
+          io.puts template( "console" )
+        }
+
+        # Create console.rc view
+        createFile( "config/console.rc", false, true ) { |io|
+          io.puts template( "static/console_rc" )
+        }
+
+        # Create plugin script
+        createFile( "script/plugin", true, true ) { |io| 
+          io.puts template( "plugin" )
+        }
+        
+        # Create Rakefile
+        createFile( "Rakefile", false, true ) { |io| 
+          io.puts template( "Rakefile" )
+        }
+      end
+    end
+    
+    desc "Update files to public/* directories"
+    task :public => [ "do_public", "configs" ]
+    task :do_public do
+      if @app_versions[:public] != BIVOUAC_VERSION or ["true", "1"].include?(ENV['FORCE'])
+        puts "* Update javascripts from Bivouac #{@app_versions[:public]} -> #{BIVOUAC_VERSION}"
+        @conf.versions << { :public => BIVOUAC_VERSION }
+        @force = true
+        
+        # Copy statics files
+        %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}", "public/javascripts", :force => true )
+        end
+        copyTemplate( "static/autocomplete.css", "public/stylesheets", :force => true )
+      end
+    end
+    
+    desc "Update app/#{@conf.appfile}.rb, config/postamble.rb and helpers/_helpers.rb"
+    task :app => [ "do_app", "configs" ]
+    task :do_app do
+      if @app_versions[:app] != BIVOUAC_VERSION or ["true", "1"].include?(ENV['FORCE'])
+        puts "* Update #{@conf.appfile}.rb from Bivouac #{@app_versions[:bivouac]} -> #{BIVOUAC_VERSION}"
+        @conf.versions << { :app => BIVOUAC_VERSION }
+        @force = true
+        
+        # Create Application Postamble file
+        createFile( "config/postamble.rb", false, true ) { |io|
+          io.puts template( "application/postamble" )
+        }
+
+        # Create Application file
+        createFile( "app/#{@conf.appfile}.rb", false, true ) { |io|
+          io.puts template( "application_#{@conf.orgtype.downcase}" ) 
+        }
+
+        # Create Application Helpers Loader file
+        createFile( "app/helpers/_helpers.rb", false, true ) { |io|
+          io.puts template( "application/helpers_#{@conf.orgtype.downcase}" )
+        }
+      end
+    end
+  end
+end
+

data/lib/bivouac/tasks/plugins.rake

@@ -0,0 +1,12 @@
+namespace :plugin do
+  desc "List installed plugins"
+  task :list do
+    Dir.glob( BIVOUAC_ROOT + '/plugins/**' ).each do |p|
+      pn = p.gsub( /.*\//, "" )
+      print "  - #{pn} : "
+      Rake::Task["plugin:#{pn}:desc"].invoke
+    end
+  end
+  
+  Dir.glob( BIVOUAC_ROOT + '/plugins/**/tasks/**.rake' ).each { |p| load p }  
+end

data/lib/bivouac/template/Rakefile.rb

@@ -4,14 +4,20 @@
 #  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
+#  Add your tasks in lib/tasks
+#
 require 'rubygems'
 require 'rake/rdoctask'
 require 'camping'
 require 'camping/session'
 require 'bivouac'
+require 'bivouac/template'
+
+BIVOUAC_ROOT = File.expand_path( File.dirname(__FILE__) )
+ENV['BIVOUAC_ROOT'] = BIVOUAC_ROOT
 
-include Bivouac
-ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) )
+require 'bivouac/tasks/bivouac'
 
 task :environment do
   Camping.goes :<%= @conf.appname %>
@@ -22,11 +28,9 @@ task :environment do
   # Load create and database schema
   files( '../db' ) { |file| require( file ) }
 
-  require "#{ENV['BIVOUAC_ROOT']}/config/environment.rb"
-  config = Bivouac::Environment.new( )
-  database_connection = config.environment.db
+  database_connection = @conf.db
   if database_connection[:adapter] =~ /sqlite/
-    database_connection[:database] = ENV['BIVOUAC_ROOT'] + "/" + database_connection[:database]
+    database_connection[:database] = BIVOUAC_ROOT + "/" + database_connection[:database]
   end
   <%= @conf.appname %>::Models::Base.establish_connection database_connection
 end
@@ -37,7 +41,7 @@ namespace :db do
     if <%= @conf.appname %>.respond_to? :create
       <%= @conf.appname %>.create
     else
-      puts "Nothing to do!"
+      puts "* Nothing to do!"
     end
   end
   
@@ -50,16 +54,3 @@ namespace :db do
     end
   end
 end
-
-namespace :plugin do
-  desc "List plugins"
-  task :list do
-    Dir.glob( filePath( __FILE__, 'plugins/**' ) ).each do |p|
-      pn = p.gsub( /.*\//, "" )
-      print "  - #{pn} : "
-      Rake::Task["plugin:#{pn}:desc"].invoke
-    end
-  end
-  
-  Dir.glob( filePath( __FILE__, 'plugins/**/tasks/**.rake' ) ).each { |p| load p }  
-end

data/lib/bivouac/template/application_goh.rb

@@ -13,15 +13,18 @@ require 'rubygems'
 require 'camping'
 require 'mime/types'
 require 'bivouac'
+require 'bivouac/filter'
 
 <% if @conf.session == :db %>
 require 'camping/session'
 module <%= @conf.appname %>
+  include Bivouac::Filters
   include Camping::Session
 end
 <% else %>
 require 'camping/cookies_sessions'
 module <%= @conf.appname %>
+  include Bivouac::Filters
   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!"
 end

data/lib/bivouac/template/console.rb

@@ -1,4 +1,12 @@
 #!/usr/bin/env ruby
+#
+#  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
+#
 require 'rubygems'
 app = File.dirname(__FILE__) + "/../app/<%= @conf.appfile %>.rb"
 

data/lib/bivouac/template/environment.rb

@@ -47,7 +47,11 @@ module Bivouac
         
         # Session type  
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
-        :session_type  => "<%= @conf.session %>"
+        :session  => "<%= @conf.session %>",
+        
+        # Session type  
+        # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
+        :versions => <%= @conf.versions %>
       )
     end
   end

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

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

data/lib/bivouac/template/generate.rb

@@ -1,4 +1,12 @@
 #!/usr/bin/env ruby
+#
+#  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
+#
 require 'rubygems'
 
 def filePath( from, *data )

data/lib/bivouac/template/plugin.rb

@@ -1,3 +1,11 @@
 #!/usr/bin/env ruby
+#
+#  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
+#
 require 'rubygems'
 require 'bivouac/commands/plugin'

data/lib/bivouac/template/server.rb

@@ -1,4 +1,12 @@
 #!/usr/bin/env ruby
+#
+#  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
+#
 require 'rubygems'
 app = File.dirname(__FILE__) + "/../app/<%= @conf.appfile %>.rb"
 

data/lib/bivouac/template.rb

@@ -55,11 +55,18 @@ module Bivouac
       end
     end
     
-    def copyTemplate( file, dest, from = File.dirname(__FILE__) )
-      if File.exist?( dest + "/" + File.basename( file ) )
+    def copyTemplate( file, dest, opts = {} )
+      force = opts[:force] || false
+      from = opts[:from] || File.dirname(__FILE__)
+      
+      if File.exist?( dest + "/" + File.basename( file ) ) and force == false
         puts "\tskip #{File.expand_path( dest + "/" + File.basename( file ) )}: already exist"
       else
-        puts "\tcreate #{File.expand_path( dest ) + "/" + File.basename( file )}"
+        if force
+          puts "\tforce #{File.expand_path( dest ) + "/" + File.basename( file )}"
+        else
+          puts "\tcreate #{File.expand_path( dest ) + "/" + File.basename( file )}"
+        end
         src = from + "/template/" + file
         FileUtils::cp( src, dest )
       end

data/lib/bivouac.rb

@@ -7,7 +7,7 @@ module Bivouac
     if ENV['BIVOUAC_ROOT']
       path = ENV['BIVOUAC_ROOT'] + "/app/" + xPath.to_s
     end
-    
+
     Dir.glob("#{path}/**/*.rb").each do |file|
       if options[0]
         if options[0].keys.include?( :except ) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-29 00:00:00 +02:00
+date: 2008-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,7 @@ files:
 - lib/bivouac/commands
 - lib/bivouac/commands/generate.rb
 - lib/bivouac/commands/plugin.rb
+- lib/bivouac/filter.rb
 - lib/bivouac/helpers
 - lib/bivouac/helpers/view
 - lib/bivouac/helpers/view/goh
@@ -130,6 +131,10 @@ files:
 - lib/bivouac/helpers/view/goh/javascript.rb
 - lib/bivouac/helpers/view/goh/scriptaculous.rb
 - lib/bivouac/helpers/view/goh/sound.rb
+- lib/bivouac/tasks
+- lib/bivouac/tasks/bivouac.rb
+- lib/bivouac/tasks/framework.rake
+- lib/bivouac/tasks/plugins.rake
 - lib/bivouac/template
 - lib/bivouac/template/application
 - lib/bivouac/template/application/helpers_goh.rb