webby 0.7.4 → 0.8.0

data/tasks/post_load.rake

@@ -3,16 +3,30 @@
 # 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
+PROJ.rdoc_exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
+PROJ.exclude << "^#{Regexp.escape(PROJ.ann_file)}$"
 
-unless PROJ.description
-  PROJ.description = paragraphs_of('README.txt', 'description').join("\n\n")
+PROJ.instance_variable_get(:@table).each do |key,val|
+  next unless val.instance_of? Array
+  next if key == :dependencies
+  val.flatten!
 end
 
-unless PROJ.summary
-  PROJ.summary = PROJ.description.split('.').first
-end
+PROJ.changes ||= paragraphs_of(PROJ.history_file, 0..1).join("\n\n")
+
+PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
+
+PROJ.summary ||= PROJ.description.split('.').first
+
+PROJ.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.rdoc_main ||= PROJ.readme_file
 
 # EOF

data/tasks/setup.rb

@@ -1,7 +1,8 @@
-# $Id: setup.rb 133 2008-02-05 06:33:39Z tim_pease $
+# $Id$
 
 require 'rubygems'
 require 'rake'
+require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
 
@@ -17,6 +18,10 @@ 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']
@@ -28,13 +33,16 @@ PROJ.test_file = 'test/all.rb'
 PROJ.test_opts = []
 
 # Rcov
-PROJ.rcov_opts = ['--sort', 'coverage', '-T']
+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$ ^Manifest.txt$)
-PROJ.rdoc_main = 'README.txt'
+PROJ.rdoc_exclude = %w(extconf.rb$)
+PROJ.rdoc_main = nil
 PROJ.rdoc_dir = 'doc'
 PROJ.rdoc_remote_dir = nil
 
@@ -45,20 +53,17 @@ PROJ.libs = []
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Gem Packaging
-PROJ.files =
-  if test ?f, 'Manifest.txt'
-    files = File.readlines('Manifest.txt').map {|fn| fn.chomp.strip}
-    files.delete ''
-    files
-  else [] end
-PROJ.executables = PROJ.files.find_all {|fn| fn =~ %r/^bin/}
+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 = []
+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
@@ -67,6 +72,21 @@ 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
+}
+
 # Load the other rake files in the tasks folder
 rakefiles = Dir.glob('tasks/*.rake').sort
 rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
@@ -99,8 +119,8 @@ SUDO = if WIN32 then ''
          else '' end
        end
 
-RCOV = WIN32 ? 'rcov.cmd'  : 'rcov'
-GEM  = WIN32 ? 'gem.cmd'   : 'gem'
+RCOV = WIN32 ? 'rcov.bat' : 'rcov'
+GEM  = WIN32 ? 'gem.bat'  : 'gem'
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin
@@ -149,7 +169,10 @@ 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 << (version.nil? ? [name] : [name, ">= #{version}"])
+  PROJ.dependencies << case version
+    when nil; [name]
+    when %r/^\d/; [name, ">= #{version}"]
+    else [name, version] end
 end
 
 # Adds the given arguments to the include path if they are not already there
@@ -186,4 +209,19 @@ def in_directory( dir, &block )
   end
 end
 
+# Scans the current working directory and creates a list of files that are
+# candidates to be in the manifest.
+#
+def manifest_files
+  files = []
+  exclude = Regexp.new(PROJ.exclude.join('|'))
+  Find.find '.' do |path|
+    path.sub! %r/^(\.\/|\/)/o, ''
+    next unless test ?f, path
+    next if path =~ exclude
+    files << path
+  end
+  files.sort!
+end
+
 # EOF

data/tasks/spec.rake

@@ -1,11 +1,13 @@
 # $Id$
 
 if HAVE_SPEC_RAKE_SPECTASK
+require 'spec/rake/verify_rcov'
 
 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.libs += PROJ.libs
@@ -13,6 +15,7 @@ namespace :spec do
 
   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.libs += PROJ.libs
@@ -21,12 +24,22 @@ namespace :spec do
   if HAVE_RCOV
     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.libs += PROJ.libs
       t.rcov = true
+      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
+    end
+
+    task :verify => :rcov
   end
 
 end  # namespace :spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-15 00:00:00 -07:00
+date: 2008-02-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -109,11 +109,14 @@ files:
 - data/content/css/site.css
 - data/content/index.txt
 - data/layouts/default.rhtml
+- data/lib/breadcrumbs.rb
 - data/tasks/create.rake
 - data/tasks/deploy.rake
 - data/tasks/growl.rake
 - data/tasks/heel.rake
 - data/tasks/setup.rb
+- data/templates/_partial.erb
+- data/templates/atom_feed.erb
 - data/templates/page.erb
 - examples/webby/Rakefile
 - examples/webby/content/css/blueprint/print.css
@@ -138,32 +141,42 @@ files:
 - lib/webby.rb
 - lib/webby/auto_builder.rb
 - lib/webby/builder.rb
-- lib/webby/file.rb
 - lib/webby/filters.rb
 - lib/webby/filters/basepath.rb
-- lib/webby/filters/coderay.rb
 - lib/webby/filters/erb.rb
-- lib/webby/filters/graphviz.rb
 - lib/webby/filters/haml.rb
 - lib/webby/filters/markdown.rb
 - lib/webby/filters/outline.rb
 - lib/webby/filters/sass.rb
 - lib/webby/filters/textile.rb
 - lib/webby/filters/tidy.rb
+- lib/webby/helpers.rb
+- lib/webby/helpers/coderay_helper.rb
+- lib/webby/helpers/graphviz_helper.rb
 - lib/webby/helpers/tag_helper.rb
+- lib/webby/helpers/tex_img_helper.rb
 - lib/webby/helpers/url_helper.rb
 - lib/webby/main.rb
-- lib/webby/pages_db.rb
 - lib/webby/renderer.rb
-- lib/webby/resource.rb
+- lib/webby/resources.rb
+- lib/webby/resources/db.rb
+- lib/webby/resources/file.rb
+- lib/webby/resources/layout.rb
+- lib/webby/resources/page.rb
+- lib/webby/resources/partial.rb
+- lib/webby/resources/resource.rb
+- lib/webby/resources/static.rb
+- lib/webby/stelan/mktemp.rb
 - lib/webby/stelan/paginator.rb
 - lib/webby/stelan/spawner.rb
 - lib/webby/utils.rb
 - lib/webby/webby_task.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/webby/file_spec.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

data/lib/webby/filters/coderay.rb

@@ -1,98 +0,0 @@
-# $Id: coderay.rb 113 2008-01-26 23:09:13Z tim_pease $
-
-require 'enumerator'
-require 'hpricot'
-try_require 'coderay'
-
-module Webby
-module Filters
-
-# The CodeRay applies syntax highlighting to source code embedded in a
-# webpage. The CodeRay highlighting engine is used for the HTML markup of
-# the source code. A set of <coderay>...</coderay> tags is used to denote
-# which sections of the page should be highlighted.
-#
-# Options can be passed to the CodeRay engine via attributes in the
-# <coderay> tag.
-#
-#    <coderay lang="ruby" line_numbers="inline">
-#    # Initializer for the class.
-#    def initialize( string )
-#      @str = stirng
-#    end
-#    </coderay>
-#    
-# The supported CodeRay options are the following:
-#
-#    lang               : the language to highlight (ruby, c, html, ...)
-#    line_numbers       : include line numbers in 'table', 'inline',
-#                         or 'list'
-#    line_number_start  : where to start with line number counting
-#    bold_every         : make every n-th number appear bold
-#    tab_width          : convert tab characters to n spaces
-#     
-class CodeRay
-
-  # call-seq:
-  #    CodeRay.new( string, filters = nil )
-  #
-  # Creates a new CodeRay filter that will operate on the given _string_.
-  #
-  def initialize( str, filters = nil )
-    @str = str
-    @filters = filters
-  end
-
-  # call-seq:
-  #    to_html    => string
-  #
-  # Process the original text string passed to the filter when it was
-  # created and output HTML formatted text. Any text between
-  # <coderay>...</coderay> tags will have syntax highlighting applied to the
-  # text via the CodeRay gem.
-  #
-  def to_html
-    doc = Hpricot(@str)
-    doc.search('//coderay') do |cr|
-      text = cr.inner_html.strip
-      lang = (cr['lang'] || 'ruby').to_sym
-
-      opts = {}
-      %w(line_numbers       to_sym
-         line_number_start  to_i
-         bold_every         to_i
-         tab_width          to_i).each_slice(2) do |key,convert|
-        next if cr[key].nil?
-        opts[key.to_sym] = cr[key].send(convert)
-      end
-
-      #cr.swap(CodeRay.scan(text, lang).html(opts).div)
-      out = "<div class=\"CodeRay\"><pre>\n"
-      out << ::CodeRay.scan(text, lang).html(opts)
-      out << "\n</pre></div>"
-
-      @filters.each do |f|
-        case f
-        when 'textile'
-          out.insert 0, "<notextile>\n"
-          out << "\n</notextile>"
-        end
-      end unless @filters.nil?
-
-      cr.swap out
-    end
-
-    doc.to_html
-  end
-
-end  # class CodeRay
-
-# Render text via the CodeRay syntax highlighter library.
-register :coderay do |input, cursor|
-  Filters::CodeRay.new(input, cursor.remaining_filters).to_html
-end
-
-end  # module Filters
-end  # module Webby
-
-# EOF

data/lib/webby/filters/graphviz.rb

@@ -1,189 +0,0 @@
-# $Id: graphviz.rb 113 2008-01-26 23:09:13Z tim_pease $
-
-require 'hpricot'
-require 'fileutils'
-require 'tempfile'
-
-module Webby
-module Filters
-
-# The Graphviz filter processes DOT scripts in a webpage and replaces them
-# with generated image files. A set of <graphviz>...</graphviz> tags is
-# used to denote which section(s) of the page contains DOT scripts.
-#
-# Options can be passed to the Graphviz filter using attributes in the
-# <graphviz> tag.
-#
-#     <graphviz path="images" type="gif" cmd="dot">
-#     digraph graph_1 {
-#       graph [URL="default.html"]
-#       a [URL="a.html"]
-#       b [URL="b.html"]
-#       c [URL="c.html"]
-#       a -> b -> c
-#       a -> c
-#     }
-#     </graphviz>
-#
-# If the DOT script contains *URL* or *href* attributes on any of the nodes
-# or edges, then an image map will be generated and the image will be
-# "clikcable" in the webpage. If *URL* or *href* attributes do not appear in
-# the DOT script, then a regular image will be inserted into the webpage.
-#
-# The image is inserted into the page using an HTML <img /> tag. A
-# corresponding <map>...</map> element will be inserted if needed.
-#
-# The supported Graphviz options are the following:
-#
-#    path     : where generated images will be stored
-#               [default is "/"]
-#    type     : the type of image to generate (png, jpeg, gif)
-#               [default is png]
-#    cmd      : the Graphviz command to use when generating images
-#               (dot, neato, twopi, circo, fdp) [default is dot]
-#
-#    the following options are passed as-is to the generated <img /> tag
-#    style    : CSS styles to apply to the <img />
-#    class    : CSS class to apply to the <img />
-#    id       : HTML identifier
-#    alt      : alternate text for the <img />
-#
-class Graphviz
-
-  class Error < StandardError; end    # :nodoc:
-
-  # call-seq:
-  #    Graphviz.new( string, filters = nil )
-  #
-  # Creates a new Graphviz filter that will operate on the given _string_.
-  # The optional _filters_ describe filters that will be applied to the
-  # output string returned by the Graphviz filter.
-  #
-  def initialize( str, filters = nil )
-    @str = str
-    @filters = filters
-
-    # create a temporary file for holding any error messages
-    # from the graphviz program
-    @err = Tempfile.new('graphviz_err')
-    @err.close
-  end
-
-  # call-seq:
-  #    to_html    => string
-  #
-  # Process the original text string passed to the filter when it was
-  # created and output HTML formatted text. Any text between
-  # <graphviz>...</graphviz> tags will have the contained DOT syntax
-  # converted into an image and then included into the resulting HTML text.
-  #
-  def to_html
-    doc = Hpricot(@str)
-    doc.search('//graphviz') do |gviz|
-      
-      path = gviz['path']
-      cmd  = gviz['cmd'] || 'dot'
-      type = gviz['type'] || 'png'
-      text = gviz.inner_html.strip   # the DOT script to process
-
-      # if we don't have a DOT script, then replace it with
-      # the empty text and move on to the next graphviz tags
-      if text.empty?
-        gviz.swap text
-        next
-      end
-
-      # ensure the requested graphviz command actually exists
-      %x[#{cmd} -V 2>&1]
-      unless 0 == $?.exitstatus
-        raise NameError, "'#{cmd}' not found on the path"
-      end
-
-      # pull the name of the graph|digraph out of the DOT script
-      name = text.match(%r/\A\s*(?:strict\s+)?(?:di)?graph\s+([A-Za-z_][A-Za-z0-9_]*)\s+\{/o)[1]
-
-      # see if the user includes any URL or href attributes
-      # if so, then we need to create an imagemap
-      usemap = text.match(%r/(?:URL|href)\s*=/o) != nil
-
-      # generate the image filename based on the path, graph name, and type
-      # of image to generate
-      image_fn = path.nil? ? name.dup : ::File.join(path, name)
-      image_fn = ::File.join('', image_fn) << '.' << type
-
-      # create the HTML img tag
-      out = "<img src=\"#{image_fn}\""
-
-      %w[class style id alt].each do |attr|
-        next if gviz[attr].nil?
-        out << " %s=\"%s\"" % [attr, gviz[attr]]
-      end
-
-      out << " usemap=\"\##{name}\"" if usemap
-      out << " />\n"
-
-      # generate the image map if needed
-      if usemap
-        IO.popen("#{cmd} -Tcmapx 2> #{@err.path}", 'r+') do |io|
-          io.write text
-          io.close_write
-          out << io.read
-        end
-        error_check
-      end
-
-      # generate the image using graphviz -- but first ensure that the
-      # path exists
-      out_dir = ::Webby.site.output_dir
-      out_file = ::File.join(out_dir, image_fn)
-      FileUtils.mkpath(::File.join(out_dir, path)) unless path.nil?
-      cmd = "#{cmd} -T#{type} -o #{out_file} 2> #{@err.path}"
-
-      IO.popen(cmd, 'w') {|io| io.write text}
-      error_check
-
-      # see if we need to put some guards around the output
-      # (specifically for textile)
-      @filters.each do |f|
-        case f
-        when 'textile'
-          out.insert 0, "<notextile>\n"
-          out << "\n</notextile>"
-        end
-      end unless @filters.nil?
-
-      gviz.swap out
-    end
-
-    doc.to_html
-  end
-
-
-  private
-
-  # call-seq:
-  #    error_check
-  #
-  # Check the temporary error file to see if it contains any error messages
-  # from the graphviz program. If it is not empty, then read the contents
-  # and log an error message and raise an exception.
-  #
-  def error_check
-    if ::File.size(@err.path) != 0
-      msg = "\n" << ::File.read(@err.path).strip
-      raise Error, msg
-    end
-  end
-
-end  # class Graphviz
-
-# Render text into iamges via the Graphviz programs.
-#
-register :graphviz do |input, cursor|
-  Filters::Graphviz.new(input, cursor.remaining_filters).to_html
-end
-
-end  # module Filters
-end  # module Webby
-
-# EOF