warbler 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adcf60dd9c5beca381437bfffd9daeb02ec4f6fb
-  data.tar.gz: d83655891a2cf7374b5a2ba9a78ce42c0c97553f
+  metadata.gz: 376781bdadb7244aa3c5922f98c1b1025f40c9c0
+  data.tar.gz: 1770365dde33c4c23d2a381357c751bc8deded5e
 SHA512:
-  metadata.gz: 072c00735322852bcd2dbabdd9d49c5d0c7730be4900799011d480a99e02ece106d1b77f288d68bee868d2f6aba162d6c6c5beeaf0c3dfa82165e0870dde76da
-  data.tar.gz: 8f7e1cd06ffc11a0d337aee62a3c6474e97189ec1bc14277e16fd8e196470ae3316f5d8395b8ef38f07119ae1f2ee60d75cf194c1c7a2b857c45a0460cb09791
+  metadata.gz: 7c1433a950c083cd92bfee72dd3476be179d96cff5e371eabb339cedfbcffd2de8d9567effd63ab4e483e465ea03fa2c77411215c159e37379a4b7aaa997e5a8
+  data.tar.gz: 68cca194a69ffc051afce73800d58460373af2e2d0ee7ce629a4b5d635db84781d6f50ab82cb575aaa2ee89b898aeb1574b2f75a4fffccd0ca9ec27a38bc4186

data/.travis.yml

@@ -1,28 +1,38 @@
+sudo: false
+language: ruby
+script: bundle exec rake spec
 rvm:
   - jruby-1.7.8
 branches:
   only:
     - master
     - 2.x-dev
+    - /^test-.*/
+before_install:
+  - ([ "$BUNDLER_VERSION" ] && gem uninstall bundler --all --force && gem install bundler -v "$BUNDLER_VERSION") || true
+  - bundle --version
+before_script:
+  - export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
 env:
-  - JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-  - JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+  - JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.7.9"
+  - JRUBY_OPTS="--1.9" BUNDLER_VERSION="~> 1.8.9"
 matrix:
   include:
     - rvm: jruby-head
-      env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-    - rvm: jruby-1.7.19
-      env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.9.9"
+    - rvm: jruby-1.7.20
+      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.10.2"
     - rvm: 1.8.7
-      env: ''
+      env: BUNDLER_VERSION="~> 1.6.9"
     - rvm: 1.9.2
-      env: ''
+      env: BUNDLER_VERSION="~> 1.7.9"
     - rvm: 1.9.3
-      env: ''
+      env: BUNDLER_VERSION="~> 1.8.9"
     - rvm: jruby
       env: MAVEN_OPTS="-XX:MaxPermSize=128m"
       script: mvn clean verify
   allow_failures:
+    - rvm: jruby
     - rvm: jruby-head
 notifications:
   irc:
@@ -32,7 +42,3 @@ notifications:
     on_failure: always
     template:
       - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
-before_install:
-  - sudo apt-get update && sudo apt-get install git
-  - git fetch --unshallow
-  - gem install bundler --pre

data/History.txt

@@ -1,5 +1,8 @@
 == Master
 
+
+== 1.4.7
+
 - Added the ability to set custom port for Jetty launcher with
   warbler.port or PORT env var
 

data/Rakefile

@@ -6,15 +6,15 @@
 # See the file LICENSE.txt for details.
 #++
 
-unless defined? Bundler
-  warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies and run inside a bundler context 'bundle exec rake'.\n\n"
+begin
+  require 'bundler'
+rescue LoadError
+  warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies.\n\n"
+else
+  require 'bundler/gem_helper'
+  Bundler::GemHelper.install_tasks :dir => File.dirname(__FILE__)
 end
 
-require 'bundler/gem_helper'
-gem_helper = Bundler::GemHelper.new(File.dirname(__FILE__))
-gem_helper.install
-gemspec = gem_helper.gemspec
-
 require 'rake/clean'
 CLEAN << "pkg" << "doc" << Dir['integration/**/target']
 
@@ -42,8 +42,13 @@ end
 # the jar tasks is part of maven-tasks
 task :build => :jar
 
+load_gemspec = lambda do
+  Gem::Specification.load(File.expand_path('warbler.gemspec', File.dirname(__FILE__)))
+end
+
 require 'rdoc/task'
 RDoc::Task.new(:docs) do |rd|
+  gemspec = load_gemspec.call
   rd.rdoc_dir = "doc"
   rd.rdoc_files.include("README.rdoc", "History.txt", "LICENSE.txt")
   rd.rdoc_files += gemspec.require_paths
@@ -54,6 +59,7 @@ end
 task :release_docs => :docs do
   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml"))) rescue nil
   if config
+    gemspec = load_gemspec.call
     dir  = "/var/www/gforge-projects/#{gemspec.rubyforge_project}/#{gemspec.name}"
     dest = "#{config["username"]}@rubyforge.org:#{dir}"
     sh %{rsync -rl --delete doc/ #{dest}}

data/ext/WarMain.java

@@ -63,6 +63,7 @@ public class WarMain extends JarMain {
     static final String MAIN = "/" + WarMain.class.getName().replace('.', '/') + ".class";
     static final String WEBSERVER_PROPERTIES = "/WEB-INF/webserver.properties";
     static final String WEBSERVER_JAR = "/WEB-INF/webserver.jar";
+    static final String WEBSERVER_CONFIG = "/WEB-INF/webserver.xml";
 
     /**
      *  jruby arguments, consider the following command :
@@ -141,10 +142,14 @@ public class WarMain extends JarMain {
 
         String port = System.getProperty("warbler.port", System.getenv("PORT"));
         port = port == null ? "8080" : port;
+        String webserverConfig = System.getProperty("warbler.webserver_config", System.getenv("WARBLER_WEBSERVER_CONFIG"));
+        String embeddedWebserverConfig = new URI("jar", entryPath(WEBSERVER_CONFIG), null).toURL().toString();
+        webserverConfig = webserverConfig == null ? embeddedWebserverConfig : webserverConfig;
         for (Map.Entry entry : props.entrySet()) {
             String val = (String) entry.getValue();
             val = val.replace("{{warfile}}", archive).
                       replace("{{port}}", port).
+                      replace("{{config}}", webserverConfig).
                       replace("{{webroot}}", webroot.getAbsolutePath());
             entry.setValue(val);
         }

data/ext/WarblerJar.java

@@ -118,16 +118,20 @@ public class WarblerJar {
                     path = value.convertToString().getUnicodeValue();
                 }
 
-                InputStream inFile = getStream(path, null);
                 try {
-                    zip.putNextEntry(new ZipEntry(entryName));
-                    byte[] buf = new byte[16384];
-                    int bytesRead;
-                    while ((bytesRead = inFile.read(buf)) != -1) {
-                        zip.write(buf, 0, bytesRead);
+                    InputStream inFile = getStream(path, null);
+                    try {
+                        zip.putNextEntry(new ZipEntry(entryName));
+                        byte[] buf = new byte[16384];
+                        int bytesRead;
+                        while ((bytesRead = inFile.read(buf)) != -1) {
+                            zip.write(buf, 0, bytesRead);
+                        }
+                    } finally {
+                        close(inFile);
                     }
-                } finally {
-                    close(inFile);
+                } catch (IOException e) {
+                    System.err.println("File not found; " + path + " not in archive");
                 }
             }
         }

data/lib/warbler.rb

@@ -34,6 +34,7 @@ require 'warbler/executable_helper'
 require 'warbler/rake_helper'
 require 'warbler/pathmap_helper'
 require 'warbler/platform_helper'
+require 'warbler/bundler_helper'
 require 'warbler/task'
 require 'warbler/application'
 require 'warbler/web_server'

data/lib/warbler/bundler_helper.rb

@@ -0,0 +1,22 @@
+#--
+# Copyright (c) 2014-2015 JRuby Team
+# This source code is available under the MIT license.
+# See the file LICENSE.txt for details.
+#++
+
+module Warbler
+  module BundlerHelper
+    def to_spec(spec)
+      # JRuby <= 1.7.20 does not handle respond_to? with method_missing right
+      # thus a `spec.respond_to?(:to_spec) ? spec.to_spec : spec` won't do :
+      if ::Bundler.const_defined?(:StubSpecification) # since Bundler 1.10.1
+        spec = spec.to_spec if spec.is_a?(::Bundler::StubSpecification)
+      else
+        spec = spec.to_spec if spec.respond_to?(:to_spec)
+      end
+      spec
+    end
+    module_function :to_spec
+  end
+end
+

data/lib/warbler/gems.rb

@@ -43,16 +43,19 @@ module Warbler
     end
 
     def specs(gem_dependencies)
-      @specs ||= map{|gem, version| find_single_gem_files(gem_dependencies, gem, version) }.flatten.compact
+      @specs ||= map { |gem, version| find_single_gem_files(gem_dependencies, gem, version) }.flatten.compact
     end
 
   private
 
     # Add a single gem to WEB-INF/gems
     def find_single_gem_files(gem_dependencies, gem_pattern, version = nil)
+      gem_spec_class = Gem::Specification
+      gem_spec_class = Gem::BasicSpecification if Gem.const_defined?(:BasicSpecification)
+      # Gem::Specification < Gem::BasicSpecification (since RGs 2.1)
       case gem_pattern
-      when Gem::Specification
-        return gem_pattern
+      when gem_spec_class
+        return BundlerHelper.to_spec(gem_pattern)
       when Gem::Dependency
         gem = gem_pattern
       else
@@ -62,14 +65,11 @@ module Warbler
       return nil if gem.respond_to?(:type) and gem.type != :runtime
 
       # Deal with deprecated Gem.source_index and #search
-      matched = gem.respond_to?(:to_spec) ? [gem.to_spec] : Gem.source_index.search(gem)
+      matched = gem.respond_to?(:to_spec) ? [ gem.to_spec ] : Gem.source_index.search(gem)
       fail "gem '#{gem}' not installed" if matched.empty?
       spec = matched.last
-      if gem_dependencies
-        [spec] + spec.dependencies.map{|gem| find_single_gem_files(gem_dependencies, gem) }
-      else
-        spec
-      end
+      return spec unless gem_dependencies
+      [spec] + spec.dependencies.map { |gem| find_single_gem_files(gem_dependencies, gem) }
     end
 
   end

data/lib/warbler/jar.rb

@@ -290,8 +290,10 @@ module Warbler
             zipfile.mkdir(entry.dup) # in case it's frozen rubyzip 0.9.6.1 workaround
           elsif File.symlink?(src)
             zipfile.get_output_stream(entry) { |f| f << File.read(src) }
-          else
+          elsif File.exist?(src)
             zipfile.add(entry, src)
+          else
+            $stderr.puts "File not found; #{entry.inspect} not in archive"
           end
         end
       end

data/lib/warbler/traits/bundler.rb

@@ -12,6 +12,7 @@ module Warbler
     class Bundler
       include Trait
       include PathmapHelper
+      include BundlerHelper
 
       def self.detect?
         File.exist?(ENV['BUNDLE_GEMFILE'] || "Gemfile")
@@ -37,15 +38,15 @@ module Warbler
         config.bundler = {}
 
         bundler_specs.each do |spec|
+          spec = to_spec(spec)
           # Bundler HAX -- fixup bad #loaded_from attribute in fake
           # bundler gemspec from bundler/source.rb
-          if spec.name == "bundler"
+          if spec.name == 'bundler'
             full_gem_path = Pathname.new(spec.full_gem_path)
-
-            while !full_gem_path.join('bundler.gemspec').exist?
+            while ! full_gem_path.join('bundler.gemspec').exist?
               full_gem_path = full_gem_path.dirname
               # if at top of the path, meaning we cannot find bundler.gemspec, abort.
-              if full_gem_path.to_s=~/^[\.\/]$/
+              if full_gem_path.to_s =~ /^[\.\/]$/
                 $stderr.puts("warning: Unable to detect bundler spec under '#{spec.full_gem_path}'' and is sub-dirs")
                 exit
               end
@@ -139,8 +140,8 @@ module Warbler
         definition = ::Bundler.definition
         all = definition.specs.to_a
         requested = definition.specs_for(definition.groups - bundle_without).to_a
-        excluded_git_specs = (all - requested).select {|spec| ::Bundler::Source::Git === spec.source }
-        excluded_git_specs.each {|spec| spec.groups << :warbler_excluded }
+        excluded_git_specs = (all - requested).select { |spec| ::Bundler::Source::Git === spec.source }
+        excluded_git_specs.each { |spec| spec.groups << :warbler_excluded }
         requested + excluded_git_specs
       end
 

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.7"
+  VERSION = "1.4.8"
 end

data/lib/warbler/web_server.rb

@@ -122,13 +122,23 @@ PROPS
 
     def add(jar)
       super
+      jar.files["WEB-INF/webserver.xml"] ||= StringIO.new(<<-CONFIG)
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+</Configure>
+CONFIG
+
       jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
-args = args0,args1,args2
+args = args0,args1,args2,args3,args4
 props = jetty.home
 args0 = --port
 args1 = {{port}}
-args2 = {{warfile}}
+args2 = --config
+args3 = {{config}}
+args4 = {{warfile}}
 jetty.home = {{webroot}}
 PROPS
     end

data/pom.xml

@@ -4,17 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>warbler</artifactId>
-  <version>1.4.5.dev-SNAPSHOT</version>
+  <version>1.4.8.dev-SNAPSHOT</version>
   <packaging>gem</packaging>
   <name>Warbler chirpily constructs .war files of your Rails applications.</name>
   <description>Warbler is a gem to make a Java jar or war file out of any Ruby,
-Rails, Merb, or Rack application. Warbler provides a minimal,
-flexible, Ruby-like way to bundle up all of your application files for
-deployment to a Java environment.</description>
-  <url>http://caldersphere.rubyforge.org/warbler</url>
+Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way to
+bundle up all of your application files for deployment to a Java environment.</description>
+  <url>https://github.com/jruby/warbler</url>
   <properties>
     <tesla.dump.readOnly>true</tesla.dump.readOnly>
-    <jruby.plugins.version>1.0.0-rc4</jruby.plugins.version>
+    <jruby.plugins.version>1.0.0</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
   </properties>
@@ -34,19 +33,26 @@ deployment to a Java environment.</description>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-rack</artifactId>
-      <version>[1.0.0,)</version>
+      <version>[1.1.1,1.3)</version>
       <type>gem</type>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rubyzip</artifactId>
-      <version>[0.9,1.1)</version>
+      <version>[0.9,1.2)</version>
       <type>gem</type>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>jbundler</artifactId>
+      <version>[0.5.5,0.5.99999]</version>
+      <type>gem</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ruby-maven</artifactId>
-      <version>[3.1.1.0.0,3.1.1.0.0.0.0.0.0.1)</version>
+      <version>[3.1.1.0,3.1.1.99999]</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>

data/spec/spec_helper.rb

@@ -82,6 +82,59 @@ module ExampleGroupHelpers
     end
   end
 
+  def create_git_gem(gem_name)
+    before do
+      @gem_dir = Dir.mktmpdir("#{gem_name}-#{rand(100)}")
+      cur_dir = Dir.pwd
+      Dir.chdir(@gem_dir) do
+        `git init`
+        `git config user.email "warbler-test@null.com"`
+        `git config user.name  "Warbler Test"`
+
+        # create the gemspec and Gemfile
+        File.open("Gemfile", "w") do |f|
+          f << <<-RUBY
+          source "http://rubygems.org/"
+          gemspec
+          RUBY
+        end
+
+        File.open("#{gem_name}.gemspec", "w") do |f|
+          f << <<-RUBY
+          # -*- encoding: utf-8 -*-
+          Gem::Specification.new do |gem|
+            gem.name = "#{gem_name}"
+            gem.version = '1.0'
+            gem.authors = ['John Doe']
+            gem.summary = "Gem for testing"
+            gem.platform = Gem::Platform::RUBY
+            gem.files = `git ls-files`.split("\n")
+            gem.add_runtime_dependency 'rake', [">= 10.4.2"]
+          end
+          RUBY
+        end
+
+        Dir.mkdir("lib")
+        Dir.mkdir("lib/#{gem_name}")
+
+        File.open("lib/#{gem_name}/version.rb", "w") do |f|
+          f << <<-RUBY
+          VERSION = "1.0"
+          RUBY
+        end
+
+        # `bundle install --local`
+        `git add .`
+        `git commit -am "first commit"`
+      end
+      Dir.chdir(cur_dir)
+    end
+
+    after do
+      FileUtils.remove_entry_secure @gem_dir
+    end
+  end
+
   def run_out_of_process_with_drb
     before :all do
       DRb.start_service

data/spec/warbler/bundler_spec.rb

@@ -21,6 +21,10 @@ describe Warbler::Jar, "with Bundler" do
     @extra_config = block
   end
 
+  def bundle_install(*args)
+    `cd #{Dir.pwd} && #{RUBY_EXE} -S bundle install #{args.join(' ')}`
+  end
+
   let(:config) { drbclient.config(@extra_config) }
   let(:jar) { drbclient.jar }
 
@@ -62,47 +66,30 @@ describe Warbler::Jar, "with Bundler" do
     end
 
     context 'with :git entries in the Gemfile' do
-      before do
-        File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
-        `#{RUBY_EXE} -S bundle install --local`
-      end
+      create_git_gem("tester")
 
       it "works with :git entries in Gemfiles" do
+        File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
+        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
+        file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb}).should_not be_empty
+        file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
       end
 
-      it "can run commands in the generated warfile" do
-        use_config do |config|
-          config.features = %w{runnable}
-          config.override_gem_home = false
-        end
+      it "bundles only the gemspec for :git entries that are excluded" do
+        File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'tester', :git => '#{@gem_dir}'\nend\n"}
+        bundle_install '--local'
         jar.apply(config)
-        jar.create('foo.war')
-        if RUBY_VERSION >= '1.9'
-          stdin, stdout, stderr, wait_thr = Open3.popen3('java -jar foo.war -S rake -T')
-          wait_thr.value.success?.should be(true), stderr.readlines.join
-        else
-          `java -jar foo.war -S rake -T`
-          $?.exitstatus.should == 0
-        end
+        file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb}).should be_empty
+        file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
       end
-    end
 
-    it "bundles only the gemspec for :git entries that are excluded" do
-      File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\nend\n"}
-      `#{RUBY_EXE} -S bundle install --local`
-      jar.apply(config)
-      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should 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"}
-      `#{RUBY_EXE} -S bundle install --local`
-      silence { jar.apply(config) }
-      file_list(%r{warbler}).should be_empty
+      it "does not work with :path entries in Gemfiles" do
+        File.open("Gemfile", "w") {|f| f << "gem 'tester', :path => '#{@gem_dir}'\n"}
+        bundle_install '--local'
+        silence { jar.apply(config) }
+        file_list(%r{tester}).should be_empty
+      end
     end
 
     it "does not bundle dependencies in the test group by default" do
@@ -138,19 +125,23 @@ describe Warbler::Jar, "with Bundler" 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"}
-      `#{RUBY_EXE} -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
-      jar.add_init_file(config)
-      contents = jar.contents('META-INF/init.rb')
-      contents.should =~ /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/
+    context 'with :git entries in the Gemfile' do
+      create_git_gem("tester")
+
+      it "works with :git entries in Gemfiles" do
+        File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
+        bundle_install '--local'
+        jar.apply(config)
+        file_list(%r{^bundler/gems/tester[^/]*/lib/tester/version\.rb}).should_not be_empty
+        file_list(%r{^bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
+        jar.add_init_file(config)
+        contents = jar.contents('META-INF/init.rb')
+        contents.should =~ /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/
+      end
     end
 
     it "adds BUNDLE_GEMFILE to init.rb" do
-      File.open("Gemfile", "w") {|f| f << "source :rubygems" }
+      File.open("Gemfile", "w") {|f| f << "source 'http://rubygems.org/'" }
       jar.add_init_file(config)
       contents = jar.contents('META-INF/init.rb')
       contents.should =~ /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/
@@ -176,13 +167,55 @@ describe Warbler::Jar, "with Bundler" do
       contents = jar.contents('META-INF/init.rb')
       contents.split("\n").grep(/ENV\['BUNDLE_FROZEN'\] = '1'/).should_not be_empty
     end
+
+    context "with the runnable feature" do
+      before do
+        File.open("Rakefile", "w") do |f|
+          f << <<-RUBY
+          task :test_task do
+            puts "success"
+          end
+          RUBY
+        end
+
+        use_config do |config|
+          config.features = %w{runnable}
+        end
+        jar.apply(config)
+      end
+
+      after do
+        rm_rf "Rakefile"
+        rm_rf "foo.war"
+      end
+
+      it "adds WarMain and JarMain to file" do
+        file_list(%r{^WarMain\.class$}).should_not be_empty
+        file_list(%r{^JarMain\.class$}).should_not be_empty
+      end
+
+      it "can run commands in the generated warfile" do
+        jar.create('foo.war')
+        if RUBY_VERSION >= '1.9'
+          stdin, stdout, stderr, wait_thr = Open3.popen3('java -jar foo.war -S rake test_task')
+          wait_thr.value.success?.should be(true)
+
+          # TODO need to update rake or we'll get an warning in stderr
+          # stderr.readlines.join.should eq("")
+          stdout.readlines.join.should include("success\n")
+        else
+          `java -jar foo.war -S rake -T`
+          $?.exitstatus.should == 0
+        end
+      end
+    end
   end
 
   context "when deployment" do
     run_in_directory "spec/sample_bundler"
 
     it "includes the bundler gem" do
-      `#{RUBY_EXE} -S bundle install --deployment`
+      bundle_install '--deployment'
       jar.apply(config)
       file_list(%r{gems/rake-0.8.7/lib}).should_not be_empty
       file_list(%r{gems/bundler-}).should_not be_empty

metadata

@@ -1,39 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
+  name: rake
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jruby-jars
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.6
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -42,18 +33,18 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+  name: jruby-jars
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jruby-rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.5.6
     - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -62,18 +53,18 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '1.3'
+  name: jruby-rack
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rubyzip
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.1.1
     - - <
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -82,64 +73,73 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '1.2'
+  name: rubyzip
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.9'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
+  name: jbundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1.0
+  name: ruby-maven
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 3.1.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdoc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.10'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
+  name: rdoc
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 description: |-
   Warbler is a gem to make a Java jar or war file out of any Ruby,
   Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way to
@@ -247,6 +247,7 @@ files:
 - integration/simple_rack_test/src/test/java/org/jruby/warbler/AppTestIT.java
 - lib/warbler.rb
 - lib/warbler/application.rb
+- lib/warbler/bundler_helper.rb
 - lib/warbler/config.rb
 - lib/warbler/executable_helper.rb
 - lib/warbler/gems.rb
@@ -391,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
@@ -562,3 +563,4 @@ test_files:
 - spec/warbler/traits_spec.rb
 - spec/warbler/war_spec.rb
 - spec/warbler/web_server_spec.rb
+has_rdoc: