webgen 0.3.1 → 0.3.2

data/ChangeLog

@@ -1,4 +1,34 @@
 ------------------------------------------------------------------------
+r231 | thomas | 2005-03-17 10:31:00 +0100 (Thu, 17 Mar 2005) | 1 line
+Changed paths:
+   M /trunk/webgen/Rakefile
+
+* rake clobber now deletes test/webgen.log
+------------------------------------------------------------------------
+r230 | thomas | 2005-03-17 10:29:43 +0100 (Thu, 17 Mar 2005) | 2 lines
+Changed paths:
+   M /trunk/webgen/doc/src/index.page
+   M /trunk/webgen/lib/webgen/plugins/tags/executecommand.rb
+   M /trunk/webgen/lib/webgen/webgen.rb
+
+* fixed bug: webgen -v now prints correct version number
+* fixed bug in executecommand tag: if command could not be executed, webgen was aborted
+------------------------------------------------------------------------
+r229 | thomas | 2005-03-17 10:20:12 +0100 (Thu, 17 Mar 2005) | 2 lines
+Changed paths:
+   M /trunk/webgen/doc/src/index.page
+   M /trunk/webgen/lib/webgen/configuration.rb
+
+* bumped version number
+* updated main index.page
+------------------------------------------------------------------------
+r228 | thomas | 2005-03-17 10:16:16 +0100 (Thu, 17 Mar 2005) | 1 line
+Changed paths:
+   M /trunk/webgen/TODO
+   M /trunk/webgen/lib/webgen/webgen.rb
+
+* fixed rubyforge bug #1637
+------------------------------------------------------------------------
 r226 | thomas | 2005-03-16 16:34:13 +0100 (Wed, 16 Mar 2005) | 1 line
 Changed paths:
    M /trunk/webgen/TODO

data/Rakefile

@@ -87,7 +87,7 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include( 'lib/**/*.rb' )
 end
 
-
+CLOBBER << "test/webgen.log"
 task :test do |t|
   chdir 'test' do
     ruby "-I../lib -I. runtests.rb"

data/TODO

@@ -1,5 +1,7 @@
 ---- CURRENT ----
 
+* create tests for methods in webgen.rb
+* webgen -c => output same info as on docu pages
 * reloctable tag: correct output for complex URLS???
 * check if duplicate nodes are created??? by using a tag in a template
 * allow a template to use another template (templates as page description files?) (template2 uses template1)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/doc/src/index.page

@@ -12,6 +12,12 @@ Choose from the menu what you want to see from or know about webgen!
 
 h2. News
 
+*Webgen 0.3.2 released!!!*
+
+Bug fix release for bug #1637 and other bugs
+
+h2. News
+
 *Webgen 0.3.1 released!!!*
 
 Major changes:

data/install.rb

@@ -3,7 +3,7 @@ require 'rpa/install'
 
 class Install_webgen < RPA::Install::FullInstaller
   name 'webgen'
-  version '0.3.1-1'
+  version '0.3.2-1'
   classification Application
   build do
     installdocs %w[COPYING ChangeLog TODO]

data/lib/webgen/configuration.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: configuration.rb 217 2005-03-11 15:15:54Z thomas $
+# $Id: configuration.rb 229 2005-03-17 09:20:12Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -43,7 +43,7 @@ end
 
 module Webgen
 
-  VERSION = [0, 3, 1]
+  VERSION = [0, 3, 2]
   SUMMARY = "Webgen is a templated based static website generator."
   DESCRIPTION = "Webgen is a web page generator implemented in Ruby. " \
   "It is used to generate static web pages from templates and page " \

data/lib/webgen/plugins/tags/executecommand.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: executecommand.rb 203 2005-02-21 18:42:04Z thomas $
+# $Id: executecommand.rb 230 2005-03-17 09:29:43Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -43,7 +43,12 @@ module Tags
 
     def process_tag( tag, node, refNode )
       @processOutput = get_param( 'processOutput' )
-      output = ( get_param( 'command' ) ? `#{get_param( 'command' )}` : '' )
+      begin
+        output = ( get_param( 'command' ) ? `#{get_param( 'command' )}` : '' )
+      rescue StandardError => e
+        output = ''
+        logger.error { "Could not execute command #{get_param( 'command' )}: #{e.message}" }
+      end
       output = CGI::escapeHTML( output ) if get_param( 'escapeHTML' )
       output
     end

data/lib/webgen/webgen.rb

@@ -1,7 +1,7 @@
 #
 #--
 #
-# $Id: webgen.rb 203 2005-02-21 18:42:04Z thomas $
+# $Id: webgen.rb 230 2005-03-17 09:29:43Z thomas $
 #
 # webgen: template based static website generator
 # Copyright (C) 2004 Thomas Leitner
@@ -83,7 +83,7 @@ module Webgen
         opts.on( "--list-configuration", "-c", "List all plugin configuration parameters" ) { main = method( :runListConfiguration ) }
         opts.on_tail( "--help", "Display this help screen" ) { puts opts; exit }
         opts.on_tail( "--version", "-v", "Show version" ) do
-          puts "Webgen #{Webgen::VERSION}"
+          puts "Webgen #{Webgen::VERSION.join('.')}"
           exit
         end
       end
@@ -123,8 +123,8 @@ module Webgen
 
       ljustlength = 30 + Color.green.length + Color.reset.length
       header = ''
-      Plugin.config.sort { |a, b| a[0] <=> b[0] }.each do |classname, data|
-        newHeader = headers[classname[/^.*?(?=::)/]]
+      Plugin.config.sort { |a, b| a[0].name <=> b[0].name }.each do |klass, data|
+        newHeader = headers[klass.name[/^.*?(?=::)/]]
         unless newHeader == header
           print "\n  #{Color.bold}#{newHeader}#{Color.reset}:\n";
           header = newHeader
@@ -137,7 +137,7 @@ module Webgen
     def runListConfiguration
       print "List of configuration parameters:\n\n"
       ljustlength = 20 + Color.green.length + Color.reset.length
-      Plugin.config.sort.each do |classname, data|
+      Plugin.config.sort { |a, b| a[0].name <=> b[0].name }.each do |klass, data|
         next if data.params.nil?
         print "  #{Color.bold}#{data.plugin}#{Color.reset}:\n"
         data.params.sort.each do |key, item|

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2005-03-16
+  version: 0.3.2
+date: 2005-03-17
 summary: Webgen is a templated based static website generator.
 require_paths: 
   - lib