bivouac 0.1.3 → 0.1.4

data/README

@@ -12,6 +12,22 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.1.4:
+* Add Thin (http://code.macournoyer.com/thin/) support -- Thin is now the default Webserver
+* class Public modified to support thin :
+	@headers['X-Sendfile'] = File.join PATH, '..', 'public', file
+	replaced by 
+	@body = open( File.join( PATH, '..', 'public', file ) )
+* Add image_path function
+* ERB applications are no longer supported. Sorry!
+* Add script/plugin (beta -- hum... bivouac is beta!)
+* Update index page 
+
+=== 0.1.3:
+* add script/console
+* add Rakefile
+* Mineur bug corrections
+
 === 0.1.2:
 * You can now use 
 	$ ruby script/server webrick [options]
@@ -79,7 +95,6 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == TODO:
 
-* add test with mosquito[http://code.whytheluckystiff.net/camping/wiki/MosquitoForBugFreeCamping]
 * more helpers...
 
 == SYNOPSIS:
@@ -131,6 +146,8 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 * camping
 * mime-types
 * extra
+* simple-daemon
+* mosquito
 
 == INSTALL:
 

data/bin/bivouac

@@ -53,12 +53,12 @@ opts = OptionParser.new do |opts|
   }
 	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.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:"
@@ -145,6 +145,10 @@ createFile( "#{@conf.appdir}/script/console", true ) { |io|
   io.puts template( "console" )
 }
 
+createFile( "#{@conf.appdir}/script/plugin", true ) { |io| 
+  io.puts template( "plugin" )
+}
+
 createFile( "#{@conf.appdir}/Rakefile", true ) { |io| 
   io.puts template( "Rakefile" )
 }

data/lib/bivouac/commands/generate.rb

@@ -192,6 +192,7 @@ module Bivouac
     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
@@ -236,6 +237,7 @@ module Bivouac
       # 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

data/lib/bivouac/commands/plugin.rb

@@ -0,0 +1,47 @@
+require 'rubygems'
+require 'bivouac/template'
+require 'fileutils'
+require File.dirname($0) + '/../config/environment.rb'
+
+BASE_URL = "http://bivouac.rubyforge.org/svn/trunk/plugins/"
+
+module Bivouac
+  class Plugin
+    def initialize( argv )
+      # Command (install, list, ...)
+      @command = argv.shift
+      
+      # Plugin arguments.
+      # Example :
+      #   script/plugin install roo_s_tent will_paginate
+      # @script_arguments = ['roo_s_tent', 'will_paginate']
+      @script_arguments = argv.dup
+      
+      # Application environment
+      @app = Bivouac::Environment.new( )
+      
+      # ...
+    end
+    
+    def run
+      send( @command.to_sym )
+    end
+    
+    private
+    
+    def install
+      FileUtils::cd( File.dirname($0) + '/../plugins' )
+      
+      r = system "svn", "co", "#{BASE_URL}#{@script_arguments}"
+      if r == false
+        raise $?
+      end
+    end
+    
+    def list
+      puts "Not yet implemented!"
+    end
+  end
+end
+
+Bivouac::Plugin.new( ARGV ).run( )

data/lib/bivouac/helpers/view/goh/html.rb

@@ -77,6 +77,23 @@ module BivouacHelpers
       img( options )
     end
     
+    # Computes the path to an image asset in the public images directory. 
+    # Full paths from the document root will be passed through. 
+    # Used internally by image_tag to build the image path.
+    #
+    #  image_path("edit")                                         # => /public/images/edit
+    #  image_path("edit.png")                                     # => /public/images/edit.png
+    #  image_path("icons/edit.png")                               # => /public/images/icons/edit.png
+    #  image_path("/icons/edit.png")                              # => /icons/edit.png
+    #  image_path("http://www.railsapplication.com/img/edit.png") # => http://www.railsapplication.com/img/edit.png
+    def image_path( source )
+      if /^http:\/\//.match( source ) || /^\//.match( source )
+        return source
+      else
+        return "/public/images/#{source}"
+      end
+    end
+    
     # Creates a link tag of the given +name+ using +address+ has the href for 
     # the link
     #

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

@@ -5,6 +5,16 @@
 #  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
 #
 
+windows_process = false
+if /Windows/.match( ENV['OS'] )
+  begin
+    require 'win32/process'
+    windows_process = true
+  rescue LoadError => e
+    warn "`win32-process' is not installed!"
+  end
+end
+
 require 'simple-daemon'
 
 DIRNAME = File.expand_path( File.dirname(__FILE__) )
@@ -36,11 +46,18 @@ class <%= @appname %>Daemon < SimpleDaemon::Base
     
     begin
       if @@use.nil?
-        require 'mongrel/camping'
+        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}"
+        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.run.join
+          @@server = Mongrel::Camping.start( config.environment.address, config.environment.port, "/", <%= @appname %>)
+          puts "** <%= @appname %> is running at http://#{config.environment.address}:#{config.environment.port}"
+          @@server.run.join
+        end
       else
         raise LoadError, "I want to use WEBrick please!"
       end
@@ -91,6 +108,11 @@ while ARGV.size > 0
     IRB.start
     break
   when '-d'
+    if /Windows/.match( ENV['OS'] ) and windows_process == false
+      warn "You must install `win32-process' to daemonize this app."
+      exit 1
+    end
+    
     <%= @appname %>Daemon.daemonize
     break
   when '-h'

data/lib/bivouac/template/application_goh.rb

@@ -53,7 +53,8 @@ module <%= @appname %>::Controllers
       else
         type = (MIME::Types.type_for(file)[0] || '/text/plain').to_s
         @headers['Content-Type'] = type
-        @headers['X-Sendfile'] = File.join PATH, '..', 'public', file
+        @body = open( File.join( PATH, '..', 'public', file ) )
+        # @headers['X-Sendfile'] = File.join PATH, '..', 'public', file
       end
     end
   end

data/{examples/blog_erb/script/generate → lib/bivouac/template/plugin.rb}

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'bivouac/commands/generate'
+require 'bivouac/commands/plugin'

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

@@ -204,8 +204,9 @@
           <li>
             <h3>Browse the documentation</h3>
             <ul class="links">
+              <li><a href="http://bivouac.rubyforge.org/files/README.html">Bivouac API</a></li>
               <li><a href="http://camping.rubyforge.org/files/README.html">Camping API</a></li>
-              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
+							<li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
               <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
             </ul>
           </li>
@@ -214,7 +215,7 @@
 
       <div id="content">
         <div id="header">
-          <h1>Welcome aboard</h1>
+          <h1>Hi Campers</h1>
           <h2>You can now go in the tent!</h2>
         </div>
 

metadata

@@ -1,76 +1,90 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2008-01-30 00:00:00 +01:00
-summary: Developpe with Camping like you do with Rails
-require_paths: 
-- lib
-email: gregoire.lejeune@free.fr
-homepage: http://greg.rubyfr.net
-rubyforge_project: 
-description: Developpe with Camping like you do with Rails
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.1
-  version: 
+  version: 0.1.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-03-20 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: camping
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.5"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.15"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: extra
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: simple-daemon
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mosquito
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Developpe with Camping like you do with Rails
+email: gregoire.lejeune@free.fr
+executables: 
+- bivouac
+extensions: []
+
+extra_rdoc_files: 
+- README
+- AUTHORS
+- COPYING
+- lib/bivouac/helpers/view/goh/base.rb
+- lib/bivouac/helpers/view/goh/form.rb
+- lib/bivouac/helpers/view/goh/html.rb
+- lib/bivouac/helpers/view/goh/scriptaculous.rb
+- lib/bivouac/helpers/view/goh/tooltip.rb
+- lib/bivouac/helpers/view/goh/javascript.rb
 files: 
 - COPYING
 - README
 - AUTHORS
 - setup.rb
 - bin/bivouac
-- doc/rdoc
-- doc/rdoc/classes
-- doc/rdoc/classes/BivouacHelpers
-- doc/rdoc/classes/BivouacHelpers/BaseView.html
-- doc/rdoc/classes/BivouacHelpers/FormView.html
-- doc/rdoc/classes/BivouacHelpers/HtmlView.html
-- doc/rdoc/classes/BivouacHelpers/JavaScriptView.html
-- doc/rdoc/classes/BivouacHelpers/ScriptAculoUsView.html
-- doc/rdoc/classes/BivouacHelpers/TooltipView.html
-- doc/rdoc/classes/BivouacHelpers.html
-- doc/rdoc/classes/JavaScriptGenerator.html
-- doc/rdoc/created.rid
-- doc/rdoc/files
-- doc/rdoc/files/AUTHORS.html
-- doc/rdoc/files/COPYING.html
-- doc/rdoc/files/lib
-- doc/rdoc/files/lib/bivouac
-- doc/rdoc/files/lib/bivouac/helpers
-- doc/rdoc/files/lib/bivouac/helpers/view
-- doc/rdoc/files/lib/bivouac/helpers/view/goh
-- doc/rdoc/files/lib/bivouac/helpers/view/goh/base_rb.html
-- doc/rdoc/files/lib/bivouac/helpers/view/goh/form_rb.html
-- doc/rdoc/files/lib/bivouac/helpers/view/goh/html_rb.html
-- doc/rdoc/files/lib/bivouac/helpers/view/goh/javascript_rb.html
-- doc/rdoc/files/lib/bivouac/helpers/view/goh/scriptaculous_rb.html
-- doc/rdoc/files/lib/bivouac/helpers/view/goh/tooltip_rb.html
-- doc/rdoc/files/README.html
-- doc/rdoc/index.html
-- doc/rdoc/permalink.gif
-- doc/rdoc/rdoc-style.css
-- doc/rdoc/rubyfr.png
 - test/test_bivouac.rb
 - test/test_template.rb
 - lib/bivouac
 - lib/bivouac/commands
 - lib/bivouac/commands/generate.rb
-- lib/bivouac/commands/server.rb
+- lib/bivouac/commands/plugin.rb
 - lib/bivouac/helpers
 - lib/bivouac/helpers/view
 - lib/bivouac/helpers/view/goh
@@ -82,12 +96,9 @@ files:
 - lib/bivouac/helpers/view/goh/tooltip.rb
 - lib/bivouac/template
 - lib/bivouac/template/application
-- lib/bivouac/template/application/helpers_erb.rb
 - lib/bivouac/template/application/helpers_goh.rb
 - lib/bivouac/template/application/postamble.rb
-- lib/bivouac/template/application_erb.rb
 - lib/bivouac/template/application_goh.rb
-- lib/bivouac/template/application_jof.rb
 - lib/bivouac/template/console.rb
 - lib/bivouac/template/environment.rb
 - lib/bivouac/template/generate
@@ -99,18 +110,15 @@ files:
 - 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_erb.rb
 - lib/bivouac/template/generate/scaffold_view_create_goh.rb
-- lib/bivouac/template/generate/scaffold_view_list_erb.rb
 - lib/bivouac/template/generate/scaffold_view_list_goh.rb
-- lib/bivouac/template/generate/scaffold_view_view_erb.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
-- lib/bivouac/template/generate/view_erb.rb
 - lib/bivouac/template/generate/view_goh.rb
 - lib/bivouac/template/generate.rb
+- lib/bivouac/template/plugin.rb
 - lib/bivouac/template/Rakefile.rb
 - lib/bivouac/template/server.rb
 - lib/bivouac/template/static
@@ -194,53 +202,6 @@ files:
 - examples/bivouac_sample/script/generate
 - examples/bivouac_sample/script/server
 - examples/bivouac_sample/test
-- examples/blog_erb
-- examples/blog_erb/app
-- examples/blog_erb/app/blog.rb
-- examples/blog_erb/app/controllers
-- examples/blog_erb/app/controllers/add.rb
-- examples/blog_erb/app/controllers/comment.rb
-- examples/blog_erb/app/controllers/edit.rb
-- examples/blog_erb/app/controllers/index.rb
-- examples/blog_erb/app/controllers/info.rb
-- examples/blog_erb/app/controllers/login.rb
-- examples/blog_erb/app/controllers/logout.rb
-- examples/blog_erb/app/controllers/view.rb
-- examples/blog_erb/app/helpers
-- examples/blog_erb/app/models
-- examples/blog_erb/app/models/comment.rb
-- examples/blog_erb/app/models/post.rb
-- examples/blog_erb/app/models/user.rb
-- examples/blog_erb/app/views
-- examples/blog_erb/app/views/add.html
-- examples/blog_erb/app/views/edit.html
-- examples/blog_erb/app/views/index.html
-- examples/blog_erb/app/views/layout.html
-- examples/blog_erb/app/views/login.html
-- examples/blog_erb/app/views/logout.html
-- examples/blog_erb/app/views/view.html
-- examples/blog_erb/config
-- examples/blog_erb/config/environment.rb
-- examples/blog_erb/db
-- examples/blog_erb/db/Blog.db
-- examples/blog_erb/db/create.rb
-- examples/blog_erb/db/migrate
-- examples/blog_erb/db/migrate/comment.rb
-- examples/blog_erb/db/migrate/post.rb
-- examples/blog_erb/db/migrate/user.rb
-- examples/blog_erb/log
-- examples/blog_erb/log/Blog.log
-- examples/blog_erb/public
-- examples/blog_erb/public/images
-- examples/blog_erb/public/images/camping.png
-- examples/blog_erb/public/index.html
-- examples/blog_erb/public/javascripts
-- examples/blog_erb/public/stylesheets
-- examples/blog_erb/public/stylesheets/style.css
-- examples/blog_erb/script
-- examples/blog_erb/script/generate
-- examples/blog_erb/script/server
-- examples/blog_erb/test
 - examples/blog_goh
 - examples/blog_goh/app
 - examples/blog_goh/app/blog.rb
@@ -291,8 +252,9 @@ files:
 - examples/blog_goh/script/generate
 - examples/blog_goh/script/server
 - examples/blog_goh/test
-test_files: []
-
+has_rdoc: true
+homepage: http://greg.rubyfr.net
+post_install_message: 
 rdoc_options: 
 - --quiet
 - --title
@@ -305,65 +267,26 @@ rdoc_options:
 - --inline-source
 - --exclude
 - ^(examples|extras|test|lib)\/
-extra_rdoc_files: 
-- README
-- AUTHORS
-- COPYING
-- lib/bivouac/helpers/view/goh/base.rb
-- lib/bivouac/helpers/view/goh/form.rb
-- lib/bivouac/helpers/view/goh/html.rb
-- lib/bivouac/helpers/view/goh/scriptaculous.rb
-- lib/bivouac/helpers/view/goh/tooltip.rb
-- lib/bivouac/helpers/view/goh/javascript.rb
-executables: 
-- bivouac
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.1
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: camping
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.5"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.15"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extra
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: simple-daemon
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mosquito
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: bivouac
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Developpe with Camping like you do with Rails
+test_files: []
+