warbler 1.4.10 → 2.0.0.pre1

data/ext/WarMain.java

@@ -6,6 +6,7 @@
  */
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.SequenceInputStream;
@@ -63,7 +64,6 @@ 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";
 
     /**
      *  jruby arguments, consider the following command :
@@ -140,26 +140,20 @@ public class WarMain extends JarMain {
             if ( is != null ) props.load(is);
         } catch (Exception e) { }
 
-        String port = getSystemProperty("warbler.port", getENV("PORT"));
+        String port = System.getProperty("warbler.port", System.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;
-        for ( Map.Entry entry : props.entrySet() ) {
+        for (Map.Entry 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());
             entry.setValue(val);
         }
 
         if (props.getProperty("props") != null) {
             String[] propsToSet = props.getProperty("props").split(",");
-            for ( String key : propsToSet ) {
-                setSystemProperty(key, props.getProperty(key));
+            for (String key : propsToSet) {
+                System.setProperty(key, props.getProperty(key));
             }
         }
 
@@ -241,7 +235,7 @@ public class WarMain extends JarMain {
 
         invokeMethod(scriptingContainer, "setArgv", (Object) executableArgv);
         invokeMethod(scriptingContainer, "setCurrentDirectory", extractRoot.getAbsolutePath());
-        initJRubyScriptingEnv(scriptingContainer, jars);
+        initJRubyScriptingEnv(scriptingContainer);
 
         final Object provider = invokeMethod(scriptingContainer, "getProvider");
         final Object rubyInstanceConfig = invokeMethod(provider, "getRubyInstanceConfig");
@@ -257,6 +251,8 @@ public class WarMain extends JarMain {
         invokeMethod(rubyInstanceConfig, "processArguments", (Object) arguments);
 
         Object runtime = invokeMethod(scriptingContainer, "getRuntime");
+
+        debug("loading resource: " + executablePath);
         Object executableInput =
             new SequenceInputStream(new ByteArrayInputStream(executableScriptEnvPrefix().getBytes()),
                                     (InputStream) invokeMethod(rubyInstanceConfig, "getScriptSource"));
@@ -317,36 +313,12 @@ public class WarMain extends JarMain {
         "end";
     }
 
-    protected void initJRubyScriptingEnv(Object scriptingContainer, final URL[] jars) throws Exception {
-        String jrubyStdlibJar = "";
-        String bcpkixJar = "";
-        String bcprovJar = "";
-        for (URL url : jars) {
-            if (url.toString().matches("file:/.*jruby-stdlib-.*jar")) {
-                jrubyStdlibJar = url.toString();
-                debug("using jruby-stdlib: " + jrubyStdlibJar);
-            } else if (url.toString().matches("file:/.*bcpkix-jdk15on-.*jar")) {
-                bcpkixJar = url.toString();
-                debug("using bcpkix: " + bcpkixJar);
-            } else if (url.toString().matches("file:/.*bcprov-jdk15on-.*jar")) {
-                bcprovJar = url.toString();
-                debug("using bcprov: " + bcprovJar);
-            }
-        }
+    protected void initJRubyScriptingEnv(Object scriptingContainer) throws Exception {
+        // for some reason, the container needs to run a scriptlet in order for it
+        // to be able to find the gem executables later
+        invokeMethod(scriptingContainer, "runScriptlet", "SCRIPTING_CONTAINER_INITIALIZED=true");
 
-        invokeMethod(scriptingContainer, "runScriptlet", "" +
-            "ruby = RUBY_VERSION.match(/^\\d\\.\\d/)[0] \n" +
-            "jruby_major_version = JRUBY_VERSION.match(/^\\d\\.\\d/)[0].to_f \n" +
-            "jruby_minor_version = JRUBY_VERSION.split('.')[2].to_i\n" +
-            "$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/#{ruby}/site_ruby\"\n" +
-            "$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/shared\"\n" +
-            "$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/#{ruby}\"\n" +
-            "if jruby_major_version >= 1.7 and jruby_minor_version < 13\n" +
-            "  require \"" + bcpkixJar + "\".gsub('file:', '') unless \"" + bcpkixJar + "\".empty?\n" +
-            "  require \"" + bcprovJar + "\".gsub('file:', '') unless \"" + bcprovJar + "\".empty?\n" +
-            "end");
-
-        invokeMethod(scriptingContainer, "setHomeDirectory", "classpath:/META-INF/jruby.home");
+        invokeMethod(scriptingContainer, "setHomeDirectory", "uri:classloader:/META-INF/jruby.home");
     }
 
     @Override

data/ext/WarblerJar.java

@@ -118,20 +118,16 @@ public class WarblerJar {
                     path = value.convertToString().getUnicodeValue();
                 }
 
+                InputStream inFile = getStream(path, null);
                 try {
-                    InputStream inFile = getStream(path, null);
-                    try {
-                        zip.putNextEntry(new ZipEntry(entryName));
-                        byte[] buf = new byte[16384];
-                        int bytesRead;
-                        while ((bytesRead = inFile.read(buf)) != -1) {
-                            zip.write(buf, 0, bytesRead);
-                        }
-                    } finally {
-                        close(inFile);
+                    zip.putNextEntry(new ZipEntry(entryName));
+                    byte[] buf = new byte[16384];
+                    int bytesRead;
+                    while ((bytesRead = inFile.read(buf)) != -1) {
+                        zip.write(buf, 0, bytesRead);
                     }
-                } catch (IOException e) {
-                    System.err.println("File not found; " + path + " not in archive");
+                } finally {
+                    close(inFile);
                 }
             }
         }

data/lib/warbler.rb

@@ -34,7 +34,6 @@ require 'warbler/executable_helper'
 require 'warbler/rake_helper'
 require 'warbler/pathmap_helper'
 require 'warbler/platform_helper'
-require 'warbler/bundler_helper'
 require 'warbler/task'
 require 'warbler/application'
 require 'warbler/web_server'

data/lib/warbler/config.rb

@@ -242,8 +242,17 @@ module Warbler
       end
     end
 
-    alias_method :war_name, :jar_name
-    alias_method :war_name=, :jar_name=
+    # 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
 
     private
     def warbler_vendor_excludes(warbler_home)

data/lib/warbler/gems.rb

@@ -43,19 +43,16 @@ module Warbler
     end
 
     def specs(gem_dependencies)
-      @specs ||= map { |gem, version| find_single_gem_files(gem_dependencies, gem, version) }.flatten.compact
+      @specs ||= map{|gem, version| find_single_gem_files(gem_dependencies, gem, version) }.flatten.compact
     end
 
   private
 
     # 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
-        return BundlerHelper.to_spec(gem_pattern)
+      when Gem::Specification
+        return gem_pattern
       when Gem::Dependency
         gem = gem_pattern
       else
@@ -65,11 +62,14 @@ module Warbler
       return nil if gem.respond_to?(:type) and 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)
+      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
-      return spec unless gem_dependencies
-      [spec] + spec.dependencies.map { |gem| find_single_gem_files(gem_dependencies, gem) }
+      if gem_dependencies
+        [spec] + spec.dependencies.map{|gem| find_single_gem_files(gem_dependencies, gem) }
+      else
+        spec
+      end
     end
 
   end

data/lib/warbler/jar.rb

@@ -158,7 +158,7 @@ module Warbler
       end
       rm_f path
       ensure_directory_entries
-      puts "Creating #{path}" unless silent?
+      puts "Creating #{path}"
       if Warbler::Config === config_or_path
         @files.delete("#{config_or_path.jar_name}/#{path}")
       end
@@ -290,10 +290,8 @@ module Warbler
             zipfile.mkdir(entry.dup) # in case it's frozen rubyzip 0.9.6.1 workaround
           elsif File.symlink?(src)
             zipfile.get_output_stream(entry) { |f| f << File.read(src) }
-          elsif File.exist?(src)
-            zipfile.add(entry, src)
           else
-            $stderr.puts "File not found; #{entry.inspect} not in archive"
+            zipfile.add(entry, src)
           end
         end
       end

data/lib/warbler/rake_helper.rb

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

data/lib/warbler/traits.rb

@@ -115,7 +115,6 @@ end
 require 'warbler/traits/jar'
 require 'warbler/traits/war'
 require 'warbler/traits/rails'
-require 'warbler/traits/merb'
 require 'warbler/traits/rack'
 require 'warbler/traits/bundler'
 require 'warbler/traits/jbundler'

data/lib/warbler/traits/bundler.rb

@@ -12,7 +12,6 @@ module Warbler
     class Bundler
       include Trait
       include PathmapHelper
-      include BundlerHelper
 
       def self.detect?
         File.exist?(ENV['BUNDLE_GEMFILE'] || "Gemfile")
@@ -23,29 +22,30 @@ 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 allow to add `config.gems` on top of those bundled
+      def add_bundler_gems
+        require 'bundler'
+        config.gems.clear
         config.gem_dependencies = false # Bundler takes care of these
-        config.bundler = {} if config.bundler == true
+        config.bundler = {}
 
         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'
+          if spec.name == "bundler"
             full_gem_path = Pathname.new(spec.full_gem_path)
-            while ! full_gem_path.join('bundler.gemspec').exist?
+
+            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 =~ /^[\.\/]$/
+              if full_gem_path.to_s=~/^[\.\/]$/
                 $stderr.puts("warning: Unable to detect bundler spec under '#{spec.full_gem_path}'' and is sub-dirs")
                 exit
               end
@@ -139,8 +139,8 @@ module Warbler
         definition = ::Bundler.definition
         all = definition.specs.to_a
         requested = definition.specs_for(definition.groups - bundle_without).to_a
-        excluded_git_specs = (all - requested).select { |spec| ::Bundler::Source::Git === spec.source }
-        excluded_git_specs.each { |spec| spec.groups << :warbler_excluded }
+        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
       end
 

data/lib/warbler/traits/gemspec.rb

@@ -18,17 +18,18 @@ module Warbler
         !Dir['*.gemspec'].empty?
       end
 
-      def before_configure; require 'yaml'
+      def before_configure
         @spec_file = Dir['*.gemspec'].first
-        @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 }
+        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 }
         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
 
@@ -53,24 +54,13 @@ module Warbler
       end
 
       def default_executable
-        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
-            raise "no `#{exe_script}` executable script found"
-          end
-        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
+        if !@spec.executables.empty?
+          "bin/#{@spec.executables.first}"
         else
-          raise "no executable script found"
+          exe = Dir['bin/*'].sort.first
+          raise "No executable script found" unless exe
+          warn "No default executable found in #{@spec_file}, using #{exe}"
+          exe
         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 Bundler.detect?
+        unless (defined?(::Rails.vendor_rails?) && ::Rails.vendor_rails?) || File.directory?("vendor/rails")
+          config.gems["rails"] = ::Rails::VERSION::STRING
         end
         if defined?(::Rails.configuration.gems)
           ::Rails.configuration.gems.each do |g|

data/lib/warbler/traits/war.rb

@@ -18,7 +18,7 @@ module Warbler
       DEFAULT_GEM_PATH = '/WEB-INF/gems'
 
       def self.detect?
-        Traits::Rails.detect? || Traits::Merb.detect? || Traits::Rack.detect?
+        Traits::Rails.detect? || Traits::Rack.detect?
       end
 
       def before_configure
@@ -134,8 +134,7 @@ 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_jar_paths = default_jar_files
-        default_jars = default_jar_paths.map { |file| File.basename(file) }
+        default_jars = default_jar_files.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/', '')
@@ -145,8 +144,6 @@ 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
@@ -183,8 +180,6 @@ module Warbler
           case self.booter
           when :rack
             "org.jruby.rack.RackServletContextListener"
-          when :merb
-            "org.jruby.rack.merb.MerbServletContextListener"
           else # :rails, default
             "org.jruby.rack.rails.RailsServletContextListener"
           end

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.10"
+  VERSION = "2.0.0.pre1"
 end

data/lib/warbler/web_server.rb

@@ -122,25 +122,13 @@ PROPS
 
     def add(jar)
       super
-      jar.files["WEB-INF/webserver.xml"] ||= StringIO.new(<<-CONFIG)
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-</Configure>
-CONFIG
-
       jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
-args = args0,args1,args2,args3,args4,args5,args6
+args = args0,args1,args2
 props = jetty.home
-args0 = --host
-args1 = {{host}}
-args2 = --port
-args3 = {{port}}
-args4 = --config
-args5 = {{config}}
-args6 = {{warfile}}
+args0 = --port
+args1 = {{port}}
+args2 = {{warfile}}
 jetty.home = {{webroot}}
 PROPS
     end