warbler 1.3.8 → 1.4.0.beta1

data/.gitignore

@@ -10,3 +10,4 @@ warbler.iml
 warbler.iws
 warbler.ipr
 warbler-*.gem
+log

data/.travis.yml

@@ -23,3 +23,6 @@ notifications:
     on_failure: always
     template:
       - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})" 
+before_install: 
+  - git fetch --unshallow
+  - gem install bundler --pre

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org/"
 gem 'rake', ">= 0.9.6"
 gem 'jruby-jars', ">= 1.5.6"
 gem 'jruby-rack', ">= 1.0.0"
-gem 'rubyzip', ">= 0.9.8"
+gem 'rubyzip', "~> 0.9"
 
 group :development do
   gem "jruby-openssl", :platform => :jruby

data/History.txt

@@ -1,3 +1,17 @@
+== 1.4.0
+
+- Support for Rails 4.x
+- Improved runnable so `rails` command works w/o script dir
+- #156: config.dirs seems to be ignored
+- #159: Rails 4.0.0.rc1 fails under warbler with `silence` error
+- #180: Problem with rubyzip 1.0.0
+- #178: Status of config.threadsafe! in rails 4.
+- #179: Jruby min and max runtimes defaults to 1 in rails 4.
+- #182: Jar creation does not honor begin/realSize from contents' ByteList
+- #177: allow specifying executable to run including other gems executables
+- #173: WAR project also should respect `override_gem_home` option
+- #168: The -S rails command is not compatible with Ruby 1.8
+
 == 1.3.8
 
 - Numerous fixes related to -S option and local environment.

data/README.rdoc

@@ -250,6 +250,19 @@ and run specs, you need to have Bundler installed and run <tt>bundle</tt> once.
 
 After that, simply run <tt>rake</tt>.
 
+=== Integration Tests
+
+There are a few integration tests in the `integration` directory that build WAR file
+with Warbler, and run some basic smoke tests against them.  You can run these like so:
+
+    cd integration
+    export MAVEN_OPTS="-XX:MaxPermSize=128m"
+    mvn verify
+
+The increased PermGen space is for the Rails4 test. And You'll need to have Maven installed, of course:
+http://maven.apache.org/
+
+
 == License
 
 Warbler is provided under the terms of the MIT license.

data/ext/WarMain.java

@@ -66,7 +66,7 @@ public class WarMain extends JarMain {
 
     /**
      *  jruby arguments, consider the following command :
-     *    `java -jar rails.was --1.9 -S rake db:migrate`
+     *    `java -jar rails.war --1.9 -S rake db:migrate`
      *   arguments == [ "--1.9" ]
      *   executable == "rake"
      *   executableArgv == [ "db:migrate" ]
@@ -93,12 +93,18 @@ public class WarMain extends JarMain {
                 throw new IllegalArgumentException("missing executable after -S");
             }
             arguments = argsList.subList(0, sIndex).toArray(new String[0]);
-            executable = argsList.get(sIndex + 1);
+            String execArg = 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")) {
+            if (execArg.equals("bundle") && executableArgv.length > 0 && executableArgv[0].equals("exec")) {
                 warn("`bundle exec' may drop out of the Warbler environment and into the system environment");
-            }
+            } else if (execArg.equals("rails")) {
+                // The rails executable doesn't play well with ScriptingContainer, so we've packaged the
+                // same script that would have been generated by `rake rails:update:bin`
+                execArg = "./META-INF/rails.rb";
+            } 
+
+            executable = execArg;
         }
     }
     
@@ -222,20 +228,9 @@ public class WarMain extends JarMain {
     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, "setCurrentDirectory", extractRoot.getAbsolutePath());
-        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\"");
+        initJRubyScriptingEnv(scriptingContainer, jars);
 
         final Object provider = invokeMethod(scriptingContainer, "getProvider");
         final Object rubyInstanceConfig = invokeMethod(provider, "getRubyInstanceConfig");
@@ -256,6 +251,7 @@ public class WarMain extends JarMain {
                                     (InputStream) invokeMethod(rubyInstanceConfig, "getScriptSource"));
         
         debug("invoking " + executablePath + " with: " + Arrays.toString(executableArgv));
+        
         Object outcome = invokeMethod(runtime, "runFromMain", 
                 new Class[] { InputStream.class, String.class }, 
                 executableInput, executablePath 
@@ -309,7 +305,28 @@ public class WarMain extends JarMain {
         "  e.status\n" +
         "end";
     }
-    
+
+    protected void initJRubyScriptingEnv(Object scriptingContainer, final URL[] jars) throws Exception {
+        String jrubyStdlibJar = "";
+        for (URL url : jars) {
+            if (url.toString().matches("file:/.*jruby-stdlib-.*jar")) {
+                jrubyStdlibJar = url.toString();
+                debug("using jruby-stdlib: " + jrubyStdlibJar);
+            }
+        }
+
+        invokeMethod(scriptingContainer, "runScriptlet", "" +
+            "ruby = RUBY_VERSION.match(/^\\d\\.\\d/)[0] \n" +
+            "jruby = JRUBY_VERSION.match(/^\\d\\.\\d/)[0].to_f \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" +
+            "require 'bcpkix-jdk15on-147.jar' if jruby >= 1.7 \n" +
+            "require 'bcprov-jdk15on-147.jar' if jruby >= 1.7 \n");        
+
+        invokeMethod(scriptingContainer, "setHomeDirectory", "classpath:/META-INF/jruby.home");
+    }
+
     @Override
     protected int start() throws Exception {
         if ( executable == null ) {

data/ext/WarblerJar.java

@@ -102,9 +102,10 @@ public class WarblerJar {
     private static void addEntry(ThreadContext context, ZipOutputStream zip, String entryName, IRubyObject value) throws IOException {
         if (value.respondsTo("read")) {
             RubyString str = (RubyString) value.callMethod(context, "read").checkStringType();
-            byte[] contents = str.getByteList().getUnsafeBytes();
+            ByteList strByteList = str.getByteList();
+            byte[] contents = strByteList.getUnsafeBytes();
             zip.putNextEntry(new ZipEntry(entryName));
-            zip.write(contents);
+            zip.write(contents, strByteList.getBegin(), strByteList.getRealSize());
         } else {
             File f;
             if (value.isNil() || (f = getFile(value)).isDirectory()) {

data/integration/gem-initializer/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jruby.warbler</groupId>
+    <artifactId>integration-tests</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>gem-initializer</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jruby.plugins</groupId>
+        <artifactId>jruby-rake-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>build-warbler-gem</id>
+            <phase>pre-integration-test</phase>
+            <goals><goal>jruby</goal></goals>
+            <configuration>
+              <args>-C../../ -S gem build warbler.gemspec</args>
+            </configuration>
+          </execution>
+          <execution>
+            <id>gem-install-warbler</id>
+            <phase>pre-integration-test</phase>
+            <goals><goal>jruby</goal></goals>
+            <configuration>
+              <args>-S gem install ${basedir}/../../warbler-${warbler.version}.gem</args>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

data/integration/pom.xml

@@ -0,0 +1,134 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.jruby.warbler</groupId>
+  <artifactId>integration-tests</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>gem-initializer</module>
+    <module>simple_rack_test</module>
+    <module>rails4_test</module>
+    <module>runnable_test</module>
+  </modules>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jruby.version>1.7.4</jruby.version>
+    <warbler.version>1.4.0.dev</warbler.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <defaultGoal>verify</defaultGoal>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/ruby</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-target-dir</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <mkdir dir="target"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <excludes>
+            <exclude>${basedir}/src/main/ruby</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.9</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.jruby.plugins</groupId>
+          <artifactId>jruby-rake-plugin</artifactId>
+          <version>${jruby.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <version>6.1.26</version>
+          <configuration>
+            <webApp>target/test.war</webApp>
+            <stopPort>9966</stopPort>
+            <stopKey>warbler_stop</stopKey>
+          </configuration>
+          <executions>
+            <execution>
+              <id>start-jetty</id>
+              <phase>pre-integration-test</phase>
+              <goals>
+                <goal>run-war</goal>
+              </goals>
+              <configuration>
+                <scanIntervalSeconds>0</scanIntervalSeconds>
+                <daemon>true</daemon>
+              </configuration>
+            </execution>
+            <execution>
+              <id>stop-jetty</id>
+              <phase>post-integration-test</phase>
+              <goals>
+                <goal>stop</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.2.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

data/integration/rails4_test/pom.xml

@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jruby.warbler</groupId>
+    <artifactId>integration-tests</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>rails4_test</artifactId>
+  <packaging>jar</packaging>
+
+  <name>rails4_test</name>
+  <url>http://maven.apache.org</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gem-initializer</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jruby.plugins</groupId>
+        <artifactId>jruby-rake-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-war</id>
+            <phase>pre-integration-test</phase>
+            <goals><goal>jruby</goal></goals>
+            <configuration>
+              <args>-C src/main/ruby -S warble</args>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

data/integration/rails4_test/src/main/ruby/Gemfile

@@ -0,0 +1,44 @@
+source 'https://rubygems.org'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.0.0.rc1'
+
+# Use jdbcsqlite3 as the database for Active Record
+gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.beta1'
+# gem 'jruby-openssl'
+
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.0.rc1'
+
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+gem 'therubyrhino'
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 1.0.1'
+
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
+end
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Use Capistrano for deployment
+# gem 'capistrano', group: :development
+