warbler 1.4.0.beta2 → 1.4.0
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 +4 -4
- data/.gitignore +2 -1
- data/.travis.yml +8 -2
- data/integration/gem-initializer/pom.xml +17 -0
- data/integration/pom.xml +25 -2
- data/integration/rails4_test/pom.xml +1 -29
- data/integration/runnable_test/pom.xml +0 -4
- data/integration/simple_rack_test/pom.xml +7 -3
- data/integration/simple_rack_test/src/main/ruby/bin/install-gems.rb +10 -0
- data/integration/simple_rack_test/src/main/ruby/config/warble.rb +1 -0
- data/lib/warbler/version.rb +1 -1
- metadata +6 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b5db7f2453a4736d90d0583b5d9387cb99123acf
|
|
4
|
+
data.tar.gz: aaca41449884533d75c66137bcdd9b0cf5a9862a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 06454dc795e4c05c1dc7adabd2f6c0a819a9daf68768caa91e953e41650ea6d556940582cbc70049bdd9f9df9e50ac774bf16344ba58384ef69dd7b29acc03f7
|
|
7
|
+
data.tar.gz: 84a0472321dd6576c310173770de00c911e13f03b892d4b80d6178ced31da925b6dd1ee6ba69e9e9b400044db719f4a750e5e8133d7641c8080a781dbae14b71
|
data/.gitignore
CHANGED
data/.travis.yml
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
rvm:
|
|
2
2
|
- jruby-1.7.6
|
|
3
|
-
- jruby-head
|
|
4
3
|
branches:
|
|
5
4
|
only:
|
|
6
5
|
- master
|
|
@@ -9,12 +8,20 @@ env:
|
|
|
9
8
|
- JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
|
|
10
9
|
matrix:
|
|
11
10
|
include:
|
|
11
|
+
- rvm: jruby-head
|
|
12
|
+
env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
|
|
12
13
|
- rvm: 1.8.7
|
|
13
14
|
env: ''
|
|
14
15
|
- rvm: 1.9.2
|
|
15
16
|
env: ''
|
|
16
17
|
- rvm: 1.9.3
|
|
17
18
|
env: ''
|
|
19
|
+
- rvm: jruby
|
|
20
|
+
env: MAVEN_OPTS="-XX:MaxPermSize=128m"
|
|
21
|
+
script: cd integration && mvn clean verify
|
|
22
|
+
allow_failures:
|
|
23
|
+
- rvm: jruby
|
|
24
|
+
- rvm: jruby-head
|
|
18
25
|
notifications:
|
|
19
26
|
irc:
|
|
20
27
|
channels:
|
|
@@ -26,4 +33,3 @@ notifications:
|
|
|
26
33
|
before_install:
|
|
27
34
|
- git fetch --unshallow
|
|
28
35
|
- gem install bundler --pre
|
|
29
|
-
- mvn -v
|
|
@@ -46,6 +46,23 @@
|
|
|
46
46
|
</execution>
|
|
47
47
|
</executions>
|
|
48
48
|
</plugin>
|
|
49
|
+
<plugin>
|
|
50
|
+
<groupId>de.saumya.mojo</groupId>
|
|
51
|
+
<artifactId>jruby-maven-plugin</artifactId>
|
|
52
|
+
<executions>
|
|
53
|
+
<execution>
|
|
54
|
+
<id>install-bundler</id>
|
|
55
|
+
<inherited>true</inherited>
|
|
56
|
+
<phase>compile</phase>
|
|
57
|
+
<goals>
|
|
58
|
+
<goal>jruby</goal>
|
|
59
|
+
</goals>
|
|
60
|
+
<configuration>
|
|
61
|
+
<args>-S gem install bundler</args>
|
|
62
|
+
</configuration>
|
|
63
|
+
</execution>
|
|
64
|
+
</executions>
|
|
65
|
+
</plugin>
|
|
49
66
|
</plugins>
|
|
50
67
|
</build>
|
|
51
68
|
</project>
|
data/integration/pom.xml
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
|
|
19
19
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
20
20
|
<jruby.version>1.7.6</jruby.version>
|
|
21
|
-
<warbler.version>1.4.0
|
|
21
|
+
<warbler.version>1.4.0</warbler.version>
|
|
22
22
|
<rubygems.home>${session.executionRootDirectory}/target/rubygems</rubygems.home>
|
|
23
23
|
</properties>
|
|
24
24
|
|
|
@@ -39,7 +39,6 @@
|
|
|
39
39
|
|
|
40
40
|
<build>
|
|
41
41
|
<defaultGoal>verify</defaultGoal>
|
|
42
|
-
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
|
|
43
42
|
<resources>
|
|
44
43
|
<resource>
|
|
45
44
|
<directory>${basedir}/src/main/ruby</directory>
|
|
@@ -91,6 +90,14 @@
|
|
|
91
90
|
</plugins>
|
|
92
91
|
<pluginManagement>
|
|
93
92
|
<plugins>
|
|
93
|
+
<plugin>
|
|
94
|
+
<groupId>org.apache.maven.plugins</groupId>
|
|
95
|
+
<artifactId>maven-compiler-plugin</artifactId>
|
|
96
|
+
<configuration>
|
|
97
|
+
<source>1.7</source>
|
|
98
|
+
<target>1.7</target>
|
|
99
|
+
</configuration>
|
|
100
|
+
</plugin>
|
|
94
101
|
<plugin>
|
|
95
102
|
<groupId>org.mortbay.jetty</groupId>
|
|
96
103
|
<artifactId>maven-jetty-plugin</artifactId>
|
|
@@ -136,6 +143,22 @@
|
|
|
136
143
|
<jrubySwitches>--1.9</jrubySwitches>
|
|
137
144
|
<jrubyVersion>${jruby.version}</jrubyVersion>
|
|
138
145
|
</configuration>
|
|
146
|
+
<executions>
|
|
147
|
+
<execution>
|
|
148
|
+
<id>bundle-install</id>
|
|
149
|
+
<goals><goal>jruby</goal></goals>
|
|
150
|
+
<configuration>
|
|
151
|
+
<args>-C ${basedir}/src/main/ruby -S ${rubygems.home}/bin/bundle install</args>
|
|
152
|
+
</configuration>
|
|
153
|
+
</execution>
|
|
154
|
+
<execution>
|
|
155
|
+
<id>create-war</id>
|
|
156
|
+
<goals><goal>jruby</goal></goals>
|
|
157
|
+
<configuration>
|
|
158
|
+
<args>-C ${basedir}/src/main/ruby -S ${rubygems.home}/bin/warble</args>
|
|
159
|
+
</configuration>
|
|
160
|
+
</execution>
|
|
161
|
+
</executions>
|
|
139
162
|
</plugin>
|
|
140
163
|
</plugins>
|
|
141
164
|
</pluginManagement>
|
|
@@ -26,45 +26,17 @@
|
|
|
26
26
|
|
|
27
27
|
<build>
|
|
28
28
|
<plugins>
|
|
29
|
-
<plugin>
|
|
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
29
|
<plugin>
|
|
44
30
|
<groupId>de.saumya.mojo</groupId>
|
|
45
31
|
<artifactId>jruby-maven-plugin</artifactId>
|
|
46
32
|
<executions>
|
|
47
33
|
<execution>
|
|
48
34
|
<id>bundle-install</id>
|
|
49
|
-
<phase>
|
|
50
|
-
<goals><goal>jruby</goal></goals>
|
|
51
|
-
<configuration>
|
|
52
|
-
<args>-C src/main/ruby -S bundle install</args>
|
|
53
|
-
</configuration>
|
|
35
|
+
<phase>initialize</phase>
|
|
54
36
|
</execution>
|
|
55
|
-
</executions>
|
|
56
|
-
</plugin>
|
|
57
|
-
<plugin>
|
|
58
|
-
<groupId>de.saumya.mojo</groupId>
|
|
59
|
-
<artifactId>jruby-maven-plugin</artifactId>
|
|
60
|
-
<executions>
|
|
61
37
|
<execution>
|
|
62
38
|
<id>create-war</id>
|
|
63
39
|
<phase>pre-integration-test</phase>
|
|
64
|
-
<goals><goal>jruby</goal></goals>
|
|
65
|
-
<configuration>
|
|
66
|
-
<args>-C src/main/ruby -S ${rubygems.home}/bin/warble</args>
|
|
67
|
-
</configuration>
|
|
68
40
|
</execution>
|
|
69
41
|
</executions>
|
|
70
42
|
</plugin>
|
|
@@ -60,10 +60,6 @@
|
|
|
60
60
|
<execution>
|
|
61
61
|
<id>create-war</id>
|
|
62
62
|
<phase>pre-integration-test</phase>
|
|
63
|
-
<goals><goal>jruby</goal></goals>
|
|
64
|
-
<configuration>
|
|
65
|
-
<args>-Csrc/main/ruby -S ${rubygems.home}/bin/warble</args>
|
|
66
|
-
</configuration>
|
|
67
63
|
</execution>
|
|
68
64
|
</executions>
|
|
69
65
|
</plugin>
|
|
@@ -30,13 +30,17 @@
|
|
|
30
30
|
<artifactId>jruby-maven-plugin</artifactId>
|
|
31
31
|
<executions>
|
|
32
32
|
<execution>
|
|
33
|
-
<id>
|
|
34
|
-
<phase>
|
|
33
|
+
<id>install-gems</id>
|
|
34
|
+
<phase>initialize</phase>
|
|
35
35
|
<goals><goal>jruby</goal></goals>
|
|
36
36
|
<configuration>
|
|
37
|
-
<args>-
|
|
37
|
+
<args>-S ${basedir}/src/main/ruby/bin/install-gems.rb</args>
|
|
38
38
|
</configuration>
|
|
39
39
|
</execution>
|
|
40
|
+
<execution>
|
|
41
|
+
<id>create-war</id>
|
|
42
|
+
<phase>pre-integration-test</phase>
|
|
43
|
+
</execution>
|
|
40
44
|
</executions>
|
|
41
45
|
</plugin>
|
|
42
46
|
<plugin>
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
#!/usr/bin/env ruby
|
|
2
|
+
|
|
3
|
+
require 'rubygems'
|
|
4
|
+
require 'rubygems/dependency_installer'
|
|
5
|
+
|
|
6
|
+
installer = Gem::DependencyInstaller.new(:force => true)
|
|
7
|
+
|
|
8
|
+
installer.install( 'bouncy-castle-java', '1.5.0147' )
|
|
9
|
+
installer.install( 'rake', '10.1.0' )
|
|
10
|
+
installer.install( 'diff-lcs', '1.2.4' )
|
data/lib/warbler/version.rb
CHANGED
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: 1.4.0
|
|
4
|
+
version: 1.4.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nick Sieger
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2013-
|
|
11
|
+
date: 2013-11-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -204,6 +204,7 @@ files:
|
|
|
204
204
|
- integration/runnable_test/src/main/ruby/config/warble.rb
|
|
205
205
|
- integration/runnable_test/src/test/java/org/jruby/warbler/RunnableWarTestIT.java
|
|
206
206
|
- integration/simple_rack_test/pom.xml
|
|
207
|
+
- integration/simple_rack_test/src/main/ruby/bin/install-gems.rb
|
|
207
208
|
- integration/simple_rack_test/src/main/ruby/config.ru
|
|
208
209
|
- integration/simple_rack_test/src/main/ruby/config/warble.rb
|
|
209
210
|
- integration/simple_rack_test/src/test/java/org/jruby/warbler/AppTestIT.java
|
|
@@ -325,9 +326,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
325
326
|
version: '0'
|
|
326
327
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
327
328
|
requirements:
|
|
328
|
-
- - '
|
|
329
|
+
- - '>='
|
|
329
330
|
- !ruby/object:Gem::Version
|
|
330
|
-
version:
|
|
331
|
+
version: '0'
|
|
331
332
|
requirements: []
|
|
332
333
|
rubyforge_project: caldersphere
|
|
333
334
|
rubygems_version: 2.1.5
|
|
@@ -413,6 +414,7 @@ test_files:
|
|
|
413
414
|
- integration/runnable_test/src/main/ruby/config/warble.rb
|
|
414
415
|
- integration/runnable_test/src/test/java/org/jruby/warbler/RunnableWarTestIT.java
|
|
415
416
|
- integration/simple_rack_test/pom.xml
|
|
417
|
+
- integration/simple_rack_test/src/main/ruby/bin/install-gems.rb
|
|
416
418
|
- integration/simple_rack_test/src/main/ruby/config.ru
|
|
417
419
|
- integration/simple_rack_test/src/main/ruby/config/warble.rb
|
|
418
420
|
- integration/simple_rack_test/src/test/java/org/jruby/warbler/AppTestIT.java
|