warbler 2.0.5 → 2.1.1

data/lib/warbler/traits/war.rb

@@ -21,6 +21,10 @@ module Warbler
         Traits::Rails.detect? || Traits::Rack.detect?
       end
 
+      def self.conflicts
+        [ Traits::Jar ]
+      end
+
       def before_configure
         config.gem_path      = DEFAULT_GEM_PATH
         config.pathmaps      = default_pathmaps
@@ -176,41 +180,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 +236,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/traits.rb

@@ -5,6 +5,7 @@
 # See the file LICENSE.txt for details.
 #++
 
+require 'set'
 require 'stringio'
 require 'tsort'
 
@@ -15,10 +16,13 @@ module Warbler
   # the kind of project and how it should be packed into the jar or
   # war file.
   module Traits
-    attr_accessor :traits
-
-    def initialize
-      @traits = auto_detect_traits
+    # @param forced_traits [Array<Class>, nil] array of Warbler::Trait types to force rather than auto-detecting them
+    def initialize(forced_traits)
+      @traits = if forced_traits.nil? || forced_traits.empty?
+                  auto_detect_traits
+                else
+                  validate_traits(forced_traits)
+                end
     end
 
     def auto_detect_traits
@@ -45,6 +49,18 @@ module Warbler
       @trait_objects = nil
       @traits.collect! {|t| t.name }
     end
+
+    private
+    def validate_traits(requested_traits)
+      conflicts = Set.new
+      requested_traits.each do |trait|
+        trait.conflicts.each do |conflict|
+          conflicts += [trait, conflict] if requested_traits.include?(conflict)
+        end
+      end
+      raise "Some forced traits declare conflicts with each other: #{conflicts.to_a}" unless conflicts.empty?
+      TraitsDependencyArray.new(requested_traits).tsort
+    end
   end
 
   # Each trait class includes this module to receive shared functionality.
@@ -53,6 +69,14 @@ module Warbler
       def requirements
         []
       end
+
+      def conflicts
+        []
+      end
+
+      def detect_any_conflicts?
+        conflicts.any? { |c| c.detect? }
+      end
     end
 
     def self.included(base)
@@ -108,7 +132,7 @@ module Warbler
 
     alias tsort_each_node each
     def tsort_each_child(node, &block)
-      node.requirements.each(&block)
+      node.requirements.select { |r| include?(r) }.each(&block)
     end
   end
 

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.5"
+  VERSION = "2.1.1"
 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,10 +103,9 @@ 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
 args0 = --host
 args1 = {{host}}
 args2 = --port
@@ -114,7 +113,10 @@ args3 = {{port}}
 args4 = --config
 args5 = {{config}}
 args6 = {{warfile}}
+props = jetty.home,org.eclipse.jetty.util.log.class,org.eclipse.jetty.util.log.stderr.ESCAPE
 jetty.home = {{webroot}}
+org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StdErrLog
+org.eclipse.jetty.util.log.stderr.ESCAPE = false
 PROPS
     end
   end

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

@@ -1,8 +1,25 @@
-# Disable Rake-environment-task framework detection by uncommenting/setting to false
+# Warbler is designed to auto-detect "traits" of your application based on the presence of various files.
+# In some cases this is ambiguous, or there is a desire to disable certain traits from being detected
+# and a list of traits can be supplied to override this.
+#
+# This is an advanced option, and must be a complete list of traits. Using this capability disables
+# some of Warbler's validation and conflict detection that causes traits to be automatically enabled and
+# disabled as required.
+# - `Warbler::Traits::Jar`       - package as a normal executable java archive (jar) application
+# - `Warbler::Traits::War`       - package as an executable web archive (war) application
+# - `Warbler::Traits::Bundler`   - package with the gems implied by a bundle Gemfile/Gemfile.lock
+# - `Warbler::Traits::Gemspec`   - package with the gems implied by a gemspec
+# - `Warbler::Traits::NoGemspec` - package only with the gems implied by that in a local `lib` folder
+# - `Warbler::Traits::JBundler`  - (deprecated, experimental) package with the jars implied by a `Jarfile`
+# - `Warbler::Traits::Rails`     - package with the necessary startup logic to boot a Rails application
+# - `Warbler::Traits::Rack`      - package with the necessary startup logic to boot a standalone Rack (non-Rails) application
+# forced_traits = [Warbler::Traits::Jar]
+
+# Disable Rake-environment-task framework detection for Rails applications by uncommenting/setting to false
 # Warbler.framework_detection = false
 
-# Warbler web application assembly configuration file
-Warbler::Config.new do |config|
+# Configure a new Warbler application assembly
+Warbler::Config.new(forced_traits: defined?(forced_traits) ? forced_traits : nil) do |config|
   # Features: additional options controlling how the jar is built.
   # Currently the following features are supported:
   # - *gemjar*: package the gem repository in a jar file in WEB-INF/lib
@@ -101,14 +118,20 @@ Warbler::Config.new do |config|
   # config.compile_gems = false
 
   # When set it specify the bytecode version for compiled class files
-  # config.bytecode_version = "1.6"
+  # config.bytecode_version = "1.8"
 
   # When set to true, Warbler will override the value of ENV['GEM_HOME'] even it
   # has already been set. When set to false it will use any existing value of
   # 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
@@ -165,7 +188,7 @@ Warbler::Config.new do |config|
   #   is simply embedded in web.xml.
   # The script is evaluated in a Rack::Builder to load the application.
   # Examples:
-  # config.webxml.rackup.path = 'WEB-INF/hello.ru'
+  # config.webxml.rackup.path = '/WEB-INF/hello.ru'
   # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
   # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
 

data/warbler.gemspec

@@ -16,20 +16,32 @@ 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.2']
+  gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.7', '< 1.4']
+  gem.add_runtime_dependency 'rubyzip', ['>= 2.1.0', '< 4']
+  gem.add_runtime_dependency 'ostruct', '~> 0.6.2'
+
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'drb', ['~> 2.2', '>= 2.2.3']
+  gem.add_development_dependency 'ruby-maven', '~> 3.9'
+  gem.add_development_dependency 'bigdecimal' # Needed workaround for maven-tools > vertus > axiom-types lack of explicit bigdecimal dependency for JRuby 10
+
+  # JBundler is unsupported on JRuby 10.1
+  gem.add_development_dependency 'jbundler', '~> 0.9.5' if RUBY_VERSION.to_f < 4.0
 end

data/web.xml.erb

@@ -5,7 +5,6 @@
   <!--
   <display-name>Uncomment and put name :here: for Tomcat Dashboard</display-name>-->
 
-  <%# NOTE: to be renamed to servlet_context_params %>
   <%- webxml.context_params.each do |name, value| -%>
   <context-param>
     <param-name><%= name %></param-name>
@@ -13,7 +12,6 @@
   </context-param>
   <%- end -%>
 
-  <%- if webxml.respond_to?(:servlet_filter) -%>
   <filter>
     <filter-name><%= webxml.servlet_filter_name %></filter-name>
     <filter-class><%= webxml.servlet_filter %></filter-class>
@@ -23,29 +21,12 @@
     <filter-name><%= webxml.servlet_filter_name %></filter-name>
     <url-pattern><%= webxml.servlet_filter_url_pattern %></url-pattern>
   </filter-mapping>
-  <%- else -%> <%# NOTE: due compatibility when warbler gets downgraded to 2.0.0 %>
-  <filter>
-    <filter-name>RackFilter</filter-name>
-    <filter-class>org.jruby.rack.RackFilter</filter-class>
-    <async-supported>true</async-supported>
-  </filter>
-  <filter-mapping>
-    <filter-name>RackFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <%- end -%>
 
-  <%- if webxml.respond_to?(:servlet_context_listeners) -%>
   <%- webxml.servlet_context_listeners.each do |listener| -%>
   <listener>
     <listener-class><%= listener %></listener-class>
   </listener>
   <%- end -%>
-  <%- else -%> <%# NOTE: due compatibility when warbler gets downgraded to 2.0.0 %>
-  <listener>
-    <listener-class><%= webxml.servlet_context_listener %></listener-class>
-  </listener>
-  <%- end -%>
 
   <%- [webxml.jndi].flatten.each do |jndi| -%>
   <resource-ref>

metadata

@@ -1,111 +1,198 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.1
 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.2'
   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.2'
 - !ruby/object:Gem::Dependency
+  name: jruby-rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: rubyzip
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !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
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !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: '3.0'
+- !ruby/object:Gem::Dependency
+  name: drb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
+  name: ruby-maven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
-  name: rspec
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jbundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 0.9.5
 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
@@ -116,8 +203,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
-- History.txt
 - LICENSE.txt
 - Mavenfile
 - README.rdoc
@@ -156,11 +243,9 @@ files:
 - lib/warbler/traits/rails.rb
 - lib/warbler/traits/war.rb
 - lib/warbler/version.rb
-- lib/warbler/war.rb
 - 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 +253,6 @@ homepage: https://github.com/jruby/warbler
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -181,16 +265,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.7.2
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files: []

data/lib/warbler/war.rb

@@ -1,8 +0,0 @@
-#--
-# Copyright (c) 2010-2012 Engine Yard, Inc.
-# Copyright (c) 2007-2009 Sun Microsystems, Inc.
-# This source code is available under the MIT license.
-# See the file LICENSE.txt for details.
-#++
-
-require 'warbler/jar'