Support bundle_without and default to excluding 'development' and 'test'

lib/warbler/config.rb

@@ -77,6 +77,10 @@ class Config
     # 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
@@ -130,6 +134,7 @@ def initialize(warbler_home = WARBLER_HOME)
       @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
@@ -215,8 +220,8 @@ def detect_bundler_gems
         root = gemfile.dirname
         lockfile = root.join('Gemfile.lock')
         definition = Bundler::Definition.build(gemfile, lockfile, nil)
-        env = Bundler::Runtime.new(root, definition)
-        env.requested_specs.each {|spec| @gems << spec }
+        groups = definition.groups - @bundle_without.map {|g| g.to_sym}
+        definition.specs_for(groups).each {|spec| @gems << spec }
       else
         @bundler = false
       end

spec/warbler/war_spec.rb

@@ -413,6 +413,15 @@ class << t; public :instance_variable_get; end
     file_list(%r{WEB-INF/gems/specifications/warbler}).should_not be_empty
   end
 
+  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)
+    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
     File.open("myserver-web.xml", "w") do |f|
       f << "<web-app></web-app>"

warble.rb

@@ -43,6 +43,10 @@
   # 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