tournament 1.1.0 → 2.0.0

data/tasks/ann.rake

@@ -9,12 +9,16 @@ require 'time'
 
 namespace :ann do
 
-  file PROJ.ann_file do
-    puts "Generating #{PROJ.ann_file}"
-    File.open(PROJ.ann_file,'w') do |fd|
+  # 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
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
       fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
       fd.puts
       fd.puts("== DESCRIPTION")
@@ -23,23 +27,24 @@ namespace :ann do
       fd.puts
       fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
       fd.puts
-      PROJ.ann_paragraphs.each do |p|
+      ann.paragraphs.each do |p|
         fd.puts "== #{p.upcase}"
         fd.puts
         fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
         fd.puts
       end
-      fd.puts PROJ.ann_text if PROJ.ann_text
+      fd.puts ann.text if ann.text
     end
   end
 
   desc "Create an announcement file"
-  task :announcement => PROJ.ann_file
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
 
   desc "Send an email announcement"
-  task :email => PROJ.ann_file do
-    from = PROJ.ann_email[:from] || PROJ.email
-    to   = Array(PROJ.ann_email[:to])
+  task :email => ['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"
@@ -49,11 +54,11 @@ namespace :ann do
     rfc822msg << "\n"
     rfc822msg << "Date: #{Time.new.rfc822}\n"
     rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{PROJ.ann_email[:domain]}>\n\n"
-    rfc822msg << File.read(PROJ.ann_file)
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
 
     params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      PROJ.ann_email[key]
+      ann.email[key]
     end
 
     params[3] = PROJ.email if params[3].nil?
@@ -71,6 +76,6 @@ end  # namespace :ann
 desc 'Alias to ann:announcement'
 task :ann => 'ann:announcement'
 
-CLOBBER << PROJ.ann_file
+CLOBBER << PROJ.ann.file
 
 # EOF

data/tasks/bones.rake

@@ -1,40 +1,21 @@
 # $Id$
 
-require 'pp'
-require 'stringio'
+if HAVE_BONES
 
 namespace :bones do
 
   desc 'Show the PROJ open struct'
   task :debug do |t|
-    atr = if ARGV.length == 2
+    atr = if t.application.top_level_tasks.length == 2
       t.application.top_level_tasks.pop
     end
-    sio = StringIO.new
-    sep = "\n" + ' '*27
-    fmt = "%23s => %s"
 
-    if atr
-      PP.pp(PROJ.send(atr.to_sym), sio, 49)
-      sio.seek 0
-      val = sio.read
-      val = val.split("\n").join(sep)
-
-      puts fmt % [atr, val]
-    else
-      h = PROJ.instance_variable_get(:@table)
-      h.keys.map {|k| k.to_s}.sort.each do |k|
-        sio.truncate 0
-        PP.pp(h[k.to_sym], sio, 49)
-        sio.seek 0
-        val = sio.read
-        val = val.split("\n").join(sep)
-
-        puts fmt % [k, val]
-      end
-    end
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
   end
 
 end  # namespace :bones
 
+end  # HAVE_BONES
+
 # EOF

data/tasks/gem.rake

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

data/tasks/git.rake

@@ -0,0 +1,41 @@
+# $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