bones 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,16 @@
+== 1.3.4 / 2008-02-20
+
+* 4 minor enhancements
+  - Added more RCov options and tasks to verify a coverage
+    threshold (RSpec only)
+  - Can specify exact dependency version requirement
+  - Added a command line option to specify the output directory for
+    a new project
+  - The history, readme, and manifest file names can be configured
+    in the Rakefile
+* 1 bug fix
+  - Now including the default rake/clean tasks
+
 == 1.3.3 / 2008-02-18
 
 * 4 minor enhancements

data/README.txt

@@ -16,8 +16,9 @@ Mr Bones provides the following rake tasks:
 
   ann               # Alias to ann:announcement
   ann:announcement  # Create an announcement file
-  ann:email         # Send email announcement
-  clobber           # Remove all build products
+  ann:email         # Send an email announcement
+  clean             # Remove any temporary products.
+  clobber           # Remove any generated file.
   doc               # Alias to doc:rdoc
   doc:rdoc          # Build the rdoc HTML Files
   doc:release       # Publish RDoc to RubyForge
@@ -25,9 +26,8 @@ Mr Bones provides the following rake tasks:
   doc:ri            # Generate ri locally for testing
   gem               # Alias to gem:package
   gem:debug         # Show information about the gem
-  gem:gem           # Build the gem file bones-1.3.3.gem
   gem:install       # Install the gem
-  gem:package       # Build all the packages
+  gem:package       # Build the gem file bones-1.3.4.gem
   gem:release       # Package and upload to RubyForge
   gem:repackage     # Force a rebuild of the package files
   gem:uninstall     # Uninstall the gem
@@ -42,6 +42,7 @@ Mr Bones provides the following rake tasks:
   spec:rcov         # Run all specs with RCov
   spec:run          # Run all specs with basic output
   spec:specdoc      # Run all specs with text output
+  spec:verify       # Verify that rcov coverage is at least 90.0%
   svn:create_tag    # Create a new tag in the SVN repository
   svn:show_tags     # Show tags from the SVN repository
   test              # Alias to test:run
@@ -74,6 +75,7 @@ following gems installed you will not get all that Mr Bones has to offer.
 * rubyforge - for easy gem publishing to rubyforge.org
 * rcov - for code coverage testing
 * rspec - if that's the way you roll
+* facets - for pretty colors
 
 == INSTALL:
 

data/Rakefile

@@ -1,12 +1,10 @@
-# $Id: Rakefile 536 2008-02-18 23:07:49Z tim_pease $
+# $Id: Rakefile 547 2008-02-20 20:30:47Z tim_pease $
 
 $:.unshift('lib')
 
 load 'tasks/setup.rb'
 require 'bones'
 
-task :default => 'spec:run'
-
 PROJ.name = 'bones'
 PROJ.authors = 'Tim Pease'
 PROJ.email = 'tim.pease@gmail.com'
@@ -14,7 +12,7 @@ PROJ.url = 'http://codeforpeople.rubyforge.org/bones'
 PROJ.rubyforge_name = 'codeforpeople'
 PROJ.rdoc_remote_dir = 'bones'
 PROJ.version = Bones::VERSION
-PROJ.release_name = 'Fractal Bovine'
+PROJ.release_name = 'Finite State Puppy'
 
 PROJ.rdoc_exclude << '^data/'
 PROJ.annotation_exclude = %w(^README\.txt$ ^data/ ^tasks/setup.rb$)
@@ -35,18 +33,22 @@ PROJ.ann_paragraphs = %w[install synopsis features requirements]
 PROJ.ann_text = <<-ANN
 == FUN FACT
 
-Half of all Americans are below average.
+A 'jiffy' is an actual unit of time for 1/100th of a second.
 
 == POST SCRIPT
 
 Blessings,
 TwP
 
+== POST POST SCRIPT
+
+The "Finite State Puppy" is the only known pet that is Touring complete.
+
 #{PROJ.post_install_message}
 ANN
 
+task :default => 'spec:run'
 task 'gem:package' => 'manifest:assert'
-
 task(:titlize) {PROJ.name = 'Mr Bones'}
 task 'ann:announcement' => :titlize
 

data/data/tasks/ann.rake

@@ -9,9 +9,9 @@ require 'time'
 
 namespace :ann do
 
-  desc "Create an announcement file"
-  task :announcement do
-    File.open('announcement.txt','w') do |fd|
+  file PROJ.ann_file do
+    puts "Generating #{PROJ.ann_file}"
+    File.open(PROJ.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
@@ -26,15 +26,18 @@ namespace :ann do
       PROJ.ann_paragraphs.each do |p|
         fd.puts "== #{p.upcase}"
         fd.puts
-        fd.puts paragraphs_of('README.txt', p).join("\n\n")
+        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
         fd.puts
       end
       fd.puts PROJ.ann_text if PROJ.ann_text
     end
   end
 
-  desc "Send email announcement"
-  task :email => :announcement do
+  desc "Create an announcement file"
+  task :announcement => 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])
 
@@ -47,7 +50,7 @@ namespace :ann do
     rfc822msg << "Date: #{Time.new.rfc822}\n"
     rfc822msg << "Message-Id: "
     rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{PROJ.ann_email[:domain]}>\n\n"
-    rfc822msg << File.read('announcement.txt')
+    rfc822msg << File.read(PROJ.ann_file)
 
     params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
       PROJ.ann_email[key]
@@ -63,15 +66,11 @@ namespace :ann do
     ### send email
     Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
   end
-
-  task :clobber_announcement do
-    rm 'announcement.txt' rescue nil
-  end
 end  # namespace :ann
 
 desc 'Alias to ann:announcement'
 task :ann => 'ann:announcement'
 
-task :clobber => %w(ann:clobber_announcement)
+CLOBBER << PROJ.ann_file
 
 # EOF

data/data/tasks/doc.rake

@@ -31,7 +31,6 @@ namespace :doc do
     sh "#{RDOC} --ri -o ri ."
   end
 
-  desc 'Remove ri products'
   task :clobber_ri do
     rm_r 'ri' rescue nil
   end
@@ -44,6 +43,6 @@ 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 doc:clobber_ri)
+remove_desc_for_task %w(doc:clobber_rdoc)
 
 # EOF

data/data/tasks/manifest.rake

@@ -6,11 +6,11 @@ namespace :manifest do
 
   desc 'Verify the manifest'
   task :check do
-    fn = 'Manifest.tmp'
+    fn = PROJ.manifest_file + '.tmp'
     files = manifest_files
 
     File.open(fn, 'w') {|fp| fp.puts files}
-    lines = %x(#{DIFF} -du Manifest.txt #{fn}).split("\n")
+    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
@@ -27,19 +27,18 @@ namespace :manifest do
 
   desc 'Create a new manifest'
   task :create do
-    fn = 'Manifest.txt'
     files = manifest_files
-    unless test(?f, fn)
-      files << fn
+    unless test(?f, PROJ.manifest_file)
+      files << PROJ.manifest_file
       files.sort!
     end
-    File.open(fn, 'w') {|fp| fp.puts files}
+    File.open(PROJ.manifest_file, 'w') {|fp| fp.puts files}
   end
 
   task :assert do
     files = manifest_files
-    manifest = File.read('Manifest.txt').split($/)
-    raise RuntimeError, "Manifest.txt is out of date" unless files == manifest
+    manifest = File.read(PROJ.manifest_file).split($/)
+    raise "ERROR: #{PROJ.manifest_file} is out of date" unless files == manifest
   end
 
 end  # namespace :manifest

data/data/tasks/post_load.rake

@@ -3,16 +3,24 @@
 # 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")
-end
+PROJ.changes ||= paragraphs_of(PROJ.history_file, 0..1).join("\n\n")
 
-unless PROJ.summary
-  PROJ.summary = PROJ.description.split('.').first
-end
+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/data/tasks/setup.rb

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'rake'
+require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
 
@@ -16,8 +17,11 @@ PROJ.email = nil
 PROJ.url = nil
 PROJ.version = ENV['VERSION'] || '0.0.0'
 PROJ.rubyforge_name = nil
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/ announcement.txt)
+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']
@@ -29,13 +33,16 @@ PROJ.test_file = 'test/all.rb'
 PROJ.test_opts = []
 
 # Rcov
+PROJ.rcov_dir = 'coverage'
 PROJ.rcov_opts = ['--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
 
@@ -46,13 +53,8 @@ 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
@@ -71,6 +73,7 @@ PROJ.svn_tags = 'tags'
 PROJ.svn_branches = 'branches'
 
 # Announce
+PROJ.ann_file = 'announcement.txt'
 PROJ.ann_text = nil
 PROJ.ann_paragraphs = []
 PROJ.ann_email = {
@@ -166,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

data/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,20 @@ 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
   end
 
 end  # namespace :spec

data/data/tasks/test.rake

@@ -6,7 +6,7 @@ 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]
+    t.test_files = if test(?f, PROJ.test_file) then [PROJ.test_file]
                    else PROJ.tests end
     t.ruby_opts += PROJ.ruby_opts
     t.ruby_opts += PROJ.test_opts
@@ -15,14 +15,14 @@ namespace :test do
   if HAVE_RCOV
     desc 'Run rcov on the unit tests'
     task :rcov => :clobber_rcov do
-      opts = PROJ.rcov_opts.join(' ')
-      files = if test ?f, PROJ.test_file then [PROJ.test_file]
+      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.tests end
       files = files.join(' ')
       sh "#{RCOV} #{files} #{opts}"
     end
 
-    desc 'Remove rcov products'
     task :clobber_rcov do
       rm_r 'coverage' rescue nil
     end
@@ -35,6 +35,4 @@ task :test => 'test:run'
 
 task :clobber => 'test:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(test:clobber_rcov)
-
 # EOF

data/lib/bones.rb

@@ -1,9 +1,9 @@
-# $Id: bones.rb 509 2008-02-08 17:17:53Z tim_pease $
+# $Id: bones.rb 542 2008-02-20 00:03:45Z tim_pease $
 
 module Bones
 
   # :stopdoc:
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
   PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   WIN32 = %r/win32/ =~ RUBY_PLATFORM
   DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'

data/lib/bones/main.rb

@@ -1,4 +1,4 @@
-# $Id: main.rb 536 2008-02-18 23:07:49Z tim_pease $
+# $Id: main.rb 543 2008-02-20 04:36:46Z tim_pease $
 
 require 'fileutils'
 require 'optparse'
@@ -8,7 +8,7 @@ module Bones
 class Main
 
   attr_writer :update
-  attr_accessor :name, :data, :verbose
+  attr_accessor :name, :data, :verbose, :output_dir
 
   # Create a new instance of Main, and run the +bones+ application given
   # the command line _args_.
@@ -38,6 +38,8 @@ class Main
             'update the rake tasks for the project') {self.update = true}
     opts.on('-v', '--verbose',
             'enable verbose output') {self.verbose = true}
+    opts.on('-d', '--directory DIRECTORY', String,
+            'project directory to create') {|dir| self.output_dir = dir}
 
     opts.separator ''
     opts.on('--freeze', 'freeze the project skeleton') {freeze; exit}
@@ -67,6 +69,8 @@ class Main
       puts opts
       ::Kernel.abort
     end
+
+    self.output_dir = name if output_dir.nil?
     nil
   end
 
@@ -88,23 +92,28 @@ class Main
   #
   def create
     # see if the directory already exists
-    abort "'#{name}' already exists" if test ?e, name
+    abort "'#{output_dir}' already exists" if test ?e, output_dir
 
     begin
       files_to_copy.each {|fn| cp fn}
 
       pwd = File.expand_path(FileUtils.pwd)
       begin
-        FileUtils.cd name
+        FileUtils.cd output_dir
         system "rake manifest:create 2>&1 > #{::Bones::DEV_NULL}"
-        STDOUT.puts "created '#{name}'\nnow you need to fix these files"
+        msg = "created '#{name}'"
+        msg << " in directory '#{output_dir}'" if name != output_dir
+        msg << "\nnow you need to fix these files"
+        STDOUT.puts msg
         system "rake notes"
       ensure
         FileUtils.cd pwd
       end
     rescue Exception => err
-      FileUtils.rm_rf name
-      abort "could not create '#{name}'"
+      FileUtils.rm_rf output_dir
+      msg = "could not create '#{name}'"
+      msg << " in directory '#{output_dir}'" if name != output_dir
+      abort msg
     end
   end
   
@@ -112,10 +121,10 @@ class Main
   # copy in new tasks from the bones/data directory.
   #
   def update
-    abort "'#{name}' does not exist" unless test ?e, name
+    abort "'#{output_dir}' does not exist" unless test ?e, output_dir
 
-    task_dir = File.join(name, 'tasks')
-    abort "no tasks directory found in '#{name}'" unless test ?d, task_dir
+    task_dir = File.join(output_dir, 'tasks')
+    abort "no tasks directory found in '#{output_dir}'" unless test ?d, task_dir
 
     archive_dir = File.join(task_dir, 'archive')
     FileUtils.rm_rf archive_dir
@@ -131,7 +140,9 @@ class Main
       cp fn
     end
 
-    STDOUT.puts "updated tasks for '#{name}'"
+    msg = "updated tasks for '#{name}'"
+    msg << " in directory '#{output_dir}'" if name != output_dir
+    STDOUT.puts msg
   end
 
   # Freeze the project skeleton to the current Mr Bones gem. If the project
@@ -211,7 +222,7 @@ class Main
   #
   def cp( file )
     dir = File.dirname(file).sub('NAME', name)
-    dir = (dir == '.' ? name : File.join(name, dir))
+    dir = (dir == '.' ? output_dir : File.join(output_dir, dir))
     dst = File.join(dir,  File.basename(file, '.erb').sub('NAME', name))
     src = File.join(data, file)
 

data/tasks/ann.rake

@@ -1,4 +1,4 @@
-# $Id: ann.rake 536 2008-02-18 23:07:49Z tim_pease $
+# $Id$
 
 begin
   require 'bones/smtp_tls'
@@ -9,9 +9,9 @@ require 'time'
 
 namespace :ann do
 
-  desc "Create an announcement file"
-  task :announcement do
-    File.open('announcement.txt','w') do |fd|
+  file PROJ.ann_file do
+    puts "Generating #{PROJ.ann_file}"
+    File.open(PROJ.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
@@ -26,15 +26,18 @@ namespace :ann do
       PROJ.ann_paragraphs.each do |p|
         fd.puts "== #{p.upcase}"
         fd.puts
-        fd.puts paragraphs_of('README.txt', p).join("\n\n")
+        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
         fd.puts
       end
       fd.puts PROJ.ann_text if PROJ.ann_text
     end
   end
 
-  desc "Send email announcement"
-  task :email => :announcement do
+  desc "Create an announcement file"
+  task :announcement => 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])
 
@@ -47,7 +50,7 @@ namespace :ann do
     rfc822msg << "Date: #{Time.new.rfc822}\n"
     rfc822msg << "Message-Id: "
     rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{PROJ.ann_email[:domain]}>\n\n"
-    rfc822msg << File.read('announcement.txt')
+    rfc822msg << File.read(PROJ.ann_file)
 
     params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
       PROJ.ann_email[key]
@@ -63,15 +66,11 @@ namespace :ann do
     ### send email
     Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
   end
-
-  task :clobber_announcement do
-    rm 'announcement.txt' rescue nil
-  end
 end  # namespace :ann
 
 desc 'Alias to ann:announcement'
 task :ann => 'ann:announcement'
 
-task :clobber => %w(ann:clobber_announcement)
+CLOBBER << PROJ.ann_file
 
 # EOF

data/tasks/doc.rake

@@ -31,7 +31,6 @@ namespace :doc do
     sh "#{RDOC} --ri -o ri ."
   end
 
-  desc 'Remove ri products'
   task :clobber_ri do
     rm_r 'ri' rescue nil
   end
@@ -44,6 +43,6 @@ 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 doc:clobber_ri)
+remove_desc_for_task %w(doc:clobber_rdoc)
 
 # EOF

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-# $Id: gem.rake 536 2008-02-18 23:07:49Z tim_pease $
+# $Id$
 
 require 'rake/gempackagetask'
 

data/tasks/manifest.rake

@@ -1,4 +1,4 @@
-# $Id: manifest.rake 536 2008-02-18 23:07:49Z tim_pease $
+# $Id$
 
 require 'find'
 
@@ -6,11 +6,11 @@ namespace :manifest do
 
   desc 'Verify the manifest'
   task :check do
-    fn = 'Manifest.tmp'
+    fn = PROJ.manifest_file + '.tmp'
     files = manifest_files
 
     File.open(fn, 'w') {|fp| fp.puts files}
-    lines = %x(#{DIFF} -du Manifest.txt #{fn}).split("\n")
+    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
@@ -27,19 +27,18 @@ namespace :manifest do
 
   desc 'Create a new manifest'
   task :create do
-    fn = 'Manifest.txt'
     files = manifest_files
-    unless test(?f, fn)
-      files << fn
+    unless test(?f, PROJ.manifest_file)
+      files << PROJ.manifest_file
       files.sort!
     end
-    File.open(fn, 'w') {|fp| fp.puts files}
+    File.open(PROJ.manifest_file, 'w') {|fp| fp.puts files}
   end
 
   task :assert do
     files = manifest_files
-    manifest = File.read('Manifest.txt').split($/)
-    raise RuntimeError, "manifest is out of date" unless files == manifest
+    manifest = File.read(PROJ.manifest_file).split($/)
+    raise "ERROR: #{PROJ.manifest_file} is out of date" unless files == manifest
   end
 
 end  # namespace :manifest

data/tasks/post_load.rake

@@ -3,16 +3,24 @@
 # 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")
-end
+PROJ.changes ||= paragraphs_of(PROJ.history_file, 0..1).join("\n\n")
 
-unless PROJ.summary
-  PROJ.summary = PROJ.description.split('.').first
-end
+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 536 2008-02-18 23:07:49Z tim_pease $
+# $Id$
 
 require 'rubygems'
 require 'rake'
+require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
 
@@ -16,8 +17,11 @@ PROJ.email = nil
 PROJ.url = nil
 PROJ.version = ENV['VERSION'] || '0.0.0'
 PROJ.rubyforge_name = nil
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/ announcement.txt)
+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']
@@ -29,13 +33,16 @@ PROJ.test_file = 'test/all.rb'
 PROJ.test_opts = []
 
 # Rcov
+PROJ.rcov_dir = 'coverage'
 PROJ.rcov_opts = ['--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
 
@@ -46,13 +53,8 @@ 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
@@ -71,6 +73,7 @@ PROJ.svn_tags = 'tags'
 PROJ.svn_branches = 'branches'
 
 # Announce
+PROJ.ann_file = 'announcement.txt'
 PROJ.ann_text = nil
 PROJ.ann_paragraphs = []
 PROJ.ann_email = {
@@ -166,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

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,20 @@ 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
   end
 
 end  # namespace :spec

data/tasks/test.rake

@@ -6,7 +6,7 @@ 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]
+    t.test_files = if test(?f, PROJ.test_file) then [PROJ.test_file]
                    else PROJ.tests end
     t.ruby_opts += PROJ.ruby_opts
     t.ruby_opts += PROJ.test_opts
@@ -15,14 +15,14 @@ namespace :test do
   if HAVE_RCOV
     desc 'Run rcov on the unit tests'
     task :rcov => :clobber_rcov do
-      opts = PROJ.rcov_opts.join(' ')
-      files = if test ?f, PROJ.test_file then [PROJ.test_file]
+      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.tests end
       files = files.join(' ')
       sh "#{RCOV} #{files} #{opts}"
     end
 
-    desc 'Remove rcov products'
     task :clobber_rcov do
       rm_r 'coverage' rescue nil
     end
@@ -35,6 +35,4 @@ task :test => 'test:run'
 
 task :clobber => 'test:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(test:clobber_rcov)
-
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-18 00:00:00 -07:00
+date: 2008-02-21 00:00:00 -07:00
 default_executable: 
 dependencies: []