warbler 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d05a82e2e4f5ccfc47ffc014a1b4baf1872510
-  data.tar.gz: 27f3d80a4e3231a1120e72a13173ebcd2cc7ce64
+  metadata.gz: f191c5553256cc2b14be10dbb9e5bb4582080046
+  data.tar.gz: 30b9d9cbb24297872f2bc0f5ec6978f4e2bfa99d
 SHA512:
-  metadata.gz: 1b220ad7086cb9ceef5db6e1fc80d863e150bf0e8d6e0a5aa9cfd5b26c225f0e036a73dbb6bee9c6e774535e79c0b9112fc8a1a1e054057b9059d5831f253c67
-  data.tar.gz: 02e5f1796a08654fe5416e20a95f5e87abef27bf3d77870dbec64233e06864ed96fd9f880d0e0184d399fa962cfa49818691d524e4da0cec2e85f99a56c0408f
+  metadata.gz: 5e445e6ad70bcf3047e44661bfb599a43d23491bf80baae4c36f468cd49660b0dce622a01b4bd98ce7eb4e2ed758b72eac1cb4cd5b0a42a30d33599d91f56b0a
+  data.tar.gz: 2623d3d975d55216dcf3a8574b126ca91e745b20b870672515a34c4ffcbf46b9b0dd7ba678e215b47aaa2315c73e7c21d1c2b5b8d143c4602ab203e3a29de87b

data/History.txt

@@ -1,3 +1,6 @@
+== 1.4.5
+- #282: Wrong default GEM_HOME in generated META-INF/init.rb
+
 == 1.4.4
 - #271: LoadError while excute rake command with runnable .war archive
 - #273: filtering support with `config.move_jars_to_webinf_lib`

data/README.rdoc

@@ -1,4 +1,4 @@
-= Warbler {<img src="https://travis-ci.org/jruby/warbler.png" />}[https://travis-ci.org/jruby/warbler]
+= Warbler {<img src="https://badge.fury.io/rb/warbler.svg" alt="Gem Version" />}[http://badge.fury.io/rb/warbler] {<img src="https://travis-ci.org/jruby/warbler.png" />}[https://travis-ci.org/jruby/warbler]
 
 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 bundle up 

data/ext/JarMain.java

@@ -25,15 +25,15 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 public class JarMain implements Runnable {
-    
+
     static final String MAIN = "/" + JarMain.class.getName().replace('.', '/') + ".class";
 
     final boolean debug = isDebug();
-    
+
     protected final String[] args;
     protected final String archive;
     private final String path;
-    
+
     protected File extractRoot;
 
     protected URLClassLoader classLoader;
@@ -43,15 +43,15 @@ public class JarMain implements Runnable {
         URL mainClass = getClass().getResource(MAIN);
         try {
             this.path = mainClass.toURI().getSchemeSpecificPart();
-        } 
+        }
         catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
         archive = this.path.replace("!" + MAIN, "").replace("file:", "");
-        
+
         Runtime.getRuntime().addShutdownHook(new Thread(this));
     }
-    
+
     protected URL[] extractArchive() throws Exception {
         final JarFile jarFile = new JarFile(archive);
         try {
@@ -65,12 +65,12 @@ public class JarMain implements Runnable {
             extractRoot = File.createTempFile("jruby", "extract");
             extractRoot.delete(); extractRoot.mkdirs();
 
-            final List<URL> urls = new ArrayList<URL>();
+            final List<URL> urls = new ArrayList<URL>(jarNames.size());
             for (Map.Entry<String, JarEntry> e : jarNames.entrySet()) {
                 URL entryURL = extractEntry(e.getValue(), e.getKey());
                 if (entryURL != null) urls.add( entryURL );
             }
-            return (URL[]) urls.toArray(new URL[urls.size()]);
+            return urls.toArray(new URL[urls.size()]);
         }
         finally {
             jarFile.close();
@@ -84,18 +84,18 @@ public class JarMain implements Runnable {
         }
         return null; // do not extract entry
     }
-    
+
     protected URL extractEntry(final JarEntry entry, final String path) throws Exception {
         final File file = new File(extractRoot, path);
         if ( entry.isDirectory() ) {
-            file.mkdirs(); 
+            file.mkdirs();
             return null;
         }
         final String entryPath = entryPath(entry.getName());
         final InputStream entryStream;
         try {
             entryStream = new URI("jar", entryPath, null).toURL().openStream();
-        } 
+        }
         catch (IllegalArgumentException e) {
             // TODO gems '%' file name "encoding" ?!
             debug("failed to open jar:" + entryPath + " skipping entry: " + entry.getName(), e);
@@ -110,7 +110,7 @@ public class JarMain implements Runnable {
             while ((bytesRead = entryStream.read(buf)) != -1) {
                 outStream.write(buf, 0, bytesRead);
             }
-        } 
+        }
         finally {
             entryStream.close();
             outStream.close();
@@ -135,7 +135,7 @@ public class JarMain implements Runnable {
         invokeMethod(scriptingContainer, "setClassLoader", new Class[] { ClassLoader.class }, classLoader);
         return scriptingContainer;
     }
-    
+
     protected int launchJRuby(final URL[] jars) throws Exception {
         final Object scriptingContainer = newScriptingContainer(jars);
         debug("invoking " + archive + " with: " + Arrays.deepToString(args));
@@ -144,7 +144,7 @@ public class JarMain implements Runnable {
     }
 
     protected String launchScript() {
-        return 
+        return
         "begin\n" +
         "  require 'META-INF/init.rb'\n" +
         "  require 'META-INF/main.rb'\n" +
@@ -153,7 +153,7 @@ public class JarMain implements Runnable {
         "  e.status\n" +
         "end";
     }
-    
+
     protected int start() throws Exception {
         final URL[] jars = extractArchive();
         return launchJRuby(jars);
@@ -168,10 +168,23 @@ public class JarMain implements Runnable {
         if (debug && t != null) t.printStackTrace(System.out);
     }
 
+    protected static void debug(Throwable t) {
+        if (isDebug()) t.printStackTrace(System.out);
+    }
+
     protected void warn(String msg) {
         System.out.println("WARNING: " + msg);
     }
-    
+
+    protected static void error(Throwable t) {
+        error(t.toString(), t);
+    }
+
+    protected static void error(String msg, Throwable t) {
+        System.err.println("ERROR: " + msg);
+        debug(t);
+    }
+
     protected void delete(File f) {
         try {
           if (f.isDirectory() && !isSymlink(f)) {
@@ -181,22 +194,19 @@ public class JarMain implements Runnable {
               }
           }
           f.delete();
-        } catch (IOException e) {
-            System.err.println("error: " + e.toString());
         }
+        catch (IOException e) { error(e); }
     }
 
     protected boolean isSymlink(File file) throws IOException {
-      if (file == null)
-        throw new NullPointerException("File must not be null");
-      File canon;
-      if (file.getParent() == null) {
-        canon = file;
-      } else {
-        File canonDir = file.getParentFile().getCanonicalFile();
-        canon = new File(canonDir, file.getName());
-      }
-      return !canon.getCanonicalFile().equals(canon.getAbsoluteFile());
+        if (file == null) throw new NullPointerException("File must not be null");
+        final File canonical;
+        if ( file.getParent() == null ) canonical = file;
+        else {
+            File parentDir = file.getParentFile().getCanonicalFile();
+            canonical = new File(parentDir, file.getName());
+        }
+        return ! canonical.getCanonicalFile().equals( canonical.getAbsoluteFile() );
     }
 
     public void run() {
@@ -204,10 +214,8 @@ public class JarMain implements Runnable {
         try {
             invokeMethod(classLoader, "close");
         }
-        catch(NoSuchMethodException e) { } // We're not being run on Java >= 7
-        catch(Exception e) {
-            System.err.println("error: " + e.toString());
-        }
+        catch (NoSuchMethodException e) { } // We're not being run on Java >= 7
+        catch (Exception e) { error(e); }
 
         if ( extractRoot != null ) delete(extractRoot);
     }
@@ -219,29 +227,27 @@ public class JarMain implements Runnable {
     protected static void doStart(final JarMain main) {
         try {
             int exit = main.start();
-            if(isSystemExitEnabled()) System.exit(exit);
-        } catch (Exception e) {
-            System.err.println("error: " + e.toString());
+            if (isSystemExitEnabled()) System.exit(exit);
+        }
+        catch (Exception e) {
             Throwable t = e;
-            while (t.getCause() != null && t.getCause() != t) {
+            while ( t.getCause() != null && t.getCause() != t ) {
                 t = t.getCause();
             }
-            if (isDebug()) {
-                t.printStackTrace();
-            }
+            error(e.toString(), t);
             System.exit(1);
         }
     }
-    
-    protected static Object invokeMethod(final Object self, final String name, final Object... args) 
+
+    protected static Object invokeMethod(final Object self, final String name, final Object... args)
         throws NoSuchMethodException, IllegalAccessException, Exception {
-        
+
         final Class[] signature = new Class[args.length];
         for ( int i = 0; i < args.length; i++ ) signature[i] = args[i].getClass();
         return invokeMethod(self, name, signature, args);
     }
 
-    protected static Object invokeMethod(final Object self, final String name, final Class[] signature, final Object... args) 
+    protected static Object invokeMethod(final Object self, final String name, final Class[] signature, final Object... args)
         throws NoSuchMethodException, IllegalAccessException, Exception {
         Method method = self.getClass().getDeclaredMethod(name, signature);
         try {
@@ -255,7 +261,7 @@ public class JarMain implements Runnable {
             throw e;
         }
     }
-    
+
     static boolean isDebug() {
         return Boolean.getBoolean("warbler.debug");
     }

data/ext/WarblerJar.java

@@ -37,8 +37,9 @@ public class WarblerJar {
     }
 
     @JRubyMethod
-    public static IRubyObject create_jar(ThreadContext context, IRubyObject recv, IRubyObject jar_path, IRubyObject entries) {
-        final Ruby runtime = recv.getRuntime();
+    public static IRubyObject create_jar(ThreadContext context, IRubyObject self,
+        IRubyObject jar_path, IRubyObject entries) {
+        final Ruby runtime = context.runtime;
 
         if (!(entries instanceof RubyHash)) {
             throw runtime.newArgumentError("expected a hash for the second argument");
@@ -56,7 +57,7 @@ public class WarblerJar {
             }
         } catch (IOException e) {
             if (runtime.isDebug()) {
-                e.printStackTrace();
+                e.printStackTrace(runtime.getOut());
             }
             throw runtime.newIOErrorFromException(e);
         }
@@ -65,8 +66,9 @@ public class WarblerJar {
     }
 
     @JRubyMethod
-    public static IRubyObject entry_in_jar(ThreadContext context, IRubyObject recv, IRubyObject jar_path, IRubyObject entry) {
-        final Ruby runtime = recv.getRuntime();
+    public static IRubyObject entry_in_jar(ThreadContext context, IRubyObject self,
+        IRubyObject jar_path, IRubyObject entry) {
+        final Ruby runtime = context.runtime;
         try {
             InputStream entryStream = getStream(jar_path.convertToString().getUnicodeValue(),
                                                 entry.convertToString().getUnicodeValue());
@@ -84,7 +86,7 @@ public class WarblerJar {
             }
         } catch (IOException e) {
             if (runtime.isDebug()) {
-                e.printStackTrace();
+                e.printStackTrace(runtime.getOut());
             }
             throw runtime.newIOErrorFromException(e);
         }
@@ -120,7 +122,7 @@ public class WarblerJar {
                 try {
                     zip.putNextEntry(new ZipEntry(entryName));
                     byte[] buf = new byte[16384];
-                    int bytesRead = -1;
+                    int bytesRead;
                     while ((bytesRead = inFile.read(buf)) != -1) {
                         zip.write(buf, 0, bytesRead);
                     }
@@ -181,7 +183,7 @@ public class WarblerJar {
         entry = trimTrailingSlashes(entry);
 
         ZipInputStream jstream = new ZipInputStream(jar);
-        ZipEntry zentry = null;
+        ZipEntry zentry;
         while ((zentry = jstream.getNextEntry()) != null) {
             if (trimTrailingSlashes(zentry.getName()).equals(entry)) {
                 return jstream;

data/integration/pom.xml

@@ -20,7 +20,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jruby.version>1.7.13</jruby.version>
     <!-- prereleased gems ARE snapshots -->
-    <warbler.version>1.4.4-SNAPSHOT</warbler.version>
+    <warbler.version>1.4.5.dev-SNAPSHOT</warbler.version>
     <gem.home>${session.executionRootDirectory}/target/rubygems</gem.home>
     <gem.path>${session.executionRootDirectory}/target/rubygems</gem.path>
   </properties>

data/lib/warbler/templates/rack.erb

@@ -1,3 +1,3 @@
-ENV['RACK_ENV'] = '<%= (params = config.webxml.context_params; params['rack.env']) %>'
+ENV['RACK_ENV'] ||= '<%= (params = config.webxml.context_params; params['rack.env']) %>'
 
 $LOAD_PATH.unshift $servlet_context.getRealPath('/WEB-INF') if $servlet_context

data/lib/warbler/templates/war.erb

@@ -1,8 +1,8 @@
 <% assignment_operator = config.override_gem_home ? "=" : "||=" %>
 if $servlet_context.nil?
-  ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path('../../WEB-INF', __FILE__)
+  ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path(File.join('..', '..', '<%= config.gem_path %>'), __FILE__)
 <% if config.bundler && config.bundler[:gemfile_path] %>
-  ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../<%= config.bundler[:gemfile_path] %>', __FILE__)
+  ENV['BUNDLE_GEMFILE'] ||= File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
 <% end %>
 else
   ENV['GEM_HOME'] <%= assignment_operator %> $servlet_context.getRealPath('<%= config.gem_path %>')

data/lib/warbler/traits.rb

@@ -6,6 +6,7 @@
 #++
 
 require 'stringio'
+require 'tsort'
 
 module Warbler
   # Traits are project configuration characteristics that correspond
@@ -21,7 +22,7 @@ module Warbler
     end
 
     def auto_detect_traits
-      Traits.constants.map {|t| Traits.const_get(t)}.select {|tc| tc.detect? }.sort
+      TraitsDependencyArray.new(Traits.constants.map {|t| Traits.const_get(t)}).tsort.select {|tc| tc.detect? }
     end
 
     def before_configure
@@ -49,12 +50,8 @@ module Warbler
   # Each trait class includes this module to receive shared functionality.
   module Trait
     module ClassMethods
-      def <=>(o)
-        requires?(o) ? 1 : (o.requires?(self) ? -1 : 0)
-      end
-
-      def requires?(t)
-        false
+      def requirements
+        []
       end
     end
 
@@ -103,6 +100,16 @@ module Warbler
       FileList[JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path]
     end
   end
+
+  class TraitsDependencyArray < Array
+    include TSort
+
+    alias tsort_each_node each
+    def tsort_each_child(node, &block)
+      node.requirements.each(&block)
+    end
+  end
+
 end
 
 require 'warbler/traits/jar'

data/lib/warbler/traits/bundler.rb

@@ -17,8 +17,8 @@ module Warbler
         File.exist?(ENV['BUNDLE_GEMFILE'] || "Gemfile")
       end
 
-      def self.requires?(trait)
-        trait == Traits::War || trait == Traits::Jar
+      def self.requirements
+        [ Traits::War, Traits::Jar ]
       end
 
       def before_configure

data/lib/warbler/traits/jbundler.rb

@@ -17,8 +17,8 @@ module Warbler
         File.exist?(ENV['JBUNDLE_JARFILE'] || "Jarfile")
       end
 
-      def self.requires?(trait)
-        trait == Traits::War || trait == Traits::Jar
+      def self.requirements
+        [ Traits::War, Traits::Jar ]
       end
 
       def before_configure

data/lib/warbler/traits/merb.rb

@@ -15,8 +15,8 @@ module Warbler
         File.exist?("config/init.rb")
       end
 
-      def self.requires?(trait)
-        trait == Traits::War
+      def self.requirements
+        [ Traits::War ]
       end
 
       def before_configure

data/lib/warbler/traits/rack.rb

@@ -15,8 +15,8 @@ module Warbler
         !Rails.detect? && (File.exist?("config.ru") || !Dir['*/config.ru'].empty?)
       end
 
-      def self.requires?(trait)
-        trait == Traits::War
+      def self.requirements
+        [ Traits::War ]
       end
 
       def before_configure

data/lib/warbler/traits/rails.rb

@@ -15,8 +15,8 @@ module Warbler
         File.exist?("config/environment.rb")
       end
 
-      def self.requires?(trait)
-        trait == Traits::War
+      def self.requirements
+        [ Traits::War ]
       end
 
       def before_configure

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

data/lib/warbler/web_server.rb

@@ -1,12 +1,13 @@
 module Warbler
   class WebServer
     class Artifact < Struct.new(:repo, :group_id, :artifact_id, :version)
+
       def path_fragment
         @path_fragment ||= "#{group_id.gsub('.', '/')}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.jar"
       end
 
       def cached_path
-        @cached_path ||= File.expand_path("~/.m2/repository/#{path_fragment}")
+        @cached_path ||= File.join(local_repository, path_fragment)
       end
 
       def download_url
@@ -33,6 +34,47 @@ module Warbler
         end
         cached_path
       end
+
+      @@local_repository = nil
+
+      def local_repository
+        @@local_repository ||= begin
+          m2_home = File.join(user_home, '.m2')
+          if File.exist?(settings = File.join(m2_home, 'settings.xml'))
+            local_repo = detect_local_repository(settings)
+          end
+          if local_repo.nil? && mvn_home = ENV['M2_HOME'] || ENV['MAVEN_HOME']
+            if File.exist?(settings = File.join(mvn_home, 'conf/settings.xml'))
+              local_repo = detect_local_repository(settings)
+            end
+          end
+          local_repo || File.join(m2_home, 'repository')
+        end
+      end
+
+      private
+
+      def user_home
+        ENV[ 'HOME' ] || begin
+          user_home = Dir.home if Dir.respond_to?(:home)
+          unless user_home
+            user_home = ENV_JAVA[ 'user.home' ] if Object.const_defined?(:ENV_JAVA)
+          end
+          user_home
+        end
+      end
+
+      def detect_local_repository(settings); require 'rexml/document'
+        doc = REXML::Document.new( File.read( settings ) )
+        if local_repo = doc.root.elements['localRepository']
+          if ( local_repo = local_repo.first )
+            local_repo = local_repo.value
+            local_repo = nil if local_repo.empty?
+          end
+        end
+        local_repo
+      end
+
     end
 
     def add(jar)
@@ -90,9 +132,9 @@ PROPS
     end
   end
 
-  WEB_SERVERS = Hash.new {|h,k| h["jenkins-ci.winstone"] }
-  WEB_SERVERS.update({ "winstone" => WinstoneServer.new,
-                       "jenkins-ci.winstone" => JenkinsWinstoneServer.new,
-                       "jetty" => JettyServer.new
-                     })
+  WEB_SERVERS = Hash.new { |hash,_| hash['jetty'] }
+  WEB_SERVERS['winstone'] = WinstoneServer.new
+  WEB_SERVERS['jenkins-ci.winstone'] = JenkinsWinstoneServer.new,
+  WEB_SERVERS['jetty'] = JettyServer.new
+
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>warbler</artifactId>
-  <version>1.4.4-SNAPSHOT</version>
+  <version>1.4.5.dev-SNAPSHOT</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,

data/spec/m2_home/conf/settings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+  <profiles>
+    <profile>
+      <id>codehaus</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>codehaus</id>
+          <name>Codehaus Repository</name>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <url>http://repository.codehaus.org</url>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <localRepository>/usr/local/maven/repo</localRepository>
+</settings>

data/spec/warbler/traits_spec.rb

@@ -9,9 +9,13 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Traits do
   it "are ordered by fewer dependencies first" do
-    traits = [Warbler::Traits::War, Warbler::Traits::Bundler, Warbler::Traits::Rails]
-    result = traits.shuffle.sort
-    result.index(Warbler::Traits::War).should < result.index(Warbler::Traits::Bundler)
-    result.index(Warbler::Traits::War).should < result.index(Warbler::Traits::Rails)
+    traits = Warbler::TraitsDependencyArray.new( Warbler::Traits.constants.map {|t| Warbler::Traits.const_get(t)})
+    result = traits.shuffle!.tsort
+
+    result.each do |trait|
+      trait.requirements.each do |requirement|
+        result.index(requirement).should < result.index(trait)
+      end
+    end
   end
 end

data/spec/warbler/web_server_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+class Warbler::WebServer::Artifact
+  def self.reset_local_repository
+    @@local_repository = nil
+  end
+end
+
+describe Warbler::WebServer::Artifact do
+
+  @@_env = ENV.dup
+
+  after(:all) { ENV.clear; ENV.update @@_env }
+
+  before do
+    Warbler::WebServer::Artifact.reset_local_repository
+  end
+
+  after(:all) do
+    Warbler::WebServer::Artifact.reset_local_repository
+  end
+
+  let(:sample_artifact) do
+    Warbler::WebServer::Artifact.new("http://repo.jenkins-ci.org/public",
+      "org.jenkins-ci", "winstone", "0.9.10-jenkins-43"
+    )
+  end
+
+  it "uses default (maven) local repository" do
+    ENV['HOME'] = '/home/borg'
+    ENV.delete('M2_HOME'); ENV.delete('MAVEN_HOME')
+    expect( sample_artifact.local_repository ).to eql "/home/borg/.m2/repository"
+  end
+
+  it "detects a custom maven repository setting" do
+    ENV['HOME'] = '/home/borg'
+    ENV['M2_HOME'] = File.expand_path('../m2_home', File.dirname(__FILE__))
+    expect( sample_artifact.local_repository ).to eql '/usr/local/maven/repo'
+  end
+
+end

data/warble.rb

@@ -80,6 +80,12 @@ Warbler::Config.new do |config|
   # of the project directory.
   # config.jar_name = "mywar"
 
+  # File extension for the archive. Defaults to either 'jar' or 'war'.
+  # config.jar_extension = "jar"
+
+  # Destionation for the created archive. Defaults to project's root directory.
+  # config.autodeploy_dir = "dist/"
+
   # Name of the MANIFEST.MF template for the war file. Defaults to a simple
   # MANIFEST.MF that contains the version of Warbler used to create the war file.
   # config.manifest_file = "config/MANIFEST.MF"

data/warbler.gemspec

@@ -25,7 +25,7 @@ bundle up all of your application files for deployment to a Java environment.}
   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.0.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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,12 +50,18 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.3'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -278,6 +284,7 @@ files:
 - pom.xml
 - 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
@@ -358,6 +365,7 @@ files:
 - spec/warbler/task_spec.rb
 - spec/warbler/traits_spec.rb
 - spec/warbler/war_spec.rb
+- spec/warbler/web_server_spec.rb
 - warble.rb
 - warbler.gemspec
 - web.xml.erb
@@ -386,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
@@ -475,6 +483,7 @@ test_files:
 - 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
@@ -555,3 +564,4 @@ test_files:
 - spec/warbler/task_spec.rb
 - spec/warbler/traits_spec.rb
 - spec/warbler/war_spec.rb
+- spec/warbler/web_server_spec.rb