warbler 1.3.0.beta1 → 1.3.0

data/spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rake}
+  s.version = "0.8.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jim Weirich"]
+  s.date = %q{2009-05-14}
+  s.description = %q{Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.}
+  s.email = %q{jim@weirichhouse.org}
+  s.executables = ["rake"]
+  s.extra_rdoc_files = ["README", "MIT-LICENSE", "TODO", "CHANGES", "doc/command_line_usage.rdoc", "doc/glossary.rdoc", "doc/proto_rake.rdoc", "doc/rakefile.rdoc", "doc/rational.rdoc", "doc/release_notes/rake-0.4.14.rdoc", "doc/release_notes/rake-0.4.15.rdoc", "doc/release_notes/rake-0.5.0.rdoc", "doc/release_notes/rake-0.5.3.rdoc", "doc/release_notes/rake-0.5.4.rdoc", "doc/release_notes/rake-0.6.0.rdoc", "doc/release_notes/rake-0.7.0.rdoc", "doc/release_notes/rake-0.7.1.rdoc", "doc/release_notes/rake-0.7.2.rdoc", "doc/release_notes/rake-0.7.3.rdoc", "doc/release_notes/rake-0.8.0.rdoc", "doc/release_notes/rake-0.8.2.rdoc", "doc/release_notes/rake-0.8.3.rdoc", "doc/release_notes/rake-0.8.4.rdoc", "doc/release_notes/rake-0.8.5.rdoc", "doc/release_notes/rake-0.8.6.rdoc", "doc/release_notes/rake-0.8.7.rdoc"]
+  s.files = ["bin/rake", "README", "MIT-LICENSE", "TODO", "CHANGES", "doc/command_line_usage.rdoc", "doc/glossary.rdoc", "doc/proto_rake.rdoc", "doc/rakefile.rdoc", "doc/rational.rdoc", "doc/release_notes/rake-0.4.14.rdoc", "doc/release_notes/rake-0.4.15.rdoc", "doc/release_notes/rake-0.5.0.rdoc", "doc/release_notes/rake-0.5.3.rdoc", "doc/release_notes/rake-0.5.4.rdoc", "doc/release_notes/rake-0.6.0.rdoc", "doc/release_notes/rake-0.7.0.rdoc", "doc/release_notes/rake-0.7.1.rdoc", "doc/release_notes/rake-0.7.2.rdoc", "doc/release_notes/rake-0.7.3.rdoc", "doc/release_notes/rake-0.8.0.rdoc", "doc/release_notes/rake-0.8.2.rdoc", "doc/release_notes/rake-0.8.3.rdoc", "doc/release_notes/rake-0.8.4.rdoc", "doc/release_notes/rake-0.8.5.rdoc", "doc/release_notes/rake-0.8.6.rdoc", "doc/release_notes/rake-0.8.7.rdoc"]
+  s.homepage = %q{http://rake.rubyforge.org}
+  s.rdoc_options = ["--line-numbers", "--main", "README", "--title", "Rake -- Ruby Make"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rake}
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Ruby based make-like utility.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/spec/sample_jar/sample_jar.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Sieger"]
   s.date = %q{2010-11-03}
-  s.default_executable = %q{sample_jar}
   s.description = %q{Sample jar application for Warbler specs.}
   s.email = ["nick@nicksieger.com"]
   s.executables = ["sample_jar"]

data/spec/sample_war/config/environments/production.rb

@@ -20,3 +20,6 @@ config.action_view.cache_template_loading            = true
 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
+
+# Uncomment to activate MT-safe Rails
+# config.threadsafe!

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
@@ -36,12 +36,13 @@ end
 module Spec::Example::ExampleGroupMethods
   def run_in_directory(dir)
     before :each do
-      @pwd = Dir.getwd
+      (@pwd ||= []) << Dir.getwd
+      Dir.chdir(@pwd.first) # let directory always be relative to project root
       Dir.chdir(dir)
     end
 
     after :each do
-      Dir.chdir(@pwd)
+      Dir.chdir(@pwd.pop)
     end
   end
 
@@ -56,7 +57,7 @@ module Spec::Example::ExampleGroupMethods
   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}
+      (ENV.keys.grep(/BUNDLE/) + ["RUBYOPT"]).each {|k| @env_save[k] = ENV[k]; ENV.delete(k)}
     end
 
     after(:each) do
@@ -68,7 +69,33 @@ module Spec::Example::ExampleGroupMethods
     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']
+                    "file.txt", 'manifest', '*Gemfile*', 'MANIFEST.MF*', 'init.rb*', '**/*.class']
+    end
+  end
+
+  def run_out_of_process_with_drb
+    before :all do
+      require 'drb'
+      DRb.start_service
+      @orig_dir = Dir.pwd
+    end
+
+    let(:drbclient) do
+      drb
+      DRbObject.new(nil, 'druby://127.0.0.1:7890').tap do |drbclient|
+        loop { (drbclient.alive? && break) rescue nil }
+      end
+    end
+
+    let(:drb) do
+      Thread.new do
+        ruby "-I#{Warbler::WARBLER_HOME}/lib", File.join(@orig_dir, 'spec/drb_helper.rb')
+      end
+    end
+
+    after :each do
+      drbclient.stop
+      drb.join
     end
   end
 end

data/spec/warbler/application_spec.rb

@@ -1,11 +1,11 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Application do
   run_in_directory "spec/sample_war"
@@ -84,3 +84,12 @@ describe Warbler::Application do
     Warbler::Application.new.load_project_rakefile
   end
 end
+
+describe Warbler::Application do
+  it "should report Warbler version with --version" do
+    ruby = File.join Config::CONFIG['bindir'], 'ruby'
+    output = `#{ruby} -rubygems -Ilib -S bin/warble --version`.chomp
+    output.should =~ /warbler/i
+    output.should =~ /#{Warbler::VERSION}/
+  end
+end

data/spec/warbler/bundler_spec.rb

@@ -0,0 +1,136 @@
+#--
+# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2007-2009 Sun Microsystems, Inc.
+# This source code is available under the MIT license.
+# See the file LICENSE.txt for details.
+#++
+
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe Warbler::Jar, "with Bundler" do
+  use_fresh_rake_application
+  use_fresh_environment
+  run_out_of_process_with_drb
+
+  def file_list(regex)
+    jar.files.keys.select {|f| f =~ regex }
+  end
+
+  def use_config(&block)
+    @extra_config = block
+  end
+
+  let(:config) { drbclient.config(@extra_config) }
+  let(:jar) { drbclient.jar }
+
+  context "in a war project" do
+    run_in_directory "spec/sample_war"
+    cleanup_temp_files
+
+    before :each do
+      File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
+    end
+
+    it "detects a Bundler trait" do
+      config.traits.should include(Warbler::Traits::Bundler)
+    end
+
+    it "detects a Gemfile and process only its gems" do
+      use_config do |config|
+        config.gems << "rake"
+      end
+      jar.apply(config)
+      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 "copies Gemfiles into the war" do
+      File.open("Gemfile.lock", "w") {|f| f << "GEM"}
+      jar.apply(config)
+      file_list(%r{WEB-INF/Gemfile}).should_not be_empty
+      file_list(%r{WEB-INF/Gemfile.lock}).should_not be_empty
+    end
+
+    it "allows overriding of the gem path when using Bundler" do
+      use_config do |config|
+        config.gem_path = '/WEB-INF/jewels'
+      end
+      jar.apply(config)
+      file_list(%r{WEB-INF/jewels/specifications/rspec}).should_not be_empty
+    end
+
+    it "works with :git entries in Gemfiles" do
+      File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
+      silence { ruby "-S", "bundle", "install", "--local" }
+      jar.apply(config)
+      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
+      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+    end
+
+    it "does not work with :path entries in Gemfiles" do
+      File.open("Gemfile", "w") {|f| f << "gem 'warbler', :path => '#{Warbler::WARBLER_HOME}'\n"}
+      silence do
+        ruby "-S", "bundle", "install", "--local"
+        jar.apply(config)
+      end
+      file_list(%r{warbler}).should be_empty
+    end
+
+    it "does not bundle dependencies in the test group by default" do
+      File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'rspec'\nend\n"}
+      jar.apply(config)
+      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 "adds BUNDLE_WITHOUT to init.rb" do
+      jar.add_init_file(config)
+      contents = jar.contents('META-INF/init.rb')
+      contents.should =~ /ENV\['BUNDLE_WITHOUT'\]/
+      contents.should =~ /'development:test'/
+    end
+
+    it "uses ENV['BUNDLE_GEMFILE'] if set" do
+      mv "Gemfile", "Special-Gemfile"
+      ENV['BUNDLE_GEMFILE'] = "Special-Gemfile"
+      config.traits.should include(Warbler::Traits::Bundler)
+    end
+  end
+
+  context "in a jar project" do
+    run_in_directory "spec/sample_jar"
+    cleanup_temp_files
+
+    it "works with :git entries in Gemfiles" do
+      File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
+      silence { ruby "-S", "bundle", "install", "--local" }
+      jar.apply(config)
+      file_list(%r{^bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
+      file_list(%r{^bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+    end
+  end
+
+  context "when frozen" do
+    run_in_directory "spec/sample_bundler"
+
+    it "includes the bundler gem" do
+      jar.apply(config)
+      config.gems.detect{|k,v| k.name == 'bundler'}.should_not be_nil
+      file_list(/bundler-/).should_not be_empty
+    end
+
+    it "does not include the bundler cache directory" do
+      jar.apply(config)
+      file_list(%r{vendor/bundle}).should be_empty
+    end
+
+    it "includes ENV['BUNDLE_FROZEN'] in init.rb" do
+      jar.apply(config)
+      contents = jar.contents('META-INF/init.rb')
+      contents.split("\n").grep(/ENV\['BUNDLE_FROZEN'\] = '1'/).should_not be_empty
+    end
+  end
+end

data/spec/warbler/config_spec.rb

@@ -1,11 +1,11 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Config do
   before :each do

data/spec/warbler/gems_spec.rb

@@ -1,11 +1,11 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Gems do
   it "should accept a hash for initialization" do

data/spec/warbler/jar_spec.rb

@@ -1,10 +1,11 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Jar do
   use_fresh_rake_application
@@ -50,10 +51,16 @@ describe Warbler::Jar do
 
     it "requires 'rubygems' in init.rb" do
       jar.add_init_file(config)
-      contents = jar.files['META-INF/init.rb'].read
+      contents = jar.contents('META-INF/init.rb')
       contents.split("\n").grep(/require 'rubygems'/).should_not be_empty
     end
 
+    it "adds ENV['GEM_HOME'] to init.rb" do
+      jar.add_init_file(config)
+      contents = jar.contents('META-INF/init.rb')
+      contents.should =~ /ENV\['GEM_HOME'\]/
+    end
+
     it "adds a main.rb" do
       jar.apply(config)
       file_list(%r{^META-INF/main.rb$}).should_not be_empty
@@ -91,23 +98,15 @@ describe Warbler::Jar do
         file_list(%r{^specifications/rubyzip.*\.gemspec}).should_not be_empty
       end
 
-      it "sets files to be stored in the archive from the spec" do
-        touch "extra.foobar"
-        jar.apply(config)
-        file_list(%r{^sample_jar/History\.txt$}).should_not be_empty
-        file_list(%r{^sample_jar/lib/sample_jar\.rb$}).should_not be_empty
-        file_list(%r{^sample_jar/extra\.foobar$}).should be_empty
-      end
-
       it "sets load paths in init.rb" do
         jar.add_init_file(config)
-        contents = jar.files['META-INF/init.rb'].read
+        contents = jar.contents('META-INF/init.rb')
         contents.split("\n").grep(/LOAD_PATH\.unshift.*sample_jar\/lib/).should_not be_empty
       end
 
       it "loads the default executable in main.rb" do
         jar.apply(config)
-        contents = jar.files['META-INF/main.rb'].read
+        contents = jar.contents('META-INF/main.rb')
         contents.split("\n").grep(/load.*sample_jar\/bin\/sample_jar/).should_not be_empty
       end
 
@@ -116,21 +115,7 @@ describe Warbler::Jar do
         jar.compile(config)
         jar.apply(config)
         file_list(%r{^sample_jar/lib/sample_jar\.class$}).should_not be_empty
-        jar.files['sample_jar/lib/sample_jar.rb'].read.should =~ /require __FILE__\.sub/
-      end
-
-      context "and a missing file" do
-        before :each do
-          mv "Rakefile", "Rakefile.tmp"
-        end
-
-        after :each do
-          mv "Rakefile.tmp", "Rakefile"
-        end
-
-        it "should warn about the missing file but still continue" do
-          capture { jar.apply(config) }.should =~ /Rakefile/
-        end
+        jar.contents('sample_jar/lib/sample_jar.rb').should =~ /require __FILE__\.sub/
       end
     end
 
@@ -154,7 +139,7 @@ describe Warbler::Jar do
 
       it "loads the first bin/executable in main.rb" do
         silence { jar.apply(config) }
-        contents = jar.files['META-INF/main.rb'].read
+        contents = jar.contents('META-INF/main.rb')
         contents.split("\n").grep(/load.*sample_jar\/bin\/sample_jar/).should_not be_empty
       end
     end
@@ -192,13 +177,13 @@ describe Warbler::Jar do
 
       it "sets load paths in init.rb" do
         jar.add_init_file(config)
-        contents = jar.files['META-INF/init.rb'].read
+        contents = jar.contents('META-INF/init.rb')
         contents.split("\n").grep(/LOAD_PATH\.unshift.*sample_jar\/lib/).should_not be_empty
       end
 
       it "loads the first bin/executable in main.rb" do
         jar.apply(config)
-        contents = jar.files['META-INF/main.rb'].read
+        contents = jar.contents('META-INF/main.rb')
         contents.split("\n").grep(/load.*sample_jar\/bin\/sample_jar/).should_not be_empty
       end
     end
@@ -231,6 +216,13 @@ describe Warbler::Jar do
       file_list(%r{WEB-INF/gems/specifications/rake.*\.gemspec}).should_not be_empty
     end
 
+    it "adds ENV['GEM_HOME'] to init.rb" do
+      jar.add_init_file(config)
+      contents = jar.contents('META-INF/init.rb')
+      contents.should =~ /ENV\['GEM_HOME'\]/
+      contents.should =~ /WEB-INF\/gems/
+    end
+
     it "does not include log files by default" do
       jar.apply(config)
       file_list(%r{WEB-INF/log}).should_not be_empty
@@ -368,6 +360,14 @@ describe Warbler::Jar do
       file_list(%r{lib/tasks/utils.rake}).should be_empty
     end
 
+    it "can exclude public files from the .war" do
+      use_config do |config|
+        config.excludes += FileList['public/robots.txt']
+      end
+      jar.apply(config)
+      file_list(%r{robots.txt}).should be_empty
+    end
+
     it "reads configuration from #{Warbler::Config::FILE}" do
       mkdir_p "config"
       File.open(Warbler::Config::FILE, "w") do |dest|
@@ -394,6 +394,7 @@ describe Warbler::Jar do
 
     it "allows specification of dependency by Gem::Dependency" do
       spec = mock "gem spec"
+      spec.stub!(:name).and_return "hpricot"
       spec.stub!(:full_name).and_return "hpricot-0.6.157"
       spec.stub!(:full_gem_path).and_return "hpricot-0.6.157"
       spec.stub!(:loaded_from).and_return "hpricot.gemspec"
@@ -406,7 +407,7 @@ describe Warbler::Jar do
       use_config do |config|
         config.gems = [Gem::Dependency.new("hpricot", "> 0.6")]
       end
-      jar.apply(config)
+      silence { jar.apply(config) }
     end
 
     it "copies loose java classes to WEB-INF/classes" do
@@ -493,17 +494,30 @@ describe Warbler::Jar do
         config.gems.keys.should include(Gem::Dependency.new("hpricot", Gem::Requirement.new("=0.6")))
       end
 
-      it "sets the jruby max runtimes to 1 when MT Rails is detected" do
-        task :environment do
-          config = mock "config"
-          @rails.stub!(:configuration).and_return(config)
-          config.stub!(:threadsafe!)
-          config.should_receive(:allow_concurrency).and_return true
-          config.should_receive(:preload_frameworks).and_return true
+      context "with threadsafe! enabled" do
+        before :each do
+          cp "config/environments/production.rb", "config/environments/production.rb.orig"
+          File.open("config/environments/production.rb", "a") {|f| f.puts "", "config.threadsafe!" }
         end
 
-        config.webxml.booter.should == :rails
-        config.webxml.jruby.max.runtimes.should == 1
+        after :each do
+          mv "config/environments/production.rb.orig", "config/environments/production.rb"
+        end
+
+        it "sets the jruby min and max runtimes to 1" do
+          config.webxml.booter.should == :rails
+          config.webxml.jruby.min.runtimes.should == 1
+          config.webxml.jruby.max.runtimes.should == 1
+        end
+
+        it "doesn't override already configured runtime numbers" do
+          use_config do |config|
+            config.webxml.jruby.min.runtimes = 2
+            config.webxml.jruby.max.runtimes = 2
+          end
+          config.webxml.jruby.min.runtimes.should == 2
+          config.webxml.jruby.max.runtimes.should == 2
+        end
       end
 
       it "adds RAILS_ENV to init.rb" do
@@ -511,7 +525,7 @@ describe Warbler::Jar do
           config.webxml.booter = :rails
         end
         jar.add_init_file(config)
-        contents = jar.files['META-INF/init.rb'].read
+        contents = jar.contents('META-INF/init.rb')
         contents.should =~ /ENV\['RAILS_ENV'\]/
         contents.should =~ /'production'/
       end
@@ -537,12 +551,12 @@ describe Warbler::Jar do
         merb.const_set("BootLoader", boot_loader)
         merb.const_set("VERSION", "1.0")
         dependencies = Class.new do
-          @@dependencies = []
+          @dependencies = []
           def self.dependencies
-            @@dependencies
+            @dependencies
           end
           def self.dependencies=(deps)
-            @@dependencies = deps
+            @dependencies = deps
           end
         end
         boot_loader.const_set("Dependencies", dependencies)
@@ -599,71 +613,12 @@ describe Warbler::Jar do
 
       it "adds RACK_ENV to init.rb" do
         jar.add_init_file(config)
-        contents = jar.files['META-INF/init.rb'].read
+        contents = jar.contents('META-INF/init.rb')
         contents.should =~ /ENV\['RACK_ENV'\]/
         contents.should =~ /'production'/
       end
     end
 
-    context "with Bundler" do
-      before :each do
-        File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
-      end
-
-      it "detects a Bundler trait" do
-        config.traits.should include(Warbler::Traits::Bundler)
-      end
-
-      it "detects a Bundler Gemfile and process only its gems" do
-        use_config do |config|
-          config.gems << "rake"
-        end
-        jar.apply(config)
-        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 "copies Bundler gemfiles into the war" do
-        File.open("Gemfile.lock", "w") {|f| f << "GEM"}
-        jar.apply(config)
-        file_list(%r{WEB-INF/Gemfile}).should_not be_empty
-        file_list(%r{WEB-INF/Gemfile.lock}).should_not be_empty
-      end
-
-      it "allows overriding of the gem path when using Bundler" do
-        use_config do |config|
-          config.gem_path = '/WEB-INF/jewels'
-        end
-        jar.apply(config)
-        file_list(%r{WEB-INF/jewels/specifications/rspec}).should_not be_empty
-      end
-
-      it "works 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" }
-        jar.apply(config)
-        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
-
-      it "does not bundle dependencies in the test group by default" do
-        File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'rspec'\nend\n"}
-        jar.apply(config)
-        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 "adds BUNDLE_WITHOUT to init.rb" do
-        jar.add_init_file(config)
-        contents = jar.files['META-INF/init.rb'].read
-        contents.should =~ /ENV\['BUNDLE_WITHOUT'\]/
-        contents.should =~ /'development:test'/
-      end
-    end
-
     it "skips directories that don't exist in config.dirs and print a warning" do
       use_config do |config|
         config.dirs = %w(lib notexist)
@@ -718,7 +673,7 @@ describe Warbler::Jar do
       end
       jar.apply(config)
       file_list(%r{WEB-INF/myserver-web.xml}).should_not be_empty
-      jar.files['WEB-INF/myserver-web.xml'].read.should =~ /web-app.*production/
+      jar.contents('WEB-INF/myserver-web.xml').should =~ /web-app.*production/
     end
 
     it "excludes test files in gems according to config.gem_excludes" do
@@ -747,7 +702,7 @@ describe Warbler::Jar do
         config.init_contents << "Rakefile"
       end
       jar.add_init_file(config)
-      contents = jar.files['META-INF/init.rb'].read
+      contents = jar.contents('META-INF/init.rb')
       contents.should =~ /require 'rake'/
     end
 
@@ -756,7 +711,7 @@ describe Warbler::Jar do
         config.webxml.dummy = '<dummy/>'
       end
       jar.apply(config)
-      jar.files['META-INF/init.rb'].read.should =~ /<dummy\/>/
+      jar.contents('META-INF/init.rb').should =~ /<dummy\/>/
     end
   end
 end