warbler 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,24 @@
+== 1.2.0
+
+- Drop compatibility with earlier versions of Bundler -- Bundler has
+  changed a lot in a short period of time, so I'm expecting the number
+  of people depending on 0.8 or 0.9 to be small. Please use Warbler
+  1.2.0 with applications that depend on Bundler 1.0 or higher.
+- Support for Bundler groups. The 'development' and 'test' groups are
+  excluded by default.
+- Add 'compiled' feature: With this feature added to config.features
+  Warbler will pre-compile all Ruby files and will not ship the
+  original Ruby source in your war file.
+- warble.rb: Add config.bundle_without that controls Bundler groups to
+  be skipped, like 'Bundler.settings.without'.
+- warble.rb: Add config.compiled_ruby_files to specify which Ruby
+  files to compile when using the "compiled" feature. Defaults to
+  compiling all Ruby files.
+- warble.rb: Add config.gem_excludes which allows exclusion of some
+  gem files from the war. Default assumes no exclusions.
+- Exclude 'tmp/war' directory so that people upgrading from 0.9 won't
+  accidentally include it in their war file.
+
 == 1.1.0
 
 - Add concept of "features" -- small Rake tasks that run before the

data/Manifest.txt

@@ -13,7 +13,6 @@ lib/warbler.rb
 lib/warbler/application.rb
 lib/warbler/config.rb
 lib/warbler/gems.rb
-lib/warbler/runtime.rb
 lib/warbler/task.rb
 lib/warbler/version.rb
 lib/warbler/war.rb

data/README.txt

@@ -6,8 +6,7 @@ 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.
+Ruby web applications to assemble and Just Work.
 
 == Getting Started
 
@@ -21,6 +20,7 @@ Warbler's +warble+ command is just a small wrapper around Rake with internally
 defined tasks.
 
     $ warble -T
+    warble compiled    # Feature: precompile all Ruby files
     warble config      # Generate a configuration file to customize your war
     warble executable  # Feature: make an executable archive
     warble gemjar      # Feature: package gem repository inside a jar
@@ -30,18 +30,16 @@ defined tasks.
     warble war:clean   # Remove the .war file
     warble war:debug   # Dump diagnostic information
 
-If you'd like to control Warbler from your own project's Rakefile,
-simply add the following code somewhere in the Rakefile:
-
-    require 'warbler'
-    Warbler::Task.new
-
-Now you should be able to invoke "rake war" to create your war file.
+Type <tt>warble</tt> or <tt>warble war</tt> to create the war file.
 
 == Features
 
 Warbler "features" are small Rake tasks that run before the creation
-of the war file and make manipulations to the war file structure.
+of the war file and make manipulations to the war file structure. For
+instance, the +executable+ feature makes your war file capable of
+running on its own (like a jar), without a servlet container:
+
+    warble executable war
 
 You can either add features to the warbler command line:
 
@@ -51,14 +49,17 @@ or configure them in config/warble.rb to always be used.
 
    config.features = %w(FEATURE)
 
-Currently, two features are available.
+Currently, three features are available.
 
 * +gemjar+: This bundles all gems into a single gem file to reduce the
   number of files in the .war. This is mostly useful for Google
   AppEngine where the number of files per application has a limit.
 * +executable+: This bundles an embedded web server into the .war so
   that it can either be deployed into a traditional java web server or
-  run as a standalone application using 'java -jar myapp.war'.
+  run as a standalone application using <tt>java -jar myapp.war</tt>.
+* +compiled+: This uses +jrubyc+ to precompile all .rb files in your
+  application to .class files and includes those in the .war instead
+  of the Ruby sources.
 
 Features may form the basis for a third-party plugin system in the
 future if there is demand.
@@ -69,8 +70,9 @@ future if there is demand.
 
 Applications that use Bundler[http://gembundler.com/], detected via
 presence of a +Gemfile+, will have the gems packaged up into the war
-file. The .bundle/environment.rb file will be included for you, and
-rewritten to use the paths to the gems inside the war.
+file along with the Gemfile. The Bundler groups named +:development+
+and +:test+ will be excluded by default, unless you specify with
++config.bundle_without+ in +config/warble.rb+.
 
 === Rails applications
 
@@ -90,7 +92,7 @@ dependencies are packaged.
 
 === Other Rack-based applications
 
-If you have a 'config.ru' file in the top directory or one of the
+If you have a +config.ru+ file in the top directory or one of the
 immediate subdirectories of your application, it will be included and
 used as the rackup script for your Rack-based application. You will
 probably need to specify framework and application gems in
@@ -101,16 +103,16 @@ of how to configure Warbler to package Camping and Sinatra apps.
 
 === Configuration auto-detect notes
 
-* Warbler will load the "environment" Rake task in a Rails application
+* Warbler will load the +environment+ Rake task in a Rails application
   to try to detect some configuration. If you don't have database
   access in the environment where you package your application, you
-  may wish to set `Warbler.framework_detection` to false at the top of
+  may wish to set +Warbler.framework_detection+ to false at the top of
   config.rb. In this case you may need to specify additional details
   such as booter, gems and other settings that would normally be
   gleaned from the application configuration.
 * 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.
+  +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.
@@ -155,18 +157,37 @@ customize it in any way, you have two options.
 
 For more information on configuration, see Warbler::Config.
 
-=== Troubleshooting
+== Rakefile integration
+
+If you'd like to control Warbler from your own project's Rakefile,
+simply add the following code somewhere in the Rakefile:
+
+    require 'warbler'
+    Warbler::Task.new
+
+If you're using Bundler, you'll want to add Warbler to your Gemfile:
+
+    group :development do
+      gem "warbler"
+    end
+
+Now you should be able to invoke "rake war" to create your war file.
+
+== Troubleshooting
 
 If Warbler isn't packaging the files you were expecting, use the
-war:debug task to give you more insight into what's going on.
++war:debug+ task to give you more insight into what's going on.
+
+If you think you found a bug, please file one at
+http://kenai.com/jira/browse/WARBLER.
 
 == Source
 
 You can get the Warbler source using Git, in any of the following ways:
 
-   git clone git://kenai.com/warbler~main
    git clone git://git.caldersphere.net/warbler.git
    git clone git://github.com/nicksieger/warbler.git
+   git clone git://kenai.com/warbler~main
 
 You can also download a tarball of Warbler source at
 http://github.com/nicksieger/warbler/tree/master.

data/Rakefile

@@ -6,8 +6,7 @@
 #++
 
 begin
-  require 'bundler'
-  Bundler.setup
+  require 'bundler/setup'
 rescue LoadError
   puts "Please install Bundler and run 'bundle install' to ensure you have all dependencies"
 end
@@ -33,7 +32,7 @@ begin
     p.summary = "Warbler chirpily constructs .war files of your Rails applications."
     p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
     p.description = p.paragraphs_of('README.txt', 1...2).join("\n\n")
-    p.extra_deps += [['rake', '>= 0.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 0.9.8'], ['rubyzip', '>= 0.9.4']]
+    p.extra_deps += [['rake', '>= 0.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 1.0.0'], ['rubyzip', '>= 0.9.4']]
     p.clean_globs += ['spec/sample/MANIFEST*', 'spec/sample/web.xml*']
   end
   hoe.spec.files = MANIFEST

data/lib/warbler.rb

@@ -34,4 +34,3 @@ require 'warbler/config'
 require 'warbler/war'
 require 'warbler/task'
 require 'warbler/application'
-require 'warbler/runtime'

data/lib/warbler/application.rb

@@ -38,6 +38,9 @@ class Warbler::Application < Rake::Application
     desc "Feature: make an executable archive"
     task :executable => "war:executable"
 
+    desc "Feature: precompile all Ruby files"
+    task :compiled => "war:compiled"
+
     desc "Display version of Warbler"
     task :version => "war:version"
   end

data/lib/warbler/config.rb

@@ -19,6 +19,7 @@ module Warbler
     # Currently the following features are supported:
     # - gemjar: package the gem repository in a jar file in WEB-INF/lib
     # - executable: embed a web server and make the war executable
+    # - compiled: compile .rb files to .class files
     attr_accessor :features
 
     # Deprecated: No longer has any effect.
@@ -26,7 +27,7 @@ module Warbler
 
     # Directory where the war file will be written. Can be used to direct
     # Warbler to place your war file directly in your application server's
-    # autodeploy directory. Defaults to the root of the Rails directory.
+    # autodeploy directory. Defaults to the root of the application directory.
     attr_accessor :autodeploy_dir
 
     # Top-level directories to be copied into WEB-INF.  Defaults to
@@ -52,6 +53,10 @@ module Warbler
     # Whether to include dependent gems (default true)
     attr_accessor :gem_dependencies
 
+    # Array of regular expressions matching relative paths in gems to
+    # be excluded from the war. Default contains no exclusions.
+    attr_accessor :gem_excludes
+
     # Whether to exclude **/*.log files (default is true)
     attr_accessor :exclude_logs
 
@@ -77,10 +82,18 @@ module Warbler
     # Use Bundler to locate gems if Gemfile is found. Default is true.
     attr_accessor :bundler
 
+    # An array of Bundler groups to avoid including in the war file.
+    # Defaults to ["development", "test"].
+    attr_accessor :bundle_without
+
     # Path to the pre-bundled gem directory inside the war file. Default is '/WEB-INF/gems'.
     # This also sets 'gem.path' inside web.xml.
     attr_accessor :gem_path
 
+    # List of ruby files to compile to class files. Default is to
+    # compile all .rb files in the application.
+    attr_accessor :compiled_ruby_files
+
     # Extra configuration for web.xml. Controls how the dynamically-generated web.xml
     # file is generated.
     #
@@ -120,18 +133,24 @@ module Warbler
       @gems        = Warbler::Gems.new
       @gem_path    = DEFAULT_GEM_PATH
       @gem_dependencies = true
+      @gem_excludes = []
       @exclude_logs = true
       @public_html = FileList["public/**/*"]
       @pathmaps    = default_pathmaps
       @webxml      = default_webxml_config
-      @rails_root  = File.expand_path(defined?(RAILS_ROOT) ? RAILS_ROOT : Dir.getwd)
+      @rails_root  = default_rails_root
       @war_name    = File.basename(@rails_root)
       @bundler     = true
+      @bundle_without = ["development", "test"]
       @webinf_files = default_webinf_files
+
       auto_detect_frameworks
       yield self if block_given?
       update_gem_path
       detect_bundler_gems
+
+      @compiled_ruby_files ||= FileList[*@dirs.map {|d| "#{d}/**/*.rb"}]
+      @excludes += ["tmp/war"] if File.directory?("tmp/war")
       @excludes += warbler_vendor_excludes(warbler_home)
       @excludes += FileList["**/*.log"] if @exclude_logs
     end
@@ -175,6 +194,10 @@ module Warbler
       c
     end
 
+    def default_rails_root
+      File.expand_path(defined?(Rails.root) ? Rails.root : (defined?(RAILS_ROOT) ? RAILS_ROOT : Dir.getwd))
+    end
+
     def default_webinf_files
       webxml = if File.exist?("config/web.xml")
         "config/web.xml"
@@ -200,26 +223,13 @@ module Warbler
       if @bundler && File.exist?("Gemfile")
         @gems.clear
         @gem_dependencies = false # Bundler takes care of these
-        begin
-          require 'bundler'
-          env = Bundler::Runtime.new(Bundler.root, Bundler.definition)
-          if bundler_env_file = Bundler.respond_to?(:env_file)
-            class << Bundler
-              alias orig_env_file env_file
-              def env_file; root.join(::Warbler::Runtime::WAR_ENV); end
-            end
-          end
-          env.extend Warbler::Runtime
-          env.gem_path = @gem_path
-          env.write_war_environment
-          env.war_specs.each {|spec| @gems << spec }
-        ensure
-          if bundler_env_file
-            class << Bundler
-              alias env_file orig_env_file
-            end
-          end
-        end
+        require 'bundler'
+        gemfile = Pathname.new("Gemfile").expand_path
+        root = gemfile.dirname
+        lockfile = root.join('Gemfile.lock')
+        definition = Bundler::Definition.build(gemfile, lockfile, nil)
+        groups = definition.groups - @bundle_without.map {|g| g.to_sym}
+        definition.specs_for(groups).each {|spec| @gems << spec }
       else
         @bundler = false
       end
@@ -233,16 +243,7 @@ module Warbler
 
     def auto_detect_frameworks
       return unless Warbler.framework_detection
-      if File.exist?(".bundle/environment.rb")
-        begin                     # Don't want Bundler to load from .bundle/environment
-          mv(".bundle/environment.rb",".bundle/environment-save.rb", :verbose => false)
-          auto_detect_rails || auto_detect_merb || auto_detect_rackup
-        ensure
-          mv(".bundle/environment-save.rb",".bundle/environment.rb", :verbose => false)
-        end
-      else
-        auto_detect_rails || auto_detect_merb || auto_detect_rackup
-      end
+      auto_detect_rails || auto_detect_merb || auto_detect_rackup
     end
 
     def auto_detect_rails
@@ -292,7 +293,7 @@ module Warbler
 
   # Helper class for holding arbitrary config.webxml values for injecting into +web.xml+.
   class WebxmlOpenStruct < OpenStruct
-    %w(java com org javax).each {|name| undef_method name if Object.methods.include?(name) }
+    %w(java com org javax gem).each {|name| undef_method name if Object.methods.include?(name) }
 
     def initialize(key = 'webxml')
       @key = key

data/lib/warbler/task.rb

@@ -59,6 +59,7 @@ module Warbler
       define_main_task
       namespace name do
         define_clean_task
+        define_compiled_task
         define_files_task
         define_jar_task
         define_debug_task
@@ -99,6 +100,12 @@ module Warbler
       task "clear" => "#{name}:clean"
     end
 
+    def define_compiled_task
+      task "compiled" do
+        war.compile(config)
+      end
+    end
+
     def define_files_task
       task "files" do
         war.apply(config)

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/warbler/war.rb

@@ -17,6 +17,30 @@ module Warbler
       @files = {}
     end
 
+    def compile(config)
+      # Compiling all Ruby files we can find -- do we need to allow an
+      # option to configure what gets compiled?
+      return if config.compiled_ruby_files.nil? || config.compiled_ruby_files.empty?
+
+      run_javac(config, config.compiled_ruby_files)
+      replace_compiled_ruby_files(config, config.compiled_ruby_files)
+    end
+
+    def run_javac(config, compiled_ruby_files)
+      # Need to use the version of JRuby in the application to compile it
+      %x{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} org.jruby.Main -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
+    end
+
+    def replace_compiled_ruby_files(config, compiled_ruby_files)
+      # Exclude the rb files and recreate them. This
+      # prevents the original contents being used.
+      config.excludes += compiled_ruby_files
+
+      compiled_ruby_files.each do |ruby_source|
+        files[apply_pathmaps(config, ruby_source, :application)] = StringIO.new("require __FILE__.sub(/\.rb$/, '.class')")
+      end
+    end
+
     # Apply the information in a Warbler::Config object in order to
     # look for files to put into this war file.
     def apply(config)
@@ -115,6 +139,7 @@ module Warbler
 
       add_with_pathmaps(config, spec.loaded_from, :gemspecs)
       spec.files.each do |f|
+        next if config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
         src = File.join(spec.full_gem_path, f)
         # some gemspecs may have incorrect file listings
         next unless File.exist?(src)
@@ -139,13 +164,12 @@ module Warbler
       @webinf_filelist.map {|f| add_with_pathmaps(config, f, :application) }
     end
 
-    # Add Bundler Gemfile and .bundle/environment.rb to the war file.
+    # Add Bundler Gemfiles to the war file.
     def add_bundler_files(config)
       if config.bundler
         @files[apply_pathmaps(config, 'Gemfile', :application)] = 'Gemfile'
         if File.exist?('Gemfile.lock')
           @files[apply_pathmaps(config, 'Gemfile.lock', :application)] = 'Gemfile.lock'
-          @files[apply_pathmaps(config, '.bundle/environment.rb', :application)] = '.bundle/war-environment.rb'
         end
       end
     end

data/spec/warbler/task_spec.rb

@@ -29,7 +29,7 @@ describe Warbler::Task do
     rm_rf "log"
     rm_f FileList["config.ru", "*web.xml", "config/web.xml*", "config/warble.rb",
                   "config/special.txt", "config/link.txt", "tmp/gems.jar",
-                  "file.txt", 'Gemfile', 'lib/rakelib']
+                  "file.txt", 'Gemfile', 'lib/rakelib', '**/*.class']
     Dir.chdir(@pwd)
   end
 
@@ -82,6 +82,21 @@ describe Warbler::Task do
     Warbler::Task.new "warble", @config
   end
 
+  it "should compile any ruby files specified" do
+    @config.features << "compiled"
+    silence { Rake::Task["warble"].invoke }
+
+    java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
+
+    Zip::ZipFile.open("#{@config.war_name}.war") do |zf|
+      java_class_header     = zf.get_input_stream('WEB-INF/app/helpers/application_helper.class') {|io| io.read }[0..3]
+      ruby_class_definition = zf.get_input_stream('WEB-INF/app/helpers/application_helper.rb') {|io| io.read }
+
+      java_class_header.should == java_class_magic_number
+      ruby_class_definition.should == %{require __FILE__.sub(/.rb$/, '.class')}
+    end
+  end
+
   it "should process symlinks by storing a file in the archive that has the same contents as the source" do
     File.open("config/special.txt", "wb") {|f| f << "special"}
     Dir.chdir("config") { ln_s "special.txt", "link.txt" }

data/spec/warbler/war_spec.rb

@@ -19,16 +19,18 @@ describe Warbler::War do
       config.war_name = "warbler"
       config.gems = ["rake"]
       config.webxml.jruby.max.runtimes = 5
-    end
+    end rescue nil
     @war = Warbler::War.new
+    @env_save = {}
+    (ENV.keys.grep(/BUNDLE/) + ["RUBYOPT", "GEM_PATH"]).each {|k| @env_save[k] = ENV[k]; ENV[k] = nil}
   end
 
   after(:each) do
-    rm_rf "log"
-    rm_rf ".bundle"
+    rm_rf FileList["log", ".bundle", "tmp/war"]
     rm_f FileList["*.war", "config.ru", "*web.xml*", "config/web.xml*",
-                  "config/warble.rb", "file.txt", 'manifest', 'Gemfile*']
+                  "config/warble.rb", "file.txt", 'manifest', 'Gemfile*', 'MANIFEST.MF*']
     Dir.chdir(@pwd)
+    @env_save.keys.each {|k| ENV[k] = @env_save[k]}
   end
 
   def file_list(regex)
@@ -364,8 +366,20 @@ describe Warbler::War do
     file_list(%r{WEB-INF/notexist}).should be_empty
   end
 
+  it "should exclude Warbler's old tmp/war directory by default" do
+    mkdir_p "tmp/war"
+    touch "tmp/war/index.html"
+    @config = Warbler::Config.new
+    @config.dirs += ["tmp"]
+    @war.apply(@config)
+    file_list(%r{WEB-INF/tmp/war/index\.html}).should be_empty
+  end
+
   it "should write gems to location specified by gem_path" do
-    @config = Warbler::Config.new {|c| c.gem_path = "/WEB-INF/jewels"; c.gems << 'rake' }
+    @config = Warbler::Config.new do |c|
+      c.gem_path = "/WEB-INF/jewels"
+      c.gems << 'rake'
+    end
     elements = expand_webxml
     file_list(%r{WEB-INF/jewels}).should_not be_empty
     elements.to_a(
@@ -379,47 +393,41 @@ describe Warbler::War do
 
   it "should detect a Bundler Gemfile and process only its gems" do
     File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
-    @war.apply(Warbler::Config.new {|c| c.gems << "rake"})
+    @war.apply(conf = Warbler::Config.new {|c| c.gems << "rake"})
     file_list(%r{WEB-INF/Gemfile}).should_not be_empty
     file_list(%r{WEB-INF/gems/specifications/rspec}).should_not be_empty
     file_list(%r{WEB-INF/gems/specifications/rake}).should be_empty
   end
 
-  it "should write a Bundler environment file into the war" do
+  it "should copy Bundler gemfiles into the war" do
     File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
+    File.open("Gemfile.lock", "w") {|f| f << "GEM"}
     @war.apply(Warbler::Config.new)
     file_list(%r{WEB-INF/Gemfile}).should_not be_empty
-    file_list(%r{WEB-INF/Gemfile.lock}).should be_empty
-    file_list(%r{WEB-INF/\.bundle/environment\.rb}).should be_empty
-  end
-
-  it "should only include Bundler lockfiles if Gemfile.lock exists" do
-    File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
-    `ruby -S bundle lock`
-    @war.apply(Warbler::Config.new)
     file_list(%r{WEB-INF/Gemfile.lock}).should_not be_empty
-    file_list(%r{WEB-INF/\.bundle/environment\.rb}).should_not be_empty
   end
 
   it "should allow overriding of the gem path when using Bundler" do
     File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
     @war.apply(Warbler::Config.new {|c| c.gem_path = '/WEB-INF/jewels' })
     file_list(%r{WEB-INF/jewels/specifications/rspec}).should_not be_empty
-    IO.readlines(".bundle/war-environment.rb").grep(/rspec/).last.should =~ %r{jewels/specifications}m
   end
 
-  it "should not let the framework load Bundler from the locked environment" do
-    task :environment do
-      File.exist?('.bundle/environment.rb').should_not be_true
-      mock_rails_module
-    end
+  it "should work with :git entries in Bundler Gemfiles" do
+    File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
+    silence { ruby "-S", "bundle", "install", "--local" }
+    @war.apply(Warbler::Config.new)
+    file_list(%r{WEB-INF/gems/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
+    file_list(%r{WEB-INF/gems/specifications/warbler}).should_not be_empty
+  end
 
-    File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
-    `ruby -S bundle lock`
-    File.exist?('.bundle/environment.rb').should be_true
+  it "should not bundle dependencies in the test group by default when bundling" do
+    File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'rspec'\nend\n"}
     @war.apply(Warbler::Config.new)
-    hash = eval("[" + IO.readlines(".bundle/environment.rb").grep(/rspec/).last + "]").first
-    hash[:load_paths].each {|p| File.exist?(p).should be_true }
+    file_list(%r{WEB-INF/gems/gems/rake[^/]*/}).should_not be_empty
+    file_list(%r{WEB-INF/gems/gems/rspec[^/]*/}).should be_empty
+    file_list(%r{WEB-INF/gems/specifications/rake}).should_not be_empty
+    file_list(%r{WEB-INF/gems/specifications/rspec}).should be_empty
   end
 
   it "should allow adding additional WEB-INF files via config.webinf_files" do
@@ -438,4 +446,10 @@ describe Warbler::War do
     file_list(%r{WEB-INF/myserver-web.xml}).should_not be_empty
     @war.files['WEB-INF/myserver-web.xml'].read.should =~ /web-app.*production/
   end
+
+  it "should exclude test files in gems according to config.gem_excludes" do
+    @config.gem_excludes += [/^(test|spec)\//]
+    @war.apply(@config)
+    file_list(%r{WEB-INF/gems/gems/rake([^/]+)/test/test_rake.rb}).should be_empty
+  end
 end

data/warble.rb

@@ -43,6 +43,10 @@ Warbler::Config.new do |config|
   # functionality, uncomment here.
   # config.bundler = false
 
+  # An array of Bundler groups to avoid including in the war file.
+  # Defaults to ["development", "test"].
+  # config.bundle_without = []
+
   # Files for WEB-INF directory (next to web.xml). This contains
   # web.xml by default. If there is an .erb-File it will be processed
   # with webxml-config. You may want to exclude this file via
@@ -69,10 +73,15 @@ Warbler::Config.new do |config|
   # config.gems << /^merb-/
   # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
 
-  # Include gem dependencies not mentioned specifically. Default is true, uncomment
-  # to turn off.
+  # Include gem dependencies not mentioned specifically. Default is
+  # true, uncomment to turn off.
   # config.gem_dependencies = false
 
+  # Array of regular expressions matching relative paths in gems to be
+  # excluded from the war. Defaults to empty, but you can set it like
+  # below, which excludes test files.
+  # config.gem_excludes = [/^(test|spec)\//]
+
   # Files to be included in the root of the webapp.  Note that files in public
   # will have the leading 'public/' part of the path stripped during staging.
   # config.public_html = FileList["public/**/*", "doc/**/*"]
@@ -87,10 +96,15 @@ Warbler::Config.new do |config|
   # of RAILS_ROOT
   # config.war_name = "mywar"
 
-  # Name of the MANIFEST.MF template for the war file. Defaults to the
-  # MANIFEST.MF normally generated by `jar cf`.
+  # Name of the MANIFEST.MF template for the war file. Defaults to a simple
+  # MANIFEST.MF that contains the version of Warbler used to create the war file.
   # config.manifest_file = "config/MANIFEST.MF"
 
+  # When using the 'compiled' feature and specified, only these Ruby
+  # files will be compiled. Default is to compile all \.rb files in
+  # the application.
+  # config.compiled_ruby_files = FileList['app/**/*.rb']
+
   # Value of RAILS_ENV for the webapp -- default as shown below
   # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
 

metadata

@@ -3,90 +3,95 @@ name: warbler
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+    - 1
+    - 2
+    - 0
+  version: 1.2.0
 platform: ruby
 authors: 
-- Nick Sieger
+  - Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -05:00
+date: 2010-08-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  prerelease: false
-  type: :runtime
-  name: rake
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  prerelease: false
-  type: :runtime
-  name: jruby-jars
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  prerelease: false
-  type: :runtime
-  name: jruby-rack
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  prerelease: false
-  type: :runtime
-  name: rubyzip
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  prerelease: false
-  type: :development
-  name: rubyforge
-  version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 8
+              - 7
+            version: 0.8.7
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jruby-jars
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 4
+              - 0
+            version: 1.4.0
+    requirement: *id002
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jruby-rack
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
+            version: 1.0.0
+    requirement: *id003
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: rubyzip
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 9
+              - 4
+            version: 0.9.4
+    requirement: *id004
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: rubyforge
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 4
+            version: 2.0.4
+    requirement: *id005
+    prerelease: false
+    type: :development
 description: |-
   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
@@ -94,92 +99,94 @@ description: |-
   server.
 email: nick@nicksieger.com
 executables: 
-- warble
+  - warble
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
 files: 
-- Gemfile
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- bin/warble
-- ext/Main.java
-- ext/WarblerWar.java
-- ext/WarblerWarService.java
-- lib/warbler.rb
-- lib/warbler/application.rb
-- lib/warbler/config.rb
-- lib/warbler/gems.rb
-- lib/warbler/runtime.rb
-- lib/warbler/task.rb
-- lib/warbler/version.rb
-- lib/warbler/war.rb
-- lib/warbler_war.jar
-- 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
-- spec/spec_helper.rb
-- spec/warbler/application_spec.rb
-- spec/warbler/config_spec.rb
-- spec/warbler/gems_spec.rb
-- spec/warbler/task_spec.rb
-- spec/warbler/war_spec.rb
-- warble.rb
-- web.xml.erb
+  - Gemfile
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
+  - Rakefile
+  - bin/warble
+  - ext/Main.java
+  - ext/WarblerWar.java
+  - ext/WarblerWarService.java
+  - lib/warbler.rb
+  - lib/warbler/application.rb
+  - lib/warbler/config.rb
+  - lib/warbler/gems.rb
+  - lib/warbler/task.rb
+  - lib/warbler/version.rb
+  - lib/warbler/war.rb
+  - lib/warbler_war.jar
+  - 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
+  - spec/spec_helper.rb
+  - spec/warbler/application_spec.rb
+  - spec/warbler/config_spec.rb
+  - spec/warbler/gems_spec.rb
+  - spec/warbler/task_spec.rb
+  - spec/warbler/war_spec.rb
+  - warble.rb
+  - web.xml.erb
 has_rdoc: true
 homepage: http://caldersphere.rubyforge.org/warbler
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
-- -SHN
-- -f
-- darkfish
+  - --main
+  - README.txt
+  - -SHN
+  - -f
+  - darkfish
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Warbler chirpily constructs .war files of your Rails applications.

data/lib/warbler/runtime.rb

@@ -1,44 +0,0 @@
-module Warbler
-  # Extension module for a Bundler::Runtime instance, to add methods
-  # to create a Bundler environment file specific to war packaging.
-  module Runtime
-    WAR_ENV = ".bundle/war-environment.rb"
-
-    attr_writer :gem_path
-    def gem_path
-      @gem_path || Config::DEFAULT_GEM_PATH
-    end
-
-    class Spec
-      def initialize(spec, gem_path)
-        location = spec[:loaded_from][%r{(.*)/specifications}, 1]
-        spec = spec.dup
-        spec[:loaded_from] = spec[:loaded_from].sub(location, gem_path)
-        spec[:load_paths] = spec[:load_paths].map {|p| p.sub(location, gem_path)}
-        @spec = spec
-      end
-
-      def inspect
-        str = @spec.inspect
-        str.gsub(%r'"/WEB-INF(/[^"]*)"', 'File.expand_path("../..\1", __FILE__)')
-      end
-    end
-
-    # deprecated; compatibility with Bundler <= 0.9.14
-    def rb_lock_file            #:nocov:
-      root.join(WAR_ENV)        #:nocov:
-    end                         #:nocov:
-
-    def specs_for_lock_file
-      super.map {|s| Spec.new(s, gem_path)}
-    end
-
-    def write_war_environment
-      write_rb_lock
-    end
-
-    def war_specs
-      respond_to?(:requested_specs) ? requested_specs : specs_for
-    end
-  end
-end