webby 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.8.2 / 2008-03-12
+
+* 2 bug fixes
+  - Fixed an error when paginating on an index page
+  - Fixed an error where leading and trailing whitespace was being
+    stripped from syntax highlighted code blocks
+
 == 0.8.1 / 2008-03-09
 
 * 2 major enhancement

data/Manifest.txt

@@ -100,12 +100,12 @@ spec/spec.opts
 spec/spec_helper.rb
 spec/webby/resources/file_spec.rb
 tasks/ann.rake
-tasks/annotations.rake
 tasks/bones.rake
-tasks/doc.rake
 tasks/gem.rake
 tasks/manifest.rake
+tasks/notes.rake
 tasks/post_load.rake
+tasks/rdoc.rake
 tasks/rubyforge.rake
 tasks/setup.rb
 tasks/spec.rake

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 196 2008-03-09 23:03:30Z tim_pease $
+# $Id: Rakefile 202 2008-03-12 16:41:30Z tim_pease $
 
 load 'tasks/setup.rb'
 
@@ -13,29 +13,34 @@ PROJ.authors = 'Tim Pease'
 PROJ.email = 'tim.pease@gmail.com'
 PROJ.url = 'http://webby.rubyforge.org/'
 PROJ.description = paragraphs_of('README.txt', 3).join("\n\n")
-PROJ.rubyforge_name = 'webby'
-PROJ.rdoc_dir = 'doc/rdoc'
-PROJ.rdoc_remote_dir = 'rdoc'
+PROJ.rubyforge.name = 'webby'
 PROJ.version = Webby::VERSION
-PROJ.release_name = 'Wandering Wookie'
+PROJ.release_name = 'Little Bugger'
 
 PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$)
-PROJ.rdoc_exclude << %w(^data ^examples)
 
-PROJ.svn = true
-PROJ.spec_opts << '--color'
+PROJ.rdoc.dir = 'doc/rdoc'
+PROJ.rdoc.remote_dir = 'rdoc'
+PROJ.rdoc.exclude << %w(^data ^examples)
 
-PROJ.ann_email[:to] << 'webby-forum@googlegroups.com'
-PROJ.ann_email[:server] = 'smtp.gmail.com'
-PROJ.ann_email[:port] = 587
+PROJ.svn.path = ''
+PROJ.spec.opts << '--color'
 
-PROJ.ann_text = <<-ANN
-== FUN FACT
+PROJ.ann.email[:to] << 'webby-forum@googlegroups.com'
+PROJ.ann.email[:server] = 'smtp.gmail.com'
+PROJ.ann.email[:port] = 587
 
-A Boeing 747's wingspan is longer than the Wright brothers first flight.
+PROJ.ann.text = <<-ANN
+== FUN FACT
 
+La Paz, the capital city of Bolivia, is the highest capital in the
+world at over 17,000 feet (5,181 m).
+ 
 == POST SCRIPT
 
+Visit the Webby forum to chat with other Webby-Heads:
+http://groups.google.com/group/webby-forum
+
 Blessings,
 TwP
 ANN

data/examples/webby/content/tips_and_tricks/index.txt

@@ -21,7 +21,9 @@ Let's assume that your website has a collection of articles in a folder called "
 <pre>
 ---
 title: Articles
-filter: erb
+filter:
+- erb
+- textile
 ---
 h2. <%= h(@page.title) %>
 

data/lib/webby/helpers/coderay_helper.rb

@@ -1,4 +1,4 @@
-# $Id: coderay_helper.rb 193 2008-03-09 02:32:37Z tim_pease $
+# $Id: coderay_helper.rb 199 2008-03-11 18:54:45Z tim_pease $
 
 if try_require 'coderay'
 require 'enumerator'
@@ -37,7 +37,7 @@ module CodeRayHelper
     pos = buffer.length
     block.call(*args)
 
-    text = buffer[pos..-1].strip
+    text = buffer[pos..-1]
     if text.empty?
       buffer[pos..-1] = ''
       return

data/lib/webby/helpers/ultraviolet_helper.rb

@@ -1,4 +1,4 @@
-# $Id: ultraviolet_helper.rb 190 2008-03-05 05:35:00Z tim_pease $
+# $Id: ultraviolet_helper.rb 199 2008-03-11 18:54:45Z tim_pease $
 
 # This code was provided by Guillaume Carbonneau -- http://radr.ca/
 # Many thanks for his support of Webby!
@@ -41,7 +41,7 @@ module UltraVioletHelper
     pos = buffer.length
     block.call(*args)
 
-    text = buffer[pos..-1].strip
+    text = buffer[pos..-1]
     if text.empty?
       buffer[pos..-1] = ''
       return

data/lib/webby/resources/page.rb

@@ -1,4 +1,4 @@
-# $Id: page.rb 191 2008-03-05 19:07:50Z tim_pease $
+# $Id: page.rb 198 2008-03-10 15:25:55Z tim_pease $
 
 require Webby.libpath(*%w[webby resources resource])
 
@@ -44,6 +44,20 @@ class Page < Resource
     renderer.render_page
   end
 
+  # call-seq
+  #    url    => string or nil
+  #
+  # Returns a string suitable for use as a URL linking to this page. Nil
+  # is returned for layouts.
+  #
+  def url
+    return @url if defined? @url and @url
+
+    @url = destination.sub(::Webby.site.output_dir, '')
+    @url = File.dirname(@url) if filename == 'index' and number.nil?
+    @url
+  end
+
   # call-seq:
   #    page.number = Integer
   #

data/lib/webby/resources/resource.rb

@@ -1,4 +1,4 @@
-# $Id: resource.rb 167 2008-02-24 00:59:54Z tim_pease $
+# $Id: resource.rb 198 2008-03-10 15:25:55Z tim_pease $
 
 unless defined? Webby::Resources::Resource
 
@@ -121,10 +121,7 @@ class Resource
   #
   def url
     return @url if defined? @url and @url
-
     @url = destination.sub(::Webby.site.output_dir, '')
-    @url = File.dirname(@url) if filename == 'index'
-    @url
   end
 
   # :stopdoc:

data/lib/webby.rb

@@ -1,4 +1,4 @@
-# $Id: webby.rb 195 2008-03-09 05:33:35Z tim_pease $
+# $Id: webby.rb 198 2008-03-10 15:25:55Z tim_pease $
 
 # Equivalent to a header guard in C/C++
 # Used to prevent the spec helper from being loaded more than once
@@ -20,7 +20,7 @@ Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
 module Webby
 
   # :stopdoc:
-  VERSION = '0.8.1'   # :nodoc:
+  VERSION = '0.8.2'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/tasks/ann.rake

@@ -1,4 +1,4 @@
-# $Id$
+# $Id: ann.rake 200 2008-03-12 16:05:17Z tim_pease $
 
 begin
   require 'bones/smtp_tls'
@@ -9,9 +9,10 @@ require 'time'
 
 namespace :ann do
 
-  file PROJ.ann_file do
-    puts "Generating #{PROJ.ann_file}"
-    File.open(PROJ.ann_file,'w') do |fd|
+  file PROJ.ann.file do
+    ann = PROJ.ann
+    puts "Generating #{ann.file}"
+    File.open(ann.file,'w') do |fd|
       fd.puts("#{PROJ.name} version #{PROJ.version}")
       fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
       fd.puts("    #{PROJ.url}") if PROJ.url
@@ -23,23 +24,24 @@ namespace :ann do
       fd.puts
       fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
       fd.puts
-      PROJ.ann_paragraphs.each do |p|
+      ann.paragraphs.each do |p|
         fd.puts "== #{p.upcase}"
         fd.puts
         fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
         fd.puts
       end
-      fd.puts PROJ.ann_text if PROJ.ann_text
+      fd.puts ann.text if ann.text
     end
   end
 
   desc "Create an announcement file"
-  task :announcement => PROJ.ann_file
+  task :announcement => PROJ.ann.file
 
   desc "Send an email announcement"
-  task :email => PROJ.ann_file do
-    from = PROJ.ann_email[:from] || PROJ.email
-    to   = Array(PROJ.ann_email[:to])
+  task :email => PROJ.ann.file do
+    ann = PROJ.ann
+    from = ann.email[:from] || PROJ.email
+    to   = Array(ann.email[:to])
 
     ### build a mail header for RFC 822
     rfc822msg =  "From: #{from}\n"
@@ -49,11 +51,11 @@ namespace :ann do
     rfc822msg << "\n"
     rfc822msg << "Date: #{Time.new.rfc822}\n"
     rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{PROJ.ann_email[:domain]}>\n\n"
-    rfc822msg << File.read(PROJ.ann_file)
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
 
     params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      PROJ.ann_email[key]
+      ann.email[key]
     end
 
     params[3] = PROJ.email if params[3].nil?
@@ -71,6 +73,6 @@ end  # namespace :ann
 desc 'Alias to ann:announcement'
 task :ann => 'ann:announcement'
 
-CLOBBER << PROJ.ann_file
+CLOBBER << PROJ.ann.file
 
 # EOF

data/tasks/bones.rake

@@ -1,7 +1,6 @@
-# $Id$
+# $Id: bones.rake 200 2008-03-12 16:05:17Z tim_pease $
 
-require 'pp'
-require 'stringio'
+if HAVE_BONES
 
 namespace :bones do
 
@@ -10,31 +9,13 @@ namespace :bones do
     atr = if ARGV.length == 2
       t.application.top_level_tasks.pop
     end
-    sio = StringIO.new
-    sep = "\n" + ' '*27
-    fmt = "%23s => %s"
 
-    if atr
-      PP.pp(PROJ.send(atr.to_sym), sio, 49)
-      sio.seek 0
-      val = sio.read
-      val = val.split("\n").join(sep)
-
-      puts fmt % [atr, val]
-    else
-      h = PROJ.instance_variable_get(:@table)
-      h.keys.map {|k| k.to_s}.sort.each do |k|
-        sio.truncate 0
-        PP.pp(h[k.to_sym], sio, 49)
-        sio.seek 0
-        val = sio.read
-        val = val.split("\n").join(sep)
-
-        puts fmt % [k, val]
-      end
-    end
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
   end
 
 end  # namespace :bones
 
+end  # HAVE_BONES
+
 # EOF

data/tasks/gem.rake

@@ -1,87 +1,77 @@
-# $Id$
+# $Id: gem.rake 200 2008-03-12 16:05:17Z tim_pease $
 
 require 'rake/gempackagetask'
 
 namespace :gem do
 
-  PROJ.spec = Gem::Specification.new do |s|
+  PROJ.gem.spec = Gem::Specification.new do |s|
     s.name = PROJ.name
     s.version = PROJ.version
     s.summary = PROJ.summary
     s.authors = Array(PROJ.authors)
     s.email = PROJ.email
     s.homepage = Array(PROJ.url).first
-    s.rubyforge_project = PROJ.rubyforge_name
-    s.post_install_message = PROJ.post_install_message
+    s.rubyforge_project = PROJ.rubyforge.name
+    s.post_install_message = PROJ.gem.post_install_message
 
     s.description = PROJ.description
 
-    PROJ.dependencies.each do |dep|
+    PROJ.gem.dependencies.each do |dep|
       s.add_dependency(*dep)
     end
 
-    s.files = PROJ.files
-    s.executables = PROJ.executables.map {|fn| File.basename(fn)}
-    s.extensions = PROJ.files.grep %r/extconf\.rb$/
+    s.files = PROJ.gem.files
+    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
+    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
 
     s.bindir = 'bin'
     dirs = Dir["{#{PROJ.libs.join(',')}}"]
     s.require_paths = dirs unless dirs.empty?
 
-    incl = Regexp.new(PROJ.rdoc_include.join('|'))
-    excl = PROJ.rdoc_exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
     excl = Regexp.new(excl.join('|'))
-    rdoc_files = PROJ.files.find_all do |fn|
+    rdoc_files = PROJ.gem.files.find_all do |fn|
                    case fn
                    when excl; false
                    when incl; true
                    else false end
                  end
-    s.rdoc_options = PROJ.rdoc_opts + ['--main', PROJ.rdoc_main]
+    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
     s.extra_rdoc_files = rdoc_files
     s.has_rdoc = true
 
-    if test ?f, PROJ.test_file
-      s.test_file = PROJ.test_file
+    if test ?f, PROJ.test.file
+      s.test_file = PROJ.test.file
     else
-      s.test_files = PROJ.tests.to_a
+      s.test_files = PROJ.test.files.to_a
     end
-
-    # Do any extra stuff the user wants
-#   spec_extras.each do |msg, val|
-#     case val
-#     when Proc
-#       val.call(s.send(msg))
-#     else
-#       s.send "#{msg}=", val
-#     end
-#   end
   end
 
   desc 'Show information about the gem'
   task :debug do
-    puts PROJ.spec.to_ruby
+    puts PROJ.gem.spec.to_ruby
   end
 
   pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
-    pkg.need_tar = PROJ.need_tar
-    pkg.need_zip = PROJ.need_zip
-    pkg.package_files += PROJ.spec.files
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+    pkg.package_files += PROJ.gem.spec.files
   end
   Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil)
 
-  gem_file = if PROJ.spec.platform == Gem::Platform::RUBY
+  gem_file = if PROJ.gem.spec.platform == Gem::Platform::RUBY
       "#{pkg.package_name}.gem"
     else
-      "#{pkg.package_name}-#{PROJ.spec.platform}.gem"
+      "#{pkg.package_name}-#{PROJ.gem.spec.platform}.gem"
     end
 
   desc "Build the gem file #{gem_file}"
   task :package => "#{pkg.package_dir}/#{gem_file}"
 
-  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.spec.files do
+  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem.spec.files do
     when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.spec).build
+      Gem::Builder.new(PROJ.gem.spec).build
       verbose(true) {
         mv gem_file, "#{pkg.package_dir}/#{gem_file}"
       }
@@ -90,7 +80,7 @@ namespace :gem do
 
   desc 'Install the gem'
   task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.full_name}"
+    sh "#{SUDO} #{GEM} install pkg/#{PROJ.gem.spec.full_name}"
   end
 
   desc 'Uninstall the gem'

data/tasks/{annotations.rake → notes.rake}

@@ -1,15 +1,15 @@
-# $Id$
+# $Id: notes.rake 200 2008-03-12 16:05:17Z tim_pease $
 
 if HAVE_BONES
 
 desc "Enumerate all annotations"
 task :notes do
   Bones::AnnotationExtractor.enumerate(
-      PROJ, PROJ.annotation_tags.join('|'), :tag => true)
+      PROJ, PROJ.notes.tags.join('|'), :tag => true)
 end
 
 namespace :notes do
-  PROJ.annotation_tags.each do |tag|
+  PROJ.notes.tags.each do |tag|
     desc "Enumerate all #{tag} annotations"
     task tag.downcase.to_sym do
       Bones::AnnotationExtractor.enumerate(PROJ, tag)

data/tasks/post_load.rake

@@ -1,16 +1,21 @@
-# $Id$
+# $Id: post_load.rake 200 2008-03-12 16:05:17Z tim_pease $
 
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
-PROJ.rdoc_exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
-PROJ.exclude << "^#{Regexp.escape(PROJ.ann_file)}$"
+PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
+PROJ.exclude << "^#{Regexp.escape(PROJ.ann.file)}$"
 
-PROJ.instance_variable_get(:@table).each do |key,val|
-  next unless val.instance_of? Array
-  next if key == :dependencies
-  val.flatten!
-end
+flatten_arrays = lambda do |this,os|
+    os.instance_variable_get(:@table).each do |key,val|
+      next if key == :dependencies
+      case val
+      when Array; val.flatten!
+      when OpenStruct; this.call(this,val)
+      end
+    end
+  end
+flatten_arrays.call(flatten_arrays,PROJ)
 
 PROJ.changes ||= paragraphs_of(PROJ.history_file, 0..1).join("\n\n")
 
@@ -18,15 +23,15 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
 
 PROJ.summary ||= PROJ.description.split('.').first
 
-PROJ.files ||=
+PROJ.gem.files ||=
   if test(?f, PROJ.manifest_file)
     files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
     files.delete ''
     files
   else [] end
 
-PROJ.executables ||= PROJ.files.find_all {|fn| fn =~ %r/^bin/}
+PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
 
-PROJ.rdoc_main ||= PROJ.readme_file
+PROJ.rdoc.main ||= PROJ.readme_file
 
 # EOF

data/tasks/{doc.rake → rdoc.rake}

@@ -1,4 +1,4 @@
-# $Id$
+# $Id: rdoc.rake 200 2008-03-12 16:05:17Z tim_pease $
 
 require 'rake/rdoctask'
 
@@ -6,12 +6,13 @@ namespace :doc do
 
   desc 'Generate RDoc documentation'
   Rake::RDocTask.new do |rd|
-    rd.main = PROJ.rdoc_main
-    rd.rdoc_dir = PROJ.rdoc_dir
+    rdoc = PROJ.rdoc
+    rd.main = rdoc.main
+    rd.rdoc_dir = rdoc.dir
 
-    incl = Regexp.new(PROJ.rdoc_include.join('|'))
-    excl = Regexp.new(PROJ.rdoc_exclude.join('|'))
-    files = PROJ.files.find_all do |fn|
+    incl = Regexp.new(rdoc.include.join('|'))
+    excl = Regexp.new(rdoc.exclude.join('|'))
+    files = PROJ.gem.files.find_all do |fn|
               case fn
               when excl; false
               when incl; true
@@ -20,10 +21,10 @@ namespace :doc do
     rd.rdoc_files.push(*files)
 
     title = "#{PROJ.name}-#{PROJ.version} Documentation"
-    title = "#{PROJ.rubyforge_name}'s " + title if PROJ.rubyforge_name != title
+    title = "#{PROJ.rubyforge.name}'s " + title if PROJ.rubyforge.name != title
 
     rd.options << "-t #{title}"
-    rd.options.concat(PROJ.rdoc_opts)
+    rd.options.concat(rdoc.opts)
   end
 
   desc 'Generate ri locally for testing'

data/tasks/rubyforge.rake

@@ -1,6 +1,6 @@
-# $Id$
+# $Id: rubyforge.rake 200 2008-03-12 16:05:17Z tim_pease $
 
-if PROJ.rubyforge_name && HAVE_RUBYFORGE
+if PROJ.rubyforge.name && HAVE_RUBYFORGE
 
 require 'rubyforge'
 require 'rake/contrib/sshpublisher'
@@ -10,11 +10,11 @@ namespace :gem do
   task :release => [:clobber, :package] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
-    pkg = "pkg/#{PROJ.spec.full_name}"
+    pkg = "pkg/#{PROJ.gem.spec.full_name}"
 
     if $DEBUG then
-      puts "release_id = rf.add_release #{PROJ.rubyforge_name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""
-      puts "rf.add_file #{PROJ.rubyforge_name.inspect}, #{PROJ.name.inspect}, release_id, \"#{pkg}.gem\""
+      puts "release_id = rf.add_release #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""
+      puts "rf.add_file #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, release_id, \"#{pkg}.gem\""
     end
 
     rf = RubyForge.new
@@ -26,12 +26,12 @@ namespace :gem do
     c['release_changes'] = PROJ.changes if PROJ.changes
     c['preformatted'] = true
 
-    files = [(PROJ.need_tar ? "#{pkg}.tgz" : nil),
-             (PROJ.need_zip ? "#{pkg}.zip" : nil),
+    files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil),
+             (PROJ.gem.need_zip ? "#{pkg}.zip" : nil),
              "#{pkg}.gem"].compact
 
     puts "Releasing #{PROJ.name} v. #{PROJ.version}"
-    rf.add_release PROJ.rubyforge_name, PROJ.name, PROJ.version, *files
+    rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files
   end
 end  # namespace :gem
 
@@ -44,9 +44,9 @@ namespace :doc do
     )
 
     host = "#{config['username']}@rubyforge.org"
-    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge_name}/"
-    remote_dir << PROJ.rdoc_remote_dir if PROJ.rdoc_remote_dir
-    local_dir = PROJ.rdoc_dir
+    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge.name}/"
+    remote_dir << PROJ.rdoc.remote_dir if PROJ.rdoc.remote_dir
+    local_dir = PROJ.rdoc.dir
 
     Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
   end

data/tasks/setup.rb

@@ -1,4 +1,4 @@
-# $Id$
+# $Id: setup.rb 200 2008-03-12 16:05:17Z tim_pease $
 
 require 'rubygems'
 require 'rake'
@@ -6,92 +6,117 @@ require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
 
-PROJ = OpenStruct.new
-
-PROJ.name = nil
-PROJ.summary = nil
-PROJ.description = nil
-PROJ.changes = nil
-PROJ.authors = nil
-PROJ.email = nil
-PROJ.url = nil
-PROJ.version = ENV['VERSION'] || '0.0.0'
-PROJ.rubyforge_name = nil
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/)
-PROJ.release_name = ENV['RELEASE']
-PROJ.history_file = 'History.txt'
-PROJ.manifest_file = 'Manifest.txt'
-PROJ.readme_file = 'README.txt'
-
-# Rspec
-PROJ.specs = FileList['spec/**/*_spec.rb']
-PROJ.spec_opts = []
-
-# Test::Unit
-PROJ.tests = FileList['test/**/test_*.rb']
-PROJ.test_file = 'test/all.rb'
-PROJ.test_opts = []
-
-# Rcov
-PROJ.rcov_dir = 'coverage'
-PROJ.rcov_opts = %w[--sort coverage -T]
-PROJ.rcov_threshold = 90.0
-PROJ.rcov_threshold_exact = false
-
-# Rdoc
-PROJ.rdoc_opts = []
-PROJ.rdoc_include = %w(^lib/ ^bin/ ^ext/ .txt$)
-PROJ.rdoc_exclude = %w(extconf.rb$)
-PROJ.rdoc_main = nil
-PROJ.rdoc_dir = 'doc'
-PROJ.rdoc_remote_dir = nil
-
-# Extensions
-PROJ.extensions = FileList['ext/**/extconf.rb']
-PROJ.ruby_opts = %w(-w)
-PROJ.libs = []
-%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
-
-# Gem Packaging
-PROJ.files = nil
-PROJ.executables = nil
-PROJ.dependencies = []
-PROJ.need_tar = true
-PROJ.need_zip = false
-PROJ.post_install_message = nil
-
-# File Annotations
-PROJ.annotation_exclude = %w(^tasks/setup.rb$)
-PROJ.annotation_extensions = %w(.txt .rb .erb) << ''
-PROJ.annotation_tags = %w(FIXME OPTIMIZE TODO)
-
-# Subversion Repository
-PROJ.svn = false
-PROJ.svn_root = nil
-PROJ.svn_trunk = 'trunk'
-PROJ.svn_tags = 'tags'
-PROJ.svn_branches = 'branches'
-
-# Announce
-PROJ.ann_file = 'announcement.txt'
-PROJ.ann_text = nil
-PROJ.ann_paragraphs = []
-PROJ.ann_email = {
-  :from     => nil,
-  :to       => %w(ruby-talk@ruby-lang.org),
-  :server   => 'localhost',
-  :port     => 25,
-  :domain   => ENV['HOSTNAME'],
-  :acct     => nil,
-  :passwd   => nil,
-  :authtype => :plain
-}
+class OpenStruct; undef :gem; end
+
+PROJ = OpenStruct.new(
+  # Project Defaults
+  :name => nil,
+  :summary => nil,
+  :description => nil,
+  :changes => nil,
+  :authors => nil,
+  :email => nil,
+  :url => nil,
+  :version => ENV['VERSION'] || '0.0.0',
+  :exclude => %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/),
+  :release_name => ENV['RELEASE'],
+
+  # System Defaults
+  :ruby_opts => %w(-w),
+  :libs => [],
+  :history_file => 'History.txt',
+  :manifest_file => 'Manifest.txt',
+  :readme_file => 'README.txt',
+
+  # Announce
+  :ann => OpenStruct.new(
+    :file => 'announcement.txt',
+    :text => nil,
+    :paragraphs => [],
+    :email => {
+      :from     => nil,
+      :to       => %w(ruby-talk@ruby-lang.org),
+      :server   => 'localhost',
+      :port     => 25,
+      :domain   => ENV['HOSTNAME'],
+      :acct     => nil,
+      :passwd   => nil,
+      :authtype => :plain
+    }
+  ),
+
+  # Gem Packaging
+  :gem => OpenStruct.new(
+    :dependencies => [],
+    :executables => nil,
+    :extensions => FileList['ext/**/extconf.rb'],
+    :files => nil,
+    :need_tar => true,
+    :need_zip => false,
+    :post_install_message => nil
+  ),
+
+  # File Annotations
+  :notes => OpenStruct.new(
+    :exclude => %w(^tasks/setup.rb$),
+    :extensions => %w(.txt .rb .erb) << '',
+    :tags => %w(FIXME OPTIMIZE TODO)
+  ),
+
+  # Rcov
+  :rcov => OpenStruct.new(
+    :dir => 'coverage',
+    :opts => %w[--sort coverage -T],
+    :threshold => 90.0,
+    :threshold_exact => false
+  ),
+
+  # Rdoc
+  :rdoc => OpenStruct.new(
+    :opts => [],
+    :include => %w(^lib/ ^bin/ ^ext/ .txt$),
+    :exclude => %w(extconf.rb$),
+    :main => nil,
+    :dir => 'doc',
+    :remote_dir => nil
+  ),
+
+  # Rubyforge
+  :rubyforge => OpenStruct.new(
+    :name => nil
+  ),
+
+  # Rspec
+  :spec => OpenStruct.new(
+    :files => FileList['spec/**/*_spec.rb'],
+    :opts => []
+  ),
+
+  # Subversion Repository
+  :svn => OpenStruct.new(
+    :root => nil,
+    :path => nil,
+    :trunk => 'trunk',
+    :tags => 'tags',
+    :branches => 'branches'
+  ),
+
+  # Test::Unit
+  :test => OpenStruct.new(
+    :files => FileList['test/**/test_*.rb'],
+    :file  => 'test/all.rb',
+    :opts  => []
+  )
+)
 
 # Load the other rake files in the tasks folder
 rakefiles = Dir.glob('tasks/*.rake').sort
 rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
 import(*rakefiles)
 
+# Setup the project libraries
+%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
+
 # Setup some constants
 WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
 
@@ -120,6 +145,7 @@ SUDO = if WIN32 then ''
        end
 
 RCOV = WIN32 ? 'rcov.bat' : 'rcov'
+RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
 GEM  = WIN32 ? 'gem.bat'  : 'gem'
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
@@ -169,7 +195,7 @@ def depend_on( name, version = nil )
   spec = Gem.source_index.find_name(name).last
   version = spec.version.to_s if version.nil? and !spec.nil?
 
-  PROJ.dependencies << case version
+  PROJ.gem.dependencies << case version
     when nil; [name]
     when %r/^\d/; [name, ">= #{version}"]
     else [name, version] end

data/tasks/spec.rake

@@ -1,4 +1,4 @@
-# $Id$
+# $Id: spec.rake 200 2008-03-12 16:05:17Z tim_pease $
 
 if HAVE_SPEC_RAKE_SPECTASK
 require 'spec/rake/verify_rcov'
@@ -8,16 +8,16 @@ namespace :spec do
   desc 'Run all specs with basic output'
   Spec::Rake::SpecTask.new(:run) do |t|
     t.ruby_opts = PROJ.ruby_opts
-    t.spec_opts = PROJ.spec_opts
-    t.spec_files = PROJ.specs
+    t.spec_opts = PROJ.spec.opts
+    t.spec_files = PROJ.spec.files
     t.libs += PROJ.libs
   end
 
   desc 'Run all specs with text output'
   Spec::Rake::SpecTask.new(:specdoc) do |t|
     t.ruby_opts = PROJ.ruby_opts
-    t.spec_opts = PROJ.spec_opts + ['--format', 'specdoc']
-    t.spec_files = PROJ.specs
+    t.spec_opts = PROJ.spec.opts + ['--format', 'specdoc']
+    t.spec_files = PROJ.spec.files
     t.libs += PROJ.libs
   end
 
@@ -25,21 +25,22 @@ namespace :spec do
     desc 'Run all specs with RCov'
     Spec::Rake::SpecTask.new(:rcov) do |t|
       t.ruby_opts = PROJ.ruby_opts
-      t.spec_opts = PROJ.spec_opts
-      t.spec_files = PROJ.specs
+      t.spec_opts = PROJ.spec.opts
+      t.spec_files = PROJ.spec.files
       t.libs += PROJ.libs
       t.rcov = true
-      t.rcov_dir = PROJ.rcov_dir
-      t.rcov_opts = PROJ.rcov_opts + ['--exclude', 'spec']
+      t.rcov_dir = PROJ.rcov.dir
+      t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
     end
 
     RCov::VerifyTask.new(:verify) do |t| 
-      t.threshold = PROJ.rcov_threshold
-      t.index_html = File.join(PROJ.rcov_dir, 'index.html')
-      t.require_exact_threshold = PROJ.rcov_threshold_exact
+      t.threshold = PROJ.rcov.threshold
+      t.index_html = File.join(PROJ.rcov.dir, 'index.html')
+      t.require_exact_threshold = PROJ.rcov.threshold_exact
     end
 
     task :verify => :rcov
+    remove_desc_for_task %w(spec:clobber_rcov)
   end
 
 end  # namespace :spec
@@ -49,8 +50,6 @@ task :spec => 'spec:run'
 
 task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(spec:clobber_rcov)
-
 end  # if HAVE_SPEC_RAKE_SPECTASK
 
 # EOF

data/tasks/svn.rake

@@ -1,21 +1,21 @@
-# $Id$
+# $Id: svn.rake 200 2008-03-12 16:05:17Z tim_pease $
 
+if PROJ.svn.path and system("svn --version 2>&1 > #{DEV_NULL}")
 
-if PROJ.svn and system("svn --version 2>&1 > #{DEV_NULL}")
-
-unless PROJ.svn_root
+unless PROJ.svn.root
   info = %x/svn info ./
   m = %r/^Repository Root:\s+(.*)$/.match(info)
-  PROJ.svn_root = (m.nil? ? '' : m[1])
+  PROJ.svn.root = (m.nil? ? '' : m[1])
 end
-PROJ.svn_root = File.join(PROJ.svn_root, PROJ.svn) if String === PROJ.svn
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
 
 namespace :svn do
 
   desc 'Show tags from the SVN repository'
   task :show_tags do |t|
-    tags = %x/svn list #{File.join(PROJ.svn_root, PROJ.svn_tags)}/
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
     tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
     puts tags
   end
 
@@ -24,9 +24,10 @@ namespace :svn do
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
 
-    trunk = File.join(PROJ.svn_root, PROJ.svn_trunk)
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
     tag = "%s-%s" % [PROJ.name, PROJ.version]
-    tag = File.join(PROJ.svn_root, PROJ.svn_tags, tag)
+    tag = File.join(svn.root, svn.tags, tag)
     msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
 
     puts "Creating SVN tag '#{tag}'"
@@ -39,6 +40,6 @@ end  # namespace :svn
 
 task 'gem:release' => 'svn:create_tag'
 
-end  # if PROJ.svn
+end  # if PROJ.svn.path
 
 # EOF

data/tasks/website.rake

@@ -1,4 +1,4 @@
-# $Id: website.rake 115 2008-01-27 03:36:45Z tim_pease $
+# $Id: website.rake 201 2008-03-12 16:16:09Z tim_pease $
 
 namespace :website do
 
@@ -26,7 +26,7 @@ namespace :website do
     )
 
     host = "#{config['username']}@rubyforge.org"
-    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge_name}/"
+    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge.name}/"
 
     sh "rsync --delete -rulptzCF doc/ #{host}:#{remote_dir}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-08 23:00:00 -07:00
+date: 2008-03-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,12 +179,12 @@ files:
 - spec/spec_helper.rb
 - spec/webby/resources/file_spec.rb
 - tasks/ann.rake
-- tasks/annotations.rake
 - tasks/bones.rake
-- tasks/doc.rake
 - tasks/gem.rake
 - tasks/manifest.rake
+- tasks/notes.rake
 - tasks/post_load.rake
+- tasks/rdoc.rake
 - tasks/rubyforge.rake
 - tasks/setup.rb
 - tasks/spec.rake