@@ -1,5 +1,5 @@ #-- -# (c) Copyright 2007-2008 Sun Microsystems, Inc. +# (c) Copyright 2007-2009 Sun Microsystems, Inc. # See the file LICENSES.txt included with the distribution for # software license details. #++ @@ -227,7 +227,11 @@ module Warbler end def define_webinf_file_tasks - target_files = @config.dirs.map do |d| + target_files = @config.dirs.select do |d| + exists = File.directory?(d) + warn "warning: application directory `#{d}' does not exist or is not a directory; skipping" unless exists + exists + end.map do |d| define_file_task(d, "#{@config.staging_dir}/#{apply_pathmaps(d, :application)}") end files = FileList[*(@config.dirs.map{|d| "#{d}/**/*"})] lib/warbler/task.rb @@ -1,5 +1,5 @@ #-- -# (c) Copyright 2007-2008 Sun Microsystems, Inc. +# (c) Copyright 2007-2009 Sun Microsystems, Inc. # See the file LICENSES.txt included with the distribution for # software license details. #++ @@ -36,7 +36,9 @@ describe Warbler::Task do @defined_tasks ||= [] tasks.each do |task| unless @defined_tasks.include?(task) - Warbler::Task.new "warble", @config, "define_#{task}_task".to_sym do |t| + meth = "define_#{task}_task" + meth = "define_#{task}_tasks" unless Warbler::Task.private_instance_methods.include?(meth) + Warbler::Task.new "warble", @config, meth.to_sym do |t| options.each {|k,v| t.send "#{k}=", v } end @defined_tasks << task @@ -438,6 +440,14 @@ describe Warbler::Task do @config.webxml.booter.should == :rails @config.webxml.jruby.max.runtimes.should == 1 end + + it "should skip directories that don't exist in config.dirs and print a warning" do + @config = Warbler::Config.new + @config.dirs = %w(lib notexist) + define_tasks "webinf_file" + Rake.application.lookup("#{@config.staging_dir}/WEB-INF/lib").should_not be_nil + Rake.application.lookup("#{@config.staging_dir}/WEB-INF/notexist").should be_nil + end end describe "The warbler.rake file" do spec/warbler/task_spec.rb @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Nick Sieger"] - s.date = %q{2008-12-18} + s.date = %q{2009-01-21} s.default_executable = %q{warble} s.description = %q{= Warbler} s.email = %q{nick@nicksieger.com} warbler.gemspec 786d3301dc0b013ae38c038ff484621ddc580f67 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/warbler/commit/73b6914f416fcc63be412518d961120c4ca5b302 73b6914f416fcc63be412518d961120c4ca5b302 2009-02-06T08:16:29-08:00 2009-02-06T08:16:29-08:00 Add warning message for directories that don't exist in config.dirs 3cc6a9903dda14c328141b0c3609630e33551037 Nick Sieger nick@nicksieger.com