warbler 1.4.0 → 1.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +4 -1
- data/Gemfile +0 -7
- data/History.txt +8 -0
- data/README.rdoc +5 -0
- data/integration/pom.xml +2 -2
- data/integration/simple_rack_test/pom.xml +2 -2
- data/lib/warbler/config.rb +3 -0
- data/lib/warbler/jar.rb +2 -1
- data/lib/warbler/templates/jbundler.erb +2 -0
- data/lib/warbler/templates/rack.erb +2 -0
- data/lib/warbler/templates/war.erb +1 -1
- data/lib/warbler/traits.rb +1 -0
- data/lib/warbler/traits/bundler.rb +9 -3
- data/lib/warbler/traits/jbundler.rb +49 -0
- data/lib/warbler/version.rb +1 -1
- data/spec/sample_jbundler/.jbundler/classpath.rb +5 -0
- data/spec/sample_jbundler/Gemfile +3 -0
- data/spec/sample_jbundler/Jarfile +1 -0
- data/spec/sample_jbundler/Jarfile.lock +2 -0
- data/spec/sample_jbundler/config.ru +0 -0
- data/spec/sample_jbundler/local_repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar +0 -0
- data/spec/sample_jbundler/local_repository/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar +0 -0
- data/spec/sample_jbundler/vendor/bundle/gems/.keep +0 -0
- data/spec/sample_jbundler/vendor/bundle/specifications/.keep +0 -0
- data/spec/sample_rack_war/config.ru +3 -0
- data/spec/sample_rack_war/lib/app.rb +6 -0
- data/spec/sample_war/.jbundler/classpath.rb +1 -0
- data/spec/sample_war/Jarfile.lock +2 -0
- data/spec/sample_war/Special-Jarfile +1 -0
- data/spec/sample_war/Special-Jarfile.lock +2 -0
- data/spec/sample_war/some.jar +0 -0
- data/spec/spec_helper.rb +5 -4
- data/spec/warbler/bundler_spec.rb +33 -6
- data/spec/warbler/config_spec.rb +4 -0
- data/spec/warbler/jar_spec.rb +6 -0
- data/spec/warbler/jbundler_spec.rb +83 -0
- data/warbler.gemspec +1 -0
- metadata +53 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4263713e65c4c0f07c101ab6e8859f9c2f153f55
|
4
|
+
data.tar.gz: 8156a547e769eead7e69635950ad5066b671deec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f39deef15841bb1ad34144a87f898f9180036b3f7bf9a13f95d17f3952ef71e22c69f9f9610befba1b0615e888a15318e978219ca481c434accd382ee0027bd6
|
7
|
+
data.tar.gz: 014b087fd609ae7c54a321fb935aebeccec3a13bc6a72fb8ab05c2b5e7ce31691e81bb8248d3fca7fa33605661a1595f20d01a862da019f17a8da12511526acd
|
data/.travis.yml
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
rvm:
|
2
|
-
- jruby-1.7.
|
2
|
+
- jruby-1.7.7
|
3
3
|
branches:
|
4
4
|
only:
|
5
5
|
- master
|
@@ -10,6 +10,8 @@ matrix:
|
|
10
10
|
include:
|
11
11
|
- rvm: jruby-head
|
12
12
|
env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
|
13
|
+
- rvm: jruby-1.7.9
|
14
|
+
env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
|
13
15
|
- rvm: 1.8.7
|
14
16
|
env: ''
|
15
17
|
- rvm: 1.9.2
|
@@ -31,5 +33,6 @@ notifications:
|
|
31
33
|
template:
|
32
34
|
- "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
|
33
35
|
before_install:
|
36
|
+
- sudo apt-get update && sudo apt-get install git
|
34
37
|
- git fetch --unshallow
|
35
38
|
- gem install bundler --pre
|
data/Gemfile
CHANGED
@@ -1,12 +1,5 @@
|
|
1
1
|
source "http://rubygems.org/"
|
2
2
|
|
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
3
|
gemspec
|
11
4
|
|
12
5
|
group :development do
|
data/History.txt
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
== 1.4.1
|
2
|
+
- Support for JBundler
|
3
|
+
- #165: Problem with bundler git gems
|
4
|
+
- #239: Supresses a warning when using bundler
|
5
|
+
- #221: Adding WEB-INF to $LOAD_PATH for simple Rack-only apps
|
6
|
+
- #220: For Rack-only apps, WEB-INF should be added to $LOAD_PATH
|
7
|
+
- #218: Invoke jrubyc using system to ensure that STDERR from jrubyc is shown
|
8
|
+
|
1
9
|
== 1.4.0
|
2
10
|
|
3
11
|
- Support for Rails 4.x
|
data/README.rdoc
CHANGED
@@ -132,6 +132,11 @@ Warbler supports Bundler for gems and git repositories, but not for plain path
|
|
132
132
|
components. Warbler will warn when a +:path+ component is found in the +Gemfile+
|
133
133
|
and will refuse to include it in the archive.
|
134
134
|
|
135
|
+
=== JBundler (experimental)
|
136
|
+
|
137
|
+
Applications that use JBundler[http://github.com/mkristian/jbundler], detected
|
138
|
+
via presence of a +Jarfile+, will have the jars packaged up into the archive. the JBundler gem is **not** needed for runtime since all jars are already part of the classloader.
|
139
|
+
|
135
140
|
== War Files
|
136
141
|
|
137
142
|
=== Rails applications
|
data/integration/pom.xml
CHANGED
@@ -17,8 +17,8 @@
|
|
17
17
|
<properties>
|
18
18
|
<version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
|
19
19
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
20
|
-
<jruby.version>1.7.
|
21
|
-
<warbler.version>1.4.
|
20
|
+
<jruby.version>1.7.9</jruby.version>
|
21
|
+
<warbler.version>1.4.1.dev</warbler.version>
|
22
22
|
<rubygems.home>${session.executionRootDirectory}/target/rubygems</rubygems.home>
|
23
23
|
</properties>
|
24
24
|
|
@@ -16,9 +16,9 @@
|
|
16
16
|
|
17
17
|
<dependencies>
|
18
18
|
<dependency>
|
19
|
-
<groupId>${groupId}</groupId>
|
19
|
+
<groupId>${project.groupId}</groupId>
|
20
20
|
<artifactId>gem-initializer</artifactId>
|
21
|
-
<version>${version}</version>
|
21
|
+
<version>${project.version}</version>
|
22
22
|
<type>pom</type>
|
23
23
|
</dependency>
|
24
24
|
</dependencies>
|
data/lib/warbler/config.rb
CHANGED
@@ -105,6 +105,9 @@ module Warbler
|
|
105
105
|
# Defaults to ["development", "test", "assets"].
|
106
106
|
attr_accessor :bundle_without
|
107
107
|
|
108
|
+
# Use JBundler to locate gems if Jarfile is found. Default is true.
|
109
|
+
attr_accessor :jbundler
|
110
|
+
|
108
111
|
# Path to the pre-bundled gem directory inside the war file. Default is '/WEB-INF/gems'.
|
109
112
|
# This also sets 'gem.path' inside web.xml.
|
110
113
|
attr_accessor :gem_path
|
data/lib/warbler/jar.rb
CHANGED
@@ -50,7 +50,8 @@ module Warbler
|
|
50
50
|
compat_version = ''
|
51
51
|
end
|
52
52
|
# Need to use the version of JRuby in the application to compile it
|
53
|
-
%
|
53
|
+
system %Q{env -i java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} org.jruby.Main #{compat_version} -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
|
54
|
+
raise "Compile failed" if $?.exitstatus > 0
|
54
55
|
end
|
55
56
|
|
56
57
|
def replace_compiled_ruby_files(config, compiled_ruby_files)
|
@@ -2,7 +2,7 @@
|
|
2
2
|
if $servlet_context.nil?
|
3
3
|
ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path('../../WEB-INF', __FILE__)
|
4
4
|
<% if config.bundler && config.bundler[:gemfile_path] %>
|
5
|
-
ENV['BUNDLE_GEMFILE']
|
5
|
+
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../<%= config.bundler[:gemfile_path] %>', __FILE__)
|
6
6
|
<% end %>
|
7
7
|
else
|
8
8
|
ENV['GEM_HOME'] <%= assignment_operator %> $servlet_context.getRealPath('<%= config.gem_path %>')
|
data/lib/warbler/traits.rb
CHANGED
@@ -62,9 +62,11 @@ module Warbler
|
|
62
62
|
config.bundler[:git_specs] ||= []
|
63
63
|
config.bundler[:git_specs] << spec
|
64
64
|
when ::Bundler::Source::Path
|
65
|
-
|
66
|
-
|
67
|
-
|
65
|
+
unless bundler_source_is_warbled_gem_itself?(spec.source)
|
66
|
+
$stderr.puts("warning: Bundler `path' components are not currently supported.",
|
67
|
+
"The `#{spec.full_name}' component was not bundled.",
|
68
|
+
"Your application may fail to boot!")
|
69
|
+
end
|
68
70
|
else
|
69
71
|
config.gems << spec
|
70
72
|
end
|
@@ -141,6 +143,10 @@ module Warbler
|
|
141
143
|
excluded_git_specs.each {|spec| spec.groups << :warbler_excluded }
|
142
144
|
requested + excluded_git_specs
|
143
145
|
end
|
146
|
+
|
147
|
+
def bundler_source_is_warbled_gem_itself?(source)
|
148
|
+
source.path.to_s == '.'
|
149
|
+
end
|
144
150
|
end
|
145
151
|
end
|
146
152
|
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
#--
|
2
|
+
# Copyright (c) 2010-2012 Engine Yard, Inc.
|
3
|
+
# Copyright (c) 2007-2009 Sun Microsystems, Inc.
|
4
|
+
# This source code is available under the MIT license.
|
5
|
+
# See the file LICENSE.txt for details.
|
6
|
+
#++
|
7
|
+
|
8
|
+
module Warbler
|
9
|
+
module Traits
|
10
|
+
# The JBundler trait uses JBundler to determine jar dependencies to
|
11
|
+
# be added to the project.
|
12
|
+
class JBundler
|
13
|
+
include Trait
|
14
|
+
include PathmapHelper
|
15
|
+
|
16
|
+
def self.detect?
|
17
|
+
File.exist?(ENV['JBUNDLE_JARFILE'] || "Jarfile")
|
18
|
+
end
|
19
|
+
|
20
|
+
def self.requires?(trait)
|
21
|
+
trait == Traits::War || trait == Traits::Jar
|
22
|
+
end
|
23
|
+
|
24
|
+
def before_configure
|
25
|
+
config.jbundler = true
|
26
|
+
end
|
27
|
+
|
28
|
+
def after_configure
|
29
|
+
add_jbundler_jars if config.jbundler
|
30
|
+
end
|
31
|
+
|
32
|
+
def add_jbundler_jars
|
33
|
+
require 'jbundler/config'
|
34
|
+
classpath = ::JBundler::Config.new.classpath_file
|
35
|
+
if File.exists?( classpath )
|
36
|
+
require File.expand_path( classpath )
|
37
|
+
else
|
38
|
+
raise 'jbundler support needs jruby to create a local config: jruby -S jbundle install'
|
39
|
+
end
|
40
|
+
# use only the jars from jbundler
|
41
|
+
config.java_libs.clear
|
42
|
+
JBUNDLER_CLASSPATH.each do |jar|
|
43
|
+
config.java_libs << jar
|
44
|
+
end
|
45
|
+
config.init_contents << "#{config.warbler_templates}/jbundler.erb"
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
data/lib/warbler/version.rb
CHANGED
@@ -0,0 +1,5 @@
|
|
1
|
+
JBUNDLER_CLASSPATH = []
|
2
|
+
JBUNDLER_CLASSPATH << './local_repository/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar'
|
3
|
+
JBUNDLER_CLASSPATH << './local_repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar'
|
4
|
+
JBUNDLER_CLASSPATH.freeze
|
5
|
+
JBUNDLER_CLASSPATH.each { |c| require c }
|
@@ -0,0 +1 @@
|
|
1
|
+
jar 'org.slf4j:slf4j-simple', '1.7.5'
|
File without changes
|
Binary file
|
data/spec/sample_jbundler/local_repository/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar
ADDED
Binary file
|
File without changes
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
JBUNDLER_CLASSPATH = ['some.jar']
|
@@ -0,0 +1 @@
|
|
1
|
+
jar 'org.slf4j:slf4j-simple', '1.7.5'
|
File without changes
|
data/spec/spec_helper.rb
CHANGED
@@ -73,11 +73,12 @@ module ExampleGroupHelpers
|
|
73
73
|
end
|
74
74
|
end
|
75
75
|
|
76
|
-
def cleanup_temp_files
|
76
|
+
def cleanup_temp_files(*except_files)
|
77
77
|
after(:each) do
|
78
|
-
FileUtils.rm_rf FileList["log", ".bundle", "tmp/war"]
|
79
|
-
FileUtils.rm_f FileList["*.war", "*.foobar", "**/config.ru", "*web.xml*", "config/web.xml*",
|
80
|
-
|
78
|
+
FileUtils.rm_rf FileList[*(["log", ".bundle", "tmp/war"] - except_files)]
|
79
|
+
FileUtils.rm_f FileList[*(["*.war", "*.foobar", "**/config.ru", "*web.xml*", "config/web.xml*",
|
80
|
+
"config/warble.rb", "file.txt", 'manifest', '*Gemfile*', 'MANIFEST.MF*', 'init.rb*',
|
81
|
+
'**/*.class'] - except_files)]
|
81
82
|
end
|
82
83
|
end
|
83
84
|
|
@@ -60,12 +60,28 @@ describe Warbler::Jar, "with Bundler" do
|
|
60
60
|
file_list(%r{WEB-INF/jewels/specifications/rspec}).should_not be_empty
|
61
61
|
end
|
62
62
|
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
63
|
+
context 'with :git entries in the Gemfile' do
|
64
|
+
before do
|
65
|
+
File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
|
66
|
+
`#{RUBY_EXE} -S bundle install --local`
|
67
|
+
end
|
68
|
+
|
69
|
+
it "works with :git entries in Gemfiles" do
|
70
|
+
jar.apply(config)
|
71
|
+
file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
|
72
|
+
file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
|
73
|
+
end
|
74
|
+
|
75
|
+
it "can run commands in the generated warfile" do
|
76
|
+
use_config do |config|
|
77
|
+
config.features = %w{runnable}
|
78
|
+
config.override_gem_home = false
|
79
|
+
end
|
80
|
+
jar.apply(config)
|
81
|
+
jar.create('foo.war')
|
82
|
+
`java -jar foo.war -S rake -T`
|
83
|
+
$?.exitstatus.should == 0
|
84
|
+
end
|
69
85
|
end
|
70
86
|
|
71
87
|
it "bundles only the gemspec for :git entries that are excluded" do
|
@@ -167,4 +183,15 @@ describe Warbler::Jar, "with Bundler" do
|
|
167
183
|
file_list(%r{gems/bundler-.*/lib}).should_not be_empty
|
168
184
|
end
|
169
185
|
end
|
186
|
+
|
187
|
+
context "in a rack app" do
|
188
|
+
run_in_directory "spec/sample_rack_war"
|
189
|
+
cleanup_temp_files '**/config.ru'
|
190
|
+
|
191
|
+
it "should have default load path" do
|
192
|
+
jar.add_init_file(config)
|
193
|
+
contents = jar.contents('META-INF/init.rb')
|
194
|
+
contents.should =~ /\$LOAD_PATH\.unshift \$servlet_context\.getRealPath\('\/WEB-INF'\) if \$servlet_context/
|
195
|
+
end
|
196
|
+
end
|
170
197
|
end
|
data/spec/warbler/config_spec.rb
CHANGED
@@ -15,6 +15,10 @@ describe Warbler::Config do
|
|
15
15
|
context "in an unknown application" do
|
16
16
|
run_in_directory 'spec/sample_war/tmp'
|
17
17
|
|
18
|
+
after :each do
|
19
|
+
rm_rf "../tmp"
|
20
|
+
end
|
21
|
+
|
18
22
|
it "has suitable default values" do
|
19
23
|
config = Warbler::Config.new
|
20
24
|
config.includes.should be_empty
|
data/spec/warbler/jar_spec.rb
CHANGED
@@ -807,11 +807,17 @@ describe Warbler::Jar do
|
|
807
807
|
|
808
808
|
context "in a Rack application" do
|
809
809
|
before :each do
|
810
|
+
mkdir 'tmp' unless File.directory?('tmp')
|
810
811
|
Dir.chdir('tmp')
|
811
812
|
rackup = "run Proc.new {|env| [200, {}, ['Hello World']]}"
|
812
813
|
File.open("config.ru", "w") {|f| f << rackup }
|
813
814
|
end
|
814
815
|
|
816
|
+
after :each do
|
817
|
+
Dir.chdir('..')
|
818
|
+
rm_rf 'tmp'
|
819
|
+
end
|
820
|
+
|
815
821
|
it "detects a Rack trait" do
|
816
822
|
config.traits.should include(Warbler::Traits::Rack)
|
817
823
|
end
|
@@ -0,0 +1,83 @@
|
|
1
|
+
#--
|
2
|
+
# Copyright (c) 2010-2012 Engine Yard, Inc.
|
3
|
+
# Copyright (c) 2007-2009 Sun Microsystems, Inc.
|
4
|
+
# This source code is available under the MIT license.
|
5
|
+
# See the file LICENSE.txt for details.
|
6
|
+
#++
|
7
|
+
|
8
|
+
require File.expand_path('../../spec_helper', __FILE__)
|
9
|
+
|
10
|
+
describe Warbler::Jar, "with JBundler" do
|
11
|
+
use_fresh_rake_application
|
12
|
+
use_fresh_environment
|
13
|
+
run_out_of_process_with_drb
|
14
|
+
|
15
|
+
def file_list(regex)
|
16
|
+
jar.files.keys.select {|f| f =~ regex }
|
17
|
+
end
|
18
|
+
|
19
|
+
def use_config(&block)
|
20
|
+
@extra_config = block
|
21
|
+
end
|
22
|
+
|
23
|
+
let(:config) { drbclient.config(@extra_config) }
|
24
|
+
let(:jar) { drbclient.jar }
|
25
|
+
|
26
|
+
context "in a war project" do
|
27
|
+
run_in_directory "spec/sample_war"
|
28
|
+
cleanup_temp_files
|
29
|
+
|
30
|
+
before :each do
|
31
|
+
File.open("Gemfile", "w") {|f| f << "gem 'jbundler'"}
|
32
|
+
File.open("Jarfile", "w") {|f| f << "jar 'org.slf4j:slf4j-simple', '1.7.5'"}
|
33
|
+
end
|
34
|
+
|
35
|
+
it "detects a JBundler trait" do
|
36
|
+
config.traits.should include(Warbler::Traits::JBundler)
|
37
|
+
end
|
38
|
+
|
39
|
+
it "detects a Jarfile and process only its jars" do
|
40
|
+
use_config do |config|
|
41
|
+
config.java_libs << "local.jar"
|
42
|
+
end
|
43
|
+
jar.apply(config)
|
44
|
+
file_list(%r{WEB-INF/libs/local.jar}).should be_empty
|
45
|
+
end
|
46
|
+
|
47
|
+
it "copies jars from jbundler classpath into the war" do
|
48
|
+
File.open(".jbundler/classpath.rb", "w") {|f| f << "JBUNDLER_CLASSPATH = ['some.jar']"}
|
49
|
+
File.open("some.jar", "w") {|f| f << ""}
|
50
|
+
jar.apply(config)
|
51
|
+
file_list(%r{WEB-INF/lib/some.jar}).should_not be_empty
|
52
|
+
end
|
53
|
+
|
54
|
+
it "adds JBUNDLE_SKIP to init.rb" do
|
55
|
+
jar.add_init_file(config)
|
56
|
+
contents = jar.contents('META-INF/init.rb')
|
57
|
+
contents.should =~ /ENV\['JBUNDLE_SKIP'\]/
|
58
|
+
end
|
59
|
+
|
60
|
+
it "uses ENV['JBUNDLE_JARFILE'] if set" do
|
61
|
+
mv "Jarfile", "Special-Jarfile"
|
62
|
+
ENV['JBUNDLE_JARFILE'] = "Special-Jarfile"
|
63
|
+
config.traits.should include(Warbler::Traits::JBundler)
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
context "when locked down" do
|
68
|
+
run_in_directory "spec/sample_jbundler"
|
69
|
+
|
70
|
+
it "does not include the jbundler gem (as it is in the development group)" do
|
71
|
+
pending( "needs JRuby to work" ) unless defined? JRUBY_VERSION
|
72
|
+
jar.apply(config)
|
73
|
+
config.gems.detect{|k,v| k.name == 'jbundler'}.should be_nil
|
74
|
+
file_list(/jbundler-/).should be_empty
|
75
|
+
end
|
76
|
+
|
77
|
+
it "does not include the jbundler runtime config" do
|
78
|
+
pending( "needs JRuby to work" ) unless defined? JRUBY_VERSION
|
79
|
+
jar.apply(config)
|
80
|
+
file_list(%r{WEB-INF/.jbundler}).should be_empty
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
data/warbler.gemspec
CHANGED
@@ -28,6 +28,7 @@ deployment to a Java environment.}
|
|
28
28
|
gem.add_runtime_dependency 'jruby-jars', [">= 1.5.6"]
|
29
29
|
gem.add_runtime_dependency 'jruby-rack', [">= 1.0.0"]
|
30
30
|
gem.add_runtime_dependency 'rubyzip', [">= 0.9", "< 1.1"]
|
31
|
+
gem.add_development_dependency 'jbundler', "~> 0.5"
|
31
32
|
gem.add_development_dependency 'rspec', "~> 2.10"
|
32
33
|
gem.add_development_dependency 'rdoc', ">= 2.4.2"
|
33
34
|
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: 1.4.
|
4
|
+
version: 1.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nick Sieger
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2014-02-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -72,6 +72,20 @@ dependencies:
|
|
72
72
|
version: '1.1'
|
73
73
|
prerelease: false
|
74
74
|
type: :runtime
|
75
|
+
- !ruby/object:Gem::Dependency
|
76
|
+
name: jbundler
|
77
|
+
version_requirements: !ruby/object:Gem::Requirement
|
78
|
+
requirements:
|
79
|
+
- - ~>
|
80
|
+
- !ruby/object:Gem::Version
|
81
|
+
version: '0.5'
|
82
|
+
requirement: !ruby/object:Gem::Requirement
|
83
|
+
requirements:
|
84
|
+
- - ~>
|
85
|
+
- !ruby/object:Gem::Version
|
86
|
+
version: '0.5'
|
87
|
+
prerelease: false
|
88
|
+
type: :development
|
75
89
|
- !ruby/object:Gem::Dependency
|
76
90
|
name: rspec
|
77
91
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -221,6 +235,7 @@ files:
|
|
221
235
|
- lib/warbler/templates/bundler.erb
|
222
236
|
- lib/warbler/templates/config.erb
|
223
237
|
- lib/warbler/templates/jar.erb
|
238
|
+
- lib/warbler/templates/jbundler.erb
|
224
239
|
- lib/warbler/templates/rack.erb
|
225
240
|
- lib/warbler/templates/rails.erb
|
226
241
|
- lib/warbler/templates/war.erb
|
@@ -228,6 +243,7 @@ files:
|
|
228
243
|
- lib/warbler/traits/bundler.rb
|
229
244
|
- lib/warbler/traits/gemspec.rb
|
230
245
|
- lib/warbler/traits/jar.rb
|
246
|
+
- lib/warbler/traits/jbundler.rb
|
231
247
|
- lib/warbler/traits/merb.rb
|
232
248
|
- lib/warbler/traits/nogemspec.rb
|
233
249
|
- lib/warbler/traits/rack.rb
|
@@ -272,8 +288,23 @@ files:
|
|
272
288
|
- spec/sample_jar/lib/sample_jar.rb
|
273
289
|
- spec/sample_jar/sample_jar.gemspec
|
274
290
|
- spec/sample_jar/test/test_sample_jar.rb
|
291
|
+
- spec/sample_jbundler/.jbundler/classpath.rb
|
292
|
+
- spec/sample_jbundler/Gemfile
|
293
|
+
- spec/sample_jbundler/Jarfile
|
294
|
+
- spec/sample_jbundler/Jarfile.lock
|
295
|
+
- spec/sample_jbundler/config.ru
|
296
|
+
- spec/sample_jbundler/local_repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar
|
297
|
+
- spec/sample_jbundler/local_repository/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar
|
298
|
+
- spec/sample_jbundler/vendor/bundle/gems/.keep
|
299
|
+
- spec/sample_jbundler/vendor/bundle/specifications/.keep
|
300
|
+
- spec/sample_rack_war/config.ru
|
301
|
+
- spec/sample_rack_war/lib/app.rb
|
302
|
+
- spec/sample_war/.jbundler/classpath.rb
|
303
|
+
- spec/sample_war/Jarfile.lock
|
275
304
|
- spec/sample_war/README
|
276
305
|
- spec/sample_war/Rakefile
|
306
|
+
- spec/sample_war/Special-Jarfile
|
307
|
+
- spec/sample_war/Special-Jarfile.lock
|
277
308
|
- spec/sample_war/app/controllers/application.rb
|
278
309
|
- spec/sample_war/app/helpers/application_helper.rb
|
279
310
|
- spec/sample_war/config/boot.rb
|
@@ -294,12 +325,14 @@ files:
|
|
294
325
|
- spec/sample_war/public/favicon.ico
|
295
326
|
- spec/sample_war/public/index.html
|
296
327
|
- spec/sample_war/public/robots.txt
|
328
|
+
- spec/sample_war/some.jar
|
297
329
|
- spec/spec_helper.rb
|
298
330
|
- spec/warbler/application_spec.rb
|
299
331
|
- spec/warbler/bundler_spec.rb
|
300
332
|
- spec/warbler/config_spec.rb
|
301
333
|
- spec/warbler/gems_spec.rb
|
302
334
|
- spec/warbler/jar_spec.rb
|
335
|
+
- spec/warbler/jbundler_spec.rb
|
303
336
|
- spec/warbler/task_spec.rb
|
304
337
|
- spec/warbler/traits_spec.rb
|
305
338
|
- spec/warbler/war_spec.rb
|
@@ -331,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
331
364
|
version: '0'
|
332
365
|
requirements: []
|
333
366
|
rubyforge_project: caldersphere
|
334
|
-
rubygems_version: 2.1.
|
367
|
+
rubygems_version: 2.1.9
|
335
368
|
signing_key:
|
336
369
|
specification_version: 4
|
337
370
|
summary: Warbler chirpily constructs .war files of your Rails applications.
|
@@ -452,8 +485,23 @@ test_files:
|
|
452
485
|
- spec/sample_jar/lib/sample_jar.rb
|
453
486
|
- spec/sample_jar/sample_jar.gemspec
|
454
487
|
- spec/sample_jar/test/test_sample_jar.rb
|
488
|
+
- spec/sample_jbundler/.jbundler/classpath.rb
|
489
|
+
- spec/sample_jbundler/Gemfile
|
490
|
+
- spec/sample_jbundler/Jarfile
|
491
|
+
- spec/sample_jbundler/Jarfile.lock
|
492
|
+
- spec/sample_jbundler/config.ru
|
493
|
+
- spec/sample_jbundler/local_repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar
|
494
|
+
- spec/sample_jbundler/local_repository/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar
|
495
|
+
- spec/sample_jbundler/vendor/bundle/gems/.keep
|
496
|
+
- spec/sample_jbundler/vendor/bundle/specifications/.keep
|
497
|
+
- spec/sample_rack_war/config.ru
|
498
|
+
- spec/sample_rack_war/lib/app.rb
|
499
|
+
- spec/sample_war/.jbundler/classpath.rb
|
500
|
+
- spec/sample_war/Jarfile.lock
|
455
501
|
- spec/sample_war/README
|
456
502
|
- spec/sample_war/Rakefile
|
503
|
+
- spec/sample_war/Special-Jarfile
|
504
|
+
- spec/sample_war/Special-Jarfile.lock
|
457
505
|
- spec/sample_war/app/controllers/application.rb
|
458
506
|
- spec/sample_war/app/helpers/application_helper.rb
|
459
507
|
- spec/sample_war/config/boot.rb
|
@@ -474,12 +522,14 @@ test_files:
|
|
474
522
|
- spec/sample_war/public/favicon.ico
|
475
523
|
- spec/sample_war/public/index.html
|
476
524
|
- spec/sample_war/public/robots.txt
|
525
|
+
- spec/sample_war/some.jar
|
477
526
|
- spec/spec_helper.rb
|
478
527
|
- spec/warbler/application_spec.rb
|
479
528
|
- spec/warbler/bundler_spec.rb
|
480
529
|
- spec/warbler/config_spec.rb
|
481
530
|
- spec/warbler/gems_spec.rb
|
482
531
|
- spec/warbler/jar_spec.rb
|
532
|
+
- spec/warbler/jbundler_spec.rb
|
483
533
|
- spec/warbler/task_spec.rb
|
484
534
|
- spec/warbler/traits_spec.rb
|
485
535
|
- spec/warbler/war_spec.rb
|