warbler 2.0.5 → 2.1.1

data/ext/WarMain.java

@@ -5,38 +5,39 @@
  * See the file LICENSE.txt for details.
  */
 
-import java.lang.reflect.Method;
-import java.io.InputStream;
 import java.io.ByteArrayInputStream;
-import java.io.SequenceInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.lang.reflect.Method;
 import java.net.URI;
-import java.net.URLClassLoader;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
 import java.util.Map;
+import java.util.Properties;
 import java.util.jar.JarEntry;
 
 /**
  * Used as a Main-Class in the manifest for a .war file, so that you can run
  * a .war file with <tt>java -jar</tt>.
- *
+ * <p/>
  * WarMain can be used with different web server libraries. WarMain expects
  * to have two files present in the .war file,
  * <tt>WEB-INF/webserver.properties</tt> and <tt>WEB-INF/webserver.jar</tt>.
- *
+ * <p/>
  * When WarMain starts up, it extracts the webserver jar to a temporary
  * directory, and creates a temporary work directory for the webapp. Both
  * are deleted on exit.
- *
+ * <p/>
  * It then reads webserver.properties into a java.util.Properties object,
  * creates a URL classloader holding the jar, and loads and invokes the
  * <tt>main</tt> method of the main class mentioned in the properties.
- *
+ * <p/>
  * An example webserver.properties follows for Jetty. The <tt>args</tt>
  * property indicates the names and ordering of other properties to be used
  * as command-line arguments. The special tokens <tt>{{warfile}}</tt> and
@@ -63,10 +64,11 @@ import java.util.jar.JarEntry;
  */
 public class WarMain extends JarMain {
 
-    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";
+    static final String WEB_INF = "WEB-INF";
+    static final String META_INF = "META-INF";
 
     /**
      *  jruby arguments, consider the following command :
@@ -83,8 +85,6 @@ public class WarMain extends JarMain {
     private final String executable;
     private final String[] executableArgv;
 
-    private File webroot;
-
     WarMain(final String[] args) {
         super(args);
         final List<String> argsList = Arrays.asList(args);
@@ -113,36 +113,40 @@ public class WarMain extends JarMain {
         }
     }
 
-    private URL extractWebserver() throws Exception {
-        this.webroot = File.createTempFile("warbler", "webroot");
-        this.webroot.delete();
-        this.webroot.mkdirs();
-        this.webroot = new File(this.webroot, new File(archive).getName());
-        debug("webroot directory is " + this.webroot.getPath());
-        InputStream jarStream = new URI("jar", entryPath(WEBSERVER_JAR), null).toURL().openStream();
+    private void launchWebServer() throws Exception {
+        File webroot = createWebRoot();
+        File jarFile = extractWebServerJar();
+
+        doLaunchWebServer(jarFile, webroot);
+    }
+
+    private File createWebRoot() throws IOException {
+        File warblerRoot = File.createTempFile("warbler", "webroot");
+        warblerRoot.delete();
+        warblerRoot.mkdirs();
+        closeables.add(() -> deleteAll(warblerRoot));
+
+        File webroot = new File(warblerRoot, new File(archive).getName());
+        debug("webroot directory is " + webroot.getPath());
+        return webroot;
+    }
+
+    private File extractWebServerJar() throws Exception {
         File jarFile = File.createTempFile("webserver", ".jar");
         jarFile.deleteOnExit();
-        FileOutputStream outStream = new FileOutputStream(jarFile);
-        try {
-            byte[] buf = new byte[4096];
-            int bytesRead;
-            while ((bytesRead = jarStream.read(buf)) != -1) {
-                outStream.write(buf, 0, bytesRead);
-            }
-        } finally {
-            jarStream.close();
-            outStream.close();
-        }
+
+        transferAndClose(
+            () -> new URI("jar", entryPath(WEBSERVER_JAR), null).toURL().openStream(),
+            () -> new FileOutputStream(jarFile));
         debug("webserver.jar extracted to " + jarFile.getPath());
-        return jarFile.toURI().toURL();
+        return jarFile;
     }
 
-    private Properties getWebserverProperties() throws Exception {
+    private Properties getWebserverProperties(File webRoot) throws Exception {
         Properties props = new Properties();
-        try {
-            InputStream is = getClass().getResourceAsStream(WEBSERVER_PROPERTIES);
+        try (InputStream is = getClass().getResourceAsStream(WEBSERVER_PROPERTIES)) {
             if ( is != null ) props.load(is);
-        } catch (Exception e) { }
+        } catch (Exception ignore) { }
 
         String port = getSystemProperty("warbler.port", getENV("PORT"));
         port = port == null ? "8080" : port;
@@ -150,13 +154,13 @@ public class WarMain extends JarMain {
         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;
-        for ( Map.Entry entry : props.entrySet() ) {
+        for ( Map.Entry<Object, Object> entry : props.entrySet() ) {
             String val = (String) entry.getValue();
             val = val.replace("{{warfile}}", archive).
                       replace("{{port}}", port).
                       replace("{{host}}", host).
                       replace("{{config}}", webserverConfig).
-                      replace("{{webroot}}", webroot.getAbsolutePath());
+                      replace("{{webroot}}", webRoot.getAbsolutePath());
             entry.setValue(val);
         }
 
@@ -170,10 +174,11 @@ public class WarMain extends JarMain {
         return props;
     }
 
-    private void launchWebServer(URL jar) throws Exception {
-        URLClassLoader loader = new URLClassLoader(new URL[] {jar});
+
+    private void doLaunchWebServer(File jar, File webRoot) throws Exception {
+        URLClassLoader loader = new URLClassLoader(new URL[] {jar.toURI().toURL()});
         Thread.currentThread().setContextClassLoader(loader);
-        Properties props = getWebserverProperties();
+        Properties props = getWebserverProperties(webRoot);
         String mainClass = props.getProperty("mainclass");
         if (mainClass == null) {
             throw new IllegalArgumentException("unknown webserver main class ("
@@ -181,7 +186,7 @@ public class WarMain extends JarMain {
                                                + " is missing 'mainclass' property)");
         }
         Class<?> klass = Class.forName(mainClass, true, loader);
-        Method main = klass.getDeclaredMethod("main", new Class[] { String[].class });
+        Method main = klass.getDeclaredMethod("main", String[].class);
         String[] newArgs = launchWebServerArguments(props);
         debug("invoking webserver with: " + Arrays.deepToString(newArgs));
         main.invoke(null, new Object[] { newArgs });
@@ -208,21 +213,24 @@ public class WarMain extends JarMain {
     @Override
     protected String getExtractEntryPath(final JarEntry entry) {
         final String name = entry.getName();
-        final String start = "WEB-INF";
-        if ( name.startsWith(start) ) {
+        final String res;
+        if ( name.startsWith(WEB_INF) ) {
             // WEB-INF/app/controllers/application_controller.rb ->
             // app/controllers/application_controller.rb
-            return name.substring(start.length());
-        }
-        if ( name.indexOf('/') == -1 ) {
+            res = name.substring(WEB_INF.length());
+        } else if (name.startsWith(META_INF)) {
+            // Keep them where they are.
+            res = name;
+        } else {
             // 404.html -> public/404.html
-            return "/public/" + name;
+            // javascripts -> public/javascripts
+            res = "/public/" + name;
         }
-        return '/' + name;
+        return res;
     }
 
     @Override
-    protected URL extractEntry(final JarEntry entry, final String path) throws Exception {
+    protected URL extractEntry(final JarEntry entry, String path) throws Exception {
         // always extract but only return class-path entry URLs :
         final URL entryURL = super.extractEntry(entry, path);
         return path.endsWith(".jar") && path.startsWith("/lib/") ? entryURL : null;
@@ -251,7 +259,7 @@ public class WarMain extends JarMain {
 
         invokeMethod(rubyInstanceConfig, "processArguments", (Object) arguments);
 
-        Object runtime = invokeMethod(scriptingContainer, "getRuntime");
+        Object runtime = invokeMethod(provider, "getRuntime");
 
         debug("loading resource: " + executablePath);
         Object executableInput =
@@ -267,21 +275,6 @@ public class WarMain extends JarMain {
         return ( outcome instanceof Number ) ? ( (Number) outcome ).intValue() : 0;
     }
 
-    @Deprecated
-    protected String locateExecutable(final Object scriptingContainer) throws Exception {
-        if ( executable == null ) {
-            throw new IllegalStateException("no executable");
-        }
-        final File exec = new File(extractRoot, executable);
-        if ( exec.exists() ) {
-            return exec.getAbsolutePath();
-        }
-        else {
-            final String script = locateExecutableScript(executable, executableScriptEnvPrefix());
-            return (String) invokeMethod(scriptingContainer, "runScriptlet", script);
-        }
-    }
-
     protected String locateExecutable(final Object scriptingContainer, final CharSequence envPreScript)
         throws Exception {
         if ( executable == null ) {
@@ -341,8 +334,7 @@ public class WarMain extends JarMain {
     protected int start() throws Exception {
         if ( executable == null ) {
             try {
-                URL server = extractWebserver();
-                launchWebServer(server);
+                launchWebServer();
             }
             catch (FileNotFoundException e) {
                 final String msg = e.getMessage();
@@ -357,12 +349,6 @@ public class WarMain extends JarMain {
         return super.start();
     }
 
-    @Override
-    public void run() {
-        super.run();
-        if ( webroot != null ) delete(webroot.getParentFile());
-    }
-
     public static void main(String[] args) {
         doStart(new WarMain(args));
     }

data/lib/warbler/bundler_helper.rb

@@ -7,14 +7,7 @@
 module Warbler
   module BundlerHelper
     def to_spec(spec)
-      # JRuby <= 1.7.20 does not handle respond_to? with method_missing right
-      # thus a `spec.respond_to?(:to_spec) ? spec.to_spec : spec` won't do :
-      if ::Bundler.const_defined?(:StubSpecification) # since Bundler 1.10.1
-        spec = spec.to_spec if spec.is_a?(::Bundler::StubSpecification)
-      else
-        spec = spec.to_spec if spec.respond_to?(:to_spec)
-      end
-      spec
+      spec.respond_to?(:to_spec) ? spec.to_spec : spec
     end
     module_function :to_spec
   end

data/lib/warbler/config.rb

@@ -15,8 +15,8 @@ module Warbler
     include RakeHelper
 
     TOP_DIRS = %w(app db config lib log script vendor)
-    FILE = "config/warble.rb"
-    BUILD_GEMS = %w(warbler rake rcov)
+    CONFIG_DIR = "config"
+    FILE = "#{CONFIG_DIR}/warble.rb"
 
     include Traits
 
@@ -29,11 +29,8 @@ module Warbler
 
     # Traits: an array of trait classes corresponding to
     # characteristics of the project that are either auto-detected or
-    # configured.
-    attr_accessor :traits
-
-    # Deprecated: No longer has any effect.
-    attr_accessor :staging_dir
+    # forced enabled during `Config.new(forced_traits: [...]) do |config|`
+    attr_reader :traits
 
     # Directory where the war file will be written. Can be used to direct
     # Warbler to place your war file directly in your application server's
@@ -185,8 +182,9 @@ module Warbler
     attr_reader :warbler_templates
     attr_reader :warbler_scripts
 
-    def initialize(warbler_home = WARBLER_HOME)
-      super()
+    # @param forced_traits [Array<Class>, nil] optional array of Warbler::Trait types to force rather than auto-detecting them
+    def initialize(warbler_home = WARBLER_HOME, forced_traits: nil)
+      super(forced_traits)
 
       @warbler_home      = warbler_home
       @warbler_templates = "#{WARBLER_HOME}/lib/warbler/templates"

data/lib/warbler/gems.rb

@@ -51,11 +51,8 @@ module Warbler
 
     # Add a single gem to WEB-INF/gems
     def find_single_gem_files(gem_dependencies, gem_pattern, version = nil)
-      gem_spec_class = Gem::Specification
-      gem_spec_class = Gem::BasicSpecification if Gem.const_defined?(:BasicSpecification)
-      # Gem::Specification < Gem::BasicSpecification (since RGs 2.1)
       case gem_pattern
-      when gem_spec_class
+      when Gem::Specification
         return BundlerHelper.to_spec(gem_pattern)
       when Gem::Dependency
         gem = gem_pattern
@@ -63,12 +60,9 @@ module Warbler
         gem = Gem::Dependency.new(gem_pattern, Gem::Requirement.create(version))
       end
       # skip development dependencies
-      return nil if gem.respond_to?(:type) and gem.type != :runtime
+      return nil if gem.type != :runtime
 
-      # Deal with deprecated Gem.source_index and #search
-      matched = gem.respond_to?(:to_spec) ? [ gem.to_spec ] : Gem.source_index.search(gem)
-      fail "gem '#{gem}' not installed" if matched.empty?
-      spec = matched.last
+      spec = gem.to_spec
       return spec unless gem_dependencies
       [spec] + spec.dependencies.map { |dependent_gem| find_single_gem_files(gem_dependencies, dependent_gem) }
     end

data/lib/warbler/jar.rb

@@ -70,8 +70,6 @@ module Warbler
       end
       @compiled = true
     end
-    # @deprecated only due compatibility
-    alias_method :run_javac, :run_jrubyc
 
     def sh_jrubyc(cmd)
       sh(cmd) do |ok, res|
@@ -88,7 +86,7 @@ module Warbler
     private :jrubyc_options
 
     def java_version(config)
-      config.bytecode_version ? "-Djava.specification.version=#{config.bytecode_version}" : ''
+      config.bytecode_version ? "-Djruby.bytecode.version=#{config.bytecode_version}" : ''
     end
 
     def replace_compiled_ruby_files(config, compiled_ruby_files)
@@ -178,6 +176,7 @@ module Warbler
 
     # Invoke a hook to allow the project traits to add or modify the archive contents.
     def apply_traits(config)
+      puts "Applying traits #{config.traits}" unless silent?
       config.update_archive(self)
     end
 
@@ -234,6 +233,11 @@ module Warbler
         next if config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
         @files[apply_pathmaps(config, File.join(spec.full_name, f), :gems)] = src
       end
+      if File.exist?(spec.gem_build_complete_path)
+        base_dir = Pathname.new(spec.base_dir)
+        gem_build_complete_path = Pathname.new(spec.gem_build_complete_path)
+        @files[File.join(config.relative_gem_path, gem_build_complete_path.relative_path_from(base_dir))] = spec.gem_build_complete_path
+      end
     end
 
     # Add all application directories and files to the archive.
@@ -280,7 +284,7 @@ module Warbler
 
     def expand_erb(file, config)
       require 'erb'
-      erb = ERB.new(File.read(file), nil, '-')
+      erb = ERB.new(File.read(file), trim_mode: '-')
       StringIO.new(erb.result(erb_binding(config)))
     end
 
@@ -330,14 +334,6 @@ module Warbler
 
     # Java-boosted jar creation for JRuby; replaces #create_jar and
     # #entry_in_jar with Java version
-    require 'warbler_jar' if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.5"
-  end
-
-  # Warbler::War is Deprecated. Please use Warbler::Jar.
-  class War < Jar
-    def initialize(*)
-      super
-      warn "Warbler::War is deprecated. Please replace all occurrences with Warbler::Jar."
-    end
+    require 'warbler_jar' if defined?(JRUBY_VERSION)
   end
 end

data/lib/warbler/task.rb

@@ -42,7 +42,7 @@ module Warbler
 
     def initialize(name = nil, config = nil)
       @config = config
-      if @config.nil? && File.exists?(Config::FILE)
+      if @config.nil? && File.exist?(Config::FILE)
         @config = eval(File.read(Config::FILE), binding, Config::FILE, 0)
       end
       @config ||= Config.new
@@ -148,15 +148,18 @@ module Warbler
 
     def define_config_task
       task "config" do
-        if File.exists?(Warbler::Config::FILE) && ENV["FORCE"].nil?
+        if File.exist?(Warbler::Config::FILE) && ENV["FORCE"].nil?
           puts "There's another bird sitting on my favorite branch"
           puts "(file '#{Warbler::Config::FILE}' already exists. Pass argument FORCE=1 to override)"
-        elsif !File.directory?("config")
-          puts "I'm confused; my favorite branch is missing"
-          puts "(directory 'config' is missing)"
-        else
-          cp "#{Warbler::WARBLER_HOME}/warble.rb", Warbler::Config::FILE
+          next
+        end
+
+        if !File.directory?(Warbler::Config::CONFIG_DIR)
+          puts "config dir is missing, creating it"
+          mkdir_p Warbler::Config::CONFIG_DIR
         end
+
+        cp "#{Warbler::WARBLER_HOME}/warble.rb", Warbler::Config::FILE
       end
     end
 

data/lib/warbler/templates/bundler.erb

@@ -2,18 +2,3 @@ ENV['BUNDLE_WITHOUT'] = '<%= config.bundle_without.join(':') %>'
 <% if config.bundler[:frozen] -%>
 ENV['BUNDLE_FROZEN'] = '1'
 <% end -%>
-
-module Bundler
-  module Patch
-    def clean_load_path
-      # nothing to be done for embedded JRuby
-    end
-  end
-  module SharedHelpers
-    def included(bundler)
-      bundler.send :include, Patch
-    end
-  end
-end
-
-require 'bundler/shared_helpers'

data/lib/warbler/templates/jar.erb

@@ -9,3 +9,5 @@ ENV['GEM_PATH'] = nil # RGs sets Gem.paths.path = Gem.default_path + [ GEM_HOME
 <% if config.bundler && config.bundler[:gemfile_path] -%>
 ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
 <% end -%>
+<%# Ensure any cached paths are cleared; otherwise behaviour can be indeterminate if the paths have already been read %>
+# Gem.clear_paths

data/lib/warbler/templates/rack.erb

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

data/lib/warbler/templates/war.erb

@@ -1,10 +1,5 @@
 if $servlet_context.nil?
   ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path(File.join('..', '..', '<%= config.gem_path %>'), __FILE__)
-<% if config.override_gem_home -%>
-<% # GEM_HOME/GEM_PATH are set as .war gets extracted (on java -jar ...)
-   # ... thus setting `ENV['GEM_PATH'] = nil` would cause a boot failure
--%>
-<% end -%>
 <% if config.bundler && config.bundler[:gemfile_path] -%>
   ENV['BUNDLE_GEMFILE'] ||= File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
 <% end -%>
@@ -17,3 +12,5 @@ else
   ENV['BUNDLE_GEMFILE'] ||= $servlet_context.getRealPath('/<%= config.bundler[:gemfile_path] %>')
 <% end -%>
 end
+<%# Ensure any cached paths are cleared; otherwise behaviour can be indeterminate if the paths have already been read %>
+Gem.clear_paths

data/lib/warbler/traits/bundler.rb

@@ -38,22 +38,6 @@ module Warbler
 
         bundler_specs.each do |spec|
           spec = to_spec(spec)
-          # Bundler HAX -- fixup bad #loaded_from attribute in fake
-          # bundler gemspec from bundler/source.rb
-          if spec.name == 'bundler'
-            full_gem_path = Pathname.new(spec.full_gem_path)
-            while ! full_gem_path.join('bundler.gemspec').exist?
-              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 =~ /^[\.\/]$/
-                warn("Unable to detect bundler spec under '#{spec.full_gem_path}'' and its sub-dirs")
-                exit
-              end
-            end
-
-            spec.loaded_from = full_gem_path.join('bundler.gemspec').to_s
-            spec.full_gem_path = full_gem_path.to_s
-          end
 
           case spec.source
           when ::Bundler::Source::Git
@@ -143,7 +127,8 @@ module Warbler
         bundle_without = config.bundle_without.map { |s| s.to_sym }
         definition = ::Bundler.definition
         all = definition.specs.to_a
-        requested = definition.specs_for(definition.groups - bundle_without).to_a
+        requested_groups = definition.groups - bundle_without
+        requested = requested_groups.empty? ? [] : definition.specs_for(requested_groups).to_a
         excluded_git_specs = (all - requested).select { |spec| ::Bundler::Source::Git === spec.source }
         excluded_git_specs.each { |spec| spec.groups << :warbler_excluded }
         requested + excluded_git_specs

data/lib/warbler/traits/gemspec.rb

@@ -18,6 +18,10 @@ module Warbler
         !Dir['*.gemspec'].empty?
       end
 
+      def self.conflicts
+        [ Traits::NoGemspec ]
+      end
+
       def before_configure; require 'yaml'
         @spec_file = Dir['*.gemspec'].first
         @spec = File.open(@spec_file) { |f| Gem::Specification.from_yaml(f) } rescue Gem::Specification.load(@spec_file)
@@ -56,9 +60,9 @@ module Warbler
         if ! @spec.executables.empty?
           exe_script = @spec.executables.first
           exe_path = File.join(@spec.bindir, exe_script) # bin/script
-          if File.exists?(exe_path)
+          if File.exist?(exe_path)
             exe_path
-          elsif File.exists?("bin/#{exe_script}") # compatibility
+          elsif File.exist?("bin/#{exe_script}") # compatibility
             "bin/#{exe_script}" # ... should probably remove this
           else
             raise "no `#{exe_script}` executable script found"

data/lib/warbler/traits/jar.rb

@@ -17,7 +17,11 @@ module Warbler
       include Trait
 
       def self.detect?
-        !War.detect?
+        !detect_any_conflicts?
+      end
+
+      def self.conflicts
+        [ Traits::War ]
       end
 
       def before_configure

data/lib/warbler/traits/jbundler.rb

@@ -23,6 +23,7 @@ module Warbler
 
       def before_configure
         config.jbundler = true
+        warn "JBundler support is deprecated due to the EOL of JBundler. See https://github.com/jruby/warbler/issues/481 for discussion on replacement with jar-dependencies."
       end
 
       def after_configure
@@ -32,10 +33,10 @@ module Warbler
       def add_jbundler_jars
         require 'jbundler/config'
         classpath = ::JBundler::Config.new.classpath_file
-        if File.exists?( classpath )
+        if File.exist?( classpath )
           require File.expand_path( classpath )
         else
-          raise 'jbundler support needs jruby to create a local config: jruby -S jbundle install'
+          raise 'JBundler support needs JRuby to create a local config: jruby -S jbundle install'
         end
         # use only the jars from jbundler and jruby
         config.java_libs += jruby_jars

data/lib/warbler/traits/nogemspec.rb

@@ -16,7 +16,11 @@ module Warbler
       include ExecutableHelper
 
       def self.detect?
-        Jar.detect? && !Gemspec.detect?
+        Jar.detect? && !detect_any_conflicts?
+      end
+
+      def self.conflicts
+        [ Traits::Gemspec ]
       end
 
       def before_configure

data/lib/warbler/traits/rack.rb

@@ -12,7 +12,11 @@ module Warbler
       include Trait
 
       def self.detect?
-        !Rails.detect? && (File.exist?("config.ru") || !Dir['*/config.ru'].empty?)
+        (File.exist?("config.ru") || !Dir['*/config.ru'].empty?) && !detect_any_conflicts?
+      end
+
+      def self.conflicts
+        [ Traits::Rails ]
       end
 
       def self.requirements

data/lib/warbler/traits/rails.rb

@@ -15,6 +15,10 @@ module Warbler
         File.exist?('config/environment.rb')
       end
 
+      def self.conflicts
+        [ Traits::Rack ]
+      end
+
       def self.requirements
         [ Traits::War ]
       end