godfat-dm-mapping 0.6.2 → 0.7.0

data/CHANGES

@@ -1,5 +1,12 @@
 = dm-mapper changes history
 
+=== dm-mapping 0.7.0, 2008-09-01
+* feature added
+ - added postgres support.
+* bug fixed
+ - fixed key mapping in mysql adapter. PRI and MUL are all keys.
+ - use DM::Text.size as default text size in sqlite3.
+
 === dm-mapping 0.6.2, 2008-08-30
 * mapping more data types for mysql.
 * don't map TINYINT to TrueClass with mysql, skip it in type_map.

data/README

@@ -1,4 +1,4 @@
-= dm-mapping 0.6.2
+= dm-mapping 0.7.0
 by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
@@ -95,7 +95,7 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
 == REQUIREMENTS:
 
 * dm-core 0.9.3 or later
-* at least one do_* adapter (currently supports sqlite3 and mysql)
+* at least one do_* adapter
 
 == INSTALL:
 

data/Rakefile

@@ -1,12 +1,18 @@
 # encoding: utf-8
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
-load 'tasks/setup.rb'
 
-ensure_in_path 'lib'
+begin
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  load 'tasks/setup.rb'   # this line should already be there
+end
 
-CLEAN.include Dir['**/*.rbc']
+PROJ.name = 'dm-mapping'
+# supress warnings, there's too many warnings in dm-core
+PROJ.ruby_opts.delete '-w'
+
+PROJ.gem.dependencies << ['dm-core', '>=0.9.3'] << ['extlib', '>=0.9.3']
+# PROJ.gem.executables = ["bin/#{PROJ.name}"]
 
 task :default do
   Rake.application.options.show_task_pattern = /./
@@ -14,42 +20,29 @@ task :default do
 end
 
 namespace :gem do
-  desc 'create dm-mapping.gemspec'
+  desc "create #{PROJ.name}.gemspec"
   task 'gemspec' do
-    puts 'rake gem:debug > dm-mapping.gemspec'
-    File.open('dm-mapping.gemspec', 'w'){|spec| spec << `rake gem:debug`.sub(/.*/, '')}
-  end
-end
-
-namespace :git do
-  desc 'push to github'
-  task 'push' do
-    sh 'git push origin master'
+    puts "rake gem:debug > #{PROJ.name}.gemspec"
+    File.open("#{PROJ.name}.gemspec", 'w'){|spec| spec << `rake gem:debug`.sub(/.*/, '')}
   end
 end
 
-# supress warnings, there's too many warnings in dm-core
-PROJ.ruby_opts.delete '-w'
-
-PROJ.name = 'dm-mapping'
 PROJ.authors = 'Lin Jen-Shin (a.k.a. godfat 真常)'
 PROJ.email = 'godfat (XD) godfat.org'
-PROJ.url = 'http://github.com/godfat/dm-mapping'
+PROJ.url = "http://github.com/godfat/#{PROJ.name}"
 PROJ.description = PROJ.summary = paragraphs_of('README', 'description').join("\n\n")
 PROJ.changes = paragraphs_of('CHANGES', 0..1).join("\n\n")
 PROJ.rubyforge.name = 'ludy'
-PROJ.version = File.open('lib/dm-mapping/version.rb', 0){ |f| f.read.gsub(/.*VERSION = '(.*)'.*/m, '\1') }
-
-PROJ.gem.dependencies << ['dm-core', '>=0.9.3'] << ['extlib', '>=0.9.3']
-# PROJ.gem.executables = []
-# PROJ.gem.files = []
+PROJ.version = File.read("lib/#{PROJ.name}/version.rb").gsub(/.*VERSION = '(.*)'.*/m, '\1')
 
 PROJ.manifest_file = 'Manifest'
-PROJ.exclude += ['Manifest', '^tmp', 'tmp$', '^pkg', '.gitignore', '^ann-']
+PROJ.exclude += ['^Manifest$', '^tmp', 'tmp$', '^pkg',
+                 '^\.gitignore$', '^ann-', '\.sqlite3$', '\.db$']
+
+PROJ.rdoc.remote_dir = PROJ.name
 
 PROJ.readme_file = 'README'
 PROJ.rdoc.main = 'README'
-PROJ.rdoc.remote_dir = 'dm-mapping'
 PROJ.rdoc.exclude += ['Rakefile', '^tasks', '^test']
 PROJ.rdoc.include << '\w+'
 PROJ.rdoc.opts << '--diagram' if !WIN32 and `which dot` =~ %r/\/dot/
@@ -58,7 +51,7 @@ PROJ.rdoc.opts += ['--charset=utf-8', '--inline-source',
 
 PROJ.spec.opts << '--color'
 
-PROJ.ann.file = "ann-dm-mapping-#{PROJ.version}"
+PROJ.ann.file = "ann-#{PROJ.name}-#{PROJ.version}"
 PROJ.ann.paragraphs.concat %w[LINKS SYNOPSIS REQUIREMENTS INSTALL LICENSE]
 
-# EOF
+CLEAN.include Dir['**/*.rbc']

data/TODO

@@ -1,5 +1,5 @@
 = dm-mapping todo list
 
 * better doc...
-* 0.7 postgresql adapter
+* 0.7.1 for more data types for postgresql adapter
 * 0.8 automatic determine model relationship

data/dm-mapping.gemspec

@@ -1,21 +1,23 @@
 
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{dm-mapping}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (a.k.a. godfat \347\234\237\345\270\270)"]
-  s.date = %q{2008-08-30}
+  s.date = %q{2008-10-22}
   s.description = %q{DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.}
   s.email = %q{godfat (XD) godfat.org}
   s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "TODO", "dm-mapping.gemspec"]
-  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "dm-mapping.gemspec", "lib/dm-mapping.rb", "lib/dm-mapping/adapters/abstract_adapter.rb", "lib/dm-mapping/adapters/mysql_adapter.rb", "lib/dm-mapping/adapters/sqlite3_adapter.rb", "lib/dm-mapping/model.rb", "lib/dm-mapping/type_map.rb", "lib/dm-mapping/version.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.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", "test/abstract.rb", "test/test_dm-mapping.rb"]
+  s.files = ["CHANGES", "LICENSE", "NOTICE", "README", "Rakefile", "TODO", "dm-mapping.gemspec", "lib/dm-mapping.rb", "lib/dm-mapping/adapters/abstract_adapter.rb", "lib/dm-mapping/adapters/mysql_adapter.rb", "lib/dm-mapping/adapters/postgres_adapter.rb", "lib/dm-mapping/adapters/sqlite3_adapter.rb", "lib/dm-mapping/model.rb", "lib/dm-mapping/type_map.rb", "lib/dm-mapping/version.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.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", "test/abstract.rb", "test/test_dm-mapping.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/godfat/dm-mapping}
   s.rdoc_options = ["--diagram", "--charset=utf-8", "--inline-source", "--line-numbers", "--promiscuous", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ludy}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.0}
   s.summary = %q{DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.}
   s.test_files = ["test/test_dm-mapping.rb"]
 
@@ -23,15 +25,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<dm-core>, [">= 0.9.3"])
       s.add_runtime_dependency(%q<extlib>, [">= 0.9.3"])
+      s.add_development_dependency(%q<bones>, [">= 2.1.0"])
     else
       s.add_dependency(%q<dm-core>, [">= 0.9.3"])
       s.add_dependency(%q<extlib>, [">= 0.9.3"])
+      s.add_dependency(%q<bones>, [">= 2.1.0"])
     end
   else
     s.add_dependency(%q<dm-core>, [">= 0.9.3"])
     s.add_dependency(%q<extlib>, [">= 0.9.3"])
+    s.add_dependency(%q<bones>, [">= 2.1.0"])
   end
 end

data/lib/dm-mapping/adapters/mysql_adapter.rb

@@ -32,7 +32,7 @@ module DataMapper
 
         def dmm_attributes field, attrs = {}
             attrs[:serial] = true if field.extra == 'auto_increment'
-            attrs[:key] = true if field.column_key == 'PRI'
+            attrs[:key] = true if field.column_key != ''
             attrs[:nullable] = field.is_nullable == 'YES'
             attrs[:default] = field.column_default if field.column_default
             attrs[:size] = field.character_maximum_length if

data/lib/dm-mapping/adapters/postgres_adapter.rb

@@ -0,0 +1,73 @@
+
+require 'dm-mapping/adapters/abstract_adapter'
+
+module DataMapper
+  module Adapters
+    class PostgresAdapter < DataObjectsAdapter #:nodoc: all
+      module Migration
+        def storages
+          sql = <<-SQL.compress_lines
+            SELECT table_name FROM "information_schema"."tables"
+            WHERE table_schema = current_schema()
+          SQL
+
+          query(sql)
+        end
+
+        private
+        def dmm_query_storage storage
+          sql = <<-SQL.compress_lines
+            SELECT column_name FROM "information_schema"."key_column_usage"
+            WHERE table_schema = current_schema() AND table_name = ?
+          SQL
+
+          keys = query(sql, storage).to_set
+
+          sql = <<-SQL.compress_lines
+            SELECT column_name, column_default, is_nullable,
+                   character_maximum_length, udt_name
+            FROM "information_schema"."columns"
+            WHERE table_schema = current_schema() AND table_name = ?
+          SQL
+
+          query(sql, storage).map{ |struct|
+            struct.instance_eval <<-END_EVAL
+              def key?
+                #{keys.member?(struct.column_name)}
+              end
+            END_EVAL
+            struct
+          }
+        end
+
+        def dmm_field_name field
+          field.column_name
+        end
+
+        def dmm_primitive field
+          field.udt_name
+        end
+
+        def dmm_attributes field, attrs = {}
+          # strip data type
+          field.column_default.gsub!(/(.*?)::[\w\s]*/, '\1') if field.column_default
+
+          attrs[:serial] = true if field.column_default =~ /nextval\('\w+_seq'\)/
+          attrs[:key] = true if field.key?
+          attrs[:nullable] = field.is_nullable == 'YES'
+          # strip string quotation
+          attrs[:default] = field.column_default.gsub(/^'(.*?)'$/, '\1') if
+            field.column_default && !attrs[:serial]
+
+          if field.character_maximum_length
+            attrs[:size] = field.character_maximum_length
+          elsif field.udt_name.upcase == 'TEXT'
+            attrs[:size] = DM::Text.size
+          end
+
+          attrs
+        end
+      end
+    end
+  end
+end

data/lib/dm-mapping/adapters/sqlite3_adapter.rb

@@ -36,7 +36,7 @@ module DataMapper
           attrs[:default] = field.dflt_value[1..-2] if field.dflt_value
 
           if field.type.upcase == 'TEXT'
-            attrs[:size] = 65535
+            attrs[:size] = DM::Text.size
           else
             ergo = field.type.match(/\((\d+)\)/)
             size = ergo && ergo[1].to_i

data/lib/dm-mapping/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Mapping
-    VERSION = '0.6.2' unless defined?(DataMapper::Mapping::VERSION)
+    VERSION = '0.7.0' unless defined?(DataMapper::Mapping::VERSION)
   end
 end

data/test/abstract.rb

@@ -1,6 +1,6 @@
 
 require 'rubygems'
-require 'data_mapper'
+require 'dm-core'
 require 'dm-mapping'
 
 module Abstract
@@ -35,7 +35,7 @@ module Abstract
     include DataMapper::Resource
     has n, :comments
 
-    property :id,         Integer, :serial => true
+    property :id,         Serial
     property :login,      String, :size => 70
     property :sig,        Text
     property :created_at, DateTime
@@ -43,14 +43,14 @@ module Abstract
 
   class SuperUser
     include DataMapper::Resource
-    property :id, Integer, :serial => true
+    property :id, Serial
   end
 
   class Comment
     include DataMapper::Resource
     belongs_to :user
 
-    property :id,    Integer, :serial => true
+    property :id,    Serial
     property :title, String,  :size => 50, :default => 'default title'
     property :body,  Text
   end
@@ -111,10 +111,10 @@ module Abstract
     assert_equal Tables, local_dm.storages.sort
     assert_equal 'abstract_comments', model.storage_name
 
-    assert_equal 1, model.count
+    model.send :mapping
+    assert_equal 1, model.all.size
     assert_equal comment_fields, sort_fields(model.fields)
 
-    model.send :mapping
     assert_equal 'XD', model.first.title
     assert_equal 1, model.first.id
   end
@@ -169,7 +169,7 @@ module Abstract
   end
 
   def test_invalid_argument
-    assert_raise(ArgumentError){
+    assert_raises(ArgumentError){
       User.send :mapping, 29
     }
   end

data/test/test_dm-mapping.rb

@@ -1,6 +1,8 @@
 
-require 'test/unit'
 require 'test/abstract'
+require 'minitest/unit'
+
+MiniTest::Unit.autorun
 
 %w[sqlite3 mysql postgres].each{ |adapter|
   begin
@@ -9,18 +11,31 @@ require 'test/abstract'
   end
 }
 
-class Sqlite3Test < Test::Unit::TestCase
+# cost 1 second to run
+class Sqlite3Test < MiniTest::Unit::TestCase
   include Abstract
 
   def setup_data_mapper
-    DataMapper.setup(:default, 'sqlite3:tmp.sqlite3')
+    DataMapper.setup(:default, 'sqlite3::memory:')
   end
-end
+end if defined?(DataObjects::Sqlite3)
+
 
-class MysqlTest < Test::Unit::TestCase
+# cost 2 seconds to run
+class MysqlTest < MiniTest::Unit::TestCase
   include Abstract
 
   def setup_data_mapper
     DataMapper.setup(:default, 'mysql://dm-mapping:godfat@localhost/dm-mapping')
   end
-end
+end if defined?(DataObjects::Mysql)
+
+
+# cost 3 seconds to run
+class PostgresTest < MiniTest::Unit::TestCase
+  include Abstract
+
+  def setup_data_mapper
+    DataMapper.setup(:default, 'postgres://dm-mapping:godfat@localhost/dm-mapping')
+  end
+end if defined?(DataObjects::Postgres)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: godfat-dm-mapping
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - "Lin Jen-Shin (a.k.a. godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 00:00:00 -07:00
+date: 2008-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+    version: 
 description: DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.
 email: godfat (XD) godfat.org
 executables: []
@@ -54,6 +63,7 @@ files:
 - lib/dm-mapping.rb
 - lib/dm-mapping/adapters/abstract_adapter.rb
 - lib/dm-mapping/adapters/mysql_adapter.rb
+- lib/dm-mapping/adapters/postgres_adapter.rb
 - lib/dm-mapping/adapters/sqlite3_adapter.rb
 - lib/dm-mapping/model.rb
 - lib/dm-mapping/type_map.rb

data/tasks/ann.rake

@@ -1,81 +0,0 @@
-# $Id$
-
-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] || 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,21 +0,0 @@
-# $Id$
-
-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,126 +0,0 @@
-# $Id$
-
-require 'rake/gempackagetask'
-
-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
-
-    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
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  desc 'Show information about the gem'
-  task :debug => 'gem:prereqs' do
-    puts PROJ.gem._spec.to_ruby
-  end
-
-  pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
-    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.gem._spec.platform == Gem::Platform::RUBY
-      "#{pkg.package_name}.gem"
-    else
-      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
-    end
-
-  desc "Build the gem file #{gem_file}"
-  task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"]
-
-  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do
-    when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.gem._spec).build
-      verbose(true) {
-        mv gem_file, "#{pkg.package_dir}/#{gem_file}"
-      }
-    }
-  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 %w(gem:clobber_package)
-
-# EOF

data/tasks/git.rake

@@ -1,41 +0,0 @@
-# $Id$
-
-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/manifest.rake

@@ -1,49 +0,0 @@
-# $Id$
-
-require 'find'
-
-namespace :manifest do
-
-  desc 'Verify the manifest'
-  task :check do
-    fn = PROJ.manifest_file + '.tmp'
-    files = manifest_files
-
-    File.open(fn, 'w') {|fp| fp.puts files}
-    lines = %x(#{DIFF} -du #{PROJ.manifest_file} #{fn}).split("\n")
-    if HAVE_FACETS_ANSICODE and ENV.has_key?('TERM')
-      lines.map! do |line|
-        case line
-        when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; ANSICode.blue line
-        when %r/^\+/; ANSICode.green line
-        when %r/^\-/; ANSICode.red line
-        else line end
-      end
-    end
-    puts lines.compact
-    rm fn rescue nil
-  end
-
-  desc 'Create a new manifest'
-  task :create do
-    files = manifest_files
-    unless test(?f, PROJ.manifest_file)
-      files << PROJ.manifest_file
-      files.sort!
-    end
-    File.open(PROJ.manifest_file, 'w') {|fp| fp.puts files}
-  end
-
-  task :assert do
-    files = manifest_files
-    manifest = File.read(PROJ.manifest_file).split($/)
-    raise "ERROR: #{PROJ.manifest_file} is out of date" unless files == manifest
-  end
-
-end  # namespace :manifest
-
-desc 'Alias to manifest:check'
-task :manifest => 'manifest:check'
-
-# EOF

data/tasks/notes.rake

@@ -1,28 +0,0 @@
-# $Id$
-
-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,39 +0,0 @@
-# $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.
-
-PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
-PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.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
-      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 ||=
-  if test(?f, PROJ.manifest_file)
-    files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
-    files.delete ''
-    files
-  else [] end
-
-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 @@
-# $Id$
-
-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)
-
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
-    rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
-
-    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,57 +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: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.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 = [(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
-  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,268 +0,0 @@
-# $Id$
-
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'fileutils'
-require 'ostruct'
-
-class OpenStruct; undef :gem; end
-
-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',
-  :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,
-    :extras => {}
-  ),
-
-  # 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 => "\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
-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
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
-
-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 WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
-
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       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|
-  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}"))
-
-# 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
-  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
-
-# 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,55 +0,0 @@
-# $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.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,48 +0,0 @@
-# $Id$
-
-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,38 +0,0 @@
-# $Id$
-
-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
-
-# EOF