warbler 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3af37ee387e01352e92875710cf763c45b05f9
-  data.tar.gz: 747124311e18f4c18b21e7c7232dc113468fcd27
+  metadata.gz: 60e9e20a37c15f1e428edab19a47965dbf9e0e5c
+  data.tar.gz: bf46d3626c310d7eb5ee69b5a4fb56b7aa59e59d
 SHA512:
-  metadata.gz: 3414140028e4b7ff61c4c4d392e6b279ce7af0e87c2631061fe1b73893dfae0e6879e9dfc1e8946905bd0c33f2160c1cc1a281350ffa2223e9ca08c62b6bbcae
-  data.tar.gz: ba036780cf02f618ec08035fa126b9f873a50db08d000cf209a3f34af05ef492e55719cc02b82fe14bf177a4030ac5470fdb67d887b6d55e8b3147f3c1bd9f27
+  metadata.gz: d87ad8be81920022dfb982775329e0988f918eec6a85f10f173319d469ee039baa50234056f8d499e5538f4d2091f2bbed80ad182dae5de895dfafc2d7732024
+  data.tar.gz: 787fc7fdd6f1bc683c33376d8de5731bc84ce50df92b647993ec1a7bfb67ae75a8ad5f74b78ff15ae8a7fd154337b71bdff0168e5215a5ec42733b113d96d43f

data/.travis.yml

@@ -1,17 +1,42 @@
+sudo: false
+language: ruby
+script: bundle exec rake spec
 rvm:
-  - jruby-9.0.0.0.pre1
+  - jruby-9.0.0.0.pre2
 jdk:
   - oraclejdk8
 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="--server -Xcompile.invokedynamic=false"
 matrix:
   include:
     - rvm: jruby-head
       env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
+matrix:
+  include:
+    - rvm: jruby-head
+      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: BUNDLER_VERSION="~> 1.6.9"
+    - rvm: 1.9.2
+      env: BUNDLER_VERSION="~> 1.7.9"
+    - rvm: 1.9.3
+      env: BUNDLER_VERSION="~> 1.8.9"
+    - rvm: jruby
+      env: MAVEN_OPTS="-XX:MaxPermSize=128m"
+      script: mvn clean verify
+>>>>>>> master
   allow_failures:
     - rvm: jruby-head
 notifications:
@@ -22,7 +47,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/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org/"
+source "https://rubygems.org/"
 
 gemspec
 

data/History.txt

@@ -1,5 +1,9 @@
 == 2x-dev
 
+== 1.4.9
+
+- Fixed a bug in detecting default PORT for executable WAR
+- #332: Warbler not picking up new Bundler convention of 'exe' directory for executables
 
 - Added the ability to set custom port for Jetty launcher with
   warbler.port or PORT env var

data/Mavenfile

@@ -7,7 +7,8 @@ gemspec( :jar => 'warbler_jar.jar',
 
 # just dump the POM as pom.xml as read-only file
 properties( 'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readOnly' => true )
+            'tesla.dump.readOnly' => true,
+            'jruby.plugins.version' => '1.0.10' )
 
 # dependencies needed for compilation
 scope :provided do

data/README.rdoc

@@ -1,7 +1,7 @@
 = Warbler {<img src="https://badge.fury.io/rb/warbler.svg" alt="Gem Version" />}[http://badge.fury.io/rb/warbler] {<img src="https://travis-ci.org/jruby/warbler.png" />}[https://travis-ci.org/jruby/warbler]
 
-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 bundle up 
+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 bundle up
 all of your application files for deployment to a Java environment.
 
 Warbler provides a sane set of out-of-the box defaults that should allow most
@@ -18,7 +18,7 @@ Version 1.4.x of Warbler supports versions of JRuby up to 1.7.x. The {2.x-dev br
 3. Choose one:
 
 * For a web project, deploy your +myapp.war+ file to your favorite Java application server.
- 
+
 * For a standalone applications, just run it: <tt>java -jar myapp.jar</tt>.
 
 == Usage
@@ -43,9 +43,9 @@ Type <tt>warble</tt> to create the jar or war file.
 
 == Features
 
-Warbler "features" are small Rake tasks that run before the creation of the war 
-file and make manipulations to the archive structure. For instance, the 
-+executable+ feature makes your war file capable of running on its own, 
+Warbler "features" are small Rake tasks that run before the creation of the war
+file and make manipulations to the archive structure. For instance, the
++executable+ feature makes your war file capable of running on its own,
 without a servlet container (using an embedded web server) :
 
     warble executable war
@@ -64,73 +64,73 @@ Currently, the following features are available :
   number of files in the .war. This is mostly useful for Google
   AppEngine where the number of files per application has a limit.
   (Note: not applicable for jar-based applications.)
-* +runnable+: This makes a (standard Java) runnable .war archive thus you can 
-  execute binary bundled (gem) commands e.g. "rake". You should use the -S 
-  switch to specify the binary followed by any arguments in takes e.g. 
+* +runnable+: This makes a (standard Java) runnable .war archive thus you can
+  execute binary bundled (gem) commands e.g. "rake". You should use the -S
+  switch to specify the binary followed by any arguments in takes e.g.
   <tt>java -jar myrailsapp.war -S rake db:migrate</tt>.
-* +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 
+* +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 <tt>java -jar myapp.war</tt>.
   (Note: jar-based applications are executable by default.)
 * +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. 
-  NOTE: The war file will still contain .rb files, but they will be short stubs 
+  to .class files and includes those in the .war instead of the Ruby sources.
+  NOTE: The war file will still contain .rb files, but they will be short stubs
   containing the following code : <tt>load __FILE__.sub(/\.rb$/, '.class')</tt>
 
-Features may form the basis for a third-party plugin system (in the future) 
+Features may form the basis for a third-party plugin system (in the future)
 if there is demand.
 
-NOTE: Feature tasks must be included in the same command invocation and 
-inserted before the +war+ task in order to take effect. For example, 
-<tt>warble compiled; warble war</tt> does not compile and obfuscate +.rb+ 
-sources because the second invocation of +warble+ does not run the +compiled+ 
+NOTE: Feature tasks must be included in the same command invocation and
+inserted before the +war+ task in order to take effect. For example,
+<tt>warble compiled; warble war</tt> does not compile and obfuscate +.rb+
+sources because the second invocation of +warble+ does not run the +compiled+
 feature and creates a basic war with the sources included, make sure you run :
 
     warble compiled war
 
-or, if it's important that the war always be compiled, use the option above to 
+or, if it's important that the war always be compiled, use the option above to
 put the feature in your <tt>config/warble.rb</tt>.
 
 == War or Jar?
 
-War-based projects are for Rails, Merb, or Rack-based web applications. 
-They usually contain a +config/environment.rb+ file, a +config/init.rb+ file, 
+War-based projects are for Rails, Merb, or Rack-based web applications.
+They usually contain a +config/environment.rb+ file, a +config/init.rb+ file,
 or a +config.ru+ file.
-The presence of these files are used to determine if the project is a web 
+The presence of these files are used to determine if the project is a web
 application, and thus a Java EE compatible war file is built for the project.
 
-Jar-based projects are for standalone Ruby applications. Usually a Ruby 
-application has a launcher script in the +bin+ directory and Ruby code 
-in the <tt>lib</tt> directory. Warbler packages the application so that 
+Jar-based projects are for standalone Ruby applications. Usually a Ruby
+application has a launcher script in the +bin+ directory and Ruby code
+in the <tt>lib</tt> directory. Warbler packages the application so that
 <tt>java -jar myapp.jar</tt> runs the launcher script.
 
 == Jar Files
 
 === Gem Specification (gemspec) Files
 
-If your project has a <tt>.gemspec</tt> file in the top directory, it will be 
-used to configure the project's dependencies, launcher script, require paths, 
-and the files to be included in the archive. For best results make sure your 
+If your project has a <tt>.gemspec</tt> file in the top directory, it will be
+used to configure the project's dependencies, launcher script, require paths,
+and the files to be included in the archive. For best results make sure your
 gemspec specifies all of the following attributes:
 
 * +executables+
 * +require_paths+
 * runtime dependencies added with +add_dependency+
 
-If your project do not have a <tt>.gemspec</tt>, Warbler will attempt to guess 
-the launcher from the contents of the <tt>bin</tt> directory and use the 
-<tt>lib</tt> directory as the lone require path. All files in the project 
+If your project do not have a <tt>.gemspec</tt>, Warbler will attempt to guess
+the launcher from the contents of the <tt>bin</tt> directory and use the
+<tt>lib</tt> directory as the lone require path. All files in the project
 will be included in the archive.
 
 === Bundler
 
-Applications that use Bundler[http://gembundler.com/], detected via presence of 
-a +Gemfile+, will have the gems packaged up into the archive along with the 
-Gemfile. The Bundler groups named ":development", ":test" and ":assets" will be 
-excluded by default, unless you specify with <tt>config.bundle_without</tt> in 
+Applications that use Bundler[http://gembundler.com/], detected via presence of
+a +Gemfile+, will have the gems packaged up into the archive along with the
+Gemfile. The Bundler groups named ":development", ":test" and ":assets" will be
+excluded by default, unless you specify with <tt>config.bundle_without</tt> in
 +config/warble.rb+.
 
-Warbler supports Bundler for gems and git repositories, but not for plain path 
+Warbler supports Bundler for gems and git repositories, but not for plain path
 components. Warbler will warn when a +:path+ component is found in the +Gemfile+
 and will refuse to include it in the archive.
 
@@ -146,18 +146,18 @@ via presence of a +Jarfile+, will have the jars packaged up into the archive. th
 Rails applications are detected automatically and configured appropriately.
 The following items are set up for you:
 
-* Your application runs in the +production+ environment by default. 
+* Your application runs in the +production+ environment by default.
   Change it in +config/warble.rb+ (see below).
 * The Rails gem is packaged if you haven't vendored Rails (Rails <= 2.x).
 * Other gems configured in Rails.configuration.gems are packaged (2.1 - 2.3)
-* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and 
+* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
   runtime pooling is disabled.
 
 === Other Rack-based applications
 
-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 
+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 +config/warble.rb+ unless you're using Bundler
 to manage your gems. <tt>ENV['RACK_ENV']</tt> will be set to +production+.
 
@@ -166,13 +166,13 @@ 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 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 
-  <tt>Warbler.framework_detection = false</tt> at the top of +config.rb+. 
-  In this case you may need to specify additional details such as booter, gems 
+* 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
+  <tt>Warbler.framework_detection = false</tt> 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 app configuration.
-* Is it possible to more generally detect what gems an application uses? 
+* Is it possible to more generally detect what gems an application uses?
   <tt>Gem.loaded_specs</tt> is available, but the application needs to be
   loaded first before its contents are reliable.
 
@@ -185,7 +185,7 @@ doing this. With the gem, simply run
 
     warble config
 
-Finally, edit the +config/warble.rb+ to your taste. The generated file is 
+Finally, edit the +config/warble.rb+ to your taste. The generated file is
 fully-documented with the available options and default values.
 
 === War layout
@@ -244,7 +244,7 @@ lock the <tt>rubyzip</tt> gem to a version before 1.0.0.
 
 == Troubleshooting
 
-If Warbler isn't packaging the files you were expecting, use the +war:debug+ 
+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.
 
 If you think you found a bug, please file one at
@@ -262,7 +262,7 @@ https://github.com/jruby/warbler/tarball/master.
 
 == Development
 
-You can develop Warbler with any implementation of Ruby. To write Warbler code 
+You can develop Warbler with any implementation of Ruby. To write Warbler code
 and run specs, you need to have Bundler installed and run <tt>bundle</tt> once.
 
 After that, simply run <tt>rake</tt>.
@@ -284,6 +284,8 @@ http://maven.apache.org/ Be aware the homebrew installs 3.0.5, which doesn't wor
 
 Warbler is provided under the terms of the MIT license.
 
-Warbler (c) 2010-2013 Engine Yard, Inc.
+Warbler (c) 2013-2015 The JRuby project
+
+Warbler (c) 2010-2012 Engine Yard, Inc.
 
 Warbler (c) 2007-2009 Sun Microsystems, Inc.

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/JarMain.java

@@ -28,8 +28,6 @@ public class JarMain implements Runnable {
 
     static final String MAIN = "/" + JarMain.class.getName().replace('.', '/') + ".class";
 
-    final boolean debug = isDebug();
-
     protected final String[] args;
     protected final String archive;
     private final String path;
@@ -126,7 +124,7 @@ public class JarMain implements Runnable {
     }
 
     protected Object newScriptingContainer(final URL[] jars) throws Exception {
-        System.setProperty("org.jruby.embed.class.path", "");
+        setSystemProperty("org.jruby.embed.class.path", "");
         classLoader = new URLClassLoader(jars);
         Class scriptingContainerClass = Class.forName("org.jruby.embed.ScriptingContainer", true, classLoader);
         Object scriptingContainer = scriptingContainerClass.newInstance();
@@ -164,12 +162,12 @@ public class JarMain implements Runnable {
     }
 
     protected void debug(String msg, Throwable t) {
-        if (debug) System.out.println(msg);
-        if (debug && t != null) t.printStackTrace(System.out);
+        if ( isDebug() ) System.out.println(msg);
+        if ( isDebug() && t != null ) t.printStackTrace(System.out);
     }
 
     protected static void debug(Throwable t) {
-        if (isDebug()) t.printStackTrace(System.out);
+        if ( isDebug() ) t.printStackTrace(System.out);
     }
 
     protected void warn(String msg) {
@@ -225,9 +223,9 @@ public class JarMain implements Runnable {
     }
 
     protected static void doStart(final JarMain main) {
+        int exit;
         try {
-            int exit = main.start();
-            if (isSystemExitEnabled()) System.exit(exit);
+            exit = main.start();
         }
         catch (Exception e) {
             Throwable t = e;
@@ -235,7 +233,13 @@ public class JarMain implements Runnable {
                 t = t.getCause();
             }
             error(e.toString(), t);
-            System.exit(1);
+            exit = 1;
+        }
+        try {
+            if ( isSystemExitEnabled() ) System.exit(exit);
+        }
+        catch (SecurityException e) {
+            debug(e);
         }
     }
 
@@ -262,17 +266,59 @@ public class JarMain implements Runnable {
         }
     }
 
-    static boolean isDebug() {
-        return Boolean.getBoolean("warbler.debug");
+    private static final boolean debug;
+    static {
+        debug = Boolean.parseBoolean( getSystemProperty("warbler.debug", "false") );
     }
 
+    static boolean isDebug() { return debug; }
+
     /**
      * if warbler.skip_system_exit system property is defined, we will not
      * call System.exit in the normal flow. System.exit can cause problems
      * for wrappers like procrun
      */
     private static boolean isSystemExitEnabled(){
-        return System.getProperty("warbler.skip_system_exit") == null; //omission enables System.exit use
+        return getSystemProperty("warbler.skip_system_exit") == null; //omission enables System.exit use
+    }
+
+    static String getSystemProperty(final String name) {
+        return getSystemProperty(name, null);
+    }
+
+    static String getSystemProperty(final String name, final String defaultValue) {
+        try {
+            return System.getProperty(name, defaultValue);
+        }
+        catch (SecurityException e) {
+            return defaultValue;
+        }
+    }
+
+    static boolean setSystemProperty(final String name, final String value) {
+        try {
+            System.setProperty(name, value);
+            return true;
+        }
+        catch (SecurityException e) {
+            return false;
+        }
+    }
+
+    static String getENV(final String name) {
+        return getENV(name, null);
+    }
+
+    static String getENV(final String name, final String defaultValue) {
+        try {
+            if ( System.getenv().containsKey(name) ) {
+                return System.getenv().get(name);
+            }
+            return defaultValue;
+        }
+        catch (SecurityException e) {
+            return defaultValue;
+        }
     }
 
 }

data/ext/WarMain.java

@@ -64,6 +64,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 :
@@ -140,20 +141,24 @@ public class WarMain extends JarMain {
             if ( is != null ) props.load(is);
         } catch (Exception e) { }
 
-        String port = System.getProperty("warbler.port", System.getenv("PORT"));
+        String port = getSystemProperty("warbler.port", getENV("PORT"));
         port = port == null ? "8080" : port;
-        for (Map.Entry entry : props.entrySet()) {
+        String webserverConfig = getSystemProperty("warbler.webserver_config", 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);
         }
 
         if (props.getProperty("props") != null) {
             String[] propsToSet = props.getProperty("props").split(",");
-            for (String key : propsToSet) {
-                System.setProperty(key, props.getProperty(key));
+            for ( String key : propsToSet ) {
+                setSystemProperty(key, props.getProperty(key));
             }
         }
 

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/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/traits/gemspec.rb

@@ -55,15 +55,32 @@ module Warbler
 
       def default_executable
         if !@spec.executables.empty?
-          "bin/#{@spec.executables.first}"
+          bundler_version =
+            Gem.loaded_specs.include?("bundler") ?
+              Gem.loaded_specs["bundler"].version :
+              Gem::Version.create("0.0.0")
+          if (bundler_version <=> Gem::Version.create("1.8.0")) < 0
+            "bin/#{@spec.executables.first}"
+          else
+            exe_script = @spec.executables.first
+            if File.exists?("exe/#{exe_script}")
+              "exe/#{exe_script}"
+            elsif File.exists?("bin/#{exe_script}")
+              "bin/#{exe_script}"
+            else
+              raise "No `#{exe_script}` executable script found"
+            end
+          end
+        elsif exe = Dir['bin/*'].sort.first
+          warn "No default executable found in #{@spec_file}, using bin/#{exe}"
+          exe
+        elsif exe = Dir['exe/*'].sort.first
+          warn "No default executable found in #{@spec_file}, using exe/#{exe}"
+          exe
         else
-          exe = Dir['bin/*'].sort.first
           raise "No executable script found" unless exe
-          warn "No default executable found in #{@spec_file}, using #{exe}"
-          exe
         end
       end
-
     end
   end
 end

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.0.pre1"
+  VERSION = "2.0.0.pre2"
 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/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/pom.xml

@@ -13,7 +13,7 @@ bundle up all of your application files for deployment to a Java environment.</d
   <url>https://github.com/jruby/warbler</url>
   <properties>
     <tesla.dump.readOnly>true</tesla.dump.readOnly>
-    <jruby.plugins.version>1.0.0</jruby.plugins.version>
+    <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
   </properties>

data/spec/spec_helper.rb

@@ -88,6 +88,9 @@ module ExampleGroupHelpers
       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
@@ -102,6 +105,8 @@ module ExampleGroupHelpers
           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"]

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 }
 
@@ -66,7 +70,7 @@ describe Warbler::Jar, "with Bundler" do
 
       it "works with :git entries in Gemfiles" do
         File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
-        `#{RUBY_EXE} -S bundle install --local`
+        bundle_install '--local'
         jar.apply(config)
         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
@@ -74,7 +78,7 @@ describe Warbler::Jar, "with Bundler" do
 
       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"}
-        `#{RUBY_EXE} -S bundle install --local`
+        bundle_install '--local'
         jar.apply(config)
         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
@@ -82,7 +86,7 @@ describe Warbler::Jar, "with Bundler" do
 
       it "does not work with :path entries in Gemfiles" do
         File.open("Gemfile", "w") {|f| f << "gem 'tester', :path => '#{@gem_dir}'\n"}
-        `#{RUBY_EXE} -S bundle install --local`
+        bundle_install '--local'
         silence { jar.apply(config) }
         file_list(%r{tester}).should be_empty
       end
@@ -126,7 +130,7 @@ describe Warbler::Jar, "with Bundler" do
 
       it "works with :git entries in Gemfiles" do
         File.open("Gemfile", "w") {|f| f << "gem 'tester', :git => '#{@gem_dir}'\n"}
-        `#{RUBY_EXE} -S bundle install --local`
+        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
@@ -137,7 +141,7 @@ describe Warbler::Jar, "with Bundler" do
     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__)/
@@ -204,7 +208,7 @@ describe Warbler::Jar, "with Bundler" 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-10.4.2/lib}).should_not be_empty
       file_list(%r{gems/bundler-}).should_not be_empty

data/spec/warbler/web_server_spec.rb

@@ -29,13 +29,13 @@ describe Warbler::WebServer::Artifact do
   it "uses default (maven) local repository" do
     ENV['HOME'] = '/home/borg'
     ENV.delete('M2_HOME'); ENV.delete('MAVEN_HOME')
-    expect( sample_artifact.local_repository ).to eql "/home/borg/.m2/repository"
+    sample_artifact.local_repository.should == "/home/borg/.m2/repository"
   end
 
   it "detects a custom maven repository setting" do
     ENV['HOME'] = '/home/borg'
     ENV['M2_HOME'] = File.expand_path('../m2_home', File.dirname(__FILE__))
-    expect( sample_artifact.local_repository ).to eql '/usr/local/maven/repo'
+    sample_artifact.local_repository.should == '/usr/local/maven/repo'
   end
 
 end

metadata

@@ -1,53 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
+  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: 9.0.0.0.pre2
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0.0.pre2
+  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
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 9.0.0.0.pre2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,18 +47,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: '1.0'
+        version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,64 +67,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: '1.0'
+    - - "<"
+      - !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
@@ -241,6 +241,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
@@ -492,7 +493,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.