src/spec/java/org/jruby/rack/fake/FakeJspWriter.java src/spec/java/org/jruby/rack/fake/FakePageContext.java @@ -10,7 +10,7 @@ require 'rbconfig' load 'src/main/ruby/jruby/rack/version.rb' CLASSPATH = Dir["src/main/jars/*.jar"] + - ["target/classes", File.join(Config::CONFIG['libdir'], Config::CONFIG['LIBRUBY'])] + ["target/classes", "target/test-classes", File.join(Config::CONFIG['libdir'], Config::CONFIG['LIBRUBY'])] CLASSPATH.each {|p| $CLASSPATH << p} ENV['CLASSPATH'] = CLASSPATH.join(File::PATH_SEPARATOR) @@ -18,10 +18,18 @@ CLEAN << 'target' directory 'target/classes' +desc "Compile java classes" task :compile => "target/classes" do |t| sh "javac -source 1.5 -target 1.5 -d #{t.prerequisites.first} #{Dir['src/main/java/**/*.java'].join(' ')}" end +directory 'target/test-classes' + +task :compilespec => "target/test-classes" do |t| + sh "javac -source 1.5 -target 1.5 -d #{t.prerequisites.first} #{Dir['src/spec/java/**/*.java'].join(' ')}" +end + +desc "Unpack the rack gem" task :unpack_gem => "target" do |t| Dir.chdir(t.prerequisites.first) do unless File.directory?("rack") @@ -31,6 +39,7 @@ task :unpack_gem => "target" do |t| end end +desc "Copy resources" task :resources => ["target/classes", :unpack_gem] do |t| ['src/main/ruby', 'target/rack/lib'].each do |dir| FileList["#{dir}/*"].each do |f| @@ -42,12 +51,15 @@ task :resources => ["target/classes", :unpack_gem] do |t| cp "src/main/tld/jruby-rack.tld", meta_inf end -Spec::Rake::SpecTask.new(:spec => [:compile, :resources]) do |t| +desc "Run specs" +Spec::Rake::SpecTask.new(:spec => [:compile, :resources, :compilespec]) do |t| t.pattern = "src/spec/ruby/**/*_spec.rb" + t.spec_opts = ["--format", "specdoc"] end task :test => :spec +desc "Create the jar" task :jar => :spec do sh "jar cf target/jruby-rack-#{JRuby::Rack::VERSION}.jar -C target/classes ." end Rakefile @@ -1,7 +1,3 @@ -- Add default convenience set of load paths for vanilla rack apps -- Dir.chdir('/WEB-INF') { ... } during Rack app initialization so that rackup scripts can "load './some/file'" -- Allow rackup script to be set from a file in addition to the servlet context - - scan webapp for files named config.ru? - Add ability to specify custom Rack middleware for Rails - Get rid of RackApplicationFactory; make custom factories just a decorating RackApplication instead - Move JRuby runtime factory logic into separate small factory that accepts a rackup script TODO src/main/java/org/jruby/rack/fake/FakeJspWriter.java src/main/java/org/jruby/rack/fake/FakePageContext.java 23c1259728b7f57140aa4eced426762239631e48 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/jruby-rack/commit/5c6a33ace2958370c2bc1c2a0fddcfa1d0fc0260 5c6a33ace2958370c2bc1c2a0fddcfa1d0fc0260 2008-11-09T10:36:14-08:00 2008-11-09T10:36:14-08:00 Split out compile/compilespec tasks 5439d25124864a9822c3c0159278c22e6140f7bc Nick Sieger nick@nicksieger.com