warbler 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f1dd2729d5f7ed39af116cf2bb27e273461020
-  data.tar.gz: c2dbf07c10202eea5fbf7b04ebf7f2b8c5e0b469
+  metadata.gz: 11eb3cb9e82388ec1b70b5ea6a5706449ea71b43
+  data.tar.gz: 3812f3bf1751fad830d4b918fad26505816700a5
 SHA512:
-  metadata.gz: 8b71e381800c2ed1f2d69a49584fc6fe768ff628a4bd4dbcb4577742f88966496694c8f5cce455ef5bca9c41568caaae45a3649d60c177476cca0d85864b632c
-  data.tar.gz: 4b1830b358b5cbe8028a470338ae6732ea19c1f53f9fe3d433fd43b81046cb44d2705cd03bd5b0e2e3b1150e9f70bb71f8c6c78780a4da369ce6f369ef6a1ce6
+  metadata.gz: 0b60b3bba36944c31cee619754322afa44eebfc708fee0016d1ca0170eee28972b69ad570bdb6c4540ece320a9a814c0ee7852419171538cbdbc3f05c2bb5776
+  data.tar.gz: 5057d8bbf554d78bfb9ce2bd13ee7e50903a7cacd3caf9e2475c8a81933ff65801853a6bf9d2ec093ae29a04a9822b9c6dad63d4d42d558656c6a08ef309b543

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - jruby-9.0.4.0
+  - jruby-9.0.5.0
 branches:
   only:
     - master
@@ -23,4 +23,4 @@ notifications:
 before_install:
   - sudo apt-get update && sudo apt-get install git
   - git fetch --unshallow
-  - gem install bundler --pre
+  - gem install bundler

data/Gemfile

@@ -7,3 +7,5 @@ group :development do
   gem "rcov", ">= 0.9.8", :platform => :mri_18
   gem "childprocess", :platform => :mri
 end
+
+gem 'rubyzip', ENV['RUBYZIP_VERSION'] if ENV['RUBYZIP_VERSION']

data/Rakefile

@@ -18,6 +18,12 @@ end
 require 'rake/clean'
 CLEAN << "pkg" << "doc" << Dir['integration/**/target']
 
+unless Rake::Application.method_defined? :last_comment
+  Rake::Application.module_eval do
+    alias_method :last_comment, :last_description
+  end
+end # Rake 11 compatibility (due rspec/core/rake_task < 3.0)
+
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ['--color', "--format documentation"]

data/ext/JarMain.java

@@ -26,7 +26,7 @@ import java.util.jar.JarFile;
 
 public class JarMain implements Runnable {
 
-    static final String MAIN = "/" + JarMain.class.getName().replace('.', '/') + ".class";
+    static final String MAIN = '/' + JarMain.class.getName().replace('.', '/') + ".class";
 
     protected final String[] args;
     protected final String archive;
@@ -78,7 +78,7 @@ public class JarMain implements Runnable {
     protected String getExtractEntryPath(final JarEntry entry) {
         final String name = entry.getName();
         if ( name.startsWith("META-INF/lib") && name.endsWith(".jar") ) {
-            return name.substring(name.lastIndexOf("/") + 1);
+            return name.substring(name.lastIndexOf('/') + 1);
         }
         return null; // do not extract entry
     }

data/ext/WarMain.java

@@ -6,7 +6,6 @@
  */
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.SequenceInputStream;
@@ -21,7 +20,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Map;
 import java.util.jar.JarEntry;
-import java.util.Set;
 
 /**
  * Used as a Main-Class in the manifest for a .war file, so that you can run
@@ -65,7 +63,7 @@ import java.util.Set;
  */
 public class WarMain extends JarMain {
 
-    static final String MAIN = "/" + WarMain.class.getName().replace('.', '/') + ".class";
+    static final String MAIN = '/' + WarMain.class.getName().replace('.', '/') + ".class";
     static final String WEBSERVER_PROPERTIES = "/WEB-INF/webserver.properties";
     static final String WEBSERVER_JAR = "/WEB-INF/webserver.jar";
     static final String WEBSERVER_CONFIG = "/WEB-INF/webserver.xml";
@@ -219,7 +217,7 @@ public class WarMain extends JarMain {
             // 404.html -> public/404.html
             return "/public/" + name;
         }
-        return "/" + name;
+        return '/' + name;
     }
 
     @Override

data/ext/WarblerJar.java

@@ -74,13 +74,13 @@ public class WarblerJar {
                                                 entry.convertToString().getUnicodeValue());
             try {
                 byte[] buf = new byte[16384];
-                ByteList blist = new ByteList();
-                int bytesRead = -1;
+                ByteList bytes = new ByteList();
+                int bytesRead;
                 while ((bytesRead = entryStream.read(buf)) != -1) {
-                    blist.append(buf, 0, bytesRead);
+                    bytes.append(buf, 0, bytesRead);
                 }
                 IRubyObject stringio = runtime.getModule("StringIO");
-                return stringio.callMethod(context, "new", runtime.newString(blist));
+                return stringio.callMethod(context, "new", runtime.newString(bytes));
             } finally {
                 close(entryStream);
             }

data/lib/warbler/config.rb

@@ -120,6 +120,10 @@ module Warbler
     # Ignored unless compile feature is used.
     attr_accessor :compile_gems
 
+    # Desired options passed to JRuby compiler if compiling to class files.
+    # Ignored unless compile feature is used.
+    attr_accessor :jrubyc_options
+
     # Warbler writes an "init" file into the war at this location. JRuby-Rack and possibly other
     # launchers may use this to initialize the Ruby environment.
     attr_accessor :init_filename
@@ -240,17 +244,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

@@ -43,34 +43,49 @@ module Warbler
 
       if config.compile_gems
         ruby_files = gather_all_rb_files(config)
-        run_javac(config, ruby_files.values)
+        run_jrubyc(config, ruby_files.values)
         replace_compiled_ruby_files_and_gems(config, ruby_files)
       else
         compiled_ruby_files = config.compiled_ruby_files - config.excludes.to_a
-        run_javac(config, compiled_ruby_files)
+        run_jrubyc(config, compiled_ruby_files)
         replace_compiled_ruby_files(config, compiled_ruby_files)
       end
     end
 
-    def run_javac(config, compiled_ruby_files)
-      if config.webxml && config.webxml.context_params.has_key?('jruby.compat.version')
-        compat_version = "--#{config.webxml.jruby.compat.version}"
-      else
-        compat_version = ''
-      end
+    DEFAULT_COMPILED_FILES_SLICE = 2500
 
-      compiled_ruby_files.each_slice(2500) do |slice|
+    def run_jrubyc(config, compiled_ruby_files)
+      slice_size = (ENV['WARBLER_COMPILED_FILES_SLICE'] || 0).to_i
+      slice_size = DEFAULT_COMPILED_FILES_SLICE if slice_size <= 0
+      compiled_ruby_files.each_slice(slice_size) do |files|
+        files = "\"#{files.join('" "')}\""
+        classpath = config.java_libs.map { |lib| "\"#{lib.gsub('"', '\\"')}\"" }.join(File::PATH_SEPARATOR)
         # Need to use the version of JRuby in the application to compile it
-        javac_cmd = %Q{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} #{java_version(config)} org.jruby.Main #{compat_version} -S jrubyc \"#{slice.join('" "')}\"}
+        javac_cmd = %Q{java -classpath #{classpath} #{java_version(config)} org.jruby.Main -S jrubyc #{jrubyc_options(config)} #{files}}
         if which('java').nil? && which('env')
-          system %Q{env -i #{javac_cmd}}
+          sh_jrubyc %Q{env -i #{javac_cmd}}
         else
-          system javac_cmd
+          sh_jrubyc javac_cmd
         end
-        raise "Compile failed" if $?.exitstatus > 0
       end
       @compiled = true
     end
+    # @deprecated only due compatibility
+    alias_method :run_javac, :run_jrubyc
+
+    def sh_jrubyc(cmd)
+      sh(cmd) do |ok, res|
+        raise "Compilation of .rb files failed (#{res})" unless ok
+      end
+    end
+    private :sh_jrubyc
+
+    def jrubyc_options(config)
+      options = ENV['WARBLER_JRUBYC_OPTIONS'] || config.jrubyc_options
+      options = options.join(' ') if options.is_a?(Array)
+      options || ''
+    end
+    private :jrubyc_options
 
     def java_version(config)
       config.bytecode_version ? "-Djava.specification.version=#{config.bytecode_version}" : ''
@@ -158,10 +173,10 @@ module Warbler
       end
       rm_f path
       ensure_directory_entries
-      puts "Creating #{path}"
       if Warbler::Config === config_or_path
         @files.delete("#{config_or_path.jar_name}/#{path}")
       end
+      puts "Creating #{path}" unless silent?
       create_jar path, @files
     end
 
@@ -203,7 +218,7 @@ module Warbler
       full_gem_path = Pathname.new(spec.full_gem_path)
 
       # skip gems whose full_gem_path does not exist
-      ($stderr.puts "warning: skipping #{spec.name} (#{full_gem_path.to_s} does not exist)" ; return) unless full_gem_path.exist?
+      (warn "skipping #{spec.name} (#{full_gem_path.to_s} does not exist)" ; return) unless full_gem_path.exist?
 
       @files[apply_pathmaps(config, "#{spec.full_name}.gemspec", :gemspecs)] = StringIO.new(spec.to_ruby)
       FileList["#{full_gem_path.to_s}/**/*"].each do |src|
@@ -217,7 +232,7 @@ module Warbler
     def find_application_files(config)
       config.dirs.select do |d|
         exists = File.directory?(d)
-        $stderr.puts "warning: application directory `#{d}' does not exist or is not a directory; skipping" unless exists
+        warn "application directory `#{d}' does not exist or is not a directory; skipping" unless exists
         exists
       end.each do |d|
         @files[apply_pathmaps(config, d, :application)] = nil
@@ -284,8 +299,8 @@ module Warbler
             zipfile.get_output_stream(entry) {|f| f << src.read }
           elsif src.nil? || File.directory?(src)
             if File.symlink?(entry) && ! defined?(JRUBY_VERSION)
-              $stderr.puts "directory symlinks are not followed unless using JRuby; " +
-                           "#{entry.inspect} contents not in archive"
+              warn "directory symlinks are not followed unless using JRuby; " +
+                   "#{entry.inspect} contents not in archive"
             end
             zipfile.mkdir(entry.dup) # in case it's frozen rubyzip 0.9.6.1 workaround
           elsif File.symlink?(src)
@@ -293,7 +308,7 @@ module Warbler
           elsif File.exist?(src)
             zipfile.add(entry, src)
           else
-            $stderr.puts "File not found; #{entry.inspect} not in archive"
+            warn "file not found; #{entry.inspect} not in archive"
           end
         end
       end
@@ -314,7 +329,7 @@ module Warbler
   class War < Jar
     def initialize(*)
       super
-      $stderr.puts "Warbler::War is deprecated. Please replace all occurrences with Warbler::Jar."
+      warn "Warbler::War is deprecated. Please replace all occurrences with Warbler::Jar."
     end
   end
 end

data/lib/warbler/rake_helper.rb

@@ -6,24 +6,25 @@
 #++
 
 module Warbler
-  # This module exists for compatibility with Rake 0.9.
   module RakeHelper
+
     def self.included(base)
       base.class_eval do
         include Rake::DSL if defined?(Rake::DSL)
-        if defined?(Rake::FileUtilsExt)
-          include FileUtils
-          include Rake::FileUtilsExt
-        end
+        include Rake::FileUtilsExt # includes FileUtils
       end
     end
 
     def self.extended(base)
       base.extend Rake::DSL if defined?(Rake::DSL)
-      if defined?(Rake::FileUtilsExt)
-        base.extend FileUtils
-        base.extend Rake::FileUtilsExt
-      end
+      base.extend Rake::FileUtilsExt
+    end
+
+    private
+
+    def silent?
+      Rake.application.options.silent rescue nil
     end
+
   end
 end

data/lib/warbler/task.rb

@@ -47,7 +47,7 @@ module Warbler
       end
       @config ||= Config.new
       unless @config.kind_of? Config
-        $stderr.puts "Warbler::Config not provided by override in initializer or #{Config::FILE}; using defaults"
+        warn "Warbler::Config not provided by override in initializer or #{Config::FILE}; using defaults"
         @config = Config.new
       end
       @name = name || @config.jar_extension
@@ -82,7 +82,7 @@ module Warbler
           @config.features.each do |feature|
             t = "#@name:#{feature}"
             unless Rake.application.lookup(t)
-              $stderr.puts "unknown feature `#{feature}', ignoring"
+              warn "unknown feature `#{feature}', ignoring"
               next
             end
             Rake::Task[t].invoke

data/lib/warbler/traits/bundler.rb

@@ -47,7 +47,7 @@ module Warbler
               full_gem_path = full_gem_path.dirname
               # if at top of the path, meaning we cannot find bundler.gemspec, abort.
               if full_gem_path.to_s =~ /^[\.\/]$/
-                $stderr.puts("warning: Unable to detect bundler spec under '#{spec.full_gem_path}'' and is sub-dirs")
+                warn("Unable to detect bundler spec under '#{spec.full_gem_path}'' and its sub-dirs")
                 exit
               end
             end
@@ -64,9 +64,9 @@ module Warbler
             config.bundler[:git_specs] << spec
           when ::Bundler::Source::Path
             unless bundler_source_is_warbled_gem_itself?(spec.source)
-              $stderr.puts("warning: Bundler `path' components are not currently supported.",
-                           "The `#{spec.full_name}' component was not bundled.",
-                           "Your application may fail to boot!")
+              warn("Bundler `path' components are not currently supported.\n" +
+                   "The `#{spec.full_name}' component was not bundled.\n" +
+                   "Your application may fail to boot!")
             end
           else
             config.gems << spec

data/lib/warbler/traits/rails.rb

@@ -45,9 +45,12 @@ module Warbler
       def after_configure
         config.init_contents << "#{config.warbler_templates}/rails.erb"
 
-        if threadsafe_enabled? or rails_4?
-          config.webxml.jruby.min.runtimes = 1 unless Integer === config.webxml.jruby.min.runtimes
-          config.webxml.jruby.max.runtimes = 1 unless Integer === config.webxml.jruby.max.runtimes
+        if config.webxml.jruby.min.runtimes.is_a?(OpenStruct) &&
+           config.webxml.jruby.max.runtimes.is_a?(OpenStruct) # not set
+           if rails_major_version(0) >= 4 || threadsafe_enabled?
+             config.webxml.jruby.min.runtimes = 1
+             config.webxml.jruby.max.runtimes = 1
+           end
         end
 
         config.includes += FileList["public/assets/.sprockets-manifest-*.json"].existing
@@ -70,14 +73,17 @@ module Warbler
         end
       end
 
-      def rails_4?
+      def rails_major_version(default = 0)
         begin
-          unless IO.readlines("Gemfile").grep(/^\s*gem\s('|")rails('|"),\s('|")4\.\d+\.\d+/).empty? &&
-              IO.readlines("Gemfile.lock").grep(/^\s*rails\s\([=~><]*\s*4\.(\d+)\.(\d+).*\)$/).empty?
-            return true
+          File.open("#{ENV['BUNDLE_GEMFILE'] || 'Gemfile'}.lock") do |file|
+            file.each_line do |line|
+              match = line.match /^\s*rails\s\(\s*(\d)\.\d+\.\d+.*\)$/
+              return match[1].to_i if match
+            end
           end
         rescue
         end
+        default
       end
     end
   end

data/lib/warbler/traits/war.rb

@@ -68,8 +68,8 @@ module Warbler
       end
 
       def default_jar_files
-        require 'jruby-jars'
-        require 'jruby-rack'
+        require 'jruby-jars' unless defined? JRubyJars.core_jar_path
+        require 'jruby-rack' unless defined? JRubyJars.jruby_rack_jar_path
         FileList[JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path, JRubyJars.jruby_rack_jar_path]
       end
 
@@ -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
@@ -176,15 +179,6 @@ module Warbler
           @table = Hash.new { |h, k| h[k] = WebxmlOpenStruct.new(k) }
         end
 
-        def servlet_context_listener
-          case self.booter
-          when :rack
-            "org.jruby.rack.RackServletContextListener"
-          else # :rails, default
-            "org.jruby.rack.rails.RailsServletContextListener"
-          end
-        end
-
         def [](key)
           new_ostruct_member(key)
           send(key)
@@ -195,6 +189,35 @@ module Warbler
           send("#{key}=", value)
         end
 
+        def method_missing(mid, *args)
+          len = args.length
+          if mname = mid[/.*(?==\z)/m]
+            if len != 1
+              raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
+            end
+            modifiable[new_ostruct_member(mname)] = args[0]
+          elsif len == 0
+            @table[mid]
+          else
+            err = NoMethodError.new "undefined method `#{mid}' for #{self}", mid, args
+            err.set_backtrace caller(1)
+            raise err
+          end
+        end
+
+        def respond_to_missing?(mid, include_private = false)
+          @table.key?(mid.to_s.chomp('=').to_sym) || super
+        end
+
+        def servlet_context_listener
+          case self.booter
+          when :rack
+            "org.jruby.rack.RackServletContextListener"
+          else # :rails, default
+            "org.jruby.rack.rails.RailsServletContextListener"
+          end
+        end
+
         def context_params(escape = true)
           require 'cgi'
           params = {}
@@ -210,7 +233,7 @@ module Warbler
             end
           end
           extra_ignored = Array === ignored ? ignored : []
-          params.delete_if {|k,v| ['ignored', *extra_ignored].include?(k.to_s) }
+          params.delete_if { |k,_| ['ignored', *extra_ignored].include?(k.to_s) }
           params
         end
 

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.0.rc2"
+  VERSION = "2.0.0.rc3"
 end

data/spec/rails4_stub/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.2'
+gem 'rails-api', '0.4.0'
+
+gem 'activerecord-jdbcpostgresql-adapter', '1.3.19'

data/spec/spec_helper.rb

@@ -73,12 +73,14 @@ module ExampleGroupHelpers
     end
   end
 
-  def cleanup_temp_files(*except_files)
+  def cleanup_temp_files(options = { :include => nil })
+    except_files = Array(options[:except])
+    include_files = Array(options[:include])
     after(:each) do
       FileUtils.rm_rf FileList[*(["log", ".bundle", "tmp"] - except_files)]
       FileUtils.rm_f  FileList[*(["*.war", "*.foobar", "**/config.ru", "*web.xml*", "config/web.xml*",
                                  "config/warble.rb", "file.txt", 'manifest', '*Gemfile*', 'MANIFEST.MF*', 'init.rb*',
-                                 '**/*.class'] - except_files)]
+                                 '**/*.class'] + include_files - except_files)]
     end
   end
 

data/spec/warbler/bundler_spec.rb

@@ -218,7 +218,7 @@ describe Warbler::Jar, "with Bundler" do
 
   context "in a rack app" do
     run_in_directory "spec/sample_rack_war"
-    cleanup_temp_files '**/config.ru'
+    cleanup_temp_files except: '**/config.ru'
 
     it "should have default load path" do
       jar.add_init_file(config)

data/spec/warbler/jar_spec.rb

@@ -35,7 +35,7 @@ describe Warbler::Jar do
 
   context "in a jar project" do
     run_in_directory "spec/sample_jar"
-    cleanup_temp_files
+    cleanup_temp_files include: '*.java'
 
     it "detects a Jar trait" do
       config.traits.should include(Warbler::Traits::Jar)
@@ -183,7 +183,7 @@ describe Warbler::Jar do
         jar.compile(config)
         jar.apply(config)
         file_list(%r{sample_jar.*\.rb$}).size.should == 2
-        file_list(%r{gems.*\.class$}).size.should == 80
+        file_list(%r{gems.*\.class$}).size.should >= 80 # depending on RubyZip version
       end
 
       it "does not compile included gems by default" do
@@ -194,6 +194,14 @@ describe Warbler::Jar do
         file_list(%r{gems.*\.class$}).size.should == 0
       end
 
+      it "compiles with jrubyc options when specified" do
+        config.jrubyc_options = [ '--java' ]
+        config.compiled_ruby_files = %w(lib/sample_jar.rb)
+        jar.compile(config)
+        jar.apply(config)
+        expect( FileList['*'] ).to include 'SampleJar.java'
+      end
+
     end
 
     context "with a gemspec without a default executable" do
@@ -808,23 +816,23 @@ describe Warbler::Jar do
           rm_rf File.dirname(manifest_file)
         end
 
-        context "When rails version is specified in Gemfile" do
+        context "when rails version is found in Gemfile.lock" do
           before :each do
-            File.open("Gemfile", "a") { |f| f.puts "gem 'rails', '4.0.0'" }
-          end
-
-          after :each do
-            rm "Gemfile"
+            ENV['BUNDLE_GEMFILE'] = File.expand_path('../rails4_stub/Gemfile', File.dirname(__FILE__))
           end
 
           it_should_behave_like "threaded environment"
           it_should_behave_like "asset pipeline"
         end
 
-        context "when rails version is not specified in Gemfile" do
+        context "when rails version is not found in Gemfile.lock" do
           before :each do
-            File.open("Gemfile", "a") { |f| f.puts "gem 'rails'" }
-            File.open("Gemfile.lock", "a") { |f| f.puts " rails (4.0.0)" }
+            File.open("Gemfile", 'w') { |f| f.puts "gem 'rails-name'\n\n" }
+            File.open("Gemfile.lock", 'w') do |f|
+              f.puts " rails-name (4.0.0)"
+              f.puts " apry-rails (4.2.0)"
+              f.puts ""
+            end
           end
 
           after :each do
@@ -832,7 +840,11 @@ describe Warbler::Jar do
             rm "Gemfile.lock"
           end
 
-          it_should_behave_like "threaded environment"
+          it "doesn't set runtime numbers to 1" do
+            config.webxml.jruby.min.runtimes.should_not == 1
+            config.webxml.jruby.max.runtimes.should_not == 1
+          end
+
           it_should_behave_like "asset pipeline"
         end
       end

data/warble.rb

@@ -57,12 +57,12 @@ Warbler::Config.new do |config|
 
   # The most recent versions of gems are used.
   # You can specify versions of gems by using a hash assignment:
-  # config.gems["rails"] = "2.3.10"
+  # config.gems["rails"] = "4.2.5"
 
   # You can also use regexps or Gem::Dependency objects for flexibility or
   # finer-grained control.
   # config.gems << /^sinatra-/
-  # config.gems << Gem::Dependency.new("sinatra", "= 1.4.5")
+  # config.gems << Gem::Dependency.new("sinatra", "= 1.4.7")
 
   # Include gem dependencies not mentioned specifically. Default is
   # true, uncomment to turn off.
@@ -152,9 +152,6 @@ Warbler::Config.new do |config|
   # Application booter to use, either :rack or :rails (autodetected by default)
   # config.webxml.booter = :rails
 
-  # Set JRuby to run in 1.9 mode.
-  # config.webxml.jruby.compat.version = "1.9"
-
   # When using the :rack booter, "Rackup" script to use.
   # - For 'rackup.path', the value points to the location of the rackup
   # script in the web archive file. You need to make sure this file

data/warbler.gemspec

@@ -24,8 +24,8 @@ bundle up all of your application files for deployment to a Java environment.}
 
   gem.add_runtime_dependency 'rake', [">= 10.1.0"]
   gem.add_runtime_dependency 'jruby-jars', [">= 9.0.0.0"]
-  gem.add_runtime_dependency 'jruby-rack', [">= 1.1.1", '< 1.3']
-  gem.add_runtime_dependency 'rubyzip', [">= 1.0", "< 1.2"]
+  gem.add_runtime_dependency 'jruby-rack', [">= 1.1.1", "< 1.3"]
+  gem.add_runtime_dependency 'rubyzip', ["~> 1.0", "< 1.4"]
   gem.add_development_dependency 'jbundler', "~> 0.9"
   gem.add_development_dependency 'rspec', "~> 2.10"
   gem.add_development_dependency 'rdoc', ">= 2.4.2"

data/web.xml.erb

@@ -1,8 +1,9 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
-  <!-- <display-name>Uncomment and put name :here: for Tomcat Dashboard</display-name> -->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      version="3.0">
+  <!--
+  <display-name>Uncomment and put name :here: for Tomcat Dashboard</display-name>-->
 
 <% webxml.context_params.each do |k,v| %>
   <context-param>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -61,23 +61,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   name: rubyzip
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -262,6 +262,8 @@ files:
 - spec/drb_default_id_conv.rb
 - spec/drb_helper.rb
 - spec/m2_home/conf/settings.xml
+- spec/rails4_stub/Gemfile
+- spec/rails4_stub/Gemfile.lock
 - spec/sample_bundler/.bundle/config
 - spec/sample_bundler/Gemfile
 - spec/sample_bundler/Gemfile.lock
@@ -569,6 +571,8 @@ test_files:
 - spec/drb_default_id_conv.rb
 - spec/drb_helper.rb
 - spec/m2_home/conf/settings.xml
+- spec/rails4_stub/Gemfile
+- spec/rails4_stub/Gemfile.lock
 - spec/sample_bundler/.bundle/config
 - spec/sample_bundler/Gemfile
 - spec/sample_bundler/Gemfile.lock