warbler 1.3.7 → 1.3.8

data/.gitignore

@@ -6,3 +6,7 @@ nbproject
 target
 Gemfile.lock
 .idea
+warbler.iml
+warbler.iws
+warbler.ipr
+warbler-*.gem

data/Gemfile

@@ -1,6 +1,9 @@
 source "http://rubygems.org/"
 
-gemspec
+gem 'rake', ">= 0.9.6"
+gem 'jruby-jars', ">= 1.5.6"
+gem 'jruby-rack', ">= 1.0.0"
+gem 'rubyzip', ">= 0.9.8"
 
 group :development do
   gem "jruby-openssl", :platform => :jruby

data/History.txt

@@ -1,3 +1,28 @@
+== 1.3.8
+
+- Numerous fixes related to -S option and local environment.
+- #162: Close the URLClassLoader before deleting tempJARs
+- #161: Comment out config.dirs to match default
+- #158: Warbler looking in the wrong directory for bundler gem
+
+== 1.3.7
+
+- #154: Use #load in .rb shims
+- #153: Runnable war error
+- #152: Mirror fallback for winstone-jenkins?
+- #150: Don't delete contents of symlinked folder.
+- #148: Resolving issue when an alternate BUNDLE_PATH is used
+- #144: No such file to load -- bundler/setup (with bundler 1.3.4)
+- #141: Support running executables from Bundler gems and project-local scripts
+- #136: java -jar rails.war -S rake db:migrate
+- #125: Fix self executable jar/wars when the filename contains '#' symbols
+- #122: When comparing zip file entries, ignore trailing slashes
+- #118: warble pluginize does not work on rails 3.x
+- #117: Allow compile feature to work in 1.9 mode
+- #112: Reset ENV['GEM_HOME'], limit search to within .jar
+- #105: Pick executables deterministically and warn when doing so
+- #104: Default executable is system-dependent
+
 == 1.3.6
 
 - #100: fix winstone URL

data/ext/JarMain.java

@@ -36,6 +36,8 @@ public class JarMain implements Runnable {
     
     protected File extractRoot;
 
+    protected URLClassLoader classLoader;
+
     JarMain(String[] args) {
         this.args = args;
         URL mainClass = getClass().getResource(MAIN);
@@ -125,12 +127,12 @@ public class JarMain implements Runnable {
 
     protected Object newScriptingContainer(final URL[] jars) throws Exception {
         System.setProperty("org.jruby.embed.class.path", "");
-        ClassLoader loader = new URLClassLoader(jars);
-        Class scriptingContainerClass = Class.forName("org.jruby.embed.ScriptingContainer", true, loader);
+        classLoader = new URLClassLoader(jars);
+        Class scriptingContainerClass = Class.forName("org.jruby.embed.ScriptingContainer", true, classLoader);
         Object scriptingContainer = scriptingContainerClass.newInstance();
         debug("scripting container class loader urls: " + Arrays.toString(jars));
         invokeMethod(scriptingContainer, "setArgv", (Object) args);
-        invokeMethod(scriptingContainer, "setClassLoader", new Class[] { ClassLoader.class }, loader);
+        invokeMethod(scriptingContainer, "setClassLoader", new Class[] { ClassLoader.class }, classLoader);
         return scriptingContainer;
     }
     
@@ -165,6 +167,10 @@ public class JarMain implements Runnable {
         if (debug) System.out.println(msg);
         if (debug && t != null) t.printStackTrace(System.out);
     }
+
+    protected void warn(String msg) {
+        System.out.println("WARNING: " + msg);
+    }
     
     protected void delete(File f) {
         try {
@@ -194,6 +200,15 @@ public class JarMain implements Runnable {
     }
 
     public void run() {
+        // If the URLClassLoader isn't closed, on Windows, temp JARs won't be cleaned up
+        try {
+            invokeMethod(classLoader, "close");
+        }
+        catch(NoSuchMethodException e) { } // We're not being run on Java >= 7
+        catch(Exception e) {
+            System.err.println("error: " + e.toString());
+        }
+
         if ( extractRoot != null ) delete(extractRoot);
     }
 

data/ext/WarMain.java

@@ -63,14 +63,19 @@ 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";
-    
-    // jruby arguments, consider the following command :
-    //   `java -jar rails.was --1.9 -S rake db:migrate`
-    // arguments == [ "--1.9" ]
-    // executable == "rake"
-    // executableArgv == [ "db:migrate" ]
+
+    /**
+     *  jruby arguments, consider the following command :
+     *    `java -jar rails.was --1.9 -S rake db:migrate`
+     *   arguments == [ "--1.9" ]
+     *   executable == "rake"
+     *   executableArgv == [ "db:migrate" ]
+     */
     private final String[] arguments;
-    // null to launch webserver or != null to run a executable e.g. rake
+
+    /**
+     * null to launch webserver or != null to run a executable e.g. rake
+     */
     private final String executable;
     private final String[] executableArgv;
             
@@ -90,6 +95,10 @@ public class WarMain extends JarMain {
             arguments = argsList.subList(0, sIndex).toArray(new String[0]);
             executable = argsList.get(sIndex + 1);
             executableArgv = argsList.subList(sIndex + 2, argsList.size()).toArray(new String[0]);
+
+            if (executable.equals("bundle") && executableArgv.length > 0 && executableArgv[0].equals("exec")) {
+                warn("`bundle exec' may drop out of the Warbler environment and into the system environment");
+            }
         }
     }
     
@@ -212,13 +221,22 @@ public class WarMain extends JarMain {
     @Override
     protected int launchJRuby(final URL[] jars) throws Exception {
         final Object scriptingContainer = newScriptingContainer(jars);
-        
+
+        String jrubyStdlibJar = "";
+        for (URL url : jars) {
+            if (url.toString().matches("file:/.*jruby-stdlib-.*jar")) {
+                jrubyStdlibJar = url.toString();
+                debug("using jruby-stdlib: " + jrubyStdlibJar);
+            }
+        }
+
+        invokeMethod(scriptingContainer, "setHomeDirectory", "classpath:/META-INF/jruby.home");
         invokeMethod(scriptingContainer, "setArgv", (Object) executableArgv);
-        //invokeMethod(scriptingContainer, "setHomeDirectory", "classpath:/META-INF/jruby.home");
         invokeMethod(scriptingContainer, "setCurrentDirectory", extractRoot.getAbsolutePath());
-        //invokeMethod(scriptingContainer, "runScriptlet", "ENV.clear");
-        //invokeMethod(scriptingContainer, "runScriptlet", "ENV['PATH']=''"); // bundler 1.1.x
-        
+        invokeMethod(scriptingContainer, "runScriptlet", "$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/1.9/site_ruby\"");
+        invokeMethod(scriptingContainer, "runScriptlet", "$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/shared\"");
+        invokeMethod(scriptingContainer, "runScriptlet", "$: << \"" + jrubyStdlibJar + "!/META-INF/jruby.home/lib/ruby/1.9\"");
+
         final Object provider = invokeMethod(scriptingContainer, "getProvider");
         final Object rubyInstanceConfig = invokeMethod(provider, "getRubyInstanceConfig");
         
@@ -263,7 +281,9 @@ public class WarMain extends JarMain {
         final String gemfile = new File(extractRoot, "Gemfile").getAbsolutePath();
         debug("setting GEM_HOME to " + gemsDir);
         debug("... and BUNDLE_GEMFILE to " + gemfile);
-        return "ENV['GEM_HOME'] ||= ENV['GEM_PATH'] = '"+ gemsDir +"' \n" +
+
+        // ideally this would look up the config.override_gem_home setting
+        return "ENV['GEM_HOME'] = ENV['GEM_PATH'] = '"+ gemsDir +"' \n" +
         "ENV['BUNDLE_GEMFILE'] ||= '"+ gemfile +"' \n" +
         "require 'META-INF/init.rb' \n";
     }

data/lib/warbler/templates/rails.erb

@@ -1 +1 @@
-ENV['RAILS_ENV'] = '<%= config.webxml.rails.env %>'
+ENV['RAILS_ENV'] ||= '<%=  config.webxml.rails.env %>'

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

data/warble.rb

@@ -11,7 +11,7 @@ Warbler::Config.new do |config|
   # config.features = %w(gemjar)
 
   # Application directories to be included in the webapp.
-  config.dirs = %w(app config db lib log vendor tmp)
+  # config.dirs = %w(app config db lib log script vendor tmp)
 
   # Additional files/directories to include, above those in config.dirs
   # config.includes = FileList["db"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake