warbler 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a948686e291d17e74ba5a81f20ac44295eeaf5dc
-  data.tar.gz: 00179dc599932291918a6e740a9b242cd55aa1d1
+  metadata.gz: 0ea2ec506ff64a6cc7d49b7d75e1bb35ed683d22
+  data.tar.gz: 3c3eae60fa8d1a946a6bfd2932b85d1f5720eb22
 SHA512:
-  metadata.gz: 0b04a6a3f642fdeaf383e9cfa7d9bf1fcf2c5a2e620a586fc04a07db3fa98399e922071301ed0df5155de2fb36ab41698af1cb7e91ea7ebaca2f76926f789b05
-  data.tar.gz: a79aaf60d19436a6f71767de58ea6c19b932ea9807a85048b15685335538b420871f42da44ca22cbda2b160816c0c0801bf8be46858d10934fee6218d3bd91a1
+  metadata.gz: faf7281b8b54b1f1ac812e89852d7ad55904ef3c4fd9beac4f0a01bd2ddc469c24a973ec1535bbdf6c15349f3f5cdafa576f1c6ded932ff6fd4a83471d784bbf
+  data.tar.gz: cbe6bd24e52e9fb102e42b9dfead6f34ec26616324357361936050e2dd5d3e9d6be0ea6811ae586b84c56412a0afbf9e6173775bcda4b431d698c7b5238cd778

data/History.txt

@@ -1,4 +1,18 @@
-== 2x-dev
+== 2.0.2
+
+- #380: exclude spec/integration/rakelib and dot-files being packed into .gem
+- #379: 2.0.1 regression due forcing GEM_PATH = GEM_HOME
+
+== 2.0.1
+
+- #367: avoid duplicate .jar copies in WEB-INF/lib
+- #364: support for compiling .rb files using jrubyc with options
+- #362: limit rubyzip version to not match too far
+- #363: [backport] support for running with (recent) rubyzip 1.2.0
+
+== 2.0.0
+
+- Initial release with 9k support
 
 == 1.4.9
 

data/ext/JarMain.java

@@ -9,6 +9,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
@@ -104,7 +105,7 @@ public class JarMain implements Runnable {
         FileOutputStream outStream = new FileOutputStream(file);
         final byte[] buf = new byte[65536];
         try {
-            int bytesRead = 0;
+            int bytesRead;
             while ((bytesRead = entryStream.read(buf)) != -1) {
                 outStream.write(buf, 0, bytesRead);
             }
@@ -114,7 +115,7 @@ public class JarMain implements Runnable {
             outStream.close();
             file.deleteOnExit();
         }
-        if (false) debug(entry.getName() + " extracted to " + file.getPath());
+        // if (false) debug(entry.getName() + " extracted to " + file.getPath());
         return file.toURI().toURL();
     }
 
@@ -167,7 +168,11 @@ public class JarMain implements Runnable {
     }
 
     protected static void debug(Throwable t) {
-        if ( isDebug() ) t.printStackTrace(System.out);
+        debug(t, System.out);
+    }
+
+    private static void debug(Throwable t, PrintStream out) {
+        if ( isDebug() ) t.printStackTrace(out);
     }
 
     protected void warn(String msg) {
@@ -180,7 +185,7 @@ public class JarMain implements Runnable {
 
     protected static void error(String msg, Throwable t) {
         System.err.println("ERROR: " + msg);
-        debug(t);
+        debug(t, System.err);
     }
 
     protected void delete(File f) {

data/ext/WarMain.java

@@ -100,13 +100,14 @@ public class WarMain extends JarMain {
             String execArg = argsList.get(sIndex + 1);
             executableArgv = argsList.subList(sIndex + 2, argsList.size()).toArray(new String[0]);
 
-            if (execArg.equals("bundle") && executableArgv.length > 0 && executableArgv[0].equals("exec")) {
-                warn("`bundle exec' may drop out of the Warbler environment and into the system environment");
-            } else if (execArg.equals("rails")) {
+            if (execArg.equals("rails")) {
                 // The rails executable doesn't play well with ScriptingContainer, so we've packaged the
                 // same script that would have been generated by `rake rails:update:bin`
                 execArg = "./META-INF/rails.rb";
             }
+            else if (execArg.equals("bundle") && executableArgv.length > 0 && executableArgv[0].equals("exec")) {
+                warn("`bundle exec' may drop out of the Warbler environment and into the system environment");
+            }
 
             executable = execArg;
         }
@@ -124,7 +125,7 @@ public class WarMain extends JarMain {
         FileOutputStream outStream = new FileOutputStream(jarFile);
         try {
             byte[] buf = new byte[4096];
-            int bytesRead = 0;
+            int bytesRead;
             while ((bytesRead = jarStream.read(buf)) != -1) {
                 outStream.write(buf, 0, bytesRead);
             }
@@ -179,7 +180,7 @@ public class WarMain extends JarMain {
                                                + WEBSERVER_PROPERTIES
                                                + " is missing 'mainclass' property)");
         }
-        Class klass = Class.forName(mainClass, true, loader);
+        Class<?> klass = Class.forName(mainClass, true, loader);
         Method main = klass.getDeclaredMethod("main", new Class[] { String[].class });
         String[] newArgs = launchWebServerArguments(props);
         debug("invoking webserver with: " + Arrays.deepToString(newArgs));
@@ -240,7 +241,9 @@ public class WarMain extends JarMain {
 
         invokeMethod(rubyInstanceConfig, "setUpdateNativeENVEnabled", new Class[] { Boolean.TYPE }, false);
 
-        final String executablePath = locateExecutable(scriptingContainer);
+        final CharSequence execScriptEnvPre = executableScriptEnvPrefix();
+
+        final String executablePath = locateExecutable(scriptingContainer, execScriptEnvPre);
         if ( executablePath == null ) {
             throw new IllegalStateException("failed to locate gem executable: '" + executable + "'");
         }
@@ -252,7 +255,7 @@ public class WarMain extends JarMain {
 
         debug("loading resource: " + executablePath);
         Object executableInput =
-            new SequenceInputStream(new ByteArrayInputStream(executableScriptEnvPrefix().getBytes()),
+            new SequenceInputStream(new ByteArrayInputStream(execScriptEnvPre.toString().getBytes()),
                                     (InputStream) invokeMethod(rubyInstanceConfig, "getScriptSource"));
 
         debug("invoking " + executablePath + " with: " + Arrays.toString(executableArgv));
@@ -264,6 +267,7 @@ public class WarMain extends JarMain {
         return ( outcome instanceof Number ) ? ( (Number) outcome ).intValue() : 0;
     }
 
+    @Deprecated
     protected String locateExecutable(final Object scriptingContainer) throws Exception {
         if ( executable == null ) {
             throw new IllegalStateException("no executable");
@@ -273,11 +277,27 @@ public class WarMain extends JarMain {
             return exec.getAbsolutePath();
         }
         else {
-            final String script = locateExecutableScript(executable);
+            final String script = locateExecutableScript(executable, executableScriptEnvPrefix());
             return (String) invokeMethod(scriptingContainer, "runScriptlet", script);
         }
     }
-    protected String executableScriptEnvPrefix() {
+
+    protected String locateExecutable(final Object scriptingContainer, final CharSequence envPreScript)
+        throws Exception {
+        if ( executable == null ) {
+            throw new IllegalStateException("no executable");
+        }
+        final File exec = new File(extractRoot, executable);
+        if ( exec.exists() ) {
+            return exec.getAbsolutePath();
+        }
+        else {
+            final String script = locateExecutableScript(executable, envPreScript);
+            return (String) invokeMethod(scriptingContainer, "runScriptlet", script);
+        }
+    }
+
+    protected CharSequence executableScriptEnvPrefix() {
         final String gemsDir = new File(extractRoot, "gems").getAbsolutePath();
         final String gemfile = new File(extractRoot, "Gemfile").getAbsolutePath();
         debug("setting GEM_HOME to " + gemsDir);
@@ -286,22 +306,20 @@ public class WarMain extends JarMain {
         // ideally this would look up the config.override_gem_home setting
         return "ENV['GEM_HOME'] = ENV['GEM_PATH'] = '"+ gemsDir +"' \n" +
         "ENV['BUNDLE_GEMFILE'] ||= '"+ gemfile +"' \n" +
-        "require 'uri:classloader:/META-INF/init.rb' \n";
+        "require 'uri:classloader:/META-INF/init.rb'";
     }
 
-    protected String locateExecutableScript(final String executable) {
-        return executableScriptEnvPrefix() +
-        "begin\n" +
-        // locate the executable within gemspecs :
-        "  require 'rubygems' \n" +
-            "  begin\n" +
-            // add bundler gems to load path:
-            "    require 'bundler' \n" +
-            // TODO: environment from web.xml. Any others?
-            "    Bundler.setup(:default, *ENV.values_at('RACK_ENV', 'RAILS_ENV').compact)\n" +
-            "  rescue LoadError\n" +
-            // bundler not used
-            "  end\n" +
+    protected String locateExecutableScript(final String executable, final CharSequence envPreScript) {
+        return ( envPreScript == null ? "" : envPreScript + " \n" ) +
+        "begin\n" + // locate the executable within gemspecs :
+        "  require 'rubygems' unless defined?(Gem) \n" +
+          "  begin\n" + // add bundled gems to load path :
+          "    require 'bundler' \n" +
+          "  rescue LoadError\n" + // bundler not used
+          "  else\n" +
+          "    env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] \n" + // init.rb sets ENV['RAILS_ENV'] ||= ...
+          "    env ? Bundler.setup(:default, env) : Bundler.setup(:default) \n" +
+          "  end if ENV_JAVA['warbler.bundler.setup'] != 'false' \n" + // java -Dwarbler.bundler.setup=false -jar my.war -S pry
         "  exec = '"+ executable +"' \n" +
         "  spec = Gem::Specification.find { |s| s.executables.include?(exec) } \n" +
         "  spec ? spec.bin_file(exec) : nil \n" +
@@ -327,7 +345,8 @@ public class WarMain extends JarMain {
                 launchWebServer(server);
             }
             catch (FileNotFoundException e) {
-                if ( e.getMessage().indexOf("WEB-INF/webserver.jar") > -1 ) {
+                final String msg = e.getMessage();
+                if ( msg != null && msg.contains("WEB-INF/webserver.jar") ) {
                     System.out.println("specify the -S argument followed by the bin file to run e.g. `java -jar rails.war -S rake -T` ...");
                     System.out.println("(or if you'd like your .war file to start a web server package it using `warbler executable war`)");
                 }
@@ -335,9 +354,7 @@ public class WarMain extends JarMain {
             }
             return 0;
         }
-        else {
-            return super.start();
-        }
+        return super.start();
     }
 
     @Override

data/ext/WarblerJar.java

@@ -153,7 +153,7 @@ public class WarblerJar {
         }
     }
 
-    private static Pattern PROTOCOL = Pattern.compile("^[a-z][a-z0-9]+:");
+    private static final Pattern PROTOCOL = Pattern.compile("^[a-z][a-z0-9]+:");
 
     private static InputStream getStream(String jar, String entry) throws IOException {
         Matcher m = PROTOCOL.matcher(jar);

data/lib/warbler/jar.rb

@@ -32,7 +32,7 @@ module Warbler
 
     def contents(entry)
       file = files[entry]
-      file.respond_to?(:read) ? file.read : File.open(file) {|f| f.read }
+      file.respond_to?(:read) ? file.read : File.read(file)
     end
 
     def compile(config)
@@ -125,16 +125,12 @@ module Warbler
     def gather_all_rb_files(config)
       FileUtils.mkdir_p('tmp')
       # Gather all the files in the files list and copy them to the tmp directory
-      gems_to_compile = files.select {|k, f| !f.is_a?(StringIO) && f =~ /\.rb$/ }
-      # 1.8.7 Support, convert back to hash
-      if gems_to_compile.is_a?(Array)
-        gems_to_compile = gems_to_compile.inject({}) {|h,z| h.merge!(z[0] => z[1]) }
-      end
-      gems_to_compile.each do |jar_file, rb|
+      files_to_compile = files.select { |_, f| !f.is_a?(StringIO) && f.end_with?('.rb') }
+      files_to_compile.each do |jar_file, rb|
         FileUtils.mkdir_p(File.dirname(File.join('tmp', jar_file)))
         new_rb = File.join('tmp', jar_file)
         FileUtils.copy(rb, new_rb)
-        gems_to_compile[jar_file] = new_rb
+        files_to_compile[jar_file] = new_rb
       end
       # Gather all the application files which the user wrote (not dependencies)
       main_files_to_compile = config.compiled_ruby_files - config.excludes.to_a
@@ -145,9 +141,9 @@ module Warbler
       main_files_to_compile = main_files_to_compile.inject({}) {|h,f| h.merge!(f => f) }
       files.keys.each do |k|
         # Update files list to point to the temporary file
-        files[k] = gems_to_compile[k] || main_files_to_compile[k] || files[k]
+        files[k] = files_to_compile[k] || main_files_to_compile[k] || files[k]
       end
-      main_files_to_compile.merge(gems_to_compile)
+      main_files_to_compile.merge(files_to_compile)
     end
 
     # Apply the information in a Warbler::Config object in order to
@@ -187,7 +183,7 @@ module Warbler
 
     # Add a manifest file either from config or by making a default manifest.
     def add_manifest(config = nil)
-      unless @files.keys.detect{|k| k =~ /^META-INF\/MANIFEST\.MF$/i}
+      unless @files.keys.detect{ |k| k =~ /^META-INF\/MANIFEST\.MF$/i }
         if config && config.manifest_file
           @files['META-INF/MANIFEST.MF'] = config.manifest_file
         else
@@ -198,12 +194,12 @@ module Warbler
 
     # Add java libraries to WEB-INF/lib.
     def find_java_libs(config)
-      config.java_libs.map {|lib| add_with_pathmaps(config, lib, :java_libs) }
+      config.java_libs.map { |lib| add_with_pathmaps(config, lib, :java_libs) }
     end
 
     # Add java classes to WEB-INF/classes.
     def find_java_classes(config)
-      config.java_classes.map {|f| add_with_pathmaps(config, f, :java_classes) }
+      config.java_classes.map { |f| add_with_pathmaps(config, f, :java_classes) }
     end
 
     # Add gems to WEB-INF/gems
@@ -218,7 +214,19 @@ module Warbler
       full_gem_path = Pathname.new(spec.full_gem_path)
 
       # skip gems whose full_gem_path does not exist
-      (warn "skipping #{spec.name} (#{full_gem_path.to_s} does not exist)" ; return) unless full_gem_path.exist?
+      unless full_gem_path.exist?
+        # its very likely that its a default gem e.g. json/jruby-openssl :
+        if (Gem.default_dir rescue nil) && full_gem_path.to_s.start_with?(Gem.default_dir)
+          # OK if the gem does not exists as its un-packed on the "shared" path
+          # ... at least gem spec.spec_file should exists although not crucial
+          if JRUBY_VERSION != JRubyJars::VERSION
+            warn "skipping #{spec.name} default gem (assuming its part of jruby-jars #{JRubyJars::VERSION})" unless silent?
+          end
+        else
+          warn "skipping #{spec.name} gem (#{full_gem_path.to_s} does not exist)"
+        end
+        return
+      end
 
       @files[apply_pathmaps(config, "#{spec.full_name}.gemspec", :gemspecs)] = StringIO.new(spec.to_ruby)
       FileList["#{full_gem_path.to_s}/**/*"].each do |src|
@@ -296,7 +304,7 @@ module Warbler
         entries.keys.sort.each do |entry|
           src = entries[entry]
           if src.respond_to?(:read)
-            zipfile.get_output_stream(entry) {|f| f << src.read }
+            zipfile.get_output_stream(entry) { |f| f << src.read }
           elsif src.nil? || File.directory?(src)
             if File.symlink?(entry) && ! defined?(JRUBY_VERSION)
               warn "directory symlinks are not followed unless using JRuby; " +

data/lib/warbler/templates/jar.erb

@@ -1,11 +1,11 @@
 <% if config.relative_gem_path.empty? -%>
-ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path('../..', __FILE__)
+ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path(File.join('..', '..', '<%= config.gem_path %>'), __FILE__)
 <% else -%>
-ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path('../../<%= config.relative_gem_path %>', __FILE__)
+ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path(File.join('..', '..', '<%= config.relative_gem_path %>'), __FILE__)
 <% end -%>
 <% if config.override_gem_home -%>
-ENV['GEM_PATH'] = ENV['GEM_HOME']
+ENV['GEM_PATH'] = nil # RGs sets Gem.paths.path = Gem.default_path + [ GEM_HOME ]
 <% end -%>
 <% if config.bundler && config.bundler[:gemfile_path] -%>
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../<%= config.bundler[:gemfile_path] %>', __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
 <% end -%>

data/lib/warbler/templates/rack.erb

@@ -1,3 +1,5 @@
-ENV['RACK_ENV'] ||= '<%= (params = config.webxml.context_params; params['rack.env']) %>'
+<% if (params = config.webxml.context_params) && params['rack.env'] -%>
+ENV['RACK_ENV'] ||= '<%= params['rack.env'] %>'
+<% end -%>
 
 $LOAD_PATH.unshift $servlet_context.getRealPath('/WEB-INF') if $servlet_context

data/lib/warbler/templates/war.erb

@@ -1,7 +1,9 @@
 if $servlet_context.nil?
   ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path(File.join('..', '..', '<%= config.gem_path %>'), __FILE__)
 <% if config.override_gem_home -%>
-  ENV['GEM_PATH'] = ENV['GEM_HOME']
+<% # GEM_HOME/GEM_PATH are set as .war gets extracted (on java -jar ...)
+   # ... thus setting `ENV['GEM_PATH'] = nil` would cause a boot failure
+-%>
 <% end -%>
 <% if config.bundler && config.bundler[:gemfile_path] -%>
   ENV['BUNDLE_GEMFILE'] ||= File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
@@ -9,7 +11,7 @@ if $servlet_context.nil?
 else
   ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> $servlet_context.getRealPath('<%= config.gem_path %>')
 <% if config.override_gem_home -%>
-  ENV['GEM_PATH'] = ENV['GEM_HOME']
+  ENV['GEM_PATH'] = nil
 <% end -%>
 <% if config.bundler && config.bundler[:gemfile_path] -%>
   ENV['BUNDLE_GEMFILE'] ||= $servlet_context.getRealPath('/<%= config.bundler[:gemfile_path] %>')

data/lib/warbler/traits.rb

@@ -74,11 +74,13 @@ module Warbler
     end
 
     def add_init_load_path(path)
-      config.init_contents << StringIO.new("$LOAD_PATH.unshift __FILE__.sub(/!.*/, '!/#{path}')\n")
+      config.init_contents << StringIO.new("$LOAD_PATH.unshift File.expand_path(File.join('..', '..', '#{path}'), __FILE__)\n")
+      # with __FILE__ = "uri:classloader:/META-INF/init.rb"
+      # ...  will end up as "uri:classloader://xxx-gem/lib"
     end
 
     def add_main_rb(jar, bin_path, params = nil)
-      binary = ""
+      binary = "".dup
       binary << "ARGV.unshift('#{params}')\n" if params
       binary << "load '#{bin_path}'"
       jar.files['META-INF/main.rb'] = StringIO.new(binary)

data/lib/warbler/traits/gemspec.rb

@@ -18,18 +18,17 @@ module Warbler
         !Dir['*.gemspec'].empty?
       end
 
-      def before_configure
+      def before_configure; require 'yaml'
         @spec_file = Dir['*.gemspec'].first
-        require 'yaml'
         @spec = File.open(@spec_file) { |f| Gem::Specification.from_yaml(f) } rescue Gem::Specification.load(@spec_file)
         @spec.runtime_dependencies.each { |g| config.gems << g }
         config.dirs = []
-        config.compiled_ruby_files = @spec.files.select {|f| f =~ /\.rb$/}
+        config.compiled_ruby_files = @spec.files.select { |f| f =~ /\.rb$/ }
       end
 
       def after_configure
         @spec.require_paths.each do |p|
-          add_init_load_path(config.pathmaps.application.inject(p) {|pm,x| pm.pathmap(x)})
+          add_init_load_path( config.pathmaps.application.inject(p) { |pm,x| pm.pathmap(x) } )
         end
       end
 
@@ -55,32 +54,26 @@ module Warbler
 
       def default_executable
         if ! @spec.executables.empty?
-          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}"
+          exe_script = @spec.executables.first
+          exe_path = File.join(@spec.bindir, exe_script) # bin/script
+          if File.exists?(exe_path)
+            exe_path
+          elsif File.exists?("bin/#{exe_script}") # compatibility
+            "bin/#{exe_script}" # ... should probably remove this
           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
+            raise "no `#{exe_script}` executable script found"
           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
+        elsif exe_path = Dir['bin/*'].sort.first
+          warn "no executables found in #{@spec_file}, using #{exe_path}"
+          exe_path
+        elsif exe_path = Dir['exe/*'].sort.first
+          warn "no executables found in #{@spec_file}, using #{exe_path}"
+          exe_path
         else
-          raise "No executable script found" unless exe
+          raise "no executable script found"
         end
       end
+
     end
   end
 end

data/lib/warbler/traits/jar.rb

@@ -29,7 +29,7 @@ module Warbler
       end
 
       def after_configure
-        config.init_contents << StringIO.new("require 'rubygems'\n")
+        config.init_contents << StringIO.new("require 'rubygems' unless defined?(Gem)\n")
       end
 
       def update_archive(jar)

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/rails4_stub/Gemfile.lock

@@ -0,0 +1,112 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      builder (~> 3.1)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      arel (~> 6.0)
+    activerecord-jdbc-adapter (1.3.19)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.19)
+      activerecord-jdbc-adapter (~> 1.3.19)
+      jdbc-postgres (>= 9.1)
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    concurrent-ruby (1.0.0-java)
+    erubis (2.7.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    jdbc-postgres (9.4.1206)
+    json (1.8.3-java)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.99)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2-java)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.5.1)
+      sprockets-rails
+    rails-api (0.4.0)
+      actionpack (>= 3.2.11)
+      railties (>= 3.2.11)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5-java)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord-jdbcpostgresql-adapter (= 1.3.19)
+  rails (~> 4.2)
+  rails-api (= 0.4.0)
+
+BUNDLED WITH
+   1.11.2

data/spec/sample_bundler/.bundle/config

@@ -0,0 +1,4 @@
+---
+BUNDLE_FROZEN: '1'
+BUNDLE_PATH: vendor/bundle
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/spec/sample_bundler/Gemfile.lock

@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.5.0)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  rake (= 10.5.0)
+
+BUNDLED WITH
+   1.11.2

data/spec/sample_jar/sample_jar.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.description = ""
   s.email = ["nick@nicksieger.com"]
   s.executables = ["sample_jar"]
-  s.files = ["History.txt", "Rakefile", "README.txt", "sample_jar.gemspec", "bin/sample_jar", "lib/sample_jar.rb", "test/test_sample_jar.rb"]
+  s.bindir = 'sbin'
+  s.files = ["History.txt", "Rakefile", "README.txt", "sample_jar.gemspec", "bin/sample_jar", "sbin/sample_jar", "lib/sample_jar.rb", "test/test_sample_jar.rb"]
   s.homepage = ""
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"

data/spec/sample_jar/sbin/sample_jar

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'sample_jar'
+
+SampleJar.hello

data/spec/warbler/jar_spec.rb

@@ -149,7 +149,7 @@ describe Warbler::Jar do
       it "loads the default executable in main.rb" do
         jar.apply(config)
         contents = jar.contents('META-INF/main.rb')
-        contents.should =~ /load.*sample_jar\/bin\/sample_jar/
+        contents.should == "load 'sample_jar/sbin/sample_jar'"
       end
 
       it "includes compiled .rb and .class files" do

data/warbler.gemspec

@@ -15,7 +15,11 @@ Gem::Specification.new do |gem|
 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.}
 
-  gem.files         = `git ls-files`.split("\n")
+  gem.files         = `git ls-files`.split("\n").
+    reject { |file| file =~ /^\./ }. # .gitignore, .travis.yml
+    reject { |file| file =~ /^spec|test\// }. # spec/**/*.spec
+    reject { |file| file =~ /^integration\// }. # (un-used) *.rake files
+    reject { |file| file =~ /^rakelib\// } # (un-used) *.rake files
   gem.test_files    = `git ls-files -- {test,spec,features,integration}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]

data/web.xml.erb

@@ -15,8 +15,8 @@
 
   <%- if webxml.respond_to?(:servlet_filter) -%>
   <filter>
-    <filter-class><%= webxml.servlet_filter %></filter-class>
     <filter-name><%= webxml.servlet_filter_name %></filter-name>
+    <filter-class><%= webxml.servlet_filter %></filter-class>
     <async-supported><%= !! webxml.servlet_filter_async %></async-supported>
   </filter>
   <filter-mapping>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +116,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE.txt
@@ -642,6 +640,7 @@ files:
 - spec/sample_jar/bin/sample_jar
 - spec/sample_jar/lib/sample_jar.rb
 - spec/sample_jar/sample_jar.gemspec
+- spec/sample_jar/sbin/sample_jar
 - spec/sample_jar/test/test_sample_jar.rb
 - spec/sample_jbundler/.jbundler/classpath.rb
 - spec/sample_jbundler/Gemfile
@@ -1213,6 +1212,7 @@ test_files:
 - spec/sample_jar/bin/sample_jar
 - spec/sample_jar/lib/sample_jar.rb
 - spec/sample_jar/sample_jar.gemspec
+- spec/sample_jar/sbin/sample_jar
 - spec/sample_jar/test/test_sample_jar.rb
 - spec/sample_jbundler/.jbundler/classpath.rb
 - spec/sample_jbundler/Gemfile

data/.gitignore

@@ -1,16 +0,0 @@
-coverage*
-pkg
-doc
-.bundle
-nbproject
-target
-Gemfile.lock
-.idea
-warbler.iml
-warbler.iws
-warbler.ipr
-warbler-*.gem
-log
-integration/**/*.iml
-build.log
-.ruby-version

data/.travis.yml

@@ -1,27 +0,0 @@
-rvm:
-  - jruby-9.0.5.0
-  - jruby-9.1.0.0
-branches:
-  only:
-    - master
-    - /-dev|-feature|-fix/
-env:
-  - JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
-matrix:
-  include:
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
-  allow_failures:
-    - rvm: jruby-head
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#jruby"
-    on_success: change
-    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