spec/sample/README spec/sample/Rakefile spec/sample/app/controllers/application.rb spec/sample/app/helpers/application_helper.rb spec/sample/config/boot.rb spec/sample/config/database.yml spec/sample/config/environment.rb spec/sample/config/environments/development.rb spec/sample/config/environments/production.rb spec/sample/config/environments/test.rb spec/sample/config/initializers/inflections.rb spec/sample/config/initializers/mime_types.rb spec/sample/config/initializers/new_rails_defaults.rb spec/sample/config/routes.rb spec/sample/lib/tasks/utils.rake spec/sample/public/404.html spec/sample/public/422.html spec/sample/public/500.html spec/sample/public/favicon.ico spec/sample/public/index.html spec/sample/public/robots.txt sun-web.xml @@ -184,6 +184,7 @@ module Warbler desc "Create an exploded war in the app's public directory" task "exploded" => ["webxml", "java_classes", "gems", *libs] do cp "#{@config.staging_dir}/WEB-INF/web.xml", "." + cp File.join(WARBLER_HOME, "sun-web.xml"), "." unless File.exists?("sun-web.xml") ln_sf "#{@config.staging_dir}/WEB-INF/gems", "." if File.directory?("#{@config.staging_dir}/WEB-INF/classes") ln_sf "#{@config.staging_dir}/WEB-INF/classes", "." @@ -198,7 +199,7 @@ module Warbler ["gems", "public/WEB-INF", "classes"]).each do |l| rm_f l if File.exist?(l) && File.symlink?(l) end - rm_f "web.xml" + rm_f "*web.xml" end end end lib/warbler/task.rb @@ -10,29 +10,25 @@ describe Warbler::Task do before(:each) do @rake = Rake::Application.new Rake.application = @rake - mkdir_p "public" + verbose(false) + @pwd = Dir.getwd + Dir.chdir("spec/sample") mkdir_p "log" - touch "public/index.html" touch "log/test.log" @config = Warbler::Config.new do |config| - config.staging_dir = "pkg/tmp/war" + config.staging_dir = "tmp/war" config.war_name = "warbler" config.gems = ["rake"] - config.dirs = %w(bin generators log lib) - config.public_html = FileList["public/**/*", "tasks/**/*"] config.webxml.jruby.max.runtimes = 5 end - verbose(false) end after(:each) do define_tasks "clean" Rake::Task["warble:clean"].invoke - rm_rf "public" - rm_rf "config" rm_rf "log" - rm_f "config.ru" - rm_f "web.xml" + rm_f FileList["config.ru", "*web.xml", "config/web.xml*", "config/warble.rb"] + Dir.chdir(@pwd) end def define_tasks(*tasks) @@ -63,7 +59,6 @@ describe Warbler::Task do define_tasks "public" Rake::Task["warble:public"].invoke file_list(%r{^#{@config.staging_dir}/index\.html}).should_not be_empty - file_list(%r{tasks/warbler\.rake}).should_not be_empty end it "should define a gems task for unpacking gems" do @@ -178,9 +173,9 @@ describe Warbler::Task do end define_tasks "app" Rake::Task["warble:app"].invoke - file_list(%r{WEB-INF/bin/warble$}).should_not be_empty - file_list(%r{WEB-INF/generators/warble/warble_generator\.rb$}).should_not be_empty - file_list(%r{WEB-INF/lib/warbler\.rb$}).should_not be_empty + file_list(%r{WEB-INF/app$}).should_not be_empty + file_list(%r{WEB-INF/config$}).should_not be_empty + file_list(%r{WEB-INF/lib$}).should_not be_empty gems_ran.should == true end @@ -198,6 +193,7 @@ describe Warbler::Task do define_tasks "webxml", "exploded", "java_classes", "gems" Rake::Task['warble:exploded'].invoke File.exist?("web.xml").should == true + File.exist?("sun-web.xml").should == true File.symlink?("gems").should == true File.symlink?("public/WEB-INF").should == true Rake::Task['warble:clean:exploded'].invoke @@ -227,12 +223,11 @@ describe Warbler::Task do end it "should be able to exclude files from the .war" do - @config.dirs << "spec" - @config.excludes += FileList['spec/spec_helper.rb'] + @config.excludes += FileList['lib/tasks/utils.rake'] task "warble:gems" do; end define_tasks "app" Rake::Task["warble:app"].invoke - file_list(%r{spec/spec_helper.rb}).should be_empty + file_list(%r{lib/tasks/utils.rake}).should be_empty end it "should be able to define all tasks successfully" do @@ -420,4 +415,4 @@ describe "Debug targets" do capture { Rake::Task["war:debug:excludes"].invoke }.should =~ /exclude/ capture { Rake::Task["war:debug"].invoke }.should =~ /Config/ end -end \ No newline at end of file +end spec/warbler/task_spec.rb 761de7bbbf7e3db249163a6fea49745f22cde0fe Nick Sieger nick@nicksieger.com http://github.com/nicksieger/warbler/commit/8bba464d99cb261448c5c7ca477133af85cc8ba6 8bba464d99cb261448c5c7ca477133af85cc8ba6 2008-11-09T09:15:29-08:00 2008-11-09T09:15:29-08:00 Move all testing activity to take place in spec/sample app - also add sun-web.xml that turns symlinks on for exploded mode fd7613a8116c1996c342626fef82fb6d750382ab Nick Sieger nick@nicksieger.com