warbler 2.0.4 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cb40a71550c20f3d1a8a2b61e5d6b356e6853eaf
4
- data.tar.gz: 0d51049692b90eb8eb4a2214f4f734c4e1bfdb19
3
+ metadata.gz: fc866f8b7cede59880be0ac7014d368a7db6d756
4
+ data.tar.gz: 5f6de19055a066bb60939c8b1aebea840f3a29f5
5
5
  SHA512:
6
- metadata.gz: d11c58088617a6b83e57bbc4f6e8552c863c8809a4d7af27c04dd63a0ef442776d69c2a2cd40319edd30b3cb8eef95ef0c3e1e19983f4febe553cd1ba5a77fe9
7
- data.tar.gz: cfaf87a6bf456bc5ee683f0be468bfeb3bb7fe3a9f3f3c1a794ad0bbda77cfd3d814b66724fcaeb8fb236613cd703b66926cd047c36daa360ac22fd6fbe2bf25
6
+ metadata.gz: dc98bb747bc17fde50404ccc478012cc7cc6504e21f91c6cd0aafe5cf636888a11749294314e75f24e4b8b5bba8cf64cb10f6cfcd7416509fabba29c2eb8b370
7
+ data.tar.gz: f2aea739629165e65f214f0d7430601e1c5763a3ca6fe6d2058a3647e41d7fe97d7dbe0125b153afbd01a384f683390d4fa1adc246c5c56684ac10726fd9da25
@@ -1,3 +1,18 @@
1
+ == 2.0.5
2
+
3
+ - #427: Check Java properties when looking up RAILS_ENV
4
+ - #424: Rails Webpacker support
5
+ - #397: Avoid warnings under JRuby 9K
6
+
7
+ == 2.0.4
8
+
9
+ - fix: an instance variable name typo (@servlet_context_listeners)
10
+ - #383: add bundler monkey patch
11
+
12
+ == 2.0.3
13
+
14
+ - Remove test_files from gemspec to save 700k
15
+
1
16
  == 2.0.2
2
17
 
3
18
  - #380: exclude spec/integration/rakelib and dot-files being packed into .gem
data/Mavenfile CHANGED
@@ -6,7 +6,7 @@ gemspec( :jar => 'warbler_jar.jar',
6
6
  :source => 'ext' )
7
7
 
8
8
  properties( 'jruby.plugins.version' => '1.1.5',
9
- 'jruby.version' => '9.1.2.0',
9
+ 'jruby.version' => '9.1.6.0',
10
10
  'jetty.version' => '9.2.10.v20150310' )
11
11
 
12
12
  # dependencies needed for compilation
@@ -23,7 +23,7 @@ plugin :invoker, '1.8' do
23
23
  :properties => { 'warbler.version' => '${project.version}',
24
24
  'jruby.version' => '${jruby.version}',
25
25
  'jetty.version' => '${jetty.version}',
26
- 'bundler.version' => '1.12.3',
26
+ 'bundler.version' => '1.12.5',
27
27
  'jruby.plugins.version' => '${jruby.plugins.version}' },
28
28
 
29
29
  :goals => ['verify'],
@@ -235,15 +235,6 @@ If you're using Bundler, you'll want to add Warbler to your +Gemfile+ :
235
235
 
236
236
  Now you should be able to invoke <tt>rake war</tt> to create your war file.
237
237
 
238
- == Ruby 1.8 compatibility
239
-
240
- Warbler supports versions of JRuby that support Ruby 1.8, so Warbler
241
- itself continues to support Ruby 1.8. However, many gems are choosing
242
- to drop 1.8 support; one of these gems is
243
- {rubyzip}(https://github.com/rubyzip/rubyzip), which Warbler relies
244
- on. If you need to use Warbler in a 1.8 environment, you will need to
245
- lock the <tt>rubyzip</tt> gem to a version before 1.0.0.
246
-
247
238
  == Troubleshooting
248
239
 
249
240
  If Warbler isn't packaging the files you were expecting, use the +war:debug+
@@ -39,8 +39,8 @@ module Warbler
39
39
  end
40
40
 
41
41
  def full_name_for(name, gem_dependencies)
42
- spec = specs(gem_dependencies).detect{ |spec| spec.name == name }
43
- spec.nil? ? name : spec.full_name
42
+ gem_spec = specs(gem_dependencies).detect{ |spec| spec.name == name }
43
+ gem_spec.nil? ? name : gem_spec.full_name
44
44
  end
45
45
 
46
46
  def specs(gem_dependencies)
@@ -70,7 +70,7 @@ module Warbler
70
70
  fail "gem '#{gem}' not installed" if matched.empty?
71
71
  spec = matched.last
72
72
  return spec unless gem_dependencies
73
- [spec] + spec.dependencies.map { |gem| find_single_gem_files(gem_dependencies, gem) }
73
+ [spec] + spec.dependencies.map { |dependent_gem| find_single_gem_files(gem_dependencies, dependent_gem) }
74
74
  end
75
75
 
76
76
  end
@@ -246,8 +246,8 @@ module Warbler
246
246
  @files[apply_pathmaps(config, d, :application)] = nil
247
247
  end
248
248
  @app_filelist = FileList[*(config.dirs.map{|d| %W{#{d}/**/*/**/* #{d}/*}}.flatten)]
249
- @app_filelist.include *(config.includes.to_a)
250
- @app_filelist.exclude *(config.excludes.to_a)
249
+ @app_filelist.include( *(config.includes.to_a) )
250
+ @app_filelist.exclude( *(config.excludes.to_a) )
251
251
  @app_filelist.map {|f| add_with_pathmaps(config, f, :application) }
252
252
  end
253
253
 
@@ -134,11 +134,11 @@ module Warbler
134
134
  end
135
135
  task "debug:includes" => "files" do
136
136
  puts "", "included files:"
137
- puts *war.app_filelist.include
137
+ puts( *war.app_filelist.include )
138
138
  end
139
139
  task "debug:excludes" => "files" do
140
140
  puts "", "excluded files:"
141
- puts *war.app_filelist.exclude
141
+ puts( *war.app_filelist.exclude )
142
142
  end
143
143
  end
144
144
 
@@ -1 +1 @@
1
- ENV['RAILS_ENV'] ||= '<%= config.webxml.rails.env %>'
1
+ ENV['RAILS_ENV'] ||= ENV_JAVA[ 'RAILS_ENV' ] || '<%= config.webxml.rails.env %>'
@@ -22,6 +22,7 @@ module Warbler
22
22
  def before_configure
23
23
  config.jar_name = default_app_name
24
24
  config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
25
+ config.pathmaps.public_html << "%{packs/(manifest.*),WEB-INF/public/packs/\\1}p"
25
26
 
26
27
  return unless Warbler.framework_detection
27
28
  return false unless task = Warbler.project_application.lookup('environment')
@@ -77,7 +78,7 @@ module Warbler
77
78
  begin
78
79
  File.open("#{ENV['BUNDLE_GEMFILE'] || 'Gemfile'}.lock") do |file|
79
80
  file.each_line do |line|
80
- match = line.match /^\s*rails\s\(\s*(\d)\.\d+\.\d+.*\)$/
81
+ match = line.match( /^\s*rails\s\(\s*(\d)\.\d+\.\d+.*\)$/ )
81
82
  return match[1].to_i if match
82
83
  end
83
84
  end
@@ -84,7 +84,7 @@ module Warbler
84
84
 
85
85
  # Add public/static assets to the root of the war file.
86
86
  def add_public_files(jar)
87
- config.public_html.exclude *(config.excludes.to_a)
87
+ config.public_html.exclude( *(config.excludes.to_a) )
88
88
  config.public_html.map {|f| jar.add_with_pathmaps(config, f, :public_html) }
89
89
  end
90
90
 
@@ -6,5 +6,5 @@
6
6
  #++
7
7
 
8
8
  module Warbler
9
- VERSION = "2.0.4"
9
+ VERSION = "2.0.5"
10
10
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: warbler
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nick Sieger
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-04 00:00:00.000000000 Z
11
+ date: 2018-05-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
189
189
  version: '0'
190
190
  requirements: []
191
191
  rubyforge_project:
192
- rubygems_version: 2.6.6
192
+ rubygems_version: 2.6.14.1
193
193
  signing_key:
194
194
  specification_version: 4
195
195
  summary: Warbler chirpily constructs .war files of your Rails applications.