warbler 1.4.0.beta1 → 1.4.0.beta2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/.travis.yml +2 -1
- data/Gemfile +12 -7
- data/History.txt +5 -0
- data/README.rdoc +15 -5
- data/ext/WarMain.java +11 -3
- data/integration/gem-initializer/pom.xml +21 -9
- data/integration/pom.xml +16 -7
- data/integration/rails4_test/pom.xml +31 -3
- data/integration/runnable_test/pom.xml +3 -3
- data/integration/simple_rack_test/pom.xml +3 -3
- data/lib/warbler/jar.rb +3 -3
- data/lib/warbler/traits/war.rb +1 -1
- data/lib/warbler/version.rb +1 -1
- data/lib/warbler/zip_support.rb +31 -0
- data/lib/warbler_jar.jar +0 -0
- data/spec/warbler/jar_spec.rb +8 -1
- data/spec/warbler/task_spec.rb +5 -5
- data/warbler.gemspec +3 -1
- metadata +30 -20
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: bf67e7d649e8e97a4789f2dd41dce23ac0d15f6f
|
4
|
+
data.tar.gz: e79ca7c9a266544ce0f5dd4143653e3a4bf51e1b
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 3e485b2cacf52b628340c8dc4102d243e5746dad4a93c4ec4fa54a23bde15995c6b07a94b4c2cf67ea490f2d2d228fabaa7db31923cb1bab9e89c558023f55a6
|
7
|
+
data.tar.gz: 7661e68e86c9378cb513e1ef7887a2b1d628ee29ada4b4330f1ab09cb1c73dc9989415bdf17140bfffd11004bb30e1f24216cfec0953e473430b4c57faf637a1
|
data/.travis.yml
CHANGED
data/Gemfile
CHANGED
@@ -1,15 +1,20 @@
|
|
1
1
|
source "http://rubygems.org/"
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
3
|
+
# The use of the `gemspec` directive generates tons of warnings when running the specs.
|
4
|
+
# That's because some of the specs are testing Bundler, and Bundler detects this file.
|
5
|
+
# So if you see messages like the one below, you can ignore them.
|
6
|
+
# warning: Bundler `path' components are not currently supported.
|
7
|
+
# The `warbler-1.4.0.dev' component was not bundled.
|
8
|
+
# Your application may fail to boot!
|
9
|
+
|
10
|
+
gemspec
|
7
11
|
|
8
12
|
group :development do
|
9
13
|
gem "jruby-openssl", :platform => :jruby
|
10
|
-
gem "rspec", ">= 2.8.0"
|
11
|
-
gem "diff-lcs"
|
12
14
|
gem "rcov", ">= 0.9.8", :platform => :mri_18
|
13
|
-
gem "rdoc", ">= 2.4.2"
|
14
15
|
gem "childprocess", :platform => :mri
|
15
16
|
end
|
17
|
+
|
18
|
+
if RUBY_VERSION < "1.9"
|
19
|
+
gem 'rubyzip', '~> 0.9'
|
20
|
+
end
|
data/History.txt
CHANGED
@@ -11,6 +11,11 @@
|
|
11
11
|
- #177: allow specifying executable to run including other gems executables
|
12
12
|
- #173: WAR project also should respect `override_gem_home` option
|
13
13
|
- #168: The -S rails command is not compatible with Ruby 1.8
|
14
|
+
- #190 and #206: Add zip adapter to support for rubyzip 0.9 and 1.0
|
15
|
+
- #197: Extra characters at the end of web.xml file
|
16
|
+
- #202: Recompile the booster jar after changes for "unsafe" bytes
|
17
|
+
- #204: Reset RubyGems gemspec cache between tests
|
18
|
+
- #203: Test ordering issue when running with RubyGems 2.1.9
|
14
19
|
|
15
20
|
== 1.3.8
|
16
21
|
|
data/README.rdoc
CHANGED
@@ -13,10 +13,11 @@ Ruby applications to assemble and Just Work.
|
|
13
13
|
|
14
14
|
2. Run warbler in the top directory of your application: <tt>warble</tt>.
|
15
15
|
|
16
|
-
|
17
|
-
application server.
|
16
|
+
3. Choose one:
|
18
17
|
|
19
|
-
|
18
|
+
* For a web project, deploy your +myapp.war+ file to your favorite Java application server.
|
19
|
+
|
20
|
+
* For a standalone applications, just run it: <tt>java -jar myapp.jar</tt>.
|
20
21
|
|
21
22
|
== Usage
|
22
23
|
|
@@ -225,6 +226,15 @@ If you're using Bundler, you'll want to add Warbler to your +Gemfile+ :
|
|
225
226
|
|
226
227
|
Now you should be able to invoke <tt>rake war</tt> to create your war file.
|
227
228
|
|
229
|
+
== Ruby 1.8 compatibility
|
230
|
+
|
231
|
+
Warbler supports versions of JRuby that support Ruby 1.8, so Warbler
|
232
|
+
itself continues to support Ruby 1.8. However, many gems are choosing
|
233
|
+
to drop 1.8 support; one of these gems is
|
234
|
+
{rubyzip}(https://github.com/rubyzip/rubyzip), which Warbler relies
|
235
|
+
on. If you need to use Warbler in a 1.8 environment, you will need to
|
236
|
+
lock the `rubyzip` gem to a version before 1.0.0.
|
237
|
+
|
228
238
|
== Troubleshooting
|
229
239
|
|
230
240
|
If Warbler isn't packaging the files you were expecting, use the +war:debug+
|
@@ -259,8 +269,8 @@ with Warbler, and run some basic smoke tests against them. You can run these li
|
|
259
269
|
export MAVEN_OPTS="-XX:MaxPermSize=128m"
|
260
270
|
mvn verify
|
261
271
|
|
262
|
-
The increased PermGen space is for the Rails4 test. And You'll need to have Maven installed, of course:
|
263
|
-
http://maven.apache.org/
|
272
|
+
The increased PermGen space is for the Rails4 test. And You'll need to have Maven 3.1.1 installed, of course:
|
273
|
+
http://maven.apache.org/ Be aware the homebrew installs 3.0.5, which doesn't work (and I don't really know why).
|
264
274
|
|
265
275
|
|
266
276
|
== License
|
data/ext/WarMain.java
CHANGED
@@ -317,12 +317,20 @@ public class WarMain extends JarMain {
|
|
317
317
|
|
318
318
|
invokeMethod(scriptingContainer, "runScriptlet", "" +
|
319
319
|
"ruby = RUBY_VERSION.match(/^\\d\\.\\d/)[0] \n" +
|
320
|
-
"
|
320
|
+
"jruby_major_version = JRUBY_VERSION.match(/^\\d\\.\\d/)[0].to_f \n" +
|
321
|
+
"jruby_minor_version = JRUBY_VERSION.split('.')[2].to_i\n" +
|
321
322
|
"$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/#{ruby}/site_ruby\"\n" +
|
322
323
|
"$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/shared\"\n" +
|
323
324
|
"$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/#{ruby}\"\n" +
|
324
|
-
"
|
325
|
-
"
|
325
|
+
"if jruby_major_version >= 1.7\n" +
|
326
|
+
" if jruby_minor_version >= 5\n" +
|
327
|
+
" require 'bcpkix-jdk15on-1.47.jar'\n" +
|
328
|
+
" require 'bcprov-jdk15on-1.47.jar'\n" +
|
329
|
+
" else\n" +
|
330
|
+
" require 'bcpkix-jdk15on-147.jar'\n" +
|
331
|
+
" require 'bcprov-jdk15on-147.jar'\n" +
|
332
|
+
" end\n" +
|
333
|
+
"end");
|
326
334
|
|
327
335
|
invokeMethod(scriptingContainer, "setHomeDirectory", "classpath:/META-INF/jruby.home");
|
328
336
|
}
|
@@ -13,21 +13,33 @@
|
|
13
13
|
<build>
|
14
14
|
<plugins>
|
15
15
|
<plugin>
|
16
|
-
<groupId>
|
17
|
-
<artifactId>jruby-
|
16
|
+
<groupId>de.saumya.mojo</groupId>
|
17
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
18
18
|
<executions>
|
19
19
|
<execution>
|
20
|
-
<id>build-warbler
|
21
|
-
<
|
22
|
-
<
|
20
|
+
<id>build-warbler</id>
|
21
|
+
<inherited>true</inherited>
|
22
|
+
<phase>compile</phase>
|
23
|
+
<goals>
|
24
|
+
<goal>jruby</goal>
|
25
|
+
</goals>
|
23
26
|
<configuration>
|
24
27
|
<args>-C../../ -S gem build warbler.gemspec</args>
|
25
28
|
</configuration>
|
26
29
|
</execution>
|
30
|
+
</executions>
|
31
|
+
</plugin>
|
32
|
+
<plugin>
|
33
|
+
<groupId>de.saumya.mojo</groupId>
|
34
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
35
|
+
<executions>
|
27
36
|
<execution>
|
28
|
-
<id>
|
29
|
-
<
|
30
|
-
<
|
37
|
+
<id>install-warbler</id>
|
38
|
+
<inherited>true</inherited>
|
39
|
+
<phase>compile</phase>
|
40
|
+
<goals>
|
41
|
+
<goal>jruby</goal>
|
42
|
+
</goals>
|
31
43
|
<configuration>
|
32
44
|
<args>-S gem install ${basedir}/../../warbler-${warbler.version}.gem</args>
|
33
45
|
</configuration>
|
@@ -36,4 +48,4 @@
|
|
36
48
|
</plugin>
|
37
49
|
</plugins>
|
38
50
|
</build>
|
39
|
-
</project>
|
51
|
+
</project>
|
data/integration/pom.xml
CHANGED
@@ -15,9 +15,11 @@
|
|
15
15
|
</modules>
|
16
16
|
|
17
17
|
<properties>
|
18
|
+
<version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
|
18
19
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
19
|
-
<jruby.version>1.7.
|
20
|
+
<jruby.version>1.7.6</jruby.version>
|
20
21
|
<warbler.version>1.4.0.dev</warbler.version>
|
22
|
+
<rubygems.home>${session.executionRootDirectory}/target/rubygems</rubygems.home>
|
21
23
|
</properties>
|
22
24
|
|
23
25
|
<dependencies>
|
@@ -54,6 +56,7 @@
|
|
54
56
|
<configuration>
|
55
57
|
<tasks>
|
56
58
|
<mkdir dir="target"/>
|
59
|
+
<mkdir dir="${rubygems.home}"/>
|
57
60
|
</tasks>
|
58
61
|
</configuration>
|
59
62
|
<goals>
|
@@ -88,11 +91,6 @@
|
|
88
91
|
</plugins>
|
89
92
|
<pluginManagement>
|
90
93
|
<plugins>
|
91
|
-
<plugin>
|
92
|
-
<groupId>org.jruby.plugins</groupId>
|
93
|
-
<artifactId>jruby-rake-plugin</artifactId>
|
94
|
-
<version>${jruby.version}</version>
|
95
|
-
</plugin>
|
96
94
|
<plugin>
|
97
95
|
<groupId>org.mortbay.jetty</groupId>
|
98
96
|
<artifactId>maven-jetty-plugin</artifactId>
|
@@ -128,7 +126,18 @@
|
|
128
126
|
<artifactId>exec-maven-plugin</artifactId>
|
129
127
|
<version>1.2.1</version>
|
130
128
|
</plugin>
|
129
|
+
<plugin>
|
130
|
+
<groupId>de.saumya.mojo</groupId>
|
131
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
132
|
+
<version>${version.jruby-maven-plugins}</version>
|
133
|
+
<extensions>true</extensions>
|
134
|
+
<configuration>
|
135
|
+
<gemHome>${rubygems.home}</gemHome>
|
136
|
+
<jrubySwitches>--1.9</jrubySwitches>
|
137
|
+
<jrubyVersion>${jruby.version}</jrubyVersion>
|
138
|
+
</configuration>
|
139
|
+
</plugin>
|
131
140
|
</plugins>
|
132
141
|
</pluginManagement>
|
133
142
|
</build>
|
134
|
-
</project>
|
143
|
+
</project>
|
@@ -27,15 +27,43 @@
|
|
27
27
|
<build>
|
28
28
|
<plugins>
|
29
29
|
<plugin>
|
30
|
-
<groupId>
|
31
|
-
<artifactId>jruby-
|
30
|
+
<groupId>de.saumya.mojo</groupId>
|
31
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
32
|
+
<executions>
|
33
|
+
<execution>
|
34
|
+
<id>install-bundler</id>
|
35
|
+
<phase>compile</phase>
|
36
|
+
<goals><goal>jruby</goal></goals>
|
37
|
+
<configuration>
|
38
|
+
<args>-S gem install bundler</args>
|
39
|
+
</configuration>
|
40
|
+
</execution>
|
41
|
+
</executions>
|
42
|
+
</plugin>
|
43
|
+
<plugin>
|
44
|
+
<groupId>de.saumya.mojo</groupId>
|
45
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
46
|
+
<executions>
|
47
|
+
<execution>
|
48
|
+
<id>bundle-install</id>
|
49
|
+
<phase>pre-integration-test</phase>
|
50
|
+
<goals><goal>jruby</goal></goals>
|
51
|
+
<configuration>
|
52
|
+
<args>-C src/main/ruby -S bundle install</args>
|
53
|
+
</configuration>
|
54
|
+
</execution>
|
55
|
+
</executions>
|
56
|
+
</plugin>
|
57
|
+
<plugin>
|
58
|
+
<groupId>de.saumya.mojo</groupId>
|
59
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
32
60
|
<executions>
|
33
61
|
<execution>
|
34
62
|
<id>create-war</id>
|
35
63
|
<phase>pre-integration-test</phase>
|
36
64
|
<goals><goal>jruby</goal></goals>
|
37
65
|
<configuration>
|
38
|
-
<args>-C src/main/ruby -S warble</args>
|
66
|
+
<args>-C src/main/ruby -S ${rubygems.home}/bin/warble</args>
|
39
67
|
</configuration>
|
40
68
|
</execution>
|
41
69
|
</executions>
|
@@ -54,15 +54,15 @@
|
|
54
54
|
</executions>
|
55
55
|
</plugin>
|
56
56
|
<plugin>
|
57
|
-
<groupId>
|
58
|
-
<artifactId>jruby-
|
57
|
+
<groupId>de.saumya.mojo</groupId>
|
58
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
59
59
|
<executions>
|
60
60
|
<execution>
|
61
61
|
<id>create-war</id>
|
62
62
|
<phase>pre-integration-test</phase>
|
63
63
|
<goals><goal>jruby</goal></goals>
|
64
64
|
<configuration>
|
65
|
-
<args>-Csrc/main/ruby -S warble</args>
|
65
|
+
<args>-Csrc/main/ruby -S ${rubygems.home}/bin/warble</args>
|
66
66
|
</configuration>
|
67
67
|
</execution>
|
68
68
|
</executions>
|
@@ -26,15 +26,15 @@
|
|
26
26
|
<build>
|
27
27
|
<plugins>
|
28
28
|
<plugin>
|
29
|
-
<groupId>
|
30
|
-
<artifactId>jruby-
|
29
|
+
<groupId>de.saumya.mojo</groupId>
|
30
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
31
31
|
<executions>
|
32
32
|
<execution>
|
33
33
|
<id>create-war</id>
|
34
34
|
<phase>pre-integration-test</phase>
|
35
35
|
<goals><goal>jruby</goal></goals>
|
36
36
|
<configuration>
|
37
|
-
<args>-Csrc/main/ruby -S warble</args>
|
37
|
+
<args>-Csrc/main/ruby -S ${rubygems.home}/bin/warble</args>
|
38
38
|
</configuration>
|
39
39
|
</execution>
|
40
40
|
</executions>
|
data/lib/warbler/jar.rb
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
# See the file LICENSE.txt for details.
|
6
6
|
#++
|
7
7
|
|
8
|
-
require '
|
8
|
+
require 'warbler/zip_support'
|
9
9
|
require 'stringio'
|
10
10
|
require 'pathname'
|
11
11
|
|
@@ -203,7 +203,7 @@ module Warbler
|
|
203
203
|
end
|
204
204
|
|
205
205
|
def create_jar(jar_path, entries)
|
206
|
-
|
206
|
+
ZipSupport.create(jar_path) do |zipfile|
|
207
207
|
entries.keys.sort.each do |entry|
|
208
208
|
src = entries[entry]
|
209
209
|
if src.respond_to?(:read)
|
@@ -224,7 +224,7 @@ module Warbler
|
|
224
224
|
end
|
225
225
|
|
226
226
|
def entry_in_jar(jar, entry)
|
227
|
-
|
227
|
+
ZipSupport.open(jar) do |zf|
|
228
228
|
zf.get_input_stream(entry) {|io| StringIO.new(io.read) }
|
229
229
|
end
|
230
230
|
end
|
data/lib/warbler/traits/war.rb
CHANGED
@@ -144,7 +144,7 @@ module Warbler
|
|
144
144
|
t = Tempfile.new(["empty", "jar"])
|
145
145
|
path = t.path
|
146
146
|
t.close!
|
147
|
-
|
147
|
+
ZipSupport.create(path) do |zipfile|
|
148
148
|
zipfile.mkdir("META-INF")
|
149
149
|
zipfile.get_output_stream("META-INF/MANIFEST.MF") {|f| f << ::Warbler::Jar::DEFAULT_MANIFEST }
|
150
150
|
end
|
data/lib/warbler/version.rb
CHANGED
@@ -0,0 +1,31 @@
|
|
1
|
+
module Warbler
|
2
|
+
class ZipSupportRubyZip0_9
|
3
|
+
def self.create(filename, &blk)
|
4
|
+
Zip::ZipFile.open(filename, Zip::ZipFile::CREATE, &blk)
|
5
|
+
end
|
6
|
+
|
7
|
+
def self.open(filename, &blk)
|
8
|
+
Zip::ZipFile.open(filename, &blk)
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
class ZipSupportRubyZip1_0
|
13
|
+
def self.create(filename, &blk)
|
14
|
+
Zip::File.open(filename, Zip::File::CREATE, &blk)
|
15
|
+
end
|
16
|
+
|
17
|
+
def self.open(filename, &blk)
|
18
|
+
Zip::File.open(filename, &blk)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
begin
|
24
|
+
require 'zip/zip'
|
25
|
+
Warbler::ZipSupport = Warbler::ZipSupportRubyZip0_9
|
26
|
+
rescue LoadError => e
|
27
|
+
raise e unless e.message =~ /zip/
|
28
|
+
|
29
|
+
require 'zip'
|
30
|
+
Warbler::ZipSupport = Warbler::ZipSupportRubyZip1_0
|
31
|
+
end
|
data/lib/warbler_jar.jar
CHANGED
Binary file
|
data/spec/warbler/jar_spec.rb
CHANGED
@@ -26,6 +26,13 @@ describe Warbler::Jar do
|
|
26
26
|
let(:config) { Warbler::Config.new {|c| apply_extra_config(c) } }
|
27
27
|
let(:jar) { Warbler::Jar.new }
|
28
28
|
|
29
|
+
before do
|
30
|
+
# We repeatedly load the same gemspec, but we modify it between
|
31
|
+
# loads. RubyGems treats the filename as the cache key, not taking
|
32
|
+
# into account the modification time or contents.
|
33
|
+
Gem::Specification.reset
|
34
|
+
end
|
35
|
+
|
29
36
|
context "in a jar project" do
|
30
37
|
run_in_directory "spec/sample_jar"
|
31
38
|
cleanup_temp_files
|
@@ -129,7 +136,7 @@ describe Warbler::Jar do
|
|
129
136
|
|
130
137
|
it "detects gem dependencies" do
|
131
138
|
jar.apply(config)
|
132
|
-
file_list(%r{^gems/rubyzip.*/lib/zip/zip.rb}).should_not be_empty
|
139
|
+
file_list(%r{^gems/rubyzip.*/lib/(zip/)?zip.rb}).should_not be_empty
|
133
140
|
file_list(%r{^specifications/rubyzip.*\.gemspec}).should_not be_empty
|
134
141
|
end
|
135
142
|
|
data/spec/warbler/task_spec.rb
CHANGED
@@ -100,7 +100,7 @@ describe Warbler::Task do
|
|
100
100
|
|
101
101
|
java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
|
102
102
|
|
103
|
-
|
103
|
+
Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
|
104
104
|
java_class_header = zf.get_input_stream('WEB-INF/app/helpers/application_helper.class') {|io| io.read }[0..3]
|
105
105
|
ruby_class_definition = zf.get_input_stream('WEB-INF/app/helpers/application_helper.rb') {|io| io.read }
|
106
106
|
|
@@ -116,7 +116,7 @@ describe Warbler::Task do
|
|
116
116
|
|
117
117
|
java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
|
118
118
|
|
119
|
-
|
119
|
+
Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
|
120
120
|
java_class_header = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.class') {|io| io.read }[0..3]
|
121
121
|
ruby_class_definition = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.rb') {|io| io.read }
|
122
122
|
|
@@ -139,7 +139,7 @@ describe Warbler::Task do
|
|
139
139
|
File.open("config/special.txt", "wb") {|f| f << "special"}
|
140
140
|
Dir.chdir("config") { FileUtils.ln_s "special.txt", "link.txt" }
|
141
141
|
silence { run_task "warble" }
|
142
|
-
|
142
|
+
Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
|
143
143
|
special = zf.get_input_stream('WEB-INF/config/special.txt') {|io| io.read }
|
144
144
|
link = zf.get_input_stream('WEB-INF/config/link.txt') {|io| io.read }
|
145
145
|
link.should == special
|
@@ -149,7 +149,7 @@ describe Warbler::Task do
|
|
149
149
|
it "should process directory symlinks by copying the whole subdirectory" do
|
150
150
|
Dir.chdir("lib") { FileUtils.ln_s "tasks", "rakelib" }
|
151
151
|
silence { run_task "warble" }
|
152
|
-
|
152
|
+
Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
|
153
153
|
zf.find_entry("WEB-INF/lib/tasks/utils.rake").should_not be_nil
|
154
154
|
zf.find_entry("WEB-INF/lib/rakelib/").should_not be_nil
|
155
155
|
zf.find_entry("WEB-INF/lib/rakelib/utils.rake").should_not be_nil if defined?(JRUBY_VERSION)
|
@@ -183,7 +183,7 @@ describe Warbler::Task do
|
|
183
183
|
silence { run_task "warble" }
|
184
184
|
end
|
185
185
|
|
186
|
-
|
186
|
+
Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
|
187
187
|
rspec = config.gems.keys.detect { |spec| spec.name == 'rspec' }
|
188
188
|
rspec.should_not be_nil, "expected rspec gem among: #{config.gems.keys.join(' ')}"
|
189
189
|
zf.find_entry("WEB-INF/gems/specifications/rspec-#{rspec.version}.gemspec").should_not be_nil
|
data/warbler.gemspec
CHANGED
@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
|
|
7
7
|
gem.version = Warbler::VERSION
|
8
8
|
gem.platform = Gem::Platform::RUBY
|
9
9
|
gem.homepage = "http://caldersphere.rubyforge.org/warbler"
|
10
|
+
gem.license = 'MIT'
|
10
11
|
gem.authors = ["Nick Sieger"]
|
11
12
|
gem.email = "nick@nicksieger.com"
|
12
13
|
gem.summary = "Warbler chirpily constructs .war files of your Rails applications."
|
@@ -26,6 +27,7 @@ deployment to a Java environment.}
|
|
26
27
|
gem.add_runtime_dependency 'rake', [">= 0.9.6"]
|
27
28
|
gem.add_runtime_dependency 'jruby-jars', [">= 1.5.6"]
|
28
29
|
gem.add_runtime_dependency 'jruby-rack', [">= 1.0.0"]
|
29
|
-
gem.add_runtime_dependency 'rubyzip', ["
|
30
|
+
gem.add_runtime_dependency 'rubyzip', [">= 0.9", "< 1.1"]
|
30
31
|
gem.add_development_dependency 'rspec', "~> 2.10"
|
32
|
+
gem.add_development_dependency 'rdoc', ">= 2.4.2"
|
31
33
|
end
|
metadata
CHANGED
@@ -1,15 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: warbler
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.0.
|
5
|
-
prerelease: 6
|
4
|
+
version: 1.4.0.beta2
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Nick Sieger
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date: 2013-
|
11
|
+
date: 2013-10-27 00:00:00.000000000 Z
|
13
12
|
dependencies:
|
14
13
|
- !ruby/object:Gem::Dependency
|
15
14
|
name: rake
|
@@ -18,13 +17,11 @@ dependencies:
|
|
18
17
|
- - '>='
|
19
18
|
- !ruby/object:Gem::Version
|
20
19
|
version: 0.9.6
|
21
|
-
none: false
|
22
20
|
requirement: !ruby/object:Gem::Requirement
|
23
21
|
requirements:
|
24
22
|
- - '>='
|
25
23
|
- !ruby/object:Gem::Version
|
26
24
|
version: 0.9.6
|
27
|
-
none: false
|
28
25
|
prerelease: false
|
29
26
|
type: :runtime
|
30
27
|
- !ruby/object:Gem::Dependency
|
@@ -34,13 +31,11 @@ dependencies:
|
|
34
31
|
- - '>='
|
35
32
|
- !ruby/object:Gem::Version
|
36
33
|
version: 1.5.6
|
37
|
-
none: false
|
38
34
|
requirement: !ruby/object:Gem::Requirement
|
39
35
|
requirements:
|
40
36
|
- - '>='
|
41
37
|
- !ruby/object:Gem::Version
|
42
38
|
version: 1.5.6
|
43
|
-
none: false
|
44
39
|
prerelease: false
|
45
40
|
type: :runtime
|
46
41
|
- !ruby/object:Gem::Dependency
|
@@ -50,29 +45,31 @@ dependencies:
|
|
50
45
|
- - '>='
|
51
46
|
- !ruby/object:Gem::Version
|
52
47
|
version: 1.0.0
|
53
|
-
none: false
|
54
48
|
requirement: !ruby/object:Gem::Requirement
|
55
49
|
requirements:
|
56
50
|
- - '>='
|
57
51
|
- !ruby/object:Gem::Version
|
58
52
|
version: 1.0.0
|
59
|
-
none: false
|
60
53
|
prerelease: false
|
61
54
|
type: :runtime
|
62
55
|
- !ruby/object:Gem::Dependency
|
63
56
|
name: rubyzip
|
64
57
|
version_requirements: !ruby/object:Gem::Requirement
|
65
58
|
requirements:
|
66
|
-
- -
|
59
|
+
- - '>='
|
67
60
|
- !ruby/object:Gem::Version
|
68
61
|
version: '0.9'
|
69
|
-
|
62
|
+
- - <
|
63
|
+
- !ruby/object:Gem::Version
|
64
|
+
version: '1.1'
|
70
65
|
requirement: !ruby/object:Gem::Requirement
|
71
66
|
requirements:
|
72
|
-
- -
|
67
|
+
- - '>='
|
73
68
|
- !ruby/object:Gem::Version
|
74
69
|
version: '0.9'
|
75
|
-
|
70
|
+
- - <
|
71
|
+
- !ruby/object:Gem::Version
|
72
|
+
version: '1.1'
|
76
73
|
prerelease: false
|
77
74
|
type: :runtime
|
78
75
|
- !ruby/object:Gem::Dependency
|
@@ -82,13 +79,25 @@ dependencies:
|
|
82
79
|
- - ~>
|
83
80
|
- !ruby/object:Gem::Version
|
84
81
|
version: '2.10'
|
85
|
-
none: false
|
86
82
|
requirement: !ruby/object:Gem::Requirement
|
87
83
|
requirements:
|
88
84
|
- - ~>
|
89
85
|
- !ruby/object:Gem::Version
|
90
86
|
version: '2.10'
|
91
|
-
|
87
|
+
prerelease: false
|
88
|
+
type: :development
|
89
|
+
- !ruby/object:Gem::Dependency
|
90
|
+
name: rdoc
|
91
|
+
version_requirements: !ruby/object:Gem::Requirement
|
92
|
+
requirements:
|
93
|
+
- - '>='
|
94
|
+
- !ruby/object:Gem::Version
|
95
|
+
version: 2.4.2
|
96
|
+
requirement: !ruby/object:Gem::Requirement
|
97
|
+
requirements:
|
98
|
+
- - '>='
|
99
|
+
- !ruby/object:Gem::Version
|
100
|
+
version: 2.4.2
|
92
101
|
prerelease: false
|
93
102
|
type: :development
|
94
103
|
description: |-
|
@@ -226,6 +235,7 @@ files:
|
|
226
235
|
- lib/warbler/version.rb
|
227
236
|
- lib/warbler/war.rb
|
228
237
|
- lib/warbler/web_server.rb
|
238
|
+
- lib/warbler/zip_support.rb
|
229
239
|
- lib/warbler_jar.jar
|
230
240
|
- spec/drb_default_id_conv.rb
|
231
241
|
- spec/drb_helper.rb
|
@@ -296,7 +306,9 @@ files:
|
|
296
306
|
- warbler.gemspec
|
297
307
|
- web.xml.erb
|
298
308
|
homepage: http://caldersphere.rubyforge.org/warbler
|
299
|
-
licenses:
|
309
|
+
licenses:
|
310
|
+
- MIT
|
311
|
+
metadata: {}
|
300
312
|
post_install_message:
|
301
313
|
rdoc_options:
|
302
314
|
- --main
|
@@ -311,18 +323,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
311
323
|
- - '>='
|
312
324
|
- !ruby/object:Gem::Version
|
313
325
|
version: '0'
|
314
|
-
none: false
|
315
326
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
316
327
|
requirements:
|
317
328
|
- - '>'
|
318
329
|
- !ruby/object:Gem::Version
|
319
330
|
version: 1.3.1
|
320
|
-
none: false
|
321
331
|
requirements: []
|
322
332
|
rubyforge_project: caldersphere
|
323
|
-
rubygems_version: 1.
|
333
|
+
rubygems_version: 2.1.5
|
324
334
|
signing_key:
|
325
|
-
specification_version:
|
335
|
+
specification_version: 4
|
326
336
|
summary: Warbler chirpily constructs .war files of your Rails applications.
|
327
337
|
test_files:
|
328
338
|
- integration/gem-initializer/pom.xml
|