webby 0.7.1 → 0.7.2

data/lib/webby/pages_db.rb

@@ -1,4 +1,4 @@
-# $Id: pages_db.rb 67 2007-12-09 00:49:26Z tim_pease $
+# $Id: pages_db.rb 119 2008-01-29 04:26:27Z wbruce $
 
 module Webby
 
@@ -98,9 +98,17 @@ class PagesDB
     opts = Hash === args.last ? args.pop : {}
     find_all = args.include? :all
 
-    dir = opts.has_key?(:in_directory) ? opts.delete(:in_directory) : nil
-    if dir && !@db.has_key?(dir)
-      raise RuntimeError, "unknown directory '#{dir}'"
+    search = if (dir = opts.delete(:in_directory))
+      strategy = if opts.delete(:recursive)
+        lambda { |key| key =~ /^#{Regexp.escape(dir)}(?:\/|$)/ }
+      else
+        lambda { |key| key == dir }
+      end
+      matching_keys = @db.keys.select(&strategy)
+      raise RuntimeError, "unknown directory '#{dir}'" if matching_keys.empty?
+      matching_keys.map { |key| @db[key] }.flatten
+    else
+      self
     end
 
     block ||= lambda do |page|
@@ -111,18 +119,17 @@ class PagesDB
       end
       found
     end
-
+    
     ary = []
-    search = dir ? @db[dir] : self
     search.each do |page|
       if block.call(page)
         ary << page
         break unless find_all
       end
     end
-
+    
     return ary if find_all
-    return ary.first 
+    return ary.first
   end
 
   # call-seq:

data/lib/webby/renderer.rb

@@ -1,4 +1,4 @@
-# $Id: renderer.rb 68 2007-12-09 07:45:37Z tim_pease $
+# $Id: renderer.rb 112 2008-01-26 05:31:48Z tim_pease $
 
 require 'erb'
 try_require 'bluecloth'
@@ -110,7 +110,7 @@ class Renderer
   # continues until all _items_ have been paginated.
   #
   # Calling this method creates a <code>@pager</code> object that can be
-  # accessed from the _page_. The <code>@pager</code> contains information
+  # accessed from the page. The <code>@pager</code> contains information
   # about the next page, the current page number, the previous page, and the
   # number of items in the current page.
   #

data/lib/webby/resource.rb

@@ -1,4 +1,4 @@
-# $Id: resource.rb 91 2008-01-03 18:24:52Z tim_pease $
+# $Id: resource.rb 102 2008-01-19 23:13:55Z tim_pease $
 
 module Webby
 
@@ -121,7 +121,7 @@ class Resource
   # filename. The extension is determined by looking at the following:
   #
   # * this resource's meta-data for an 'extension' property
-  # * the meta-data of this resource's layout for an 'extension' propery
+  # * the meta-data of this resource's layout for an 'extension' property
   # * the extension of this resource file
   #
   def extension
@@ -144,16 +144,16 @@ class Resource
   # resource is dirty and in need of rendering.
   #
   # The destination for any resource can be overridden by explicitly setting
-  # the 'destination' propery in the resource's meta-data.
+  # the 'destination' property in the resource's meta-data.
   #
   def destination
     return @dest if defined? @dest and @dest
     return @dest = ::Webby.cairn if is_layout?
 
     @dest = if @mdata.has_key? 'destination' then @mdata['destination']
-            else File.join(dir, filename) end
+            else ::File.join(dir, filename) end
 
-    @dest = File.join(::Webby.site.output_dir, @dest)
+    @dest = ::File.join(::Webby.site.output_dir, @dest)
     @dest << @number.to_s if @number
 
     ext = extension
@@ -259,7 +259,7 @@ class Resource
 
     # if this file's mtime is larger than the destination file's
     # mtime, then we are dirty
-    dirty = @mtime > File.mtime(destination)
+    dirty = @mtime > ::File.mtime(destination)
     return dirty if is_static? or dirty
 
     # check to see if the layout is dirty, and it it is then we

data/lib/webby/utils.rb

@@ -1,4 +1,4 @@
-# $Id: utils.rb 67 2007-12-09 00:49:26Z tim_pease $
+# $Id: utils.rb 121 2008-01-29 04:55:28Z tim_pease $
 
 module Enumerable
   def injecting( initial )
@@ -33,4 +33,20 @@ class Hash
   end
 end
 
+class String
+  def underscore
+    self.
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr(" -", "__").
+      downcase
+  end
+end
+
+class Time
+  def to_y
+    self.to_yaml.slice(4..-1).strip
+  end
+end
+
 # EOF

data/lib/webby/webby_task.rb

@@ -1,4 +1,4 @@
-# $Id: webby_task.rb 86 2008-01-01 22:14:55Z tim_pease $
+# $Id: webby_task.rb 106 2008-01-25 04:58:49Z tim_pease $
 
 begin
   require 'rake'
@@ -43,7 +43,7 @@ class WebbyTask < TaskLib
     yield self if block_given?
 
     # load any user defined libraries
-    glob = File.join(FileUtils.pwd, 'lib', '**', '*.rb')
+    glob = ::File.join(FileUtils.pwd, 'lib', '**', '*.rb')
     Dir.glob(glob).sort.each {|fn| require fn}
 
     # create the Webby rake tasks
@@ -54,18 +54,22 @@ class WebbyTask < TaskLib
   # Defines the :build and :rebuild tasks
   #
   def define_build_tasks
+    task :configure_basepath do
+      ::Webby.site.base = ENV['BASE'] if ENV.has_key?('BASE')
+    end
+
     desc "build the website"
-    task :build do |t|
+    task :build => :configure_basepath do |t|
       ::Webby::Builder.run
     end
 
     desc "rebuild the website"
-    task :rebuild do |t|
+    task :rebuild => :configure_basepath do |t|
       ::Webby::Builder.run :rebuild => true
     end
 
     desc "continuously build the website"
-    task :autobuild do |t|
+    task :autobuild => :configure_basepath do |t|
       ::Webby::AutoBuilder.run
     end
 
@@ -88,8 +92,17 @@ class WebbyTask < TaskLib
         raise "Usage:  rake #{t.name} path" unless ARGV.length == 2
 
         page = t.application.top_level_tasks.pop
-        page = File.join(::Webby.site.content_dir, page)
-        page << '.txt' if File.extname(page).empty?
+        name = ::Webby::File.basename(page)
+        ext  = ::Webby::File.extname(page)
+        dir  = ::Webby::File.dirname(page)
+
+        if ::Webby.site.create_mode == 'directory'
+          page = ::File.join(::Webby.site.content_dir, name, 'index')
+          page << '.' << (ext.empty? ? 'txt' : ext)
+        else
+          page = ::File.join(::Webby.site.content_dir, page)
+          page << '.txt' if ext.empty?
+        end
 
         ::Webby::Builder.create page, :from => template
       end  # task

data/tasks/annotations.rake

@@ -1,4 +1,4 @@
-# $Id: annotations.rake 85 2008-01-01 20:37:31Z tim_pease $
+# $Id$
 
 if HAVE_BONES
 

data/tasks/doc.rake

@@ -1,4 +1,4 @@
-# $Id: doc.rake 85 2008-01-01 20:37:31Z tim_pease $
+# $Id$
 
 require 'rake/rdoctask'
 
@@ -7,7 +7,6 @@ namespace :doc do
   desc 'Generate RDoc documentation'
   Rake::RDocTask.new do |rd|
     rd.main = PROJ.rdoc_main
-    rd.options << '-d' if !WIN32 and `which dot` =~ %r/\/dot/
     rd.rdoc_dir = PROJ.rdoc_dir
 
     incl = Regexp.new(PROJ.rdoc_include.join('|'))
@@ -24,6 +23,7 @@ namespace :doc do
     title = "#{PROJ.rubyforge_name}'s " + title if PROJ.rubyforge_name != title
 
     rd.options << "-t #{title}"
+    rd.options.concat(PROJ.rdoc_opts)
   end
 
   desc 'Generate ri locally for testing'

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-# $Id: gem.rake 85 2008-01-01 20:37:31Z tim_pease $
+# $Id$
 
 require 'rake/gempackagetask'
 
@@ -69,12 +69,12 @@ namespace :gem do
 
   desc 'Install the gem'
   task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.file_name}"
+    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.full_name}"
   end
 
   desc 'Uninstall the gem'
   task :uninstall do
-    sh "#{SUDO} #{GEM} uninstall -v '#{PROJ.version}' #{PROJ.name}"
+    sh "#{SUDO} #{GEM} uninstall -v '#{PROJ.version}' -x #{PROJ.name}"
   end
 
 end  # namespace :gem

data/tasks/manifest.rake

@@ -1,4 +1,4 @@
-# $Id: manifest.rake 85 2008-01-01 20:37:31Z tim_pease $
+# $Id$
 
 require 'find'
 
@@ -36,6 +36,9 @@ namespace :manifest do
     files << fn unless test ?f, fn
     File.open(fn, 'w') {|fp| fp.puts files.sort}
   end
-end
+end  # namespace :manifest
+
+desc 'Alias to manifest:check'
+task :manifest => 'manifest:check'
 
 # EOF

data/tasks/post_load.rake

@@ -0,0 +1,18 @@
+# $Id$
+
+# This file does not define any rake tasks. It is used to load some project
+# settings if they are not defined by the user.
+
+unless PROJ.changes
+  PROJ.changes = paragraphs_of('History.txt', 0..1).join("\n\n")
+end
+
+unless PROJ.description
+  PROJ.description = paragraphs_of('README.txt', 'description').join("\n\n")
+end
+
+unless PROJ.summary
+  PROJ.summary = PROJ.description.split('.').first
+end
+
+# EOF

data/tasks/rubyforge.rake

@@ -45,7 +45,7 @@ namespace :doc do
 
     host = "#{config['username']}@rubyforge.org"
     remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge_name}/"
-    remote_dir << PROJ.rdoc_remote_dir || PROJ.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

data/tasks/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 85 2008-01-01 20:37:31Z tim_pease $
+# $Id$
 
 require 'rubygems'
 require 'rake'
@@ -16,7 +16,7 @@ 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.exclude = %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/)
 
 # Rspec
 PROJ.specs = FileList['spec/**/*_spec.rb']
@@ -32,8 +32,8 @@ PROJ.rcov_opts = ['--sort', 'coverage', '-T']
 
 # Rdoc
 PROJ.rdoc_opts = []
-PROJ.rdoc_include = %w(^lib ^bin ^ext txt$)
-PROJ.rdoc_exclude = %w(extconf\.rb$ ^Manifest\.txt$)
+PROJ.rdoc_include = %w(^lib/ ^bin/ ^ext/ .txt$)
+PROJ.rdoc_exclude = %w(extconf.rb$ ^Manifest.txt$)
 PROJ.rdoc_main = 'README.txt'
 PROJ.rdoc_dir = 'doc'
 PROJ.rdoc_remote_dir = nil
@@ -60,8 +60,17 @@ PROJ.need_zip = false
 PROJ.annotation_exclude = []
 PROJ.annotation_extensions = %w(.txt .rb .erb) << ''
 
+# Subversion Repository
+PROJ.svn = false
+PROJ.svn_root = nil
+PROJ.svn_trunk = 'trunk'
+PROJ.svn_tags = 'tags'
+PROJ.svn_branches = 'branches'
+
 # Load the other rake files in the tasks folder
-Dir.glob('tasks/*.rake').sort.each {|fn| import fn}
+rakefiles = Dir.glob('tasks/*.rake').sort
+rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
+import(*rakefiles)
 
 # Setup some constants
 WIN32 = %r/win32/ =~ RUBY_PLATFORM unless defined? WIN32
@@ -108,8 +117,28 @@ end
 #    changes = paragraphs_of('History.txt', 0..1).join("\n\n")
 #    summary, *description = paragraphs_of('README.txt', 3, 3..8)
 #
-def paragraphs_of(path, *paragraphs)
-  File.read(path).delete("\r").split(/\n\n+/).values_at(*paragraphs)
+def paragraphs_of( path, *paragraphs )
+  title = String === paragraphs.first ? paragraphs.shift : nil
+  ary = File.read(path).delete("\r").split(/\n\n+/)
+
+  result = if title
+    tmp, matching = [], false
+    rgxp = %r/^=+\s*#{Regexp.escape(title)}/i
+    paragraphs << (0..-1) if paragraphs.empty?
+
+    ary.each do |val|
+      if val =~ rgxp
+        break if matching
+        matching = true
+        rgxp = %r/^=+/i
+      elsif matching
+        tmp << val
+      end
+    end
+    tmp
+  else ary end
+
+  result.values_at(*paragraphs)
 end
 
 # Adds the given gem _name_ to the current project's dependency list. An
@@ -123,11 +152,13 @@ def depend_on( name, version = nil )
   PROJ.dependencies << (version.nil? ? [name] : [name, ">= #{version}"])
 end
 
-# Adds the given _path_ to the include path if it is not already there
+# Adds the given arguments to the include path if they are not already there
 #
-def ensure_in_path( path )
-  path = File.expand_path(path)
-  $:.unshift(path) if test(?d, path) and not $:.include?(path)
+def ensure_in_path( *args )
+  args.each do |path|
+    path = File.expand_path(path)
+    $:.unshift(path) if test(?d, path) and not $:.include?(path)
+  end
 end
 
 # Find a rake task using the task name and remove any description text. This
@@ -141,4 +172,18 @@ def remove_desc_for_task( names )
   end
 end
 
+# Change working directories to _dir_, call the _block_ of code, and then
+# change back to the original working directory (the current directory when
+# this method was called).
+#
+def in_directory( dir, &block )
+  curdir = pwd
+  begin
+    cd dir
+    return block.call
+  ensure
+    cd curdir
+  end
+end
+
 # EOF

data/tasks/spec.rake

@@ -1,4 +1,4 @@
-# $Id: spec.rake 85 2008-01-01 20:37:31Z tim_pease $
+# $Id$
 
 if HAVE_SPEC_RAKE_SPECTASK
 
@@ -8,12 +8,14 @@ namespace :spec do
   Spec::Rake::SpecTask.new(:run) do |t|
     t.spec_opts = PROJ.spec_opts
     t.spec_files = PROJ.specs
+    t.libs += PROJ.libs
   end
 
   desc 'Run all specs with text output'
   Spec::Rake::SpecTask.new(:specdoc) do |t|
     t.spec_opts = PROJ.spec_opts + ['--format', 'specdoc']
     t.spec_files = PROJ.specs
+    t.libs += PROJ.libs
   end
 
   if HAVE_RCOV
@@ -21,6 +23,7 @@ namespace :spec do
     Spec::Rake::SpecTask.new(:rcov) do |t|
       t.spec_opts = PROJ.spec_opts
       t.spec_files = PROJ.specs
+      t.libs += PROJ.libs
       t.rcov = true
       t.rcov_opts = PROJ.rcov_opts + ['--exclude', 'spec']
     end

data/tasks/svn.rake

@@ -0,0 +1,44 @@
+# $Id$
+
+
+if PROJ.svn and system("svn --version 2>&1 > #{DEV_NULL}")
+
+unless PROJ.svn_root
+  info = %x/svn info ./
+  m = %r/^Repository Root:\s+(.*)$/.match(info)
+  PROJ.svn_root = (m.nil? ? '' : m[1])
+end
+PROJ.svn_root = File.join(PROJ.svn_root, PROJ.svn) if String === PROJ.svn
+
+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.gsub!(%r/\/$/, '')
+    puts tags
+  end
+
+  desc 'Create a new tag in the SVN repository'
+  task :create_tag 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
+
+    trunk = File.join(PROJ.svn_root, PROJ.svn_trunk)
+    tag = "%s-%s" % [PROJ.name, PROJ.version]
+    tag = File.join(PROJ.svn_root, PROJ.svn_tags, tag)
+    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
+
+    puts "Creating SVN tag '#{tag}'"
+    unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
+      abort "Tag creation failed" 
+    end
+  end
+
+end  # namespace :svn
+
+task 'gem:release' => 'svn:create_tag'
+
+end  # if PROJ.svn
+
+# EOF