Rakefile in facets-2.8.4 vs Rakefile in facets-2.9.0.pre.1

@@ -1,155 +1,130 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
 
 #
-# CORE TEST COVERAGE
-# ----------------------------------------------------------------------------
-
-desc "show core unit test coverage"
-
-task 'coverage' do
-  core_scripts = []
-  cd 'lib/core/facets' do
-    core_scripts = Dir['**/*'].reject{ |s| File.directory?(s) }
-  end
-
-  core_tests = []
-  cd 'test/core' do
-    core_tests = Dir['**/*']
-  end
-
-  core_tests = core_tests.collect do |t|
-    dir, fname = *File.split(t)
-    File.join(dir, fname.sub(/^test_/,''))
-  end
-
-  diff = core_scripts - core_tests
-
-  # remove core collectives
-  diff = diff - %w{
-    array.rb binding.rb cattr.rb class.rb comparable.rb dir.rb
-    enumerable.rb exception.rb hash.rb file.rb filetest.rb float.rb
-    integer.rb kernel.rb matchdata.rb module.rb nilclass.rb
-    numeric.rb proc.rb range.rb regexp.rb string.rb symbol.rb
-    time.rb unboundmethod.rb
-  }
-
-  puts diff.sort.join("\n")
-  puts
-  puts "#{diff.size} files uncovered."
-
-end
-
-
-#
 # GENERATE RDOCS
 # ----------------------------------------------------------------------------
 
 desc "generate rdocs"
 
 task "rdoc" do
   TEMPLATE  = ENV['RDOC_TEMPLATE'] || 'html'
-  APIOUT    = "doc/rdoc"
+  APIOUT    = "site/doc/api"
 
   FileUtils.rm_r(APIOUT)
 
-  system "rdoc -a -S -t'Facets Core API' -T #{TEMPLATE} -m README --op '#{APIOUT}/core' README lib/facets/core"
-  system "rdoc -a -S -t'Facets More API' -T #{TEMPLATE} -m README --op '#{APIOUT}/more' README lib/facets/more"
+  system "rdoc -a -S -t'Facets Core API' -T #{TEMPLATE} -m README.rdoc --op '#{APIOUT}/core' README.rdoc lib/facets/core"
+  system "rdoc -a -S -t'Facets More API' -T #{TEMPLATE} -m README.rdoc --op '#{APIOUT}/more' README.rdoc lib/facets/more"
+  system "rdoc -a -S -t'Facets Tour API' -T #{TEMPLATE} -m README.rdoc --op '#{APIOUT}/tour' README.rdoc lib/facets/tour"
 end
 
 #
-# RUN TESTS
+# RUN TESTS (requires Lemon)
 # ----------------------------------------------------------------------------
 
-task 'default' do
-  prepare_tests_all
+task "default" do
+  sh "lemon #{lemon_flags} -Ilib/core:lib/more:lib/tour test/core test/more test/tour"
 end
 
-task 'test' do
-  prepare_tests_all
+task "test" do
+  if tests = ENV['TESTS']
+    sh "lemon #{lemon_flags} -Ilib/core:lib/more:lib/tour #{tests}"
+  else
+    sh "lemon #{lemon_flags} -Ilib/core:lib/more:lib/tour test/core test/more test/tour"
+  end
 end
 
 desc "run all unit tests"
-task 'test:all' do
-  prepare_tests_all
+task "test:all" do
+  sh "lemon #{lemon_flags} -Ilib/core:lib/more:lib/tour test/core test/more test/tour"
 end
 
 desc "run core unit tests"
-task 'test:core' do
-  prepare_tests_core
+task "test:core" do
+  sh "lemon#{lemon_flags}  -Ilib/core test/core"
 end
 
 desc "run more unit tests"
-task 'test:more' do
-  prepare_tests_more
+task "test:more" do
+  sh "lemon #{lemon_flags} -Ilib/core:lib/more test/more"
 end
 
+desc "run tour unit tests"
+task "test:tour" do
+  sh "lemon #{lemon_flags} -Ilib/core:lib/tour test/tour"
+end
+
 desc "run all unit tests with ActiveSupport loaded"
 task 'test:all:activesupport' => [:include_activesupport, 'test:all']
 
 desc "run core unit tests with ActiveSupport loaded"
 task 'test:core:activesupport' => [:include_activesupport, 'test:core']
 
 desc "run more unit tests with ActiveSupport loaded"
 task 'test:more:activesupport' => [:include_activesupport, 'test:more']
 
+desc "run tour unit tests with ActiveSupport loaded"
+task 'test:more:activesupport' => [:include_activesupport, 'test:tour']
+
 task 'include_activesupport' do
   require 'activesupport'
 end
 
-def add_loadpath(*paths)
-  live = ENV['live']
-
-  unless live
-    # $LOAD_PATH.unshift(File.expand_path('lib/core'))
-    # $LOAD_PATH.unshift(File.expand_path('lib/more'))
-    paths.each do |path|
-      $LOAD_PATH.unshift(File.expand_path(path))
-    end
+def lemon_flags
+  flags = []
+  if ENV['verbose']
+    flags << '-v'
   end
-
-  puts "RUBY VERSION: #{RUBY_VERSION}"
-  puts "LOAD PATH:\n" + $LOAD_PATH.join("\n") if $DEBUG
+  flags.join(' ')
 end
 
-def get_tests(find=nil)
-  find = find && File.directory?(find) ? File.join(find, '**/test_*.rb') : find
-  find = find || ENV['TESTS'] || 'test/**/test_*.rb'
-  Dir.glob(find)
-end
+#def add_loadpath(*paths)
+#  live = ENV['live']
+#
+#  unless live
+#    # $LOAD_PATH.unshift(File.expand_path('lib/core'))
+#    # $LOAD_PATH.unshift(File.expand_path('lib/more'))
+#    paths.each do |path|
+#      $LOAD_PATH.unshift(File.expand_path(path))
+#    end
+#  end
+#
+#  puts "RUBY VERSION: #{RUBY_VERSION}"
+#  puts "LOAD PATH:\n" + $LOAD_PATH.join("\n") if $DEBUG
+#end
 
-def run_tests(files)
-  files.each do |file|
-    next if File.directory?(file)
-    begin
-      puts "Loading: #{file}" if $DEBUG
-      load(file)
-    rescue LoadError
-      puts "Error loading: #{file}"
-    end
-  end
-end
+#def get_tests(find=nil)
+#  find = find && File.directory?(find) ? File.join(find, '**/test_*.rb') : find
+#  find = find || ENV['TESTS'] || 'test/**/test_*.rb'
+#  Dir.glob(find)
+#end
 
-def prepare_tests_all
-  add_loadpath('lib/core','lib/more')
-  files = get_tests
-  run_tests(files)
-end
+#def run_tests(files)
+#  files.each do |file|
+#    next if File.directory?(file)
+#    begin
+#      puts "Loading: #{file}" if $DEBUG
+#      load(file)
+#    rescue LoadError
+#      puts "Error loading: #{file}"
+#    end
+#  end
+#end
 
-def prepare_tests_core
-  add_loadpath('lib/core')
-  files = get_tests('test/core')
-  run_tests(files)
-end
+#def prepare_tests_all
+#  add_loadpath('lib/core','lib/more', 'lib/tour')
+#  files = get_tests
+#  run_tests(files)
+#end
 
-def prepare_tests_more
-  add_loadpath('lib/more')
-  files = get_tests('test/more')
-  run_tests(files)
-end
+#def prepare_tests(type)
+#  add_loadpath("lib/#{type}")
+#  files = get_tests('test/#{type}')
+#  run_tests(files)
+#end
 
 #def run_tests
 #  live = ENV['live']
 #
 #  unless live
@@ -178,9 +153,127 @@
 #    rescue LoadError
 #      puts "Error loading: #{file}"
 #    end
 #  end
 #end
+
+
+#
+# TEST COVERAGE
+# ----------------------------------------------------------------------------
+
+desc "show test coverage"
+task "cov" do
+  sh "lemon -Ilib/core:lib/more:lib/tour -c test/core test/more test/tour"
+end
+
+desc "show core test coverage"
+task "cov:core" do
+  sh "lemon -Ilib/core -c test/core"
+end
+
+desc "show more test coverage"
+task "cov:more" do
+  sh "lemon -Ilib/more -c test/more"
+end
+
+desc "show tour test coverage"
+task "cov:tour" do
+  sh "lemon -Ilib/tour -c test/tour"
+end
+
+desc "show core coverage by file name"
+task 'cov:file:core' do
+  core_scripts = Dir['lib/core/facets/**/*.rb'].reject{ |s| File.directory?(s) }
+  core_tests   = Dir['test/core/**/*.rb']
+
+  core_scripts = core_scripts.map do |f|
+    md = /lib\/core\/facets\/(.*?)$/.match(f)
+    md[1]
+  end
+
+  core_tests = core_tests.map do |f|
+    md = /test\/core\/(.*?)$/.match(f)
+    md[1].sub('/test_', '/')
+  end
+
+  diff = core_scripts - core_tests
+
+  # remove core collectives
+  diff = diff - %w{
+    array.rb binding.rb cattr.rb class.rb comparable.rb dir.rb
+    enumerable.rb exception.rb hash.rb file.rb filetest.rb float.rb
+    integer.rb kernel.rb matchdata.rb method.rb module.rb nilclass.rb
+    numeric.rb object.rb proc.rb process.rb range.rb regexp.rb string.rb
+    symbol.rb time.rb unboundmethod.rb
+  }
+
+  puts diff.sort.join("\n")
+  puts
+  puts "#{diff.size} files uncovered."
+end
+
+
+#
+# QED
+# ----------------------------------------------------------------------------
+
+desc "run qed docs"
+task 'qed' do
+  sh "qed #{qed_flags} -Ilib/core:lib/more:lib/tour qed/core qed/more qed/tour"
+end
+
+desc "run core qed docs"
+task 'qed:core' do
+  sh "qed #{qed_flags} -Ilib/core qed/core"
+end
+
+desc "run more qed docs"
+task 'qed:more' do
+  sh "qed #{qed_flags} -Ilib/core:lib/more qed/more"
+end
+
+desc "run tour qed docs"
+task 'qed:tour' do
+  sh "qed #{qed_flags} -Ilib/core:lib/tour qed/tour"
+end
+
+desc "run core qed docs"
+task 'qed:code' do
+  sh "qed #{qed_flags} -c -Ilib/core lib/core"
+end
+
+def qed_flags
+  flags = []
+  if ENV['verbose']
+    flags << '-v'
+  end
+  flags.join(' ')
+end
+
+
+#
+# Extension Clashes
+#-----------------------------------------------------------------------------
+
+# TODO: need to fork each lookup via a seprate process to get a clean picture
+
+desc "print method clashes with ActiveSupport"
+task 'clash:as' do
+  #require 'lemon/model/snapshot'
+  #snap1 = Snapshot.new
+  #$LOAD_PATH.unshift('lib/core')
+  #$LOAD_PATH.unshift('lib/more')
+  #$LOAD_PATH.unshift('lib/tour')
+  #require 'facets' # 'facets/all'
+  #snap2 = Snapshot.new
+end
+
+desc "print method clashes with Ruby"
+task 'clash:ruby' do
+  require 'lemon/model/snapshot'
+end
+
 
 #
 # SETUP/INSTALL
 # ----------------------------------------------------------------------------