friendly_format 0.7.1 → 0.7.2

data/CHANGES

@@ -1,5 +1,10 @@
 = friendly_format changes history
 
+== friendly_format 0.7.2 / 2009-12-31
+* an executable to format text from stdin to stdout.
+* fixed latest hpricot compatibility
+* hpricot support is deprecated, and would be removed in 0.8+
+
 == friendly_format 0.7.1 / 2009-08-06
 * filter attribute value start with javascript.
 

data/README

@@ -35,7 +35,7 @@ by Lin Jen-Shin (aka godfat-真常[http://godfat.org])
 
 Apache License 2.0
 
-Copyright (c) 2008, Lin Jen-Shin (aka godfat 真常)
+Copyright (c) 2008-2009, Lin Jen-Shin (aka godfat 真常)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,39 +1,33 @@
 # encoding: utf-8
 
-require 'bones'
-Bones.setup
-
-PROJ.name = 'friendly_format'
-PROJ.authors = 'Lin Jen-Shin (aka godfat 真常)'
-PROJ.email = 'godfat (XD) godfat.org'
-PROJ.url = "http://github.com/godfat/#{PROJ.name}"
-PROJ.rubyforge.name = 'ludy'
-
-PROJ.gem.development_dependencies << ['hpricot',     '>=0.8'] <<
-                                     ['nokogiri',    '>=1.2']
-# PROJ.ruby_opts.delete '-w'
+begin
+  require 'bones'
+rescue LoadError
+  abort '### Please install the "bones" gem ###'
+end
 
-PROJ.description = PROJ.summary = paragraphs_of('README', 'description').join("\n\n")
-PROJ.changes = paragraphs_of('CHANGES', 0..1).join("\n\n")
-PROJ.version = File.read("lib/#{PROJ.name}/version.rb").gsub(/.*VERSION = '(.*)'.*/m, '\1')
+ensure_in_path 'lib'
+proj = 'friendly_format'
+require "#{proj}/version"
 
-PROJ.exclude += ['^tmp', 'tmp$', '^pkg', '^\.gitignore$',
-                 '^ann-', '\.sqlite3$', '\.db$']
+Bones{
+  version FriendlyFormat::VERSION
 
-PROJ.rdoc.remote_dir = PROJ.name
+  # ruby_opts [''] # silence warning, too many in addressable and/or dm-core
 
-PROJ.readme_file = 'README'
-PROJ.rdoc.main = 'README'
-PROJ.rdoc.exclude += ['Rakefile', '^tasks', '^test']
-PROJ.rdoc.include << '\w+'
-# PROJ.rdoc.opts << '--diagram' if !Rake::Win32 and `which dot` =~ %r/\/dot/
-PROJ.rdoc.opts += ['--charset=utf-8', '--inline-source',
-                   '--line-numbers', '--promiscuous']
+  depend_on 'nokogiri', :development => true, :version => '>=1.2'
+  depend_on 'hpricot',  :development => true, :version => '>=0.8'
 
-PROJ.spec.opts << '--color'
+  name    proj
+  url     "http://github.com/godfat/#{proj}"
+  authors 'Lin Jen-Shin (aka godfat 真常)'
+  email   'godfat (XD) godfat.org'
 
-PROJ.ann.file = "ann-#{PROJ.name}-#{PROJ.version}"
-PROJ.ann.paragraphs.concat %w[LINKS SYNOPSIS REQUIREMENTS INSTALL LICENSE]
+  history_file   'CHANGES'
+   readme_file   'README'
+   ignore_file   '.gitignore'
+  rdoc.include   ['\w+']
+}
 
 CLEAN.include Dir['**/*.rbc']
 

data/TODO

@@ -7,3 +7,4 @@
   <a href="/">嗯</a> as 1 character too. never cut out tag and unicode.
 
 * an executable to format text from stdin to stdout.
+ - options for it. includes 1. file input, allowed tags selection

data/bin/friendly_format

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'friendly_format'
+
+puts FriendlyFormat.format_article($stdin.read, FriendlyFormat::SetCommon.new)

data/friendly_format.gemspec

@@ -2,22 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendly_format}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lin Jen-Shin (aka godfat \347\234\237\345\270\270)"]
-  s.date = %q{2009-08-06}
+  s.authors = ["Lin Jen-Shin (aka godfat 真常)"]
+  s.date = %q{2009-12-31}
+  s.default_executable = %q{friendly_format}
   s.description = %q{ make user input be valid xhtml and format it with gsub("\n", "<br/>") etc.
  you can partially allow some tags and don't escape them.}
   s.email = %q{godfat (XD) godfat.org}
-  s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "TODO", "friendly_format.gemspec"]
-  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "friendly_format.gemspec", "lib/friendly_format.rb", "lib/friendly_format/adapter/hpricot_adapter.rb", "lib/friendly_format/adapter/nokogiri_adapter.rb", "lib/friendly_format/set_common.rb", "lib/friendly_format/set_strict.rb", "lib/friendly_format/version.rb", "test/sample/complex_article.txt", "test/sample/complex_article_result.txt", "test/test_friendly_format.rb"]
+  s.executables = ["friendly_format"]
+  s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "bin/friendly_format", "friendly_format.gemspec", "test/sample/complex_article.txt", "test/sample/complex_article_result.txt"]
+  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "bin/friendly_format", "friendly_format.gemspec", "lib/friendly_format.rb", "lib/friendly_format/adapter/hpricot_adapter.rb", "lib/friendly_format/adapter/nokogiri_adapter.rb", "lib/friendly_format/set_common.rb", "lib/friendly_format/set_strict.rb", "lib/friendly_format/version.rb", "test/sample/complex_article.txt", "test/sample/complex_article_result.txt", "test/test_friendly_format.rb"]
   s.homepage = %q{http://github.com/godfat/friendly_format}
-  s.rdoc_options = ["--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
+  s.rdoc_options = ["--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ludy}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{make user input be valid xhtml and format it with gsub("\n", "<br/>") etc. you can partially allow some tags and don't escape them.}
+  s.summary = %q{make user input be valid xhtml and format it with gsub("\n", "<br/>") etc}
   s.test_files = ["test/test_friendly_format.rb"]
 
   if s.respond_to? :specification_version then
@@ -25,17 +27,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
-      s.add_development_dependency(%q<hpricot>, [">= 0.8"])
       s.add_development_dependency(%q<nokogiri>, [">= 1.2"])
+      s.add_development_dependency(%q<hpricot>, [">= 0.8"])
+      s.add_development_dependency(%q<bones>, [">= 3.2.0"])
     else
-      s.add_dependency(%q<bones>, [">= 2.5.1"])
-      s.add_dependency(%q<hpricot>, [">= 0.8"])
       s.add_dependency(%q<nokogiri>, [">= 1.2"])
+      s.add_dependency(%q<hpricot>, [">= 0.8"])
+      s.add_dependency(%q<bones>, [">= 3.2.0"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.5.1"])
-    s.add_dependency(%q<hpricot>, [">= 0.8"])
     s.add_dependency(%q<nokogiri>, [">= 1.2"])
+    s.add_dependency(%q<hpricot>, [">= 0.8"])
+    s.add_dependency(%q<bones>, [">= 3.2.0"])
   end
 end

data/lib/friendly_format/adapter/hpricot_adapter.rb

@@ -1,4 +1,6 @@
 
+puts '[WARN] [DEPRECATED] hpricot backend for friendly_foramt is deprecated, and would be removed in version 0.8+'
+
 require 'hpricot'
 
 module FriendlyFormat

data/lib/friendly_format/version.rb

@@ -1,3 +1,3 @@
 module FriendlyFormat
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/friendly_format.rb

@@ -239,13 +239,15 @@ module FriendlyFormat
     end
 
     def node_attrs_reject_js node
-      attrs2str(node.attributes.reject{ |k, v|
+      # TODO: no need to convert to hash for nokogiri
+      attrs2str(Hash[node.attributes].reject{ |k, v|
         k      =~ /\Aon/ ||
         v.to_s =~ /\Ajavascript/ })
     end
 
     def attrs2str attrs
-      attrs.sort.inject(''){ |i, (k, v)| i + " #{k}=\"#{v}\"" }
+      # TODO: no need to convert to hash for nokogiri
+      Hash[attrs].sort.inject(''){ |i, (k, v)| i + " #{k}=\"#{v}\"" }
     end
 
   end

data/test/test_friendly_format.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'rubygems'
-
 TestCase = begin
              require 'minitest/unit'
              MiniTest::Unit.autorun

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: friendly_format
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 +08:00
+date: 2009-12-31 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: nokogiri
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.1
+        version: "1.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
@@ -33,19 +33,19 @@ dependencies:
         version: "0.8"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: bones
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: 3.2.0
     version: 
 description: " make user input be valid xhtml and format it with gsub(\"\\n\", \"<br/>\") etc.\n you can partially allow some tags and don't escape them."
 email: godfat (XD) godfat.org
-executables: []
-
+executables: 
+- friendly_format
 extensions: []
 
 extra_rdoc_files: 
@@ -53,8 +53,12 @@ extra_rdoc_files:
 - LICENSE
 - NOTICE
 - README
+- Rakefile
 - TODO
+- bin/friendly_format
 - friendly_format.gemspec
+- test/sample/complex_article.txt
+- test/sample/complex_article_result.txt
 files: 
 - CHANGES
 - LICENSE
@@ -62,6 +66,7 @@ files:
 - README
 - Rakefile
 - TODO
+- bin/friendly_format
 - friendly_format.gemspec
 - lib/friendly_format.rb
 - lib/friendly_format/adapter/hpricot_adapter.rb
@@ -69,19 +74,6 @@ files:
 - lib/friendly_format/set_common.rb
 - lib/friendly_format/set_strict.rb
 - lib/friendly_format/version.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-- tasks/zentest.rake
 - test/sample/complex_article.txt
 - test/sample/complex_article_result.txt
 - test/test_friendly_format.rb
@@ -91,10 +83,6 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=utf-8
-- --inline-source
-- --line-numbers
-- --promiscuous
 - --main
 - README
 require_paths: 
@@ -113,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: ludy
+rubyforge_project: friendly_format
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: make user input be valid xhtml and format it with gsub("\n", "<br/>") etc. you can partially allow some tags and don't escape them.
+summary: make user input be valid xhtml and format it with gsub("\n", "<br/>") etc
 test_files: 
 - test/test_friendly_format.rb

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  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.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      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 ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    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|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF

data/tasks/bones.rake

@@ -1,20 +0,0 @@
-
-if HAVE_BONES
-
-namespace :bones do
-
-  desc 'Show the PROJ open struct'
-  task :debug do |t|
-    atr = if t.application.top_level_tasks.length == 2
-      t.application.top_level_tasks.pop
-    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,201 +0,0 @@
-
-require 'find'
-require 'rake/packagetask'
-require 'rubygems/user_interaction'
-require 'rubygems/builder'
-
-module Bones
-class GemPackageTask < Rake::PackageTask
-  # Ruby GEM spec containing the metadata for this package.  The
-  # name, version and package_files are automatically determined
-  # from the GEM spec and don't need to be explicitly provided.
-  #
-  attr_accessor :gem_spec
-
-  # Tasks from the Bones gem directory
-  attr_reader :bones_files
-
-  # Create a GEM Package task library.  Automatically define the gem
-  # if a block is given.  If no block is supplied, then +define+
-  # needs to be called to define the task.
-  #
-  def initialize(gem_spec)
-    init(gem_spec)
-    yield self if block_given?
-    define if block_given?
-  end
-
-  # Initialization tasks without the "yield self" or define
-  # operations.
-  #
-  def init(gem)
-    super(gem.name, gem.version)
-    @gem_spec = gem
-    @package_files += gem_spec.files if gem_spec.files
-    @bones_files = []
-
-    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
-    if !test(?e, local_setup)
-      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
-    end
-  end
-
-  # Create the Rake tasks and actions specified by this
-  # GemPackageTask.  (+define+ is automatically called if a block is
-  # given to +new+).
-  #
-  def define
-    super
-    task :prereqs
-    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
-    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
-      when_writing("Creating GEM") {
-        chdir(package_dir_path) do
-          Gem::Builder.new(gem_spec).build
-          verbose(true) {
-            mv gem_file, "../#{gem_file}"
-          }
-        end
-      }
-    end
-
-    file package_dir_path => bones_files do
-      mkdir_p package_dir rescue nil
-
-      gem_spec.files = (gem_spec.files +
-          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
-
-      bones_files.each do |fn|
-        base_fn = File.join('tasks', File.basename(fn))
-        f = File.join(package_dir_path, base_fn)
-        fdir = File.dirname(f)
-        mkdir_p(fdir) if !File.exist?(fdir)
-        if File.directory?(fn)
-          mkdir_p(f)
-        else
-          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
-          safe_ln(fn, f)
-        end
-      end
-    end
-  end
-  
-  def gem_file
-    if @gem_spec.platform == Gem::Platform::RUBY
-      "#{package_name}.gem"
-    else
-      "#{package_name}-#{@gem_spec.platform}.gem"
-    end
-  end
-end  # class GemPackageTask
-end  # module Bones
-
-namespace :gem do
-
-  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.description = PROJ.description
-
-    PROJ.gem.dependencies.each do |dep|
-      s.add_dependency(*dep)
-    end
-
-    PROJ.gem.development_dependencies.each do |dep|
-      s.add_development_dependency(*dep)
-    end
-
-    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]
-    excl = Regexp.new(excl.join('|'))
-    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.extra_rdoc_files = rdoc_files
-    s.has_rdoc = true
-
-    if test ?f, PROJ.test.file
-      s.test_file = PROJ.test.file
-    else
-      s.test_files = PROJ.test.files.to_a
-    end
-
-    # Do any extra stuff the user wants
-    PROJ.gem.extras.each do |msg, val|
-      case val
-      when Proc
-        val.call(s.send(msg))
-      else
-        s.send "#{msg}=", val
-      end
-    end
-  end  # Gem::Specification.new
-
-  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
-    pkg.need_tar = PROJ.gem.need_tar
-    pkg.need_zip = PROJ.gem.need_zip
-  end
-
-  desc 'Show information about the gem'
-  task :debug => 'gem:prereqs' do
-    puts PROJ.gem._spec.to_ruby
-  end
-
-  desc 'Write the gemspec '
-  task :spec => 'gem:prereqs' do
-    File.open("#{PROJ.name}.gemspec", 'w') do |f|
-      f.write PROJ.gem._spec.to_ruby
-    end
-  end
-
-  desc 'Install the gem'
-  task :install => [:clobber, 'gem:package'] do
-    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
-
-    # use this version of the command for rubygems > 1.0.0
-    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
-  end
-
-  desc 'Uninstall the gem'
-  task :uninstall do
-    installed_list = Gem.source_index.find_name(PROJ.name)
-    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
-      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
-    end
-  end
-
-  desc 'Reinstall the gem'
-  task :reinstall => [:uninstall, :install]
-
-  desc 'Cleanup the gem'
-  task :cleanup do
-    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
-  end
-end  # namespace :gem
-
-
-desc 'Alias to gem:package'
-task :gem => 'gem:package'
-
-task :clobber => 'gem:clobber_package'
-remove_desc_for_task 'gem:clobber_package'
-
-# EOF

data/tasks/git.rake

@@ -1,40 +0,0 @@
-
-if HAVE_GIT
-
-namespace :git do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  desc 'Show tags from the Git repository'
-  task :show_tags => 'git:prereqs' do |t|
-    puts %x/git tag/
-  end
-
-  desc 'Create a new tag in the Git repository'
-  task :create_tag => 'git:prereqs' 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
-
-    tag = "%s-%s" % [PROJ.name, PROJ.version]
-    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
-
-    puts "Creating Git tag '#{tag}'"
-    unless system "git tag -a -m '#{msg}' #{tag}"
-      abort "Tag creation failed"
-    end
-
-    if %x/git remote/ =~ %r/^origin\s*$/
-      unless system "git push origin #{tag}"
-        abort "Could not push tag to remote Git repository"
-      end
-    end
-  end
-
-end  # namespace :git
-
-task 'gem:release' => 'git:create_tag'
-
-end  # if HAVE_GIT
-
-# EOF

data/tasks/notes.rake

@@ -1,27 +0,0 @@
-
-if HAVE_BONES
-
-desc "Enumerate all annotations"
-task :notes do |t|
-  id = if t.application.top_level_tasks.length > 1
-    t.application.top_level_tasks.slice!(1..-1).join(' ')
-  end
-  Bones::AnnotationExtractor.enumerate(
-      PROJ, PROJ.notes.tags.join('|'), id, :tag => true)
-end
-
-namespace :notes do
-  PROJ.notes.tags.each do |tag|
-    desc "Enumerate all #{tag} annotations"
-    task tag.downcase.to_sym do |t|
-      id = if t.application.top_level_tasks.length > 1
-        t.application.top_level_tasks.slice!(1..-1).join(' ')
-      end
-      Bones::AnnotationExtractor.enumerate(PROJ, tag, id)
-    end
-  end
-end
-
-end  # if HAVE_BONES
-
-# EOF

data/tasks/post_load.rake

@@ -1,34 +0,0 @@
-
-# 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.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
-                 "^#{Regexp.escape(PROJ.ignore_file)}$",
-                 "^#{Regexp.escape(PROJ.rdoc.dir)}/",
-                 "^#{Regexp.escape(PROJ.rcov.dir)}/"]
-
-flatten_arrays = lambda do |this,os|
-    os.instance_variable_get(:@table).each do |key,val|
-      next if key == :dependencies \
-           or key == :development_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")
-
-PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
-
-PROJ.summary ||= PROJ.description.split('.').first
-
-PROJ.gem.files ||= manifest
-
-PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
-
-PROJ.rdoc.main ||= PROJ.readme_file
-
-# EOF

data/tasks/rdoc.rake

@@ -1,51 +0,0 @@
-
-require 'rake/rdoctask'
-
-namespace :doc do
-
-  desc 'Generate RDoc documentation'
-  Rake::RDocTask.new do |rd|
-    rdoc = PROJ.rdoc
-    rd.main = rdoc.main
-    rd.rdoc_dir = rdoc.dir
-
-    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
-              else false end
-            end
-    rd.rdoc_files.push(*files)
-
-    name    = PROJ.name
-    rf_name = PROJ.rubyforge.name
-
-    title = "#{name}-#{PROJ.version} Documentation"
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
-
-    rd.options << "-t #{title}"
-    rd.options.concat(rdoc.opts)
-  end
-
-  desc 'Generate ri locally for testing'
-  task :ri => :clobber_ri do
-    sh "#{RDOC} --ri -o ri ."
-  end
-
-  task :clobber_ri do
-    rm_r 'ri' rescue nil
-  end
-
-end  # namespace :doc
-
-desc 'Alias to doc:rdoc'
-task :doc => 'doc:rdoc'
-
-desc 'Remove all build products'
-task :clobber => %w(doc:clobber_rdoc doc:clobber_ri)
-
-remove_desc_for_task %w(doc:clobber_rdoc)
-
-# EOF

data/tasks/rubyforge.rake

@@ -1,55 +0,0 @@
-
-if PROJ.rubyforge.name.valid? && HAVE_RUBYFORGE
-
-require 'rubyforge'
-require 'rake/contrib/sshpublisher'
-
-namespace :gem do
-  desc 'Package and upload to RubyForge'
-  task :release => [:clobber, 'gem'] 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.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\""
-    end
-
-    rf = RubyForge.new
-    rf.configure rescue nil
-    puts 'Logging in'
-    rf.login
-
-    c = rf.userconfig
-    c['release_notes'] = PROJ.description if PROJ.description
-    c['release_changes'] = PROJ.changes if PROJ.changes
-    c['preformatted'] = true
-
-    files = Dir.glob("#{pkg}*.*")
-
-    puts "Releasing #{PROJ.name} v. #{PROJ.version}"
-    rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files
-  end
-end  # namespace :gem
-
-
-namespace :doc do
-  desc "Publish RDoc to RubyForge"
-  task :release => %w(doc:clobber_rdoc doc:rdoc) do
-    config = YAML.load(
-        File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-
-    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
-
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-end  # namespace :doc
-
-end  # if HAVE_RUBYFORGE
-
-# EOF

data/tasks/setup.rb

@@ -1,292 +0,0 @@
-
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'fileutils'
-require 'ostruct'
-require 'find'
-
-class OpenStruct; undef :gem if defined? :gem; end 
-
-# TODO: make my own openstruct type object that includes descriptions
-# TODO: use the descriptions to output help on the available bones options
-
-PROJ = OpenStruct.new(
-  # Project Defaults
-  :name => nil,
-  :summary => nil,
-  :description => nil,
-  :changes => nil,
-  :authors => nil,
-  :email => nil,
-  :url => "\000",
-  :version => ENV['VERSION'] || '0.0.0',
-  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
-  :release_name => ENV['RELEASE'],
-
-  # System Defaults
-  :ruby_opts => %w(-w),
-  :libs => [],
-  :history_file => 'History.txt',
-  :readme_file => 'README.txt',
-  :ignore_file => '.bnsignore',
-
-  # 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 => [],
-    :development_dependencies => [],
-    :executables => nil,
-    :extensions => FileList['ext/**/extconf.rb'],
-    :files => nil,
-    :need_tar => true,
-    :need_zip => false,
-    :extras => {}
-  ),
-
-  # File Annotations
-  :notes => OpenStruct.new(
-    :exclude => %w(^tasks/setup\.rb$),
-    :extensions => %w(.txt .rb .erb .rdoc) << '',
-    :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$ \.rdoc$),
-    :exclude => %w(extconf\.rb$),
-    :main => nil,
-    :dir => 'doc',
-    :remote_dir => nil
-  ),
-
-  # Rubyforge
-  :rubyforge => OpenStruct.new(
-    :name => "\000"
-  ),
-
-  # Rspec
-  :spec => OpenStruct.new(
-    :files => FileList['spec/**/*_spec.rb'],
-    :opts => []
-  ),
-
-  # Subversion Repository
-  :svn => OpenStruct.new(
-    :root => nil,
-    :path => '',
-    :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
-tasks_dir = File.expand_path(File.dirname(__FILE__))
-post_load_fn = File.join(tasks_dir, 'post_load.rake')
-rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort
-rakefiles.unshift(rakefiles.delete(post_load_fn)).compact!
-import(*rakefiles)
-
-# Setup the project libraries
-%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
-
-# Setup some constants
-DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
-
-def quiet( &block )
-  io = [STDOUT.dup, STDERR.dup]
-  STDOUT.reopen DEV_NULL
-  STDERR.reopen DEV_NULL
-  block.call
-ensure
-  STDOUT.reopen io.first
-  STDERR.reopen io.last
-  $stdout, $stderr = STDOUT, STDERR
-end
-
-DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
-       else 'diff' end unless defined? DIFF
-
-SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
-       else '' end unless defined? SUDO
-
-RCOV = "#{RUBY} -S rcov"
-RDOC = "#{RUBY} -S rdoc"
-GEM  = "#{RUBY} -S gem"
-
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
-  begin
-    require lib
-    Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}
-  rescue LoadError
-    Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
-  end
-end
-HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
-            system("svn --version 2>&1 > #{DEV_NULL}"))
-HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
-            system("git --version 2>&1 > #{DEV_NULL}"))
-
-# Add bones as a development dependency
-#
-if HAVE_BONES
-  PROJ.gem.development_dependencies << ['bones', ">= #{Bones::VERSION}"]
-end
-
-# Reads a file at +path+ and spits out an array of the +paragraphs+
-# specified.
-#
-#    changes = paragraphs_of('History.txt', 0..1).join("\n\n")
-#    summary, *description = paragraphs_of('README.txt', 3, 3..8)
-#
-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
-# optional gem _version_ can be given. If omitted, the newest gem version
-# will be used.
-#
-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.gem.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
-#
-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
-# will prevent the task from being displayed in the list of available tasks.
-#
-def remove_desc_for_task( names )
-  Array(names).each do |task_name|
-    task = Rake.application.tasks.find {|t| t.name == task_name}
-    next if task.nil?
-    task.instance_variable_set :@comment, nil
-  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
-
-# Scans the current working directory and creates a list of files that are
-# candidates to be in the manifest.
-#
-def manifest
-  files = []
-  exclude = PROJ.exclude.dup
-  comment = %r/^\s*#/
- 
-  # process the ignore file and add the items there to the exclude list
-  if test(?f, PROJ.ignore_file)
-    ary = []
-    File.readlines(PROJ.ignore_file).each do |line|
-      next if line =~ comment
-      line.chomp!
-      line.strip!
-      next if line.nil? or line.empty?
-
-      glob = line =~ %r/\*\./ ? File.join('**', line) : line
-      Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"}
-    end
-    exclude.concat ary
-  end
-
-  # generate a regular expression from the exclude list
-  exclude = Regexp.new(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
-
-# We need a "valid" method thtat determines if a string is suitable for use
-# in the gem specification.
-#
-class Object
-  def valid?
-    return !(self.empty? or self == "\000") if self.respond_to?(:to_str)
-    return false
-  end
-end
-
-# EOF

data/tasks/spec.rake

@@ -1,54 +0,0 @@
-
-if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
-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.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.spec.files
-    t.libs += PROJ.libs
-  end
-
-  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.spec.files
-      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
-    remove_desc_for_task %w(spec:clobber_rcov)
-  end
-
-end  # namespace :spec
-
-desc 'Alias to spec:run'
-task :spec => 'spec:run'
-
-task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
-
-end  # if HAVE_SPEC_RAKE_SPECTASK
-
-# EOF

data/tasks/svn.rake

@@ -1,47 +0,0 @@
-
-if HAVE_SVN
-
-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.path) unless PROJ.svn.path.empty?
-
-namespace :svn do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  desc 'Show tags from the SVN repository'
-  task :show_tags => 'svn:prereqs' do |t|
-    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
-
-  desc 'Create a new tag in the SVN repository'
-  task :create_tag => 'svn:prereqs' 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
-
-    svn = PROJ.svn
-    trunk = File.join(svn.root, svn.trunk)
-    tag = "%s-%s" % [PROJ.name, PROJ.version]
-    tag = File.join(svn.root, 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.path
-
-# EOF

data/tasks/test.rake

@@ -1,40 +0,0 @@
-
-if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
-require 'rake/testtask'
-
-namespace :test do
-
-  Rake::TestTask.new(:run) do |t|
-    t.libs = PROJ.libs
-    t.test_files = if test(?f, PROJ.test.file) then [PROJ.test.file]
-                   else PROJ.test.files end
-    t.ruby_opts += PROJ.ruby_opts
-    t.ruby_opts += PROJ.test.opts
-  end
-
-  if HAVE_RCOV
-    desc 'Run rcov on the unit tests'
-    task :rcov => :clobber_rcov do
-      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
-      opts = opts.join(' ')
-      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
-              else PROJ.test.files end
-      files = files.join(' ')
-      sh "#{RCOV} #{files} #{opts}"
-    end
-
-    task :clobber_rcov do
-      rm_r 'coverage' rescue nil
-    end
-  end
-
-end  # namespace :test
-
-desc 'Alias to test:run'
-task :test => 'test:run'
-
-task :clobber => 'test:clobber_rcov' if HAVE_RCOV
-
-end
-
-# EOF

data/tasks/zentest.rake

@@ -1,36 +0,0 @@
-if HAVE_ZENTEST
-
-# --------------------------------------------------------------------------
-if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
-require 'autotest'
-
-namespace :test do
-  task :autotest do
-    Autotest.run
-  end
-end
-
-desc "Run the autotest loop"
-task :autotest => 'test:autotest'
-
-end  # if test
-
-# --------------------------------------------------------------------------
-if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
-require 'autotest/rspec'
-
-namespace :spec do
-  task :autotest do
-    load '.autotest' if test(?f, '.autotest')
-    Autotest::Rspec.run
-  end
-end
-
-desc "Run the autotest loop"
-task :autotest => 'spec:autotest'
-
-end  # if rspec
-
-end  # if HAVE_ZENTEST
-
-# EOF