warbler 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62857e66b600cbaa2a79c76f1f184cbd73c33171
-  data.tar.gz: d2758474c41625d2d5d61b779e6d7d8c50545791
+  metadata.gz: 193f10998499ba07232b514ad698a49b648552ee
+  data.tar.gz: c7ac8f3a09baaa3f93d7aef10a1cdf7eec9253d9
 SHA512:
-  metadata.gz: 37bcb9035a8bc0723c2faa6ca06e00f2e339581c811360dbc1fadb7cc9adc0bfdc46cbee7292c9513c60242a59d76188ba8672b2f3e4dc81721e2452e8646350
-  data.tar.gz: 12637d24a34f8b5568ea74e6f480ee02a539f59bd7b1067079d49c299dac7d2ea0b16a8fee8ab164c3fb3bcf57632109067169f7576c0f5fe1b3a1148abad55e
+  metadata.gz: c41353fe596a7547303aec2da758d395ecdaa3326515a92c01d7abd69a1669420ec6392270d31c8737d4e090244a0d595ecbadb5b49b08fd6f286d3af11b589b
+  data.tar.gz: c9bc63f6a746dd771959d4e2ac33dd5de5fbcdd46f1c1896d54417334e786d8244a3fa5192cbf937222dcf9d099f4ce1899984663276a5687e01c18c101f3a4b

data/.travis.yml

@@ -2,38 +2,39 @@ sudo: false
 language: ruby
 script: bundle exec rake spec
 rvm:
-  - jruby-1.7.8
+  - jruby-1.7.24
 branches:
   only:
     - master
-    - 2.x-dev
-    - /^test-.*/
+    - /-dev|-feature|-fix/
 before_install:
   - ([ "$BUNDLER_VERSION" ] && gem uninstall bundler --all --force && gem install bundler -v "$BUNDLER_VERSION") || true
   - bundle --version
 before_script:
   - export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
 env:
-  - JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.7.9"
-  - JRUBY_OPTS="--1.9" BUNDLER_VERSION="~> 1.8.9"
+  - BUNDLER_VERSION="~> 1.10"
 matrix:
   include:
-    - rvm: jruby-head
-      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.9.9"
-    - rvm: jruby-1.7.20
-      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.10.2"
+    - rvm: jruby-1.7.24
+      env: JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.7.9" RAKE_VERSION="~> 10.2.2"
+    - rvm: jruby-1.7.24
+      env: JRUBY_OPTS="--1.9" BUNDLER_VERSION="~> 1.11.2" RAKE_VERSION="~> 10.3.2"
+    - rvm: jruby-1.7.8
+      env: JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.8.9" RAKE_VERSION="~> 10.1.1"
+    - rvm: jruby-1.7.16
+      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.10.2" RAKE_VERSION="~> 10.4.2"
     - rvm: 1.8.7
-      env: BUNDLER_VERSION="~> 1.6.9"
+      env: BUNDLER_VERSION="~> 1.6.9" RAKE_VERSION="~> 10.4.2"
     - rvm: 1.9.2
-      env: BUNDLER_VERSION="~> 1.7.9"
+      env: BUNDLER_VERSION="~> 1.7.9" RAKE_VERSION="~> 10.5.0"
     - rvm: 1.9.3
-      env: BUNDLER_VERSION="~> 1.8.9"
-    - rvm: jruby
+      env: BUNDLER_VERSION="~> 1.8.9" RAKE_VERSION="~> 10.2.2"
+    - rvm: jruby-1.7.24
       env: MAVEN_OPTS="-XX:MaxPermSize=128m"
       script: mvn clean verify
   allow_failures:
-    - rvm: jruby
-    - rvm: jruby-head
+    - script: mvn clean verify
 notifications:
   irc:
     channels:

data/Gemfile

@@ -9,6 +9,13 @@ group :development do
   gem "maven-tools", "~> 0.34.5"
 end
 
-if RUBY_VERSION < "1.9"
-  gem 'rubyzip', '~> 0.9'
+group :development, :test do
+  gem 'rdoc', '~> 3.10', :require => nil
+  gem 'rake', ENV['RAKE_VERSION'], :require => nil if ENV['RAKE_VERSION']
 end
+
+if ENV['RUBYZIP_VERSION']
+  gem 'rubyzip', ENV['RUBYZIP_VERSION']
+elsif RUBY_VERSION < "1.9"
+  gem 'rubyzip', '~> 0.9'
+end

data/ext/WarMain.java

@@ -142,6 +142,7 @@ public class WarMain extends JarMain {
 
         String port = getSystemProperty("warbler.port", getENV("PORT"));
         port = port == null ? "8080" : port;
+        String host = getSystemProperty("warbler.host", "0.0.0.0");
         String webserverConfig = getSystemProperty("warbler.webserver_config", getENV("WARBLER_WEBSERVER_CONFIG"));
         String embeddedWebserverConfig = new URI("jar", entryPath(WEBSERVER_CONFIG), null).toURL().toString();
         webserverConfig = webserverConfig == null ? embeddedWebserverConfig : webserverConfig;
@@ -149,6 +150,7 @@ public class WarMain extends JarMain {
             String val = (String) entry.getValue();
             val = val.replace("{{warfile}}", archive).
                       replace("{{port}}", port).
+                      replace("{{host}}", host).
                       replace("{{config}}", webserverConfig).
                       replace("{{webroot}}", webroot.getAbsolutePath());
             entry.setValue(val);

data/lib/warbler/config.rb

@@ -242,17 +242,8 @@ module Warbler
       end
     end
 
-    # Deprecated
-    def war_name
-      $stderr.puts "config.war_name deprecated; replace with config.jar_name" #:nocov:
-      jar_name                  #:nocov:
-    end
-
-    # Deprecated
-    def war_name=(w)
-      $stderr.puts "config.war_name deprecated; replace with config.jar_name" #:nocov:
-      self.jar_name = w         #:nocov:
-    end
+    alias_method :war_name, :jar_name
+    alias_method :war_name=, :jar_name=
 
     private
     def warbler_vendor_excludes(warbler_home)

data/lib/warbler/jar.rb

@@ -158,7 +158,7 @@ module Warbler
       end
       rm_f path
       ensure_directory_entries
-      puts "Creating #{path}"
+      puts "Creating #{path}" unless silent?
       if Warbler::Config === config_or_path
         @files.delete("#{config_or_path.jar_name}/#{path}")
       end

data/lib/warbler/rake_helper.rb

@@ -25,5 +25,12 @@ module Warbler
         base.extend Rake::FileUtilsExt
       end
     end
+
+    private
+
+    def silent?
+      Rake.application.options.silent rescue nil
+    end
+
   end
 end

data/lib/warbler/traits/bundler.rb

@@ -23,19 +23,18 @@ module Warbler
       end
 
       def before_configure
-        config.bundler = true
-        config.bundle_without = ["development", "test", "assets"]
+        config.bundler ||= true
+        config.bundle_without = ['development', 'test', 'assets']
       end
 
       def after_configure
         add_bundler_gems if config.bundler
       end
 
-      def add_bundler_gems
-        require 'bundler'
-        config.gems.clear
+      def add_bundler_gems; require 'bundler'
+        # config.gems.clear allow to add `config.gems` on top of those bundled
         config.gem_dependencies = false # Bundler takes care of these
-        config.bundler = {}
+        config.bundler = {} if config.bundler == true
 
         bundler_specs.each do |spec|
           spec = to_spec(spec)

data/lib/warbler/traits/gemspec.rb

@@ -18,18 +18,17 @@ module Warbler
         !Dir['*.gemspec'].empty?
       end
 
-      def before_configure
+      def before_configure; require 'yaml'
         @spec_file = Dir['*.gemspec'].first
-        require 'yaml'
-        @spec = File.open(@spec_file) {|f| Gem::Specification.from_yaml(f) } rescue Gem::Specification.load(@spec_file)
-        @spec.runtime_dependencies.each {|g| config.gems << g }
+        @spec = File.open(@spec_file) { |f| Gem::Specification.from_yaml(f) } rescue Gem::Specification.load(@spec_file)
+        @spec.runtime_dependencies.each { |g| config.gems << g }
         config.dirs = []
-        config.compiled_ruby_files = @spec.files.select {|f| f =~ /\.rb$/}
+        config.compiled_ruby_files = @spec.files.select { |f| f =~ /\.rb$/ }
       end
 
       def after_configure
         @spec.require_paths.each do |p|
-          add_init_load_path(config.pathmaps.application.inject(p) {|pm,x| pm.pathmap(x)})
+          add_init_load_path( config.pathmaps.application.inject(p) { |pm,x| pm.pathmap(x) } )
         end
       end
 
@@ -54,33 +53,27 @@ module Warbler
       end
 
       def default_executable
-        if !@spec.executables.empty?
-          bundler_version =
-            Gem.loaded_specs.include?("bundler") ?
-              Gem.loaded_specs["bundler"].version :
-              Gem::Version.create("0.0.0")
-          if (bundler_version <=> Gem::Version.create("1.8.0")) < 0
-            "bin/#{@spec.executables.first}"
+        if ! @spec.executables.empty?
+          exe_script = @spec.executables.first
+          exe_path = File.join(@spec.bindir, exe_script) # bin/script
+          if File.exists?(exe_path)
+            exe_path
+          elsif File.exists?("bin/#{exe_script}") # compatibility
+            "bin/#{exe_script}" # ... should probably remove this
           else
-            exe_script = @spec.executables.first
-            if File.exists?("exe/#{exe_script}")
-              "exe/#{exe_script}"
-            elsif File.exists?("bin/#{exe_script}")
-              "bin/#{exe_script}"
-            else
-              raise "No `#{exe_script}` executable script found"
-            end
+            raise "no `#{exe_script}` executable script found"
           end
-        elsif exe = Dir['bin/*'].sort.first
-          warn "No default executable found in #{@spec_file}, using bin/#{exe}"
-          exe
-        elsif exe = Dir['exe/*'].sort.first
-          warn "No default executable found in #{@spec_file}, using exe/#{exe}"
-          exe
+        elsif exe_path = Dir['bin/*'].sort.first
+          warn "no executables found in #{@spec_file}, using #{exe_path}"
+          exe_path
+        elsif exe_path = Dir['exe/*'].sort.first
+          warn "no executables found in #{@spec_file}, using #{exe_path}"
+          exe_path
         else
-          raise "No executable script found" unless exe
+          raise "no executable script found"
         end
       end
+
     end
   end
 end

data/lib/warbler/traits/rails.rb

@@ -12,7 +12,7 @@ module Warbler
       include Trait
 
       def self.detect?
-        File.exist?("config/environment.rb")
+        File.exist?('config/environment.rb')
       end
 
       def self.requirements
@@ -24,15 +24,15 @@ module Warbler
         config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
 
         return unless Warbler.framework_detection
-        return false unless task = Warbler.project_application.lookup("environment")
+        return false unless task = Warbler.project_application.lookup('environment')
 
         task.invoke rescue nil
         return false unless defined?(::Rails)
 
-        config.dirs << "tmp" if File.directory?("tmp")
+        config.dirs << 'tmp' if File.directory?('tmp')
         config.webxml.booter = :rails
-        unless (defined?(::Rails.vendor_rails?) && ::Rails.vendor_rails?) || File.directory?("vendor/rails")
-          config.gems["rails"] = ::Rails::VERSION::STRING
+        unless (defined?(::Rails.vendor_rails?) && ::Rails.vendor_rails?) || File.directory?('vendor/rails')
+          config.gems['rails'] = ::Rails::VERSION::STRING unless Bundler.detect?
         end
         if defined?(::Rails.configuration.gems)
           ::Rails.configuration.gems.each do |g|

data/lib/warbler/traits/war.rb

@@ -134,7 +134,8 @@ module Warbler
       def move_jars_to_webinf_lib(jar, selector = nil)
         return unless selector # default is false
         selector = /.*/ if selector == true # move all if not a RegExp given
-        default_jars = default_jar_files.map { |file| File.basename(file) }
+        default_jar_paths = default_jar_files
+        default_jars = default_jar_paths.map { |file| File.basename(file) }
         jar.files.keys.select { |k| k =~ /^WEB-INF\/.*\.jar$/ }.each do |k|
           if k.start_with?('WEB-INF/lib/') # .jar already in WEB-INF/lib
             if default_jars.include? k.sub('WEB-INF/lib/', '')
@@ -144,6 +145,8 @@ module Warbler
             next
           end
           next unless selector =~ File.basename(k)
+          # default jars might end up mapped twice as they're part of gems
+          next if default_jar_paths.include?(jar.files[k])
           name = k.sub('WEB-INF', '')[1..-1].gsub(/[\/\\]/, '-')
           jar.files["WEB-INF/lib/#{name}"] = jar.files[k]
           jar.files[k] = empty_jar

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.9"
+  VERSION = "1.4.10"
 end

data/lib/warbler/web_server.rb

@@ -132,13 +132,15 @@ CONFIG
 
       jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
-args = args0,args1,args2,args3,args4
+args = args0,args1,args2,args3,args4,args5,args6
 props = jetty.home
-args0 = --port
-args1 = {{port}}
-args2 = --config
-args3 = {{config}}
-args4 = {{warfile}}
+args0 = --host
+args1 = {{host}}
+args2 = --port
+args3 = {{port}}
+args4 = --config
+args5 = {{config}}
+args6 = {{warfile}}
 jetty.home = {{webroot}}
 PROPS
     end

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>warbler</artifactId>
-  <version>1.4.8</version>
+  <version>1.4.10</version>
   <packaging>gem</packaging>
   <name>Warbler chirpily constructs .war files of your Rails applications.</name>
   <description>Warbler is a gem to make a Java jar or war file out of any Ruby,
@@ -39,7 +39,7 @@ bundle up all of your application files for deployment to a Java environment.</d
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rubyzip</artifactId>
-      <version>[0.9,1.2)</version>
+      <version>[0.9,1.3)</version>
       <type>gem</type>
     </dependency>
     <dependency>
@@ -52,7 +52,7 @@ bundle up all of your application files for deployment to a Java environment.</d
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ruby-maven</artifactId>
-      <version>[3.1.1.0,3.1.1.99999]</version>
+      <version>[3.1.1,3.1.99999]</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
@@ -63,13 +63,6 @@ bundle up all of your application files for deployment to a Java environment.</d
       <type>gem</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rdoc</artifactId>
-      <version>[2.4.2,)</version>
-      <type>gem</type>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>

data/spec/sample_jar/sample_jar.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.description = ""
   s.email = ["nick@nicksieger.com"]
   s.executables = ["sample_jar"]
-  s.files = ["History.txt", "Rakefile", "README.txt", "sample_jar.gemspec", "bin/sample_jar", "lib/sample_jar.rb", "test/test_sample_jar.rb"]
+  s.bindir = 'sbin'
+  s.files = ["History.txt", "Rakefile", "README.txt", "sample_jar.gemspec", "bin/sample_jar", "sbin/sample_jar", "lib/sample_jar.rb", "test/test_sample_jar.rb"]
   s.homepage = ""
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"

data/spec/sample_jar/sbin/sample_jar

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'sample_jar'
+
+SampleJar.hello

data/spec/spec_helper.rb

@@ -109,7 +109,7 @@ module ExampleGroupHelpers
             gem.summary = "Gem for testing"
             gem.platform = Gem::Platform::RUBY
             gem.files = `git ls-files`.split("\n")
-            gem.add_runtime_dependency 'rake', [">= 10.4.2"]
+            gem.add_runtime_dependency 'rake', ['>= 0.8.7']
           end
           RUBY
         end

data/spec/warbler/jar_spec.rb

@@ -149,7 +149,7 @@ describe Warbler::Jar do
       it "loads the default executable in main.rb" do
         jar.apply(config)
         contents = jar.contents('META-INF/main.rb')
-        contents.should =~ /load.*sample_jar\/bin\/sample_jar/
+        contents.should == "load 'sample_jar/sbin/sample_jar'"
       end
 
       it "includes compiled .rb and .class files" do
@@ -184,7 +184,7 @@ describe Warbler::Jar do
         jar.apply(config)
         file_list(%r{sample_jar.*\.rb$}).size.should == 2
         if RUBY_VERSION >= '1.9'
-          file_list(%r{gems.*\.class$}).size.should == 80
+          file_list(%r{gems.*\.class$}).size.should >= 80 # depending on RubyZip version
         else
           # 1.8.7 uses an older version of rubyzip and so the number of files compiled changes
           file_list(%r{gems.*\.class$}).size.should == 32
@@ -910,10 +910,10 @@ describe Warbler::Jar do
 
       it "skips Merb development dependencies" do
         task :merb_env do
-          @merb.dependencies = [Gem::Dependency.new("rake", "= #{RAKEVERSION}", :development)]
+          @merb.dependencies = [Gem::Dependency.new("rake", "= #{Rake::VERSION}", :development)]
         end
         jar.apply(config)
-        file_list(/rake-#{RAKEVERSION}/).should be_empty
+        file_list(/rake-#{Rake::VERSION}/).should be_empty
       end
 
       it "warns about using Merb < 1.0" do

data/warbler.gemspec

@@ -22,13 +22,12 @@ bundle up all of your application files for deployment to a Java environment.}
 
   gem.rdoc_options = ["--main", "README.rdoc", "-H", "-f", "darkfish"]
 
-  gem.add_runtime_dependency 'rake', [">= 0.9.6"]
+  gem.add_runtime_dependency 'rake', ['>= 0.9.6']
   # restrict it for maven not to find jruby-9000.dev
-  gem.add_runtime_dependency 'jruby-jars', [">= 1.5.6", '< 2.0']
-  gem.add_runtime_dependency 'jruby-rack', [">= 1.1.1", '< 1.3']
-  gem.add_runtime_dependency 'rubyzip', [">= 0.9", "< 1.2"]
-  gem.add_development_dependency 'jbundler', "~> 0.5.5"
-  gem.add_development_dependency 'ruby-maven', '~> 3.1.1.0'
-  gem.add_development_dependency 'rspec', "~> 2.10"
-  gem.add_development_dependency 'rdoc', ">= 2.4.2"
+  gem.add_runtime_dependency 'jruby-jars', ['>= 1.5.6', '< 2.0']
+  gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3']
+  gem.add_runtime_dependency 'rubyzip', ['>= 0.9', "< 1.3"]
+  gem.add_development_dependency 'jbundler', '~> 0.5.5'
+  gem.add_development_dependency 'ruby-maven', '~> 3.1.1'
+  gem.add_development_dependency 'rspec', '~> 2.10'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.6
   name: rake
@@ -21,16 +21,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   name: jruby-jars
@@ -38,19 +38,19 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.3'
   name: jruby-rack
@@ -58,36 +58,36 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   name: rubyzip
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.5
   name: jbundler
@@ -95,27 +95,27 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.1.1
   name: ruby-maven
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
   name: rspec
@@ -123,23 +123,9 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  name: rdoc
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
 description: |-
   Warbler is a gem to make a Java jar or war file out of any Ruby,
   Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way to
@@ -150,8 +136,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE.txt
@@ -314,6 +300,7 @@ files:
 - spec/sample_jar/bin/sample_jar
 - spec/sample_jar/lib/sample_jar.rb
 - spec/sample_jar/sample_jar.gemspec
+- spec/sample_jar/sbin/sample_jar
 - spec/sample_jar/test/test_sample_jar.rb
 - spec/sample_jbundler/.jbundler/classpath.rb
 - spec/sample_jbundler/Gemfile
@@ -373,21 +360,21 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- -H
-- -f
+- "-H"
+- "-f"
 - darkfish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -396,170 +383,4 @@ rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
-test_files:
-- integration/Rakefile
-- integration/pom.xml
-- integration/rails4_test/pom.xml
-- integration/rails4_test/src/main/ruby/Gemfile
-- integration/rails4_test/src/main/ruby/README.rdoc
-- integration/rails4_test/src/main/ruby/Rakefile
-- integration/rails4_test/src/main/ruby/app/assets/javascripts/application.js
-- integration/rails4_test/src/main/ruby/app/assets/javascripts/posts.js.coffee
-- integration/rails4_test/src/main/ruby/app/assets/stylesheets/application.css
-- integration/rails4_test/src/main/ruby/app/assets/stylesheets/posts.css.scss
-- integration/rails4_test/src/main/ruby/app/assets/stylesheets/scaffolds.css.scss
-- integration/rails4_test/src/main/ruby/app/controllers/application_controller.rb
-- integration/rails4_test/src/main/ruby/app/controllers/concerns/.keep
-- integration/rails4_test/src/main/ruby/app/controllers/posts_controller.rb
-- integration/rails4_test/src/main/ruby/app/helpers/application_helper.rb
-- integration/rails4_test/src/main/ruby/app/helpers/posts_helper.rb
-- integration/rails4_test/src/main/ruby/app/mailers/.keep
-- integration/rails4_test/src/main/ruby/app/models/.keep
-- integration/rails4_test/src/main/ruby/app/models/concerns/.keep
-- integration/rails4_test/src/main/ruby/app/models/post.rb
-- integration/rails4_test/src/main/ruby/app/views/layouts/application.html.erb
-- integration/rails4_test/src/main/ruby/app/views/posts/_form.html.erb
-- integration/rails4_test/src/main/ruby/app/views/posts/edit.html.erb
-- integration/rails4_test/src/main/ruby/app/views/posts/index.html.erb
-- integration/rails4_test/src/main/ruby/app/views/posts/index.json.jbuilder
-- integration/rails4_test/src/main/ruby/app/views/posts/new.html.erb
-- integration/rails4_test/src/main/ruby/app/views/posts/show.html.erb
-- integration/rails4_test/src/main/ruby/app/views/posts/show.json.jbuilder
-- integration/rails4_test/src/main/ruby/config.ru
-- integration/rails4_test/src/main/ruby/config/application.rb
-- integration/rails4_test/src/main/ruby/config/boot.rb
-- integration/rails4_test/src/main/ruby/config/database.yml
-- integration/rails4_test/src/main/ruby/config/environment.rb
-- integration/rails4_test/src/main/ruby/config/environments/development.rb
-- integration/rails4_test/src/main/ruby/config/environments/production.rb
-- integration/rails4_test/src/main/ruby/config/environments/test.rb
-- integration/rails4_test/src/main/ruby/config/initializers/backtrace_silencers.rb
-- integration/rails4_test/src/main/ruby/config/initializers/filter_parameter_logging.rb
-- integration/rails4_test/src/main/ruby/config/initializers/inflections.rb
-- integration/rails4_test/src/main/ruby/config/initializers/mime_types.rb
-- integration/rails4_test/src/main/ruby/config/initializers/secret_token.rb
-- integration/rails4_test/src/main/ruby/config/initializers/session_store.rb
-- integration/rails4_test/src/main/ruby/config/initializers/wrap_parameters.rb
-- integration/rails4_test/src/main/ruby/config/locales/en.yml
-- integration/rails4_test/src/main/ruby/config/routes.rb
-- integration/rails4_test/src/main/ruby/config/warble.rb
-- integration/rails4_test/src/main/ruby/db/development.sqlite3
-- integration/rails4_test/src/main/ruby/db/migrate/20130502003552_create_posts.rb
-- integration/rails4_test/src/main/ruby/db/production.sqlite3
-- integration/rails4_test/src/main/ruby/db/schema.rb
-- integration/rails4_test/src/main/ruby/db/seeds.rb
-- integration/rails4_test/src/main/ruby/lib/assets/.keep
-- integration/rails4_test/src/main/ruby/lib/tasks/.keep
-- integration/rails4_test/src/main/ruby/public/404.html
-- integration/rails4_test/src/main/ruby/public/422.html
-- integration/rails4_test/src/main/ruby/public/500.html
-- integration/rails4_test/src/main/ruby/public/favicon.ico
-- integration/rails4_test/src/main/ruby/public/robots.txt
-- integration/rails4_test/src/main/ruby/test/controllers/.keep
-- integration/rails4_test/src/main/ruby/test/controllers/posts_controller_test.rb
-- integration/rails4_test/src/main/ruby/test/fixtures/.keep
-- integration/rails4_test/src/main/ruby/test/fixtures/posts.yml
-- integration/rails4_test/src/main/ruby/test/helpers/.keep
-- integration/rails4_test/src/main/ruby/test/helpers/posts_helper_test.rb
-- integration/rails4_test/src/main/ruby/test/integration/.keep
-- integration/rails4_test/src/main/ruby/test/mailers/.keep
-- integration/rails4_test/src/main/ruby/test/models/.keep
-- integration/rails4_test/src/main/ruby/test/models/post_test.rb
-- integration/rails4_test/src/main/ruby/test/test_helper.rb
-- integration/rails4_test/src/main/ruby/vendor/assets/javascripts/.keep
-- integration/rails4_test/src/main/ruby/vendor/assets/stylesheets/.keep
-- integration/rails4_test/src/test/java/org/jruby/warbler/Rails4AppTestIT.java
-- integration/runnable_test/pom.xml
-- integration/runnable_test/src/main/ruby/Rakefile
-- integration/runnable_test/src/main/ruby/config.ru
-- integration/runnable_test/src/main/ruby/config/warble.rb
-- integration/runnable_test/src/test/java/org/jruby/warbler/RunnableWarTestIT.java
-- integration/simple_rack_test/pom.xml
-- integration/simple_rack_test/src/main/ruby/bin/install-gems.rb
-- integration/simple_rack_test/src/main/ruby/config.ru
-- integration/simple_rack_test/src/main/ruby/config/warble.rb
-- integration/simple_rack_test/src/test/java/org/jruby/warbler/AppTestIT.java
-- spec/drb_default_id_conv.rb
-- spec/drb_helper.rb
-- spec/m2_home/conf/settings.xml
-- spec/sample_bundler/.bundle/config
-- spec/sample_bundler/Gemfile
-- spec/sample_bundler/Gemfile.lock
-- spec/sample_bundler/config.ru
-- spec/sample_bundler/vendor/bundle/jruby/1.8/bin/rake
-- spec/sample_bundler/vendor/bundle/jruby/1.8/cache/rake-0.8.7.gem
-- spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/bin/rake
-- spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/lib/rake.rb
-- spec/sample_bundler/vendor/bundle/jruby/1.8/specifications/rake-0.8.7.gemspec
-- spec/sample_bundler/vendor/bundle/jruby/1.9/bin/rake
-- spec/sample_bundler/vendor/bundle/jruby/1.9/cache/rake-0.8.7.gem
-- spec/sample_bundler/vendor/bundle/jruby/1.9/gems/rake-0.8.7/bin/rake
-- spec/sample_bundler/vendor/bundle/jruby/1.9/gems/rake-0.8.7/lib/rake.rb
-- spec/sample_bundler/vendor/bundle/jruby/1.9/specifications/rake-0.8.7.gemspec
-- spec/sample_bundler/vendor/bundle/ruby/1.8/bin/rake
-- spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem
-- spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/bin/rake
-- spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb
-- spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec
-- spec/sample_bundler/vendor/bundle/ruby/1.9.1/bin/rake
-- spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem
-- spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/bin/rake
-- spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb
-- spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec
-- spec/sample_jar/History.txt
-- spec/sample_jar/README.txt
-- spec/sample_jar/Rakefile
-- spec/sample_jar/bin/another_jar
-- spec/sample_jar/bin/sample_jar
-- spec/sample_jar/lib/sample_jar.rb
-- spec/sample_jar/sample_jar.gemspec
-- spec/sample_jar/test/test_sample_jar.rb
-- spec/sample_jbundler/.jbundler/classpath.rb
-- spec/sample_jbundler/Gemfile
-- spec/sample_jbundler/Jarfile
-- spec/sample_jbundler/Jarfile.lock
-- spec/sample_jbundler/config.ru
-- spec/sample_jbundler/local_repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar
-- spec/sample_jbundler/local_repository/org/slf4j/slf4j-simple/1.7.5/slf4j-simple-1.7.5.jar
-- spec/sample_jbundler/vendor/bundle/gems/.keep
-- spec/sample_jbundler/vendor/bundle/specifications/.keep
-- spec/sample_rack_war/config.ru
-- spec/sample_rack_war/lib/app.rb
-- spec/sample_war/.jbundler/classpath.rb
-- spec/sample_war/Jarfile.lock
-- spec/sample_war/README
-- spec/sample_war/Rakefile
-- spec/sample_war/Special-Jarfile
-- spec/sample_war/Special-Jarfile.lock
-- spec/sample_war/app/controllers/application.rb
-- spec/sample_war/app/helpers/application_helper.rb
-- spec/sample_war/config/boot.rb
-- spec/sample_war/config/database.yml
-- spec/sample_war/config/environment.rb
-- spec/sample_war/config/environments/development.rb
-- spec/sample_war/config/environments/production.rb
-- spec/sample_war/config/environments/test.rb
-- spec/sample_war/config/initializers/inflections.rb
-- spec/sample_war/config/initializers/mime_types.rb
-- spec/sample_war/config/initializers/new_rails_defaults.rb
-- spec/sample_war/config/routes.rb
-- spec/sample_war/lib/ruby_one_nine.rb
-- spec/sample_war/lib/tasks/utils.rake
-- spec/sample_war/public/404.html
-- spec/sample_war/public/422.html
-- spec/sample_war/public/500.html
-- spec/sample_war/public/favicon.ico
-- spec/sample_war/public/index.html
-- spec/sample_war/public/robots.txt
-- spec/sample_war/some.jar
-- spec/spec_helper.rb
-- spec/warbler/application_spec.rb
-- spec/warbler/bundler_spec.rb
-- spec/warbler/config_spec.rb
-- spec/warbler/gems_spec.rb
-- spec/warbler/jar_spec.rb
-- spec/warbler/jbundler_spec.rb
-- spec/warbler/task_spec.rb
-- spec/warbler/traits_spec.rb
-- spec/warbler/war_spec.rb
-- spec/warbler/web_server_spec.rb
+test_files: []