warbler 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb40a71550c20f3d1a8a2b61e5d6b356e6853eaf
-  data.tar.gz: 0d51049692b90eb8eb4a2214f4f734c4e1bfdb19
+  metadata.gz: fc866f8b7cede59880be0ac7014d368a7db6d756
+  data.tar.gz: 5f6de19055a066bb60939c8b1aebea840f3a29f5
 SHA512:
-  metadata.gz: d11c58088617a6b83e57bbc4f6e8552c863c8809a4d7af27c04dd63a0ef442776d69c2a2cd40319edd30b3cb8eef95ef0c3e1e19983f4febe553cd1ba5a77fe9
-  data.tar.gz: cfaf87a6bf456bc5ee683f0be468bfeb3bb7fe3a9f3f3c1a794ad0bbda77cfd3d814b66724fcaeb8fb236613cd703b66926cd047c36daa360ac22fd6fbe2bf25
+  metadata.gz: dc98bb747bc17fde50404ccc478012cc7cc6504e21f91c6cd0aafe5cf636888a11749294314e75f24e4b8b5bba8cf64cb10f6cfcd7416509fabba29c2eb8b370
+  data.tar.gz: f2aea739629165e65f214f0d7430601e1c5763a3ca6fe6d2058a3647e41d7fe97d7dbe0125b153afbd01a384f683390d4fa1adc246c5c56684ac10726fd9da25

data/History.txt

@@ -1,3 +1,18 @@
+== 2.0.5
+
+- #427: Check Java properties when looking up RAILS_ENV
+- #424: Rails Webpacker support
+- #397: Avoid warnings under JRuby 9K
+
+== 2.0.4
+
+- fix: an instance variable name typo (@servlet_context_listeners)
+- #383: add bundler monkey patch
+
+== 2.0.3
+
+- Remove test_files from gemspec to save 700k
+
 == 2.0.2
 
 - #380: exclude spec/integration/rakelib and dot-files being packed into .gem

data/Mavenfile

@@ -6,7 +6,7 @@ gemspec( :jar => 'warbler_jar.jar',
          :source => 'ext' )
 
 properties( 'jruby.plugins.version' => '1.1.5',
-            'jruby.version' => '9.1.2.0',
+            'jruby.version' => '9.1.6.0',
             'jetty.version' => '9.2.10.v20150310' )
 
 # dependencies needed for compilation
@@ -23,7 +23,7 @@ plugin :invoker, '1.8' do
                  :properties => { 'warbler.version' => '${project.version}',
                                   'jruby.version' => '${jruby.version}',
                                   'jetty.version' => '${jetty.version}',
-                                  'bundler.version' => '1.12.3',
+                                  'bundler.version' => '1.12.5',
                                   'jruby.plugins.version' => '${jruby.plugins.version}' },
 
                  :goals => ['verify'],

data/README.rdoc

@@ -235,15 +235,6 @@ If you're using Bundler, you'll want to add Warbler to your +Gemfile+ :
 
 Now you should be able to invoke <tt>rake war</tt> to create your war file.
 
-== Ruby 1.8 compatibility
-
-Warbler supports versions of JRuby that support Ruby 1.8, so Warbler
-itself continues to support Ruby 1.8. However, many gems are choosing
-to drop 1.8 support; one of these gems is
-{rubyzip}(https://github.com/rubyzip/rubyzip), which Warbler relies
-on. If you need to use Warbler in a 1.8 environment, you will need to
-lock the <tt>rubyzip</tt> gem to a version before 1.0.0.
-
 == Troubleshooting
 
 If Warbler isn't packaging the files you were expecting, use the +war:debug+

data/lib/warbler/gems.rb

@@ -39,8 +39,8 @@ module Warbler
     end
 
     def full_name_for(name, gem_dependencies)
-      spec = specs(gem_dependencies).detect{ |spec| spec.name == name }
-      spec.nil? ? name : spec.full_name
+      gem_spec = specs(gem_dependencies).detect{ |spec| spec.name == name }
+      gem_spec.nil? ? name : gem_spec.full_name
     end
 
     def specs(gem_dependencies)
@@ -70,7 +70,7 @@ module Warbler
       fail "gem '#{gem}' not installed" if matched.empty?
       spec = matched.last
       return spec unless gem_dependencies
-      [spec] + spec.dependencies.map { |gem| find_single_gem_files(gem_dependencies, gem) }
+      [spec] + spec.dependencies.map { |dependent_gem| find_single_gem_files(gem_dependencies, dependent_gem) }
     end
 
   end

data/lib/warbler/jar.rb

@@ -246,8 +246,8 @@ module Warbler
         @files[apply_pathmaps(config, d, :application)] = nil
       end
       @app_filelist = FileList[*(config.dirs.map{|d| %W{#{d}/**/*/**/* #{d}/*}}.flatten)]
-      @app_filelist.include *(config.includes.to_a)
-      @app_filelist.exclude *(config.excludes.to_a)
+      @app_filelist.include( *(config.includes.to_a) )
+      @app_filelist.exclude( *(config.excludes.to_a) )
       @app_filelist.map {|f| add_with_pathmaps(config, f, :application) }
     end
 

data/lib/warbler/task.rb

@@ -134,11 +134,11 @@ module Warbler
       end
       task "debug:includes" => "files" do
         puts "", "included files:"
-        puts *war.app_filelist.include
+        puts( *war.app_filelist.include )
       end
       task "debug:excludes" => "files" do
         puts "", "excluded files:"
-        puts *war.app_filelist.exclude
+        puts( *war.app_filelist.exclude )
       end
     end
 

data/lib/warbler/templates/rails.erb

@@ -1 +1 @@
-ENV['RAILS_ENV'] ||= '<%= config.webxml.rails.env %>'
+ENV['RAILS_ENV'] ||= ENV_JAVA[ 'RAILS_ENV' ] || '<%= config.webxml.rails.env %>'

data/lib/warbler/traits/rails.rb

@@ -22,6 +22,7 @@ module Warbler
       def before_configure
         config.jar_name = default_app_name
         config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+        config.pathmaps.public_html << "%{packs/(manifest.*),WEB-INF/public/packs/\\1}p"
 
         return unless Warbler.framework_detection
         return false unless task = Warbler.project_application.lookup('environment')
@@ -77,7 +78,7 @@ module Warbler
         begin
           File.open("#{ENV['BUNDLE_GEMFILE'] || 'Gemfile'}.lock") do |file|
             file.each_line do |line|
-              match = line.match /^\s*rails\s\(\s*(\d)\.\d+\.\d+.*\)$/
+              match = line.match( /^\s*rails\s\(\s*(\d)\.\d+\.\d+.*\)$/ )
               return match[1].to_i if match
             end
           end

data/lib/warbler/traits/war.rb

@@ -84,7 +84,7 @@ module Warbler
 
       # Add public/static assets to the root of the war file.
       def add_public_files(jar)
-        config.public_html.exclude *(config.excludes.to_a)
+        config.public_html.exclude( *(config.excludes.to_a) )
         config.public_html.map {|f| jar.add_with_pathmaps(config, f, :public_html) }
       end
 

data/lib/warbler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.6
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.