warbler 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fc866f8b7cede59880be0ac7014d368a7db6d756
-  data.tar.gz: 5f6de19055a066bb60939c8b1aebea840f3a29f5
+SHA256:
+  metadata.gz: 654aeb31bfaf47861744ade9017e48bc448eae6925aa63068d2d0078f22df415
+  data.tar.gz: 05e1441e228642e09368c8d9700088e4f150eb6fbe917e67f20aac6f6a53d39c
 SHA512:
-  metadata.gz: dc98bb747bc17fde50404ccc478012cc7cc6504e21f91c6cd0aafe5cf636888a11749294314e75f24e4b8b5bba8cf64cb10f6cfcd7416509fabba29c2eb8b370
-  data.tar.gz: f2aea739629165e65f214f0d7430601e1c5763a3ca6fe6d2058a3647e41d7fe97d7dbe0125b153afbd01a384f683390d4fa1adc246c5c56684ac10726fd9da25
+  metadata.gz: 3394f5ed88207814bfa6286c75f7d18e2796b541dae0adc35b061bee56b5ae704990ebeb4551b43404f5966b07ee393149b145885fee507eb5bef962a439ba32
+  data.tar.gz: 736165aadf9d3a4005a0c9317adc8227ca68f9980b5cb46f10cf3842ec440e70252ab15f1d24906d6b8b6dd1b2fb7fe49c7c4fdc40786a3ef9c3182ef69a74b1

data/Gemfile

@@ -2,15 +2,13 @@ source "https://rubygems.org/"
 
 gemspec
 
-group :development do
-  gem "jruby-openssl", :platform => :jruby
-  gem "rcov", ">= 0.9.8", :platform => :mri_18
-  gem "childprocess", :platform => :mri
-end
+# override default maven-tools used by bundler
+gem 'maven-tools', '1.2.3'
 
-gem 'rubyzip', ENV['RUBYZIP_VERSION'] if ENV['RUBYZIP_VERSION']
-gem 'rake', ENV['RAKE_VERSION'], :require => nil if ENV['RAKE_VERSION']
 
 group :development, :test do
-  gem 'rdoc', ['>= 3.10', '< 4.3'], :require => nil
+  gem 'rdoc', ['>= 3.10', '< 7'], :require => nil
+
+  # force jruby-jars to use current JRuby version for testing
+  gem 'jruby-jars', '~> ' + JRUBY_VERSION.split('.')[0..1].join('.')
 end

data/History.txt

@@ -1,3 +1,22 @@
+== Unreleased
+
+== 2.1.0
+
+Requires JRuby >= 9.4 due to needing Ruby 3.0+ compatibility.
+
+- #439: Include gem_build_complete_path in jar for RubyGems 2.5+ extension support
+- #440: Don't overwrite user-specified `webserver.properties` file
+- #513, #521: Fix issues with openstruct used for `config.webxml` values on JRuby 9.3+
+- #527: Fix war file path as argument for Jetty runner on Jetty 9.4.32+
+- #538: Put public folders inside public for executable war
+- #552, #553: Use URI.open instead of open
+- #557: Replace File.exists? with File.exist? for Ruby 3.2.0+ compatibility
+- #559, 575: Fixes to update Warbler to modern libs and JRuby, removing old Bundler 1.x hacks
+- #562: Fix problems with spaces in path names under windows
+- #571: Use newer keyword argument rubyzip 3.0 API (drops support for JRuby 9.3)
+- #575: Fix Gem path issues on JRuby 9.4.x
+- #574: Bump default Jetty version for executables to 9.4.58.v20250814
+
 == 2.0.5
 
 - #427: Check Java properties when looking up RAILS_ENV

data/LICENSE.txt

@@ -2,6 +2,7 @@
 
 Warbler is provided under the terms of the MIT license.
 
+Warbler (c) 2013-2018 The JRuby Team
 Warbler (c) 2010-2013 Engine Yard, Inc.
 Warbler (c) 2007-2009 Sun Microsystems, Inc.
 

data/Mavenfile

@@ -5,9 +5,23 @@
 gemspec( :jar => 'warbler_jar.jar',
          :source => 'ext' )
 
-properties( 'jruby.plugins.version' => '1.1.5',
-            'jruby.version' => '9.1.6.0',
-            'jetty.version' => '9.2.10.v20150310' )
+plugin_repository( :url => 'https://central.sonatype.com/repository/maven-snapshots/',
+                   :id => 'central-snapshots' ) do
+  releases 'false'
+  snapshots 'true'
+end
+repository( :url => 'https://central.sonatype.com/repository/maven-snapshots/',
+            :id => 'central-snapshots' ) do
+  releases 'false'
+  snapshots 'true'
+end
+
+properties(
+  'project.build.sourceEncoding' => 'UTF-8',
+  'mavengem.wagon.version' => '2.0.2',
+  'jruby.plugins.version' => '3.0.6',
+  'jetty.version' => '9.4.58.v20250814',
+)
 
 # dependencies needed for compilation
 scope :provided do
@@ -15,16 +29,26 @@ scope :provided do
   jar 'org.eclipse.jetty:jetty-webapp', '${jetty.version}'
 end
 
-plugin :compiler, '3.1', :source => '1.5', :target => '1.5'
+plugin :clean, '3.5.0'
+plugin :compiler, '3.14.1', :release => '8'
+plugin :resources, '3.3.1'
+plugin :jar, '3.4.2' do
+  execute_goals(:phase => 'none') # Avoid a duplicate execution with that defined by the :gemspec directive
+end
+plugin :install, '3.1.4'
+
+gem 'bundler', '${bundler.version}'
+gem 'jruby-jars', '${jruby.version}'
 
-plugin :invoker, '1.8' do
+plugin :invoker, '3.9.1' do
   execute_goals( :install, :run,
                  :id => 'integration-test',
                  :properties => { 'warbler.version' => '${project.version}',
                                   'jruby.version' => '${jruby.version}',
                                   'jetty.version' => '${jetty.version}',
-                                  'bundler.version' => '1.12.5',
-                                  'jruby.plugins.version' => '${jruby.plugins.version}' },
+                                  'bundler.version' => '${bundler.version}',
+                                  'jruby.plugins.version' => '${jruby.plugins.version}',
+                                  'style.color' => 'always' },
 
                  :goals => ['verify'],
                  :projectsDirectory => 'integration',

data/README.rdoc

@@ -1,4 +1,5 @@
-= 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
+{rdoc-image:https://badge.fury.io/rb/warbler.svg}[http://badge.fury.io/rb/warbler] {rdoc-image:https://github.com/jruby/warbler/actions/workflows/ci.yml/badge.svg}[https://github.com/jruby/warbler/actions/workflows/ci.yml]
 
 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
@@ -7,7 +8,7 @@ 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
 Ruby applications to assemble and Just Work.
 
-Version 2.x of Warbler supports versions of JRuby from 9.0.0.0 and up.
+Version 2.x of Warbler supports versions of JRuby from 9.2.0.0 and up.
 
 Version 1.4.x of Warbler supports versions of JRuby up to 1.7.x. The {1.x-dev branch}[https://github.com/jruby/warbler/tree/1.x-dev] is the working code for this.
 
@@ -93,7 +94,7 @@ feature and creates a basic war with the sources included, make sure you run :
 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 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,
@@ -108,7 +109,7 @@ in the <tt>lib</tt> directory. Warbler packages the application so that
 
 == Jar Files
 
-=== Gem Specification (gemspec) Files
+=== Gem Specification 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,
@@ -155,7 +156,7 @@ The following items are set up for you:
 * Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
   runtime pooling is disabled.
 
-=== Other Rack-based applications
+=== Other Rack 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
@@ -166,7 +167,7 @@ to manage your gems. <tt>ENV['RACK_ENV']</tt> will be set to +production+.
 See {the examples in the jruby-rack project}[http://github.com/jruby/jruby-rack/tree/master/examples/]
 of how to configure Warbler to package Camping and Sinatra apps.
 
-=== Configuration auto-detect notes
+=== Configuration 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
@@ -178,7 +179,7 @@ of how to configure Warbler to package Camping and Sinatra apps.
   <tt>Gem.loaded_specs</tt> is available, but the application needs to be
   loaded first before its contents are reliable.
 
-== Custom configuration
+== Custom Configuration
 
 If the default settings are not appropriate for your application, you can
 customize Warbler's behavior. To customize files, libraries, and gems included
@@ -190,7 +191,7 @@ doing this. With the gem, simply run
 Finally, edit the +config/warble.rb+ to your taste. The generated file is
 fully-documented with the available options and default values.
 
-=== War layout
+=== Archive Layout
 
 The default configuration puts application files (+app+, +config+, +lib+,
 +log+, +vendor+, +tmp+) under the .war file's +WEB-INF+ directory, and files in
@@ -198,7 +199,7 @@ The default configuration puts application files (+app+, +config+, +lib+,
 automatically be placed in +WEB-INF/lib+ for placement on the web app's
 class-path.
 
-=== Web.xml
+=== web.xml
 
 Java web applications are configured mainly through this file, and Warbler
 creates a suitable default file for you for use. However, if you need to
@@ -219,7 +220,7 @@ customize it in any way, you have two options.
 
 For more information on configuration, see Warbler::Config.
 
-== Rakefile integration
+== Rakefile Integration
 
 If you'd like to control Warbler from your own project's +Rakefile+,
 simply add the following code somewhere in the +Rakefile+ :
@@ -247,11 +248,10 @@ https://github.com/jruby/warbler/issues.
 
 You can get the Warbler source using Git, in any of the following ways:
 
-   git clone git://git.caldersphere.net/warbler.git
    git clone git://github.com/jruby/warbler.git
 
 You can also download a tarball of Warbler source at
-https://github.com/jruby/warbler/tarball/master.
+https://github.com/jruby/warbler/archive/master.zip.
 
 == Development
 
@@ -266,18 +266,15 @@ There are a few integration tests in the `integration` directory that build WAR
 with Warbler, and run some basic smoke tests against them.  You can run these like so:
 
     cd integration
-    export MAVEN_OPTS="-XX:MaxPermSize=128m"
     mvn verify
 
-The increased PermGen space is for the Rails4 test. And You'll need to have Maven 3.1.1 installed, of course:
-http://maven.apache.org/ Be aware the homebrew installs 3.0.5, which doesn't work (and I don't really know why).
-
+You'll need to have Maven >= 3.1.1 installed, of course: http://maven.apache.org/
 
 == License
 
 Warbler is provided under the terms of the MIT license.
 
-Warbler (c) 2013-2015 The JRuby project
+Warbler (c) 2013-2018 The JRuby Team
 
 Warbler (c) 2010-2012 Engine Yard, Inc.
 

data/Rakefile

@@ -6,63 +6,55 @@
 # See the file LICENSE.txt for details.
 #++
 
-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'
+Bundler::GemHelper.install_tasks :dir => File.dirname(__FILE__)
 
 require 'rake/clean'
-CLEAN << "pkg" << "doc" << Dir['integration/**/target']
-
-unless Rake::Application.method_defined? :last_comment
-  Rake::Application.module_eval do
-    alias_method :last_comment, :last_description
-  end
-end # Rake 11 compatibility (due rspec/core/rake_task < 3.0)
+CLEAN << "pkg" << "doc" << Dir['integration/**/target'] << "lib/warbler_jar.jar"
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ['--color', "--format documentation"]
 end
 
+task :spec => :jar
+
 task :default => :spec
 
 # use Mavenfile to define :jar task
 require 'maven/ruby/maven'
 mvn = Maven::Ruby::Maven.new
-if defined?(JRUBY_VERISON) && ! (JRUBY_VERSION =~ /^9.0/)
-  mvn.inherit_jruby_version
-end
+mvn << "-Djruby.version=#{JRUBY_VERSION}"
+mvn << "-Dbundler.version=#{Bundler::VERSION}"
+mvn << '--no-transfer-progress'
+mvn << '--color=always'
+
+mvn.inherit_jruby_version
 
 desc 'compile java sources and build jar'
 task :jar do
-  mvn.prepare_package
+  success = mvn.prepare_package
+  exit(1) unless success
 end
 
 desc 'run some integration test'
-task :integration do
-  mvn.verify
+task :integration => :jar do
+  success = mvn.verify
+  exit(1) unless success
 end
 
 desc 'generate the pom.xml from the Mavenfile'
 task :pom do
-  mvn.validate('-Dpolyglot.dump.pom=pom.xml')
+  success = mvn.validate('-Dpolyglot.dump.pom=pom.xml')
+  exit(1) unless success
 end
 
 # Make sure jar gets compiled before the gem is built
 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
+  gemspec = Gem::Specification.load(File.expand_path('warbler.gemspec', File.dirname(__FILE__)))
   rd.rdoc_dir = "doc"
   rd.rdoc_files.include("README.rdoc", "History.txt", "LICENSE.txt")
   rd.rdoc_files += gemspec.require_paths
@@ -70,13 +62,4 @@ RDoc::Task.new(:docs) do |rd|
   rd.options += gemspec.rdoc_options
 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}}
-  end
-end
-task :release => :release_docs
+task :release => :docs

data/ext/JarMain.java

@@ -40,13 +40,20 @@ public class JarMain implements Runnable {
     JarMain(String[] args) {
         this.args = args;
         URL mainClass = getClass().getResource(MAIN);
+        URI uri;
+        File file;
+        String pathWithoutMain;
+
         try {
             this.path = mainClass.toURI().getSchemeSpecificPart();
+            pathWithoutMain = mainClass.toURI().getRawSchemeSpecificPart().replace("!" + MAIN, "");
+            uri = new URI(pathWithoutMain);
         }
         catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
-        archive = this.path.replace("!" + MAIN, "").replace("file:", "");
+
+        archive = new File(uri.getPath()).getAbsolutePath();
 
         Runtime.getRuntime().addShutdownHook(new Thread(this));
     }

data/ext/WarMain.java

@@ -67,6 +67,8 @@ public class WarMain extends JarMain {
     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";
+    static final String WEB_INF = "WEB-INF";
+    static final String META_INF = "META-INF";
 
     /**
      *  jruby arguments, consider the following command :
@@ -208,17 +210,20 @@ public class WarMain extends JarMain {
     @Override
     protected String getExtractEntryPath(final JarEntry entry) {
         final String name = entry.getName();
-        final String start = "WEB-INF";
-        if ( name.startsWith(start) ) {
+        final String res;
+        if ( name.startsWith(WEB_INF) ) {
             // WEB-INF/app/controllers/application_controller.rb ->
             // app/controllers/application_controller.rb
-            return name.substring(start.length());
-        }
-        if ( name.indexOf('/') == -1 ) {
+            res = name.substring(WEB_INF.length());
+        } else if (name.startsWith(META_INF)) {
+            // Keep them where they are.
+            res = name;
+        } else {
             // 404.html -> public/404.html
-            return "/public/" + name;
+            // javascripts -> public/javascripts
+            res = "/public/" + name;
         }
-        return '/' + name;
+        return res;
     }
 
     @Override

data/lib/warbler/gems.rb

@@ -52,8 +52,6 @@ module Warbler
     # 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_spec_class
         return BundlerHelper.to_spec(gem_pattern)

data/lib/warbler/jar.rb

@@ -88,7 +88,7 @@ module Warbler
     private :jrubyc_options
 
     def java_version(config)
-      config.bytecode_version ? "-Djava.specification.version=#{config.bytecode_version}" : ''
+      config.bytecode_version ? "-Djruby.bytecode.version=#{config.bytecode_version}" : ''
     end
 
     def replace_compiled_ruby_files(config, compiled_ruby_files)
@@ -234,6 +234,11 @@ module Warbler
         next if config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
         @files[apply_pathmaps(config, File.join(spec.full_name, f), :gems)] = src
       end
+      if File.exist?(spec.gem_build_complete_path)
+        base_dir = Pathname.new(spec.base_dir)
+        gem_build_complete_path = Pathname.new(spec.gem_build_complete_path)
+        @files[File.join(config.relative_gem_path, gem_build_complete_path.relative_path_from(base_dir))] = spec.gem_build_complete_path
+      end
     end
 
     # Add all application directories and files to the archive.
@@ -280,7 +285,7 @@ module Warbler
 
     def expand_erb(file, config)
       require 'erb'
-      erb = ERB.new(File.read(file), nil, '-')
+      erb = ERB.new(File.read(file), trim_mode: '-')
       StringIO.new(erb.result(erb_binding(config)))
     end
 

data/lib/warbler/task.rb

@@ -42,7 +42,7 @@ module Warbler
 
     def initialize(name = nil, config = nil)
       @config = config
-      if @config.nil? && File.exists?(Config::FILE)
+      if @config.nil? && File.exist?(Config::FILE)
         @config = eval(File.read(Config::FILE), binding, Config::FILE, 0)
       end
       @config ||= Config.new
@@ -148,7 +148,7 @@ module Warbler
 
     def define_config_task
       task "config" do
-        if File.exists?(Warbler::Config::FILE) && ENV["FORCE"].nil?
+        if File.exist?(Warbler::Config::FILE) && ENV["FORCE"].nil?
           puts "There's another bird sitting on my favorite branch"
           puts "(file '#{Warbler::Config::FILE}' already exists. Pass argument FORCE=1 to override)"
         elsif !File.directory?("config")

data/lib/warbler/templates/bundler.erb

@@ -2,18 +2,3 @@ ENV['BUNDLE_WITHOUT'] = '<%= config.bundle_without.join(':') %>'
 <% if config.bundler[:frozen] -%>
 ENV['BUNDLE_FROZEN'] = '1'
 <% end -%>
-
-module Bundler
-  module Patch
-    def clean_load_path
-      # nothing to be done for embedded JRuby
-    end
-  end
-  module SharedHelpers
-    def included(bundler)
-      bundler.send :include, Patch
-    end
-  end
-end
-
-require 'bundler/shared_helpers'

data/lib/warbler/templates/jar.erb

@@ -9,3 +9,5 @@ ENV['GEM_PATH'] = nil # RGs sets Gem.paths.path = Gem.default_path + [ GEM_HOME
 <% if config.bundler && config.bundler[:gemfile_path] -%>
 ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
 <% end -%>
+<%# Ensure any cached paths are cleared; otherwise behaviour can be indeterminate if the paths have already been read %>
+# Gem.clear_paths

data/lib/warbler/templates/rack.erb

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

data/lib/warbler/templates/war.erb

@@ -1,10 +1,5 @@
 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 -%>
-<% # 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__)
 <% end -%>
@@ -17,3 +12,5 @@ else
   ENV['BUNDLE_GEMFILE'] ||= $servlet_context.getRealPath('/<%= config.bundler[:gemfile_path] %>')
 <% end -%>
 end
+<%# Ensure any cached paths are cleared; otherwise behaviour can be indeterminate if the paths have already been read %>
+Gem.clear_paths

data/lib/warbler/traits/bundler.rb

@@ -38,22 +38,6 @@ module Warbler
 
         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'
-            full_gem_path = Pathname.new(spec.full_gem_path)
-            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 =~ /^[\.\/]$/
-                warn("Unable to detect bundler spec under '#{spec.full_gem_path}'' and its sub-dirs")
-                exit
-              end
-            end
-
-            spec.loaded_from = full_gem_path.join('bundler.gemspec').to_s
-            spec.full_gem_path = full_gem_path.to_s
-          end
 
           case spec.source
           when ::Bundler::Source::Git
@@ -143,7 +127,8 @@ module Warbler
         bundle_without = config.bundle_without.map { |s| s.to_sym }
         definition = ::Bundler.definition
         all = definition.specs.to_a
-        requested = definition.specs_for(definition.groups - bundle_without).to_a
+        requested_groups = definition.groups - bundle_without
+        requested = requested_groups.empty? ? [] : definition.specs_for(requested_groups).to_a
         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

data/lib/warbler/traits/gemspec.rb

@@ -56,9 +56,9 @@ module Warbler
         if ! @spec.executables.empty?
           exe_script = @spec.executables.first
           exe_path = File.join(@spec.bindir, exe_script) # bin/script
-          if File.exists?(exe_path)
+          if File.exist?(exe_path)
             exe_path
-          elsif File.exists?("bin/#{exe_script}") # compatibility
+          elsif File.exist?("bin/#{exe_script}") # compatibility
             "bin/#{exe_script}" # ... should probably remove this
           else
             raise "no `#{exe_script}` executable script found"

data/lib/warbler/traits/jbundler.rb

@@ -32,7 +32,7 @@ module Warbler
       def add_jbundler_jars
         require 'jbundler/config'
         classpath = ::JBundler::Config.new.classpath_file
-        if File.exists?( classpath )
+        if File.exist?( classpath )
           require File.expand_path( classpath )
         else
           raise 'jbundler support needs jruby to create a local config: jruby -S jbundle install'

data/lib/warbler/traits/war.rb

@@ -176,41 +176,14 @@ module Warbler
 
         def initialize(key = 'webxml')
           @key = key
-          @table = Hash.new { |h, k| h[k] = WebxmlOpenStruct.new(k) }
+          @table = Hash.new { |h, k|
+            new_ostruct_member!(k)
+            h[k] = WebxmlOpenStruct.new(k)
+          }
 
           @servlet_filter_async = nil # true/false
         end
 
-        def [](key)
-          new_ostruct_member(key)
-          send(key)
-        end
-
-        def []=(key, value)
-          new_ostruct_member(key)
-          send("#{key}=", value)
-        end
-
-        def method_missing(mid, *args)
-          len = args.length
-          if mname = mid[/.*(?==\z)/m]
-            if len != 1
-              raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
-            end
-            modifiable[new_ostruct_member(mname)] = args[0]
-          elsif len == 0
-            @table[mid]
-          else
-            err = NoMethodError.new "undefined method `#{mid}' for #{self}", mid, args
-            err.set_backtrace caller(1)
-            raise err
-          end
-        end
-
-        def respond_to_missing?(mid, include_private = false)
-          @table.key?(mid.to_s.chomp('=').to_sym) || super
-        end
-
         def servlet_filter; @servlet_filter ||= 'org.jruby.rack.RackFilter' end
         attr_writer :servlet_filter
 
@@ -259,6 +232,28 @@ module Warbler
         def to_s
           "No value for '#@key' found"
         end
+
+        private
+
+        def method_missing(mid, *args)
+          len = args.length
+          if mname = mid[/.*(?==\z)/m]
+            if len != 1
+              raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
+            end
+            self[mname] = args[0]
+          elsif len == 0
+            @table[mid]
+          else
+            err = NoMethodError.new "undefined method `#{mid}' for #{self}", mid, args
+            err.set_backtrace caller(1)
+            raise err
+          end
+        end
+
+        def respond_to_missing?(mid, include_private = false)
+          @table.key?(mid.to_s.chomp('=').to_sym) || super
+        end
       end
     end
   end

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end

data/lib/warbler/web_server.rb

@@ -20,7 +20,7 @@ module Warbler
           FileUtils.mkdir_p File.dirname(cached_path) #:nocov:
           require 'open-uri'                    #:nocov:
           begin
-            open(download_url) do |stream|        #:nocov:
+            URI.open(download_url) do |stream|        #:nocov:
               File.open(cached_path, "wb") do |f| #:nocov:
                 while buf = stream.read(4096) #:nocov:
                   f << buf                    #:nocov:
@@ -88,9 +88,9 @@ module Warbler
 
   class JettyServer < WebServer
     def initialize
-      @artifact = Artifact.new(ENV["MAVEN_REPO"] || "http://repo2.maven.org/maven2",
+      @artifact = Artifact.new(ENV["MAVEN_REPO"] || "https://repo1.maven.org/maven2",
                                "org.eclipse.jetty", "jetty-runner",
-                               ENV["WEBSERVER_VERSION"] || "9.2.9.v20150224")
+                               ENV["WEBSERVER_VERSION"] || "9.4.58.v20250814")
     end
 
     def add(jar)
@@ -103,7 +103,7 @@ module Warbler
 </Configure>
 CONFIG
 
-      jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
+      jar.files["WEB-INF/webserver.properties"] ||= StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
 args = args0,args1,args2,args3,args4,args5,args6
 props = jetty.home

data/lib/warbler/zip_support.rb

@@ -3,7 +3,7 @@ require 'zip'
 module Warbler
   class ZipSupport
     def self.create(filename, &blk)
-      Zip::File.open(filename, Zip::File::CREATE, &blk)
+      ::Zip::File.open(filename, create: true, &blk)
     end
 
     def self.open(filename, &blk)

data/warble.rb

@@ -108,7 +108,13 @@ Warbler::Config.new do |config|
   # GEM_HOME if it is set.
   # config.override_gem_home = true
 
-  # Allows for specifing custom executables
+  # Specify executable
+  # Default: First item from alphabetized Gemspec executables array
+  # Takes either of two forms:
+  #  o String: Relative path to the executable from your project root
+  #  o Two-element Array:
+  #     [0] Name of the gem that contains the executable
+  #     [1] Relative path to the executable from the gem root
   # config.executable = ["rake", "bin/rake"]
 
   # Sets default (prefixed) parameters for the executables

data/warbler.gemspec

@@ -16,20 +16,26 @@ Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way
 bundle up all of your application files for deployment to a Java environment.}
 
   gem.files         = `git ls-files`.split("\n").
-    reject { |file| file =~ /^\./ }. # .gitignore, .travis.yml
+    reject { |file| file =~ /^\./ }. # .gitignore, .github
     reject { |file| file =~ /^spec|test\// }. # spec/**/*.spec
     reject { |file| file =~ /^integration\// }. # (un-used) *.rake files
     reject { |file| file =~ /^rakelib\// } # (un-used) *.rake files
+  gem.files << "lib/warbler_jar.jar"
+  
   gem.test_files    = [] # tests and specs add 700k to the gem, so don't include them
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
   gem.rdoc_options = ["--main", "README.rdoc", "-H", "-f", "darkfish"]
 
-  gem.add_runtime_dependency 'rake', ['>= 10.1.0']
-  gem.add_runtime_dependency 'jruby-jars', ['>= 9.0.0.0']
-  gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3']
-  gem.add_runtime_dependency 'rubyzip', ['~> 1.0', '< 1.4']
-  gem.add_development_dependency 'jbundler', '~> 0.9'
-  gem.add_development_dependency 'rspec', '~> 2.10'
+  gem.required_ruby_version = ">= 3.1"
+
+  gem.add_runtime_dependency 'rake', ['~> 13.0', '>= 13.0.3']
+  gem.add_runtime_dependency 'rexml', '~> 3.0'
+  gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.1']
+  gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.3', '< 1.3']
+  gem.add_runtime_dependency 'rubyzip', '>= 3.0.0'
+  gem.add_runtime_dependency 'ostruct', '~> 0.6.2'
+  gem.add_development_dependency 'jbundler', '0.9.5'
+  gem.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,111 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Nick Sieger
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
-  name: rake
-  prerelease: false
+        version: 13.0.3
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.0
-  name: jruby-jars
-  prerelease: false
+        version: '3.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: jruby-jars
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '9.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  name: jruby-rack
-  prerelease: false
+        version: '10.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '9.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
+  name: jruby-rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
-  name: rubyzip
-  prerelease: false
+        version: '1.3'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  name: jbundler
+        version: 0.6.2
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
+  name: jbundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.10'
-  name: rspec
+        version: 0.9.5
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.0'
 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
@@ -160,7 +193,6 @@ files:
 - lib/warbler/web_server.rb
 - lib/warbler/zip_support.rb
 - lib/warbler_jar.jar
-- pom.xml
 - warble.rb
 - warbler.gemspec
 - web.xml.erb
@@ -168,7 +200,6 @@ homepage: https://github.com/jruby/warbler
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -181,16 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.1
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files: []

data/pom.xml

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-DO NOT MODIFIY - GENERATED CODE
-
-
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>rubygems</groupId>
-  <artifactId>warbler</artifactId>
-  <version>2.0.0.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, 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>
-  <licenses>
-    <license>
-      <name>MIT</name>
-      <url>http://opensource.org/licenses/MIT</url>
-      <comments>MIT license</comments>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>Nick Sieger</name>
-      <email>nick@nicksieger.com</email>
-    </developer>
-  </developers>
-  <scm>
-    <connection>https://github.com/jruby/warbler.git</connection>
-    <url>https://github.com/jruby/warbler</url>
-  </scm>
-  <properties>
-    <jruby.plugins.version>1.1.3</jruby.plugins.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rake</artifactId>
-      <version>[10.1.0,)</version>
-      <type>gem</type>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>jruby-jars</artifactId>
-      <version>[9.0.0.0,)</version>
-      <type>gem</type>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>jruby-rack</artifactId>
-      <version>[1.1.1,1.3)</version>
-      <type>gem</type>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rubyzip</artifactId>
-      <version>[1.0,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,3.1.1.99999]</version>
-      <type>gem</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rspec</artifactId>
-      <version>[2.10,2.99999]</version>
-      <type>gem</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rdoc</artifactId>
-      <version>[2.4.2,)</version>
-      <type>gem</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jruby</groupId>
-      <artifactId>jruby</artifactId>
-      <version>1.7.8</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>9.2.10.v20150310</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
-    </repository>
-  </repositories>
-  <build>
-    <sourceDirectory>ext</sourceDirectory>
-    <extensions>
-      <extension>
-        <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-with-jar-extension</artifactId>
-        <version>${jruby.plugins.version}</version>
-      </extension>
-    </extensions>
-    <directory>${basedir}/pkg</directory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outputDirectory>lib</outputDirectory>
-          <finalName>warbler_jar</finalName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>lib</directory>
-              <includes>
-                <include>warbler_jar.jar</include>
-                <include>*/**/*.jar</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-maven-plugin</artifactId>
-        <version>${jruby.plugins.version}</version>
-        <configuration>
-          <gemspec>warbler.gemspec</gemspec>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>integration-test</id>
-            <goals>
-              <goal>install</goal>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <projectsDirectory>integration</projectsDirectory>
-              <streamLogs>true</streamLogs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>