warbler 1.2.1 → 1.3.0.beta1

data/spec/spec_helper.rb

@@ -33,6 +33,46 @@ def capture(&block)
   io.string
 end
 
+module Spec::Example::ExampleGroupMethods
+  def run_in_directory(dir)
+    before :each do
+      @pwd = Dir.getwd
+      Dir.chdir(dir)
+    end
+
+    after :each do
+      Dir.chdir(@pwd)
+    end
+  end
+
+  def use_fresh_rake_application
+    before :each do
+      @rake = Rake::Application.new
+      Rake.application = @rake
+      verbose(false)
+    end
+  end
+
+  def use_fresh_environment
+    before(:each) do
+      @env_save = {}
+      (ENV.keys.grep(/BUNDLE/) + ["RUBYOPT", "GEM_PATH"]).each {|k| @env_save[k] = ENV[k]; ENV[k] = nil}
+    end
+
+    after(:each) do
+      @env_save.keys.each {|k| ENV[k] = @env_save[k]}
+    end
+  end
+
+  def cleanup_temp_files
+    after(:each) do
+      rm_rf FileList["log", ".bundle", "tmp/war"]
+      rm_f FileList["*.war", "*.foobar", "**/config.ru", "*web.xml*", "config/web.xml*", "config/warble.rb",
+                    "file.txt", 'manifest', 'Gemfile*', 'MANIFEST.MF*', 'init.rb*', '**/*.class']
+    end
+  end
+end
+
 Spec::Runner.configure do |config|
   config.after(:each) do
     class << Object

data/spec/warbler/application_spec.rb

@@ -8,10 +8,10 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Warbler::Application do
+  run_in_directory "spec/sample_war"
+
   before :each do
     verbose(false)
-    @pwd = Dir.getwd
-    Dir.chdir("spec/sample")
     @argv = ARGV.dup
     ARGV.clear
     @app = Rake.application
@@ -27,7 +27,6 @@ describe Warbler::Application do
     Warbler.framework_detection = @detection
     @argv.reverse.each {|a| ARGV.unshift a}
     rm_rf FileList['vendor/plugins/warbler']
-    Dir.chdir(@pwd)
   end
 
   it "should be able to list its tasks" do
@@ -84,10 +83,4 @@ describe Warbler::Application do
   it "should provide a means to load the project Rakefile" do
     Warbler::Application.new.load_project_rakefile
   end
-
-  it "should define a gemjar task for setting up gem packaging inside a jar" do
-    ARGV.unshift "gemjar"
-    Warbler::Application.new.run
-    Rake::Task['war:jar'].prerequisites.should include('war:make_gemjar')
-  end
 end

data/spec/warbler/config_spec.rb

@@ -12,101 +12,119 @@ describe Warbler::Config do
     verbose(false)
   end
 
-  it "should have suitable default values" do
-    config = Warbler::Config.new
-    config.dirs.should include(*Warbler::Config::TOP_DIRS.select{|d| File.directory?(d)})
-    config.includes.should be_empty
-    config.java_libs.should_not be_empty
-    config.war_name.size.should > 0
-    config.webxml.should be_kind_of(OpenStruct)
-    config.pathmaps.should be_kind_of(OpenStruct)
-    config.pathmaps.public_html.should == ["%{public/,}p"]
-  end
+  context "in an unknown application" do
+    run_in_directory 'spec/sample_war/tmp'
 
-  it "should allow configuration through an initializer block" do
-    config = Warbler::Config.new do |c|
-      c.war_name = "mywar"
+    it "has suitable default values" do
+      config = Warbler::Config.new
+      config.includes.should be_empty
+      config.jar_name.size.should > 0
     end
-    config.war_name.should == "mywar"
   end
 
-  it "should allow gems to be added/changed with =, +=, -=, <<" do
-    config = Warbler::Config.new do |c|
-      c.gems += ["activerecord-jdbc-adapter"]
-      c.gems -= ["rails"]
-      c.gems << "tzinfo"
-      c.gems = ["camping"]
+  context "in a web application" do
+    run_in_directory 'spec/sample_war'
+
+    after :each do
+      rm_f "vendor/test.log"
     end
-  end
 
-  it "should exclude log files by default" do
-    mkdir_p "vendor"
-    touch "vendor/test.log"
-    config = Warbler::Config.new
-    config.exclude_logs.should == true
-    config.excludes.include?("vendor/test.log").should == true
-  end
+    it "should have suitable default values" do
+      config = Warbler::Config.new
+      config.dirs.should include(*Warbler::Config::TOP_DIRS.select{|d| File.directory?(d)})
+      config.includes.should be_empty
+      config.java_libs.should_not be_empty
+      config.jar_name.size.should > 0
+      config.webxml.should be_kind_of(OpenStruct)
+      config.pathmaps.should be_kind_of(OpenStruct)
+      config.pathmaps.public_html.should == ["%{public/,}p"]
+    end
 
-  it "should include log files if exclude_logs is false" do
-    mkdir_p "vendor"
-    touch "vendor/test.log"
-    config = Warbler::Config.new {|c| c.exclude_logs = false }
-    config.exclude_logs.should == false
-    config.excludes.include?("vendor/test.log").should == false
-  end
+    it "should allow configuration through an initializer block" do
+      config = Warbler::Config.new do |c|
+        c.jar_name = "mywar"
+      end
+      config.jar_name.should == "mywar"
+    end
 
-  it "should exclude Warbler itself when run as a plugin" do
-    config = Warbler::Config.new
-    config.excludes.include?("vendor/plugins/warbler").should == false
-    config = Warbler::Config.new File.join(Dir.getwd, "vendor", "plugins", "warbler")
-    config.excludes.include?("vendor/plugins/warbler").should == true
-  end
+    it "should allow gems to be added/changed with =, +=, -=, <<" do
+      config = Warbler::Config.new do |c|
+        c.gems += ["activerecord-jdbc-adapter"]
+        c.gems -= ["rails"]
+        c.gems << "tzinfo"
+        c.gems = ["camping"]
+      end
+    end
 
-  it "should generate context parameters from the webxml openstruct" do
-    config = Warbler::Config.new
-    config.webxml.a.b.c = "123"
-    config.webxml.com.example.config = "blah"
-    config.webxml.rails.env = 'staging'
-    config.webxml.jruby.min.runtimes = 2
-    config.webxml.jruby.max.runtimes = 4
-    config.webxml['org']['jruby']['rack'] = "rails"
-    params = config.webxml.context_params
-    params.should have_key('a.b.c')
-    params.should have_key('rails.env')
-    params.should have_key('jruby.min.runtimes')
-    params.should have_key('jruby.max.runtimes')
-    params['a.b.c'].should == "123"
-    params['com.example.config'].should == "blah"
-    params['rails.env'].should == "staging"
-    params['jruby.min.runtimes'].should == "2"
-    params['jruby.max.runtimes'].should == "4"
-    params['org.jruby.rack'].should == "rails"
-  end
+    it "should exclude log files by default" do
+      mkdir_p "vendor"
+      touch "vendor/test.log"
+      config = Warbler::Config.new
+      config.exclude_logs.should == true
+      config.excludes.include?("vendor/test.log").should == true
+    end
 
-  it "should determine the context listener from the webxml.booter parameter" do
-    config = Warbler::Config.new
-    config.webxml.booter = :rack
-    config.webxml.servlet_context_listener.should == "org.jruby.rack.RackServletContextListener"
-    config = Warbler::Config.new
-    config.webxml.booter = :merb
-    config.webxml.servlet_context_listener.should == "org.jruby.rack.merb.MerbServletContextListener"
-    config = Warbler::Config.new
-    config.webxml.servlet_context_listener.should == "org.jruby.rack.rails.RailsServletContextListener"
-  end
+    it "should include log files if exclude_logs is false" do
+      mkdir_p "vendor"
+      touch "vendor/test.log"
+      config = Warbler::Config.new {|c| c.exclude_logs = false }
+      config.exclude_logs.should == false
+      config.excludes.include?("vendor/test.log").should == false
+    end
 
-  it "should not include ignored webxml keys in the context params hash" do
-    Warbler::Config.new.webxml.context_params.should_not have_key('ignored')
-    Warbler::Config.new.webxml.context_params.should_not have_key('jndi')
-    Warbler::Config.new.webxml.context_params.should_not have_key('booter')
-  end
+    it "should exclude Warbler itself when run as a plugin" do
+      config = Warbler::Config.new
+      config.excludes.include?("vendor/plugins/warbler").should == false
+      config = Warbler::Config.new File.join(Dir.getwd, "vendor", "plugins", "warbler")
+      config.excludes.include?("vendor/plugins/warbler").should == true
+    end
 
-  it "should have a helpful string representation for an empty key" do
-    Warbler::Config.new.webxml.missing_key.to_s.should =~ /No value for 'missing_key' found/
-  end
+    it "should generate context parameters from the webxml openstruct" do
+      config = Warbler::Config.new
+      config.webxml.a.b.c = "123"
+      config.webxml.com.example.config = "blah"
+      config.webxml.rails.env = 'staging'
+      config.webxml.jruby.min.runtimes = 2
+      config.webxml.jruby.max.runtimes = 4
+      config.webxml['org']['jruby']['rack'] = "rails"
+      params = config.webxml.context_params
+      params.should have_key('a.b.c')
+      params.should have_key('rails.env')
+      params.should have_key('jruby.min.runtimes')
+      params.should have_key('jruby.max.runtimes')
+      params['a.b.c'].should == "123"
+      params['com.example.config'].should == "blah"
+      params['rails.env'].should == "staging"
+      params['jruby.min.runtimes'].should == "2"
+      params['jruby.max.runtimes'].should == "4"
+      params['org.jruby.rack'].should == "rails"
+    end
+
+    it "should determine the context listener from the webxml.booter parameter" do
+      config = Warbler::Config.new
+      config.webxml.booter = :rack
+      config.webxml.servlet_context_listener.should == "org.jruby.rack.RackServletContextListener"
+      config = Warbler::Config.new
+      config.webxml.booter = :merb
+      config.webxml.servlet_context_listener.should == "org.jruby.rack.merb.MerbServletContextListener"
+      config = Warbler::Config.new
+      config.webxml.servlet_context_listener.should == "org.jruby.rack.rails.RailsServletContextListener"
+    end
+
+    it "should not include ignored webxml keys in the context params hash" do
+      Warbler::Config.new.webxml.context_params.should_not have_key('ignored')
+      Warbler::Config.new.webxml.context_params.should_not have_key('jndi')
+      Warbler::Config.new.webxml.context_params.should_not have_key('booter')
+    end
 
-  it "should HTML-escape all webxml keys and values" do
-    config = Warbler::Config.new
-    config.webxml.a["b&"].c = "123<hi>456"
-    config.webxml.context_params['a.b&amp;.c'].should == "123&lt;hi&gt;456"
+    it "should have a helpful string representation for an empty key" do
+      Warbler::Config.new.webxml.missing_key.to_s.should =~ /No value for 'missing_key' found/
+    end
+
+    it "should HTML-escape all webxml keys and values" do
+      config = Warbler::Config.new
+      config.webxml.a["b&"].c = "123<hi>456"
+      config.webxml.context_params['a.b&amp;.c'].should == "123&lt;hi&gt;456"
+    end
   end
 end