@@ -1,44 +1,86 @@ -require 'config/requirements' - -begin - require 'hanna/rdoctask' -rescue LoadError => e - require "rake/rdoctask" -end - -require 'config/jeweler' # setup gem configuration - -desc "Clean tmp directory" -task :clean_tmp do |t| - FileUtils.rm_rf("#{File.dirname(__FILE__)}/Manifest.txt") if ::File.exists?("#{File.dirname(__FILE__)}/Manifest.txt") - FileUtils.touch("#{File.dirname(__FILE__)}/Manifest.txt") - %w(logs tmp).each do |dir| - FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}") - end -end - -desc "Remove the pkg directory" -task :clean_pkg do |t| - %w(pkg).each do |dir| - FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}") - end -end - - -namespace :gem do - task(:build).prerequisites.unshift :gemspec # Prepend the gemspec generation - - desc "Build the gem only if the tests pass" - task :test_then_build => [:test, :build] - - desc "Build and install the gem only if the tests pass" - task :test_then_install => [:test, :install] -end - -# Generate documentation -Rake::RDocTask.new do |rd| - rd.main = "README.rdoc" - rd.rdoc_files.include("README.rdoc", "lib/**/*.rb") - rd.rdoc_dir = "rdoc" - # rd.template = "hanaa" +require 'rake' +require 'rake/testtask' +require 'rake/rdoctask' + +require 'config/requirements' + +begin + require 'hanna/rdoctask' +rescue LoadError => e + require "rake/rdoctask" +end + +require 'config/jeweler' # setup gem configuration + +task :default => [:test, :cleanup_test] +desc "Update vendor directory and run tests" +task :ci => ["poolparty:vendor:setup", "poolparty:vendor:update", :spec, :test] + +task :cleanup_test do + ::FileUtils.rm_rf "/tmp/poolparty" +end + +# task :test do +# sh "ruby -Ilib:test #{Dir["#{File.dirname(__FILE__)}/../test/poolparty/*/*.rb"].join(" ")}" +# end + +Rake::TestTask.new(:test) do |t| + t.test_files = FileList['test/lib/**/*_test.rb'] + t.warning = false + t.verbose = false +end + +begin + require 'rcov/rcovtask' + + Rcov::RcovTask.new(:rcov) do |t| + t.libs << FileList['lib/**/*.rb'] + t.rcov_opts = [ + '-xRakefile', '-xrakefile', + '-xlib/erlang', + '--text-report', + '--sort coverage' + ] + FileList['tasks/*.rake'].pathmap("-x%p") + t.test_files = FileList['test/lib/**/*_test.rb'] + t.output_dir = 'coverage' + t.verbose = true + end +rescue LoadError + puts "RCov is not available" +end + + +desc "Clean tmp directory" +task :clean_tmp do |t| + FileUtils.rm_rf("#{File.dirname(__FILE__)}/Manifest.txt") if ::File.exists?("#{File.dirname(__FILE__)}/Manifest.txt") + FileUtils.touch("#{File.dirname(__FILE__)}/Manifest.txt") + %w(logs tmp).each do |dir| + FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}") + end +end + +desc "Remove the pkg directory" +task :clean_pkg do |t| + %w(pkg).each do |dir| + FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}") + end +end + + +namespace :gem do + task(:build).prerequisites.unshift :gemspec # Prepend the gemspec generation + + desc "Build the gem only if the tests pass" + task :test_then_build => [:test, :build] + + desc "Build and install the gem only if the tests pass" + task :test_then_install => [:test, :install] +end + +# Generate documentation +Rake::RDocTask.new do |rd| + rd.main = "README.rdoc" + rd.rdoc_files.include("README.rdoc", "lib/**/*.rb") + rd.rdoc_dir = "rdoc" + # rd.template = "hanaa" end \ No newline at end of file Rakefile @@ -3,5 +3,9 @@ class Object def pool(name=nil, &block) @@pool ||= PoolParty::Pool.new(name, &block) end + + def reset! + @@pool = nil + end end \ No newline at end of file lib/core/object.rb @@ -10,48 +10,11 @@ class ArrayTest < Test::Unit::TestCase {:name => "jenna", :occupation => "lawyer"} ] end - - def test_have_collect_with_index - out = [] - @arr.collect_with_index do |ele, i| - out << "#{ele}#{i+1}" - end - assert_equal ["a1", "b2", "c3", "d4"], out - end - + def test_be_able_to_select_with_hash assert_equal @hash_arr.select_with_hash(:name => "matt").first[:occupation], "doctor" assert_equal @hash_arr.select_with_hash(:occupation => "computer scientist").first[:name], "peter" assert @hash_arr.select_with_hash(:occupation => "matt").empty? end - - def test_should_be_able_to_wrap_with_the_next - assert_equal @arr.wrapping_next("a"), "b" - assert_equal @arr.wrapping_next("b"), "c" - assert_equal @arr.wrapping_next("c"), "d" - assert_equal @arr.wrapping_next("d"), "a" - end - - def test_swap - assert_equal %w(a c b d), @arr.swap!(1,2) - assert_equal %w(d c b a), @arr.swap!(0,3) - assert_equal %w(d c a b), @arr.swap!(2,3) - end - - def test_zip_offset - arr = %w(a b c d e f) - assert_equal [["a","b"],["b","c"],["c","d"],["d","e"],["e","f"]], arr.zip_offset(1) - assert_equal [["a","b"],["b","c"],["c","d"],["d","e"]], arr.zip_offset(2) - assert_equal [["a","b"],["b","c"],["c","d"]], arr.zip_offset(3) - assert_equal [["a","b"]], arr.zip_offset(5) - - assert_equal [["a","b"],["b","c"],["c","d"],["d","e"]], %w(a b c d e).zip_offset(1) - assert_equal [["a","b"],["b","c"],["c","d"]], %w(a b c d e).zip_offset(2) - end - - def test_rotate - arr = %w(a b c d e) - assert_equal %w(b c d e a), arr.rotate - end end \ No newline at end of file test/lib/core/array_test.rb @@ -3,52 +3,24 @@ require "#{File.dirname(__FILE__)}/../../test_helper" class ObjectTest < Test::Unit::TestCase context "object" do setup do - clear! + reset! end context "global methods" do setup do @o = Object.new end - - should "have the clouds method" do - assert @o.respond_to?(:clouds) - assert_equal Hash, @o.clouds.class - end - + should "have the pools method" do - assert @o.respond_to?(:pools) - assert_equal Hash, @o.pools.class + assert @o.respond_to?(:pool) end should "make a pool when calling pool" do - assert_nil @o.pools[:fun_pool] - @pool = @o.pool :fun_pool do - end - assert_not_nil @o.pools["fun_pool"] - assert_equal @pool, @o.pools["fun_pool"] - end - - should "throw an error if the method pool for creation is given without a block" do - PoolParty::PoolPartyError.create("PoolError") - assert_raise PoolError do - @o.pool :banks + assert_nil @@pool + @@pool = pool :fun_pool do end + assert_not_nil @@pool end - context "do_once" do - should "have run_procs" do - assert_equal Array, @o.run_procs.class - assert_equal [], @o.run_procs - end - - should "insert the block into the runprocs" do - @proc = Proc.new {} - @o.do_once &@proc - assert_equal [@proc.to_s], @o.run_procs - end - end - - end test/lib/core/object_test.rb @@ -2,17 +2,7 @@ require "#{File.dirname(__FILE__)}/../../test_helper" class StringTest < Test::Unit::TestCase context "string" do - - should "replace with ^" do - out = ":god bless :country" ^ {:god => "Budda", :country => "India"} - assert_equal "Budda bless India", out - end - - should "not explode with non-existant data in the hash (replace with whitespace)" do - out = ":person has a girlfriend" ^ {:boss => "Budda"} - assert_equal " has a girlfriend", out - end - + should "camelcase properly" do assert_equal "DocRiver", "doc_river".camelcase assert_equal "AWholeLottaHotdogs", "a_whole_lotta_hotdogs".camelcase @@ -39,35 +29,12 @@ class StringTest < Test::Unit::TestCase assert_equal "Pepper", "dr.pepper".classify assert_equal "Dr::Pepper", "dr::pepper".classify end - - should "to_hash from a string of = signs" do - str =<<-EOE - a = b - b = c - c = a - EOE - hsh = str.to_hash - assert_equal Hash, hsh.class - assert_equal hsh[:a], "b" - assert_equal hsh[:b], "c" - assert_equal hsh[:c], "a" - end - - should "get the top level class" do - assert_equal "pepper", "Dr::Pepper".top_level_class - assert_equal "pepper_and_chives", "Dr::Pepper-And_chives".top_level_class - assert_equal "rig", "Rig".top_level_class - end - + should "have the / for filepaths" do assert_equal "/root/home/stuff", "/root"/"home"/"stuff" assert_equal "/root/box", "/root" / "box" end - should "have pluralize (dumb)" do - assert_equal "ferry".pluralize(2), "ferrys" - assert_equal "boat".pluralize(2), "boats" - end end end \ No newline at end of file test/lib/core/string_test.rb @@ -13,10 +13,6 @@ class SymbolTest < Test::Unit::TestCase assert_equal :a / :b, "a/b" end - should "be able to be sanitized" do - assert_equal "abcd", "a.b-c d".to_sym.sanitize - end - should "classify the symbol" do assert_equal :C, :c.classify end test/lib/core/symbol_test.rb @@ -2,11 +2,9 @@ require "#{File.dirname(__FILE__)}/../../test_helper" stub_keypair_searchable_paths -class PoolTest < Test::Unit::TestCase - def setup - end - +class PoolTest < Test::Unit::TestCase def test_set_up_pool_object + reset! pool "hi" do end assert_equal @@pool.name, "hi" test/lib/poolparty/pool_test.rb TODO.textile 7cecc027d0dad9fdfe187416896ad28ba1bab57f Ari Lerner arilerner@mac.com http://github.com/auser/poolparty/commit/b6f5664f1b89d9701be9067339fed0fcef586dc6 b6f5664f1b89d9701be9067339fed0fcef586dc6 2009-10-27T15:22:03-07:00 2009-10-27T15:22:03-07:00 Fixed tests 63a84984b7b9b0161088c9829cabb78845f1d14d Ari Lerner arilerner@mac.com