webgen 0.5.2 → 0.5.3

data/Rakefile

@@ -134,13 +134,22 @@ EOF
       s.version = Webgen::VERSION
       s.summary = SUMMARY
       s.description = DESCRIPTION
+      s.post_install_message = <<EOF
+Thanks for choosing webgen! Here are some places to get you started:
+* The webgen User Documentation at <http://webgen.rubyforge.org/documentation/index.html>
+* The mailing list archive at <http://rubyforge.org/pipermail/webgen-users/>
+
+Have a look at <http://webgen.rubyforge.org/news/index.html> for a list of changes!
+
+Have fun!
+EOF
 
       #### Dependencies, requirements and files
 
       s.files = PKG_FILES.to_a
       s.add_dependency('cmdparse', '~> 2.0.0')
       s.add_dependency('maruku', '>= 0.5.6')
-      s.add_dependency('facets', '>= 2.4.1')
+      s.add_dependency('facets', '>= 2.4.3')
       s.add_dependency('rake', '>= 0.8.0')
       s.add_dependency('ramaze', '2008.06')
       s.add_dependency('launchy', '>= 0.3.2')
@@ -152,6 +161,7 @@ EOF
       s.add_development_dependency('builder', '>= 2.1.0')
       s.add_development_dependency('rdoc', '>= 2.0.0')
       s.add_development_dependency('coderay', '>= 0.7.4.215')
+      s.add_development_dependency('feedtools', '>= 0.2.29')
 
       s.require_path = 'lib'
 
@@ -229,14 +239,14 @@ EOF
     site.config_block = lambda do |config|
       config['sources'] += [['/documentation/', 'Webgen::Source::FileSystem', '../doc'],
                             ['/', "Webgen::Source::FileSystem", '../misc', 'default.css'],
+                            ['/documentation/', "Webgen::Source::FileSystem", '../misc', 'htmldoc.virtual'],
                             ['/', "Webgen::Source::FileSystem", '../misc', 'images/**/*']]
     end
   end
-  task :website => ['rdoc']
 
   desc "Upload the webgen website to Rubyforge"
-  task :publish_website => [:website] do
-    sh "rsync -avc --delete --exclude 'documentation/0.5.x' --exclude 'documentation/0.4.x' --exclude 'wiki' --exclude 'robots.txt'  website/out/ gettalong@rubyforge.org:/var/www/gforge-projects/webgen/"
+  task :publish_website => ['rdoc', :website] do
+    sh "rsync -avc --delete --exclude documentation/rdoc --exclude 'documentation/0.5.x' --exclude 'documentation/0.4.x' --exclude 'wiki' --exclude 'robots.txt'  website/out/ gettalong@rubyforge.org:/var/www/gforge-projects/webgen/"
     sh "rsync -avc --delete htmldoc/rdoc/ gettalong@rubyforge.org:/var/www/gforge-projects/webgen/documentation/rdoc"
   end
 
@@ -272,6 +282,7 @@ EOF
   EXCLUDED_FOR_TESTS=FileList.new(['lib/webgen/cli{*,**/*}', 'lib/webgen/version.rb',
                                    'lib/webgen/output.rb', 'lib/webgen/source.rb',
                                    'lib/webgen/tag.rb', 'lib/webgen/default_config.rb',
+                                   'lib/webgen/common.rb'
                                   ])
 
   EXCLUDED_FOR_DOCU=FileList.new(['lib/webgen/cli{*,**/*}', 'lib/webgen/contentprocessor/context.rb',

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/data/webgen/webgui/controller/main.rb

@@ -102,7 +102,7 @@ class MainController < Ramaze::Controller
       @styles = wm.styles.keys.select {|k| k =~ /^website-|[^-]+/ }.sort
 
       if !@cur_style.nil? && !@cur_template.nil?
-        ws = Webgen::Website.new('unknown') do |config|
+        ws = Webgen::Website.new('unknown', nil) do |config|
           config['sources'] = [
                                ['/', 'Webgen::Source::Resource', 'webgen-website-template-' + @cur_template, '/src/**', '/src'],
                                ['/', 'Webgen::Source::Resource', 'webgen-website-style-' + @cur_style, '/src/**', '/src']

data/data/webgen/website_skeleton/ext/init.rb

@@ -0,0 +1,6 @@
+# = webgen extensions directory
+#
+# All init.rb files anywhere under this directory get automatically loaded on a webgen run. This
+# allows you to add your own extensions to webgen or to modify webgen's core!
+#
+# If you don't need this feature you can savely delete this file and the directory in which it is!

data/data/webgen/website_styles/1024px/src/default.css

@@ -1,188 +1,188 @@
-/* 1024px - An open source xhtml/css website template by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer.
-
-Version: 1.2, April 20, 2006 */
-
-/******** General tags ********/
-body{
-font:76% Verdana,Tahoma,Arial,sans-serif;
-background:#ffffff url(images/background.gif) top center repeat-y;
-color:#404040;
-line-height:1.2em;
-margin:0 auto;
-padding:0;
-}
-
-a, #sidebar .webgen-menu span {
-text-decoration:none;
-color:#4088b8;
-font-weight:bold;
-}
-
-a:hover{text-decoration:underline;}
-a img{border:0;}
-p{margin:0 0 18px 10px;}
-ul,ol,dl{font-size:0.9em; margin:2px 0 16px 35px;}
-ul ul,ol ol{margin:4px 0 4px 35px;}
-
-h1{
-font-size:4.2em;
-letter-spacing:-5px;
-margin:0 0 30px 25px;
-color:#4088b8;
-}
-
-h1 a{text-transform:none; color:#4088b8;}
-
-h2{
-font-size:1.4em;
-color:#4088b8;
-border-bottom:4px solid #dadada;
-padding:0 2px 2px 5px;
-margin:0 0 10px 0;
-letter-spacing:-1px;
-}
-
-h3{
-font-size:1.2em;
-font-weight:bold;
-color:#4088b8;
-border-bottom:1px solid #dadada;
-margin:10px 0 8px 0;
-padding:1px 2px 2px 3px;
-}
-
-blockquote{
-font-size:0.9em;
-border:1px solid #dadada;
-margin:20px 10px;
-padding:8px;
-}
-
-/******** Main wrap ********/
-#wrap{
-color:#404040;
-width:970px;
-margin:10px auto;
-padding:0;
-}
-
-#header{margin:0;}
-
-#header h1 {margin-top: -30px}
-
-#toplinks{text-align:right; padding:5px 2px 2px 3px;}
-
-#slogan{
-font-size:1.5em;
-color:#808080;
-font-weight:bold;
-letter-spacing:-1px;
-margin:15px 0px 20px 35px;
-line-height:1.2em;
-}
-
-/******** sidebar ********/
-#sidebar{
-float:left;
-width:195px;
-margin:0 0 5px 0;
-padding:1px 0 0 0;
-}
-
-#sidebar ul{
-list-style:none;
-font-size:0.9em;
-margin:0;
-padding:0 0 15px 10px;
-}
-
-#sidebar li{
-list-style:none;
-margin:0 0 4px 0;
-padding:0;
-}
-
-#sidebar li a, #sidebar li span {
-font-size:1.2em;
-font-weight:bold;
-padding:2px;
-}
-
-#sidebar ul ul{
-margin:4px 0 3px 15px;
-line-height:1.2em;
-padding:0;
-}
-
-#sidebar ul ul li a, #sidebar ul ul li span {font-weight:normal;}
-#sidebar h2{margin:3px 0px 8px 0px;}
-
-/******** Content variations ********/
-#content{
-line-height:1.5em;
-width:750px;
-float:right;
-text-align:left;
-margin:0;
-padding:0;
-}
-
-#contentalt{
-line-height:1.5em;
-width:750px;
-float:left;
-text-align:left;
-padding:0;
-margin-right:20px;
-}
-
-#content h3, #contentalt h3{margin:10px 0 8px;}
-
-/******** Footer ********/
-#footer{
-clear:both;
-text-align:right;
-color:#808080;
-font-size:0.9em;
-border-top:4px solid #dadada;
-margin:0 auto;
-padding:8px 0;
-line-height:1.6em;
-}
-
-#footer p{margin:0; padding:0;}
-#footer a{color:#808080;}
-
-/******** Various classes ********/
-.box{
-color:#ffffff;
-font-size:0.9em;
-background-color:#4088b8;
-border:1px solid #c8c8c8;
-line-height:1.3em;
-padding:5px 5px 5px 8px;
-}
-
-.box a{color:#f0f0f0;}
-.left{float:left; margin:0 15px 4px 0;}
-.right{float:right; margin:0 0 4px 15px;}
-.textright{text-align:right;}
-.readmore{text-align:right; margin:-10px 10px 12px 0;}
-
-.center{text-align:center;}
-.blue{color:#4088b8;}
-.big{font-size:1.3em;}
-.small{font-size:0.8em;}
-.bold{font-weight:bold;}
-
-.clear{clear:both;}
-.hide{display:none;}
-.fade{color:#c8c8c8;}
-.gray{color:#808080;}
-
-.photo{
-border:1px solid #bababa;
-padding:2px;
-background-color:#ffffff;
-margin:6px 18px 2px 5px;
-}
+/* 1024px - An open source xhtml/css website template by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer.
+
+Version: 1.2, April 20, 2006 */
+
+/******** General tags ********/
+body{
+font:76% Verdana,Tahoma,Arial,sans-serif;
+background:#ffffff url(images/background.gif) top center repeat-y;
+color:#404040;
+line-height:1.2em;
+margin:0 auto;
+padding:0;
+}
+
+a, #sidebar #menu span {
+text-decoration:none;
+color:#4088b8;
+font-weight:bold;
+}
+
+a:hover{text-decoration:underline;}
+a img{border:0;}
+p{margin:0 0 18px 10px;}
+ul,ol,dl{font-size:0.9em; margin:2px 0 16px 35px;}
+ul ul,ol ol{margin:4px 0 4px 35px;}
+
+h1{
+font-size:4.2em;
+letter-spacing:-5px;
+margin:0 0 30px 25px;
+color:#4088b8;
+}
+
+h1 a{text-transform:none; color:#4088b8;}
+
+h2{
+font-size:1.4em;
+color:#4088b8;
+border-bottom:4px solid #dadada;
+padding:0 2px 2px 5px;
+margin:0 0 10px 0;
+letter-spacing:-1px;
+}
+
+h3{
+font-size:1.2em;
+font-weight:bold;
+color:#4088b8;
+border-bottom:1px solid #dadada;
+margin:10px 0 8px 0;
+padding:1px 2px 2px 3px;
+}
+
+blockquote{
+font-size:0.9em;
+border:1px solid #dadada;
+margin:20px 10px;
+padding:8px;
+}
+
+/******** Main wrap ********/
+#wrap{
+color:#404040;
+width:970px;
+margin:10px auto;
+padding:0;
+}
+
+#header{margin:0;}
+
+#header h1 {margin-top: -30px}
+
+#toplinks{text-align:right; padding:5px 2px 2px 3px;}
+
+#slogan{
+font-size:1.5em;
+color:#808080;
+font-weight:bold;
+letter-spacing:-1px;
+margin:15px 0px 20px 35px;
+line-height:1.2em;
+}
+
+/******** sidebar ********/
+#sidebar{
+float:left;
+width:195px;
+margin:0 0 5px 0;
+padding:1px 0 0 0;
+}
+
+#sidebar ul{
+list-style:none;
+font-size:0.9em;
+margin:0;
+padding:0 0 15px 10px;
+}
+
+#sidebar li{
+list-style:none;
+margin:0 0 4px 0;
+padding:0;
+}
+
+#sidebar li a, #sidebar li span {
+font-size:1.2em;
+font-weight:bold;
+padding:2px;
+}
+
+#sidebar ul ul{
+margin:4px 0 3px 15px;
+line-height:1.2em;
+padding:0;
+}
+
+#sidebar ul ul li a, #sidebar ul ul li span {font-weight:normal;}
+#sidebar h2{margin:3px 0px 8px 0px;}
+
+/******** Content variations ********/
+#content{
+line-height:1.5em;
+width:750px;
+float:right;
+text-align:left;
+margin:0;
+padding:0;
+}
+
+#contentalt{
+line-height:1.5em;
+width:750px;
+float:left;
+text-align:left;
+padding:0;
+margin-right:20px;
+}
+
+#content h3, #contentalt h3{margin:10px 0 8px;}
+
+/******** Footer ********/
+#footer{
+clear:both;
+text-align:right;
+color:#808080;
+font-size:0.9em;
+border-top:4px solid #dadada;
+margin:0 auto;
+padding:8px 0;
+line-height:1.6em;
+}
+
+#footer p{margin:0; padding:0;}
+#footer a{color:#808080;}
+
+/******** Various classes ********/
+.box{
+color:#ffffff;
+font-size:0.9em;
+background-color:#4088b8;
+border:1px solid #c8c8c8;
+line-height:1.3em;
+padding:5px 5px 5px 8px;
+}
+
+.box a{color:#f0f0f0;}
+.left{float:left; margin:0 15px 4px 0;}
+.right{float:right; margin:0 0 4px 15px;}
+.textright{text-align:right;}
+.readmore{text-align:right; margin:-10px 10px 12px 0;}
+
+.center{text-align:center;}
+.blue{color:#4088b8;}
+.big{font-size:1.3em;}
+.small{font-size:0.8em;}
+.bold{font-weight:bold;}
+
+.clear{clear:both;}
+.hide{display:none;}
+.fade{color:#c8c8c8;}
+.gray{color:#808080;}
+
+.photo{
+border:1px solid #bababa;
+padding:2px;
+background-color:#ffffff;
+margin:6px 18px 2px 5px;
+}