warbler 0.9.10 → 0.9.11

data/History.txt

@@ -1,3 +1,21 @@
+== 0.9.11
+
+* Auto-detect Rails and Merb and configure appropriately
+  - For Rails, set rails booter, determine max runtimes based on Rails.configuration.threadsafe!,
+    add Rails gem, detect Rails version, set gems to be packaged based on
+    Rails.configuration.gems if available
+  - Rails gems only added if Rails application detected
+  - For Merb, set merb booter automatically
+* Auto-detect config.ru rackup script and pass it into config.webxml.rackup
+* rails.env now commented by default in config/warble.rb and internally default
+  the value to 'production'
+* Default directories in config.dirs to only those that are found to be present
+* Allow config.gems array to contain regexps and Gem::Dependency objects as well
+ (assist from Jani Soila)
+* Fix bug ensuring you can += and -= for config.gems
+* Upgrade to JRuby 1.1.4 and JRuby-Rack 0.9.2
+* add [] as a way to specify non-identifier keys, example: config.webxml['!@#$%^'] = 'haha'
+
 == 0.9.10
 
 * Upgraded to JRuby-Rack 0.9.1. Fixes JRUBY-2620, JRUBY-2594, JRUBY-2507.
@@ -23,7 +41,7 @@
 
 == 0.9.5
 
-* Fix bug in plugin warbler.rake task file that would favor loading warbler from gems before the version 
+* Fix bug in plugin warbler.rake task file that would favor loading warbler from gems before the version
   installed as a plugin
 * Upgrade to JRuby 1.1 final and Goldspike 1.6.1
 

data/Manifest.txt

@@ -9,8 +9,8 @@ generators/warble
 generators/warble/templates
 generators/warble/templates/warble.rb
 generators/warble/warble_generator.rb
-lib/jruby-complete-1.1.3.jar
-lib/jruby-rack-0.9.1.jar
+lib/jruby-complete-1.1.4.jar
+lib/jruby-rack-0.9.2.jar
 lib/warbler
 lib/warbler/config.rb
 lib/warbler/gems.rb

data/README.txt

@@ -1,15 +1,18 @@
 = Warbler
 
-Warbler is a gem to make a .war file out of a Rails project. The intent is to provide a minimal,
-flexible, ruby-like way to bundle up all of your application files for deployment to a Java
-application server.
+Warbler is a gem to make a .war file out of a Rails, Merb, or Rack-based
+application. The intent is to provide a minimal, flexible, ruby-like way to
+bundle up all of your application files for deployment to a Java application
+server.
 
-Warbler provides a sane set of out-of-the box defaults that should allow most Rails applications
-without external gem dependencies (aside from Rails itself) to assemble and Just Work.
+Warbler provides a sane set of out-of-the box defaults that should allow most
+Rails applications without external gem dependencies (aside from Rails itself)
+to assemble and Just Work.
 
-Warbler bundles JRuby and the JRuby-Rack servlet adapter for dispatching requests to your application inside
-the java application server, and assembles all jar files in WARBLER_HOME/lib/*.jar into
-your application. No external dependencies are downloaded.
+Warbler bundles JRuby and the JRuby-Rack servlet adapter for dispatching
+requests to your application inside the java application server, and assembles
+all jar files in WARBLER_HOME/lib/*.jar into your application. No external
+dependencies are downloaded.
 
 == Getting Started
 
@@ -19,9 +22,9 @@ your application. No external dependencies are downloaded.
 
 == Usage
 
-Warbler's +warble+ command is just a small wrapper around Rake with internally defined tasks. (Notice
-"rake" still prints out in the message, but you should substitute "warble" for "rake" on the command
-line when running this way.)
+Warbler's +warble+ command is just a small wrapper around Rake with internally
+defined tasks. (Notice "rake" still prints out in the message, but you should
+substitute "warble" for "rake" on the command line when running this way.)
 
     $ warble -T
     rake config         # Generate a configuration file to customize your war assembly
@@ -35,50 +38,108 @@ line when running this way.)
     rake war:public     # Copy all public HTML files to the root of the .war
     rake war:webxml     # Generate a web.xml file for the webapp
 
-Warble makes heavy use of Rake's file and directory tasks, so only recently updated files will be
-copied, making repeated assemblies much faster.
+Warble makes heavy use of Rake's file and directory tasks, so only recently
+updated files will be copied, making repeated assemblies much faster.
 
 == Configuration
 
-The default configuration puts application files (+app+, +config+, +lib+, +log+, +vendor+, +tmp+)
-under the .war file's WEB-INF directory, and files in +public+ in the root of the .war file. Any Java
-.jar files stored in lib will automatically be placed in WEB-INF/lib for placement on the web app's
+=== Rails applications
+
+Rails applications are detected automatically and configured appropriately.
+The following items are set up for you:
+
+* The Rails gem is packaged if you haven't vendored Rails.
+* Other gems configured in Rails.configuration.gems are packaged (Rails 2.1 or
+  later)
+* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
+  runtime pooling is disabled.
+
+=== Merb applications
+
+Merb applications are detected automatically, and the merb gem and its
+dependencies are packaged.
+
+=== Other Rack-based applications
+
+If you have a 'config.ru' file in the top directory of your application, its
+contents will be used as the rackup script for your Rack-based application.
+You will probably need to specify framework and application gems in
+config/warble.rb.
+
+See http://github.com/nicksieger/jruby-rack/tree/master/examples for examples
+of how to configure Warbler to package Camping and Sinatra apps.
+
+=== Configuration auto-detect TODOs
+
+* A more accurate way of detecting a Merb application's gems is needed. Until
+  then, you will have to specify them in config/warble.rb. See below.
+* Is it possible to more generally detect what gems an application uses?
+  Gem.loaded_specs is available, but the application needs to be loaded first
+  before its contents are reliable.
+
+=== Custom configuration
+
+The default configuration puts application files (+app+, +config+, +lib+,
++log+, +vendor+, +tmp+) under the .war file's WEB-INF directory, and files in
++public+ in the root of the .war file. Any Java .jar files stored in lib will
+automatically be placed in WEB-INF/lib for placement on the web app's
 classpath.
 
-To customize files, libraries, and gems included in the .war file, you'll need a config/warble.rb
-file. There a two ways of doing this. With the gem, simply run
+If the default settings are not appropriate for your application, you can
+customize Warbler's behavior. To customize files, libraries, and gems included
+in the .war file, you'll need a config/warble.rb file. There a two ways of
+doing this. With the gem, simply run
 
     warble config
 
 If you have Warbler installed as a plugin, use the generator:
 
     script/generate warble
-    
-Finally, edit the config/warble.rb to your taste. If you install the gem but later decide you'd like to have it as a plugin, use the +pluginize+ command:
+
+Finally, edit the config/warble.rb to your taste. If you install the gem but
+later decide you'd like to have it as a plugin, use the +pluginize+ command:
 
     warble pluginize
 
-If you wish to upgrade or switch one or more java libraries from what's bundled in the Warbler gem, simply change the jars in WARBLER_HOME/lib, or modify the +java_libs+ attribute of Warbler::Config to include the files you need.
+If you wish to upgrade or switch one or more java libraries from what's
+bundled in the Warbler gem, simply change the jars in WARBLER_HOME/lib, or
+modify the +java_libs+ attribute of Warbler::Config to include the files you
+need.
 
-Once Warbler is installed as a plugin, you can use +rake+ to build the war (with the same set of tasks as above).
+Once Warbler is installed as a plugin, you can use +rake+ to build the war
+(with the same set of tasks as above).
 
-=== Web.xml
+The generated config/warble.rb file is fully-documented with the available
+options and default values.
 
-Java web applications are configured mainly through this file, and Warbler creates a suitable default file for you for use.  However, if you need to customize it in any way, you have two options.
+=== Web.xml
 
-1. If you just want a static web.xml file whose contents you manually control, you may copy the one generated for you in <tt>tmp/war/WEB-INF/web.xml</tt> to <tt>config/web.xml</tt>.  It will be copied into the webapp for you.
-2. If you want to inject some dynamic information into the file, copy the <tt>WARBLER_HOME/web.xml.erb</tt> to <tt>config/web.xml.erb</tt>.  Its contents will be evaluated for you and put in the webapp.  Note that you can also pass arbitrary properties to the ERb template by setting <tt>config.webxml.customkey</tt> values in your <tt>config/warble.rb</tt> file.
+Java web applications are configured mainly through this file, and Warbler
+creates a suitable default file for you for use. However, if you need to
+customize it in any way, you have two options.
+
+1. If you just want a static web.xml file whose contents you manually control,
+   you may copy the one generated for you in <tt>tmp/war/WEB-INF/web.xml</tt>
+   to <tt>config/web.xml</tt> and modify as needed. It will be copied into the
+   webapp for you.
+2. If you want to inject some dynamic information into the file, copy the
+   <tt>WARBLER_HOME/web.xml.erb</tt> to <tt>config/web.xml.erb</tt>. Its
+   contents will be evaluated for you and put in the webapp. Note that you can
+   also pass arbitrary properties to the ERb template by setting
+   <tt>config.webxml.customkey</tt> values in your <tt>config/warble.rb</tt>
+   file.
 
 For more information on configuration, see Warbler::Config.
 
 === Troubleshooting
 
-If Warbler isn't packaging the files you were expecting, there are several debug tasks available to give you more insight into what's going on.
+If Warbler isn't packaging the files you were expecting, there are several
+debug tasks available to give you more insight into what's going on.
 
 * <tt>war:debug</tt> prints a YAML dump of the current configuration
-* <tt>war:debug:X</tt> prints a list of files that Warbler will include during that stage of
-  assembly. Valid values of <tt>X</tt> are <tt>app, java_libs, gems, public, includes,
-  excludes</tt>.
+* <tt>war:debug:X</tt> prints a list of files that Warbler will include during
+  that stage of assembly. Valid values of <tt>X</tt> are <tt>app, java_libs,
+  gems, public, includes, excludes</tt>.
 
 == Source
 
@@ -88,7 +149,8 @@ You can get the Warbler source using Git, in any of the following ways:
     git clone http://git.caldersphere.net/warbler.git
     git clone git://github.com/nicksieger/warbler.git
 
-You can also download a tarball of Warbler source at http://github.com/nicksieger/warbler/tree/master.
+You can also download a tarball of Warbler source at
+http://github.com/nicksieger/warbler/tree/master.
 
 == License
 
@@ -96,5 +158,6 @@ Warbler is provided under the terms of the MIT license.
 
     Warbler (c) 2007-08 Sun Microsystems, Inc.
 
-Warbler also bundles several other pieces of software for convenience. Please read the file LICENSES.txt to ensure
-that you agree with the terms of all the components.
+Warbler also bundles several other pieces of software for convenience. Please
+read the file LICENSES.txt to ensure that you agree with the terms of all the
+components.

data/bin/warble

@@ -11,9 +11,22 @@ require 'rake'
 require 'warbler'
 
 application = Rake.application
+
+# Load any application rakefiles to aid in autodetecting applications
+Warbler.project_application = Rake::Application.new
+Rake.application = Warbler.project_application
+Rake::Application::DEFAULT_RAKEFILES.each do |rf|
+  if File.exist?(rf)
+    load rf
+    break
+  end
+end
+
+Rake.application = application
 application.standard_exception_handling do
   application.init
 
+  # Load the main warbler tasks
   Warbler::Task.new
 
   task :default => :war
@@ -21,11 +34,11 @@ application.standard_exception_handling do
   desc "Generate a configuration file to customize your war assembly"
   task :config do
     if File.exists?(Warbler::Config::FILE) && ENV["FORCE"].nil?
-      warn "There's another bird sitting on my favorite branch"
-      warn "(file '#{Warbler::Config::FILE}' already exists. Pass argument FORCE=1 to override)"
+      puts "There's another bird sitting on my favorite branch"
+      puts "(file '#{Warbler::Config::FILE}' already exists. Pass argument FORCE=1 to override)"
     elsif !File.directory?("config")
-      warn "I'm confused; my favorite branch is missing"
-      warn "(directory 'config' is missing)"
+      puts "I'm confused; my favorite branch is missing"
+      puts "(directory 'config' is missing)"
     else
       cp "#{Warbler::WARBLER_HOME}/generators/warble/templates/warble.rb", Warbler::Config::FILE
     end
@@ -34,11 +47,11 @@ application.standard_exception_handling do
   desc "Unpack warbler as a plugin in your Rails application"
   task :pluginize do
     if !Dir["vendor/plugins/warbler*"].empty?
-      warn "I found an old nest in vendor/plugins; please trash it so I can make a new one"
-      warn "(directory vendor/plugins/warbler* exists)"
+      puts "I found an old nest in vendor/plugins; please trash it so I can make a new one"
+      puts "(directory vendor/plugins/warbler* exists)"
     elsif !File.directory?("vendor/plugins")
-      warn "I can't find a place to build my nest"
-      warn "(directory 'vendor/plugins' is missing)"
+      puts "I can't find a place to build my nest"
+      puts "(directory 'vendor/plugins' is missing)"
     else
       Dir.chdir("vendor/plugins") do
         ruby "-S", "gem", "unpack", "warbler"

data/generators/warble/templates/warble.rb

@@ -40,6 +40,11 @@ Warbler::Config.new do |config|
   # You can specify versions of gems by using a hash assignment:
   # config.gems["rails"] = "2.0.2"
 
+  # You can also use regexps or Gem::Dependency objects for flexibility or
+  # fine-grained control.
+  # config.gems << /^merb-/
+  # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
+
   # Include gem dependencies not mentioned specifically
   config.gem_dependencies = true
 
@@ -54,8 +59,8 @@ Warbler::Config.new do |config|
   # of RAILS_ROOT
   # config.war_name = "mywar"
 
-  # Value of RAILS_ENV for the webapp
-  config.webxml.rails.env = 'production'
+  # Value of RAILS_ENV for the webapp -- default as shown below
+  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
 
   # Application booter to use, one of :rack, :rails, or :merb. (Default :rails)
   # config.webxml.booter = :rails

data/lib/warbler/config.rb

@@ -9,7 +9,7 @@ require 'ostruct'
 module Warbler
   # Warbler assembly configuration.
   class Config
-    TOP_DIRS = %w(app config lib log vendor tmp)
+    TOP_DIRS = %w(app config lib log vendor)
     FILE = "config/warble.rb"
     BUILD_GEMS = %w(warbler rake rcov)
 
@@ -21,7 +21,7 @@ module Warbler
     # autodeploy directory. Defaults to the root of the Rails directory.
     attr_accessor :autodeploy_dir
 
-    # Top-level directories to be copied into WEB-INF.  Defaults to 
+    # Top-level directories to be copied into WEB-INF.  Defaults to
     # names in TOP_DIRS
     attr_accessor :dirs
 
@@ -88,12 +88,12 @@ module Warbler
 
     def initialize(warbler_home = WARBLER_HOME)
       @staging_dir = File.join("tmp", "war")
-      @dirs        = TOP_DIRS
+      @dirs        = TOP_DIRS.select {|d| File.directory?(d)}
       @includes    = FileList[]
       @excludes    = FileList[]
       @java_libs   = FileList["#{warbler_home}/lib/*.jar"]
       @java_classes = FileList[]
-      @gems        = default_gems
+      @gems        = Warbler::Gems.new
       @gem_dependencies = true
       @exclude_logs = true
       @public_html = FileList["public/**/*"]
@@ -101,6 +101,7 @@ module Warbler
       @webxml      = default_webxml_config
       @rails_root  = File.expand_path(defined?(RAILS_ROOT) ? RAILS_ROOT : Dir.getwd)
       @war_name    = File.basename(@rails_root)
+      auto_detect_frameworks
       yield self if block_given?
       @excludes += warbler_vendor_excludes(warbler_home)
       @excludes += FileList["**/*.log"] if @exclude_logs
@@ -134,26 +135,52 @@ module Warbler
 
     def default_webxml_config
       c = WebxmlOpenStruct.new
-      c.rails.env  = "production"
+      c.rails.env  = ENV['RAILS_ENV'] || 'production'
       c.public.root = '/'
       c.jndi = nil
       c.ignored = %w(jndi booter)
       c
     end
 
-    def default_gems
-      gems = Warbler::Gems.new
-      # Include all gems which are used by the web application, this only works when run as a plugin
-      #for gem in Gem.loaded_specs.values
-      #  next if BUILD_GEMS.include?(gem.name)
-      #  gems[gem.name] = gem.version.version
-      #end
-      gems << "rails" unless File.directory?("vendor/rails")
-      gems
+    def auto_detect_frameworks
+      auto_detect_rails || auto_detect_merb || auto_detect_rackup
+    end
+
+    def auto_detect_rails
+      return false unless task = Warbler.project_application.lookup("environment")
+      task.invoke
+      return false unless defined?(::Rails)
+      @dirs << "tmp" if File.directory?("tmp")
+      @webxml.booter = :rails
+      unless (defined?(Rails.vendor_rails?) && Rails.vendor_rails?) || File.directory?("vendor/rails")
+        @gems["rails"] = Rails::VERSION::STRING
+      end
+      if defined?(Rails.configuration.gems)
+        Rails.configuration.gems.each {|g| @gems[g.name] = g.version }
+      end
+      @webxml.jruby.max.runtimes = 1 if defined?(Rails.configuration.threadsafe!)
+      true
+    end
+
+    def auto_detect_merb
+      return false unless task = Warbler.project_application.lookup("merb_env")
+      task.invoke
+      return false unless defined?(::Merb)
+      @webxml.booter = :merb
+      @gems["merb"] = Merb::VERSION
+      true
+    end
+
+    def auto_detect_rackup
+      return false unless File.exist?("config.ru")
+      @webxml.booter = :rack
+      @webxml.rackup = File.read("config.ru")
     end
   end
 
   class WebxmlOpenStruct < OpenStruct
+    %w(java com org javax).each {|name| undef_method name if Object.methods.include?(name) }
+
     def initialize(key = 'webxml')
       @key = key
       @table = Hash.new {|h,k| h[k] = WebxmlOpenStruct.new(k) }
@@ -170,17 +197,28 @@ module Warbler
       end
     end
 
+    def [](key)
+      new_ostruct_member(key)
+      send(key)
+    end
+
+    def []=(key, value)
+      new_ostruct_member(key)
+      send("#{key}=", value)
+    end
+
     def context_params
+      require 'cgi'
       params = {}
       @table.each do |k,v|
         case v
         when WebxmlOpenStruct
           nested_params = v.context_params
           nested_params.each do |nk,nv|
-            params["#{k}.#{nk}"] = nv
+            params["#{CGI::escapeHTML(k.to_s)}.#{nk}"] = nv
           end
         else
-          params[k] = v.to_s
+          params[CGI::escapeHTML(k.to_s)] = CGI::escapeHTML(v.to_s)
         end
       end
       params.delete_if {|k,v| ['ignored', *ignored].include?(k.to_s) }

data/lib/warbler/gems.rb

@@ -22,6 +22,13 @@ module Warbler
     def <<(gem)
       self[gem] ||= ANY_VERSION
     end
-    
+
+    def +(other)
+      other.each {|g| self[g] ||= ANY_VERSION }
+    end
+
+    def -(other)
+      other.each {|g| self.delete(g)}
+    end
   end
 end

data/lib/warbler/task.rb

@@ -8,6 +8,13 @@ require 'rake'
 require 'rake/tasklib'
 
 module Warbler
+  class << self
+    attr_writer :project_application
+    def project_application
+      @project_application || Rake.application
+    end
+  end
+
   # Warbler Rake task.  Allows defining multiple configurations inside the same 
   # Rakefile by using different task names.
   class Task < Rake::TaskLib
@@ -239,8 +246,14 @@ module Warbler
       targets
     end
 
-    def define_single_gem_tasks(gem, targets, version = nil)
-      matched = Gem.source_index.search(gem, version)
+    def define_single_gem_tasks(gem_pattern, targets, version = nil)
+      gem = case gem_pattern
+      when Gem::Dependency
+        gem_pattern
+      else
+        Gem::Dependency.new(gem_pattern, version)
+      end
+      matched = Gem.source_index.search(gem)
       fail "gem '#{gem}' not installed" if matched.empty?
       spec = matched.last
       

data/lib/warbler/version.rb

@@ -5,5 +5,5 @@
 #++
 
 module Warbler
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/spec/spec_helper.rb

@@ -30,4 +30,14 @@ def capture(&block)
   io = StringIO.new
   silence(io, &block)
   io.string
+end
+
+Spec::Runner.configure do |config|
+  config.after(:each) do
+    class << Object
+      public :remove_const
+    end
+    Object.remove_const("Rails") rescue nil
+    rm_rf "vendor"
+  end
 end

data/spec/warbler/config_spec.rb

@@ -7,14 +7,10 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Warbler::Config do
-  after(:each) do
-    rm_rf "vendor"
-  end
-
   it "should have suitable default values" do
     config = Warbler::Config.new
     config.staging_dir.should == "tmp/war"
-    config.dirs.should include(*Warbler::Config::TOP_DIRS)
+    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
@@ -32,13 +28,13 @@ describe Warbler::Config do
     config.war_name.should == "mywar"
   end
 
-  it "should provide Rails gems by default, unless vendor/rails is present" do
-    config = Warbler::Config.new
-    config.gems.should include("rails")
-
-    mkdir_p "vendor/rails"
-    config = Warbler::Config.new
-    config.gems.should be_empty
+  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 exclude log files by default" do
@@ -67,18 +63,22 @@ describe Warbler::Config do
   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
@@ -102,6 +102,12 @@ describe Warbler::Config 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
+
   #it "should automatically gems used by the web application" do
   #  gem "actionpack"
   #  config = Warbler::Config.new

data/spec/warbler/task_spec.rb

@@ -31,6 +31,7 @@ describe Warbler::Task do
     rm_rf "public"
     rm_rf "config"
     rm_rf "log"
+    rm_f "config.ru"
   end
 
   def define_tasks(*tasks)
@@ -65,6 +66,7 @@ describe Warbler::Task do
   end
 
   it "should define a gems task for unpacking gems" do
+    @config.gems << "rails"
     define_tasks "gems"
     Rake::Task["warble:gems"].invoke
     file_list(%r{WEB-INF/gems/gems/rake.*/lib/rake.rb}).should_not be_empty
@@ -254,18 +256,123 @@ describe Warbler::Task do
     spec.stub!(:original_platform).and_return "java"
     spec.stub!(:loaded_from).and_return "hpricot.gemspec"
     spec.stub!(:dependencies).and_return []
-    Gem.source_index.should_receive(:search).with("hpricot", nil).and_return [spec]
+    Gem.source_index.should_receive(:search).and_return do |gem|
+      gem.name.should == "hpricot"
+      [spec]
+    end
     File.should_receive(:exist?).with(File.join(Gem.dir, 'cache', "hpricot-0.6.157-java.gem")).and_return true
     @config.gems = ["hpricot"]
     define_tasks "gems"
   end
 
+  it "should allow specification of dependency by Gem::Dependency" do
+    spec = mock "gem spec"
+    spec.stub!(:name).and_return "hpricot"
+    spec.stub!(:version).and_return "0.6.157"
+    spec.stub!(:platform).and_return "java"
+    spec.stub!(:original_platform).and_return "java"
+    spec.stub!(:loaded_from).and_return "hpricot.gemspec"
+    spec.stub!(:dependencies).and_return []
+    Gem.source_index.should_receive(:search).and_return do |gem|
+      gem.name.should == "hpricot"
+      [spec]
+    end
+    File.should_receive(:exist?).with(File.join(Gem.dir, 'cache', "hpricot-0.6.157-java.gem")).and_return true
+    @config.gems = [Gem::Dependency.new("hpricot", "> 0.6")]
+    define_tasks "gems"
+  end
+
   it "should define a java_classes task for copying loose java classes" do
     @config.java_classes = FileList["Rakefile"]
     define_tasks "java_classes"
     Rake::Task["warble:java_classes"].invoke
     file_list(%r{WEB-INF/classes/Rakefile$}).should_not be_empty
   end
+
+  def mock_rails_module
+    rails = Module.new
+    Object.const_set("Rails", rails)
+    version = Module.new
+    rails.const_set("VERSION", version)
+    version.const_set("STRING", "2.1.0")
+    rails
+  end
+
+  it "should auto-detect a Rails application" do
+    task :environment do
+      mock_rails_module
+    end
+    @config = Warbler::Config.new
+    @config.webxml.booter.should == :rails
+    @config.gems["rails"].should == "2.1.0"
+  end
+
+  it "should provide Rails gems by default, unless vendor/rails is present" do
+    rails = nil
+    task :environment do
+      rails = mock_rails_module
+    end
+
+    config = Warbler::Config.new
+    config.gems.should include("rails")
+
+    mkdir_p "vendor/rails"
+    config = Warbler::Config.new
+    config.gems.should be_empty
+
+    rm_rf "vendor/rails"
+    rails.stub!(:vendor_rails?).and_return true
+    config = Warbler::Config.new
+    config.gems.should be_empty
+  end
+
+  it "should auto-detect a Merb application" do
+    task :merb_env do
+      merb = Module.new
+      Object.const_set("Merb", merb)
+      merb.const_set("VERSION", "0.9.3")
+    end
+    @config = Warbler::Config.new
+    @config.webxml.booter.should == :merb
+    @config.gems["merb"].should == "0.9.3"
+    @config.gems.keys.should_not include("rails")
+  end
+
+  it "should auto-detect a Rack application with a config.ru file" do
+    rackup = "run Proc.new {|env| [200, {}, ['Hello World']]}"
+    File.open("config.ru", "w") {|f| f << rackup }
+    @config = Warbler::Config.new
+    @config.webxml.booter.should == :rack
+    @config.webxml.rackup.should == rackup
+  end
+
+  it "should automatically add Rails.configuration.gems to the list of gems" do
+    task :environment do
+      rails = mock_rails_module
+      config = mock "config"
+      rails.stub!(:configuration).and_return(config)
+      gem = mock "gem"
+      gem.stub!(:name).and_return "hpricot"
+      gem.stub!(:version).and_return "=0.6"
+      config.stub!(:gems).and_return [gem]
+    end
+
+    @config = Warbler::Config.new
+    @config.webxml.booter.should == :rails
+    @config.gems["hpricot"].should == "=0.6"
+  end
+
+  it "should set the jruby max runtimes to 1 when MT Rails is detected" do
+    task :environment do
+      rails = mock_rails_module
+      config = mock "config"
+      rails.stub!(:configuration).and_return(config)
+      config.stub!(:threadsafe!)
+    end
+    @config = Warbler::Config.new
+    @config.webxml.booter.should == :rails
+    @config.webxml.jruby.max.runtimes.should == 1
+  end
 end
 
 describe "The warbler.rake file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warbler
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-26 00:00:00 -05:00
+date: 2008-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ files:
 - generators/warble/templates
 - generators/warble/templates/warble.rb
 - generators/warble/warble_generator.rb
-- lib/jruby-complete-1.1.3.jar
-- lib/jruby-rack-0.9.1.jar
+- lib/jruby-complete-1.1.4.jar
+- lib/jruby-rack-0.9.2.jar
 - lib/warbler
 - lib/warbler/config.rb
 - lib/warbler/gems.rb