warbler 1.4.1 → 1.4.2

data/.gitignore

@@ -11,4 +11,6 @@ warbler.iws
 warbler.ipr
 warbler-*.gem
 log
-integration/**/*.iml
+integration/**/*.iml
+build.log
+.ruby-version

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - jruby-1.7.7
+  - jruby-1.7.8
 branches:
   only:
     - master
@@ -20,9 +20,8 @@ matrix:
       env: ''
     - rvm: jruby
       env: MAVEN_OPTS="-XX:MaxPermSize=128m"
-      script: cd integration && mvn clean verify
+      script: mvn clean verify
   allow_failures:
-    - rvm: jruby
     - rvm: jruby-head
 notifications:
   irc:

data/History.txt

@@ -1,3 +1,11 @@
+== 1.4.2
+- #241: jars from jruby.jar itself do not get copied over to WEB-INF/lib
+- #199: javascript_include_tag and stylesheet_link_tag not generating digestions
+- #247: better support for Rails 4 asset pipeline
+- #169: Compile war not loading assets
+- #243: Added the move_jars_to_webinf_lib method back in...
+- #249: Warbler 1.4.1 fails to compile on Windows
+
 == 1.4.1
 - Support for JBundler
 - #165: Problem with bundler git gems

data/Mavenfile

@@ -0,0 +1,25 @@
+#-*- mode: ruby -*-
+
+# tell the gem setup for maven where the java sources are
+# and how to name the jar file (default path for the jar: ./lib )
+gemspec( :jar => 'warbler_jar.jar',
+         :source => 'ext' )
+
+# just dump the POM as pom.xml as read-only file
+properties( 'tesla.dump.pom' => 'pom.xml',
+            'tesla.dump.readOnly' => true )
+
+# dependencies needed for compilation
+scope :provided do
+  jar 'org.jruby:jruby', '1.7.8'
+  jar 'org.eclipse.jetty:jetty-webapp', '8.1.9.v20130131'
+end
+
+plugin :compiler, '3.1', :source => '1.5', :target => '1.5'
+
+plugin :invoker, '1.8' do
+  execute_goals( :install, :run,
+                 :id => 'integration-test',
+                 :projectsDirectory => 'integration',
+                 :streamLogs => true )
+end

data/Rakefile

@@ -1,3 +1,4 @@
+#-*- mode: ruby -*-
 #--
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
@@ -5,12 +6,8 @@
 # See the file LICENSE.txt for details.
 #++
 
-begin
-  require 'bundler/setup'
-rescue LoadError => e
-  require('rubygems') && retry
-  puts "Please `gem install bundler' and run `bundle install' to ensure you have all dependencies"
-  raise e
+unless defined? Bundler
+  warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies and run inside a bundler context 'bundle exec rake'.\n\n"
 end
 
 require 'bundler/gem_helper'
@@ -19,7 +16,7 @@ gem_helper.install
 gemspec = gem_helper.gemspec
 
 require 'rake/clean'
-CLEAN << "pkg" << "doc"
+CLEAN << "pkg" << "doc" << Dir['integration/**/target']
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -28,31 +25,21 @@ end
 
 task :default => :spec
 
-jar_file = "lib/warbler_jar.jar"
-begin
-  require 'ant'
-  directory "pkg/classes"
-  CLEAN << "pkg"
+# use Mavenfile to define :jar task
+require 'maven/ruby/tasks'
 
-  file jar_file => FileList['ext/*.java', 'pkg/classes'] do
-    rm_rf FileList['pkg/classes/**/*']
-    ant.javac :srcdir => "ext", :includes => "*.java", :destdir => "pkg/classes",
-      :source => "1.5", :target => "1.5", :debug => true,
-      :classpath => "${java.class.path}:${sun.boot.class.path}",
-      :includeantRuntime => false
-
-    ant.jar :basedir => "pkg/classes", :destfile => jar_file, :includes => "*.class"
-  end
+desc 'run some integration test'
+task :integration do
+  maven.verify
+end
 
-  desc "Compile and jar the Warbler Java helper classes"
-  task :jar => jar_file
-rescue LoadError
-  task :jar do
-    puts "Run 'jar' with JRuby to re-compile the java jar booster"
-  end
+desc 'generate the pom.xml from the Mavenfile'
+task :pom do
+  maven.validate
 end
 
 # Make sure jar gets compiled before the gem is built
+# the jar tasks is part of maven-tasks
 task :build => :jar
 
 require 'rdoc/task'

data/integration/Rakefile

@@ -0,0 +1,10 @@
+#-*- mode: ruby -*-
+
+require 'maven/ruby/tasks'
+
+task :default do
+  # chdir might not work with jruby, in that case run 'rake verify' from the parrent dir
+  Dir.chdir '..' do
+    maven.install
+  end
+end

data/integration/pom.xml

@@ -8,21 +8,43 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>gem-initializer</module>
     <module>simple_rack_test</module>
+
     <module>rails4_test</module>
+
     <module>runnable_test</module>
   </modules>
 
   <properties>
-    <version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
+    <version.jruby-maven-plugins>1.0.0-rc</version.jruby-maven-plugins>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jruby.version>1.7.9</jruby.version>
-    <warbler.version>1.4.1.dev</warbler.version>
-    <rubygems.home>${session.executionRootDirectory}/target/rubygems</rubygems.home>
+    <!-- prereleased gems ARE snapshots -->
+    <warbler.version>1.4.1.dev-SNAPSHOT</warbler.version>
+    <gem.home>${session.executionRootDirectory}/target/rubygems</gem.home>
+    <gem.path>${session.executionRootDirectory}/target/rubygems</gem.path>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>rubygems-releases</id>
+      <url>http://rubygems-proxy.torquebox.org/releases</url>
+    </repository>
+  </repositories>
+
   <dependencies>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>bundler</artifactId>
+      <version>1.5.3</version>
+      <type>gem</type>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>warbler</artifactId>
+      <version>${warbler.version}</version>
+      <type>gem</type>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -45,35 +67,6 @@
       </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"/>
-                <mkdir dir="${rubygems.home}"/>
-              </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>
@@ -87,6 +80,16 @@
           </execution>
         </executions>
       </plugin>
+        <plugin>
+          <groupId>de.saumya.mojo</groupId>
+          <artifactId>gem-maven-plugin</artifactId>
+          <version>${version.jruby-maven-plugins}</version>
+	  <executions>
+            <execution>
+	      <goals><goal>initialize</goal></goals>
+	    </execution>
+	  </executions>
+	</plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -137,25 +140,27 @@
           <groupId>de.saumya.mojo</groupId>
           <artifactId>jruby-maven-plugin</artifactId>
           <version>${version.jruby-maven-plugins}</version>
-          <extensions>true</extensions>
           <configuration>
-            <gemHome>${rubygems.home}</gemHome>
+            <gemHome>${gem.home}</gemHome>
             <jrubySwitches>--1.9</jrubySwitches>
             <jrubyVersion>${jruby.version}</jrubyVersion>
           </configuration>
           <executions>
+
             <execution>
               <id>bundle-install</id>
-              <goals><goal>jruby</goal></goals>
+              
+	      <goals><goal>jruby</goal></goals>
               <configuration>
-                <args>-C ${basedir}/src/main/ruby -S ${rubygems.home}/bin/bundle install</args>
+                <args>-C ${basedir}/src/main/ruby -S ${gem.home}/bin/bundle install</args>
               </configuration>
             </execution>
+	     
             <execution>
               <id>create-war</id>
               <goals><goal>jruby</goal></goals>
               <configuration>
-                <args>-C ${basedir}/src/main/ruby -S ${rubygems.home}/bin/warble</args>
+                <args>-C ${basedir}/src/main/ruby -S ${gem.home}/bin/warble</args>
               </configuration>
             </execution>
           </executions>

data/integration/rails4_test/pom.xml

@@ -14,16 +14,6 @@
   <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>

data/integration/runnable_test/pom.xml

@@ -18,15 +18,6 @@
     <test-file>test-file.tmp</test-file>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>gem-initializer</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>

data/integration/simple_rack_test/pom.xml

@@ -14,29 +14,12 @@
   <name>simple_rack_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>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>jruby-maven-plugin</artifactId>
         <executions>
-          <execution>
-            <id>install-gems</id>
-            <phase>initialize</phase>
-            <goals><goal>jruby</goal></goals>
-            <configuration>
-              <args>-S ${basedir}/src/main/ruby/bin/install-gems.rb</args>
-            </configuration>
-          </execution>
           <execution>
             <id>create-war</id>
             <phase>pre-integration-test</phase>

data/lib/warbler.rb

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

data/lib/warbler/config.rb

@@ -164,6 +164,10 @@ module Warbler
     # * <tt>jetty</tt> - Embedded Jetty from Eclipse
     attr_accessor :webserver
 
+    # If set to true, Warbler will move jar files into the WEB-INF/lib directory of the
+    # created war file. This may be needed for some web servers. Defaults to false.
+    attr_accessor :move_jars_to_webinf_lib
+
     # These file will be placed in the META-INF directory of the jar or war that warbler
     # produces. They are primarily used as launchers by the runnable feature.
     attr_accessor :script_files
@@ -195,6 +199,7 @@ module Warbler
       @override_gem_home = true
       @script_files      = []
       @warbler_scripts = "#{WARBLER_HOME}/lib/warbler/scripts"
+      @move_jars_to_webinf_lib = false
 
       before_configure
       yield self if block_given?

data/lib/warbler/jar.rb

@@ -19,6 +19,7 @@ module Warbler
   class Jar
     include PathmapHelper
     include RakeHelper
+    include PlatformHelper
 
     DEFAULT_MANIFEST = %{Manifest-Version: 1.0\nCreated-By: Warbler #{Warbler::VERSION}\n\n}
 
@@ -50,7 +51,12 @@ module Warbler
         compat_version = ''
       end
       # Need to use the version of JRuby in the application to compile it
-      system %Q{env -i java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} org.jruby.Main #{compat_version} -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
+      javac_cmd = %Q{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} org.jruby.Main #{compat_version} -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
+      if which('env')
+        system %Q{env -i #{javac_cmd}}
+      else
+        system javac_cmd
+      end
       raise "Compile failed" if $?.exitstatus > 0
     end
 

data/lib/warbler/platform_helper.rb

@@ -0,0 +1,26 @@
+#--
+# Copyright (c) 2010-2012 Engine Yard, Inc.
+# Copyright (c) 2007-2009 Sun Microsystems, Inc.
+# This source code is available under the MIT license.
+# See the file LICENSE.txt for details.
+#++
+
+module Warbler
+  module PlatformHelper
+    # Cross-platform way of finding an executable in the $PATH.
+    # Thanks to @mislav
+    #
+    #   which('ruby') #=> /usr/bin/ruby
+    def which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable? exe
+        }
+      end
+      return nil
+    end
+  end
+end
+

data/lib/warbler/traits/rails.rb

@@ -49,8 +49,10 @@ module Warbler
           config.webxml.jruby.min.runtimes = 1 unless Integer === config.webxml.jruby.min.runtimes
           config.webxml.jruby.max.runtimes = 1 unless Integer === config.webxml.jruby.max.runtimes
         end
-      end
 
+        config.includes += FileList["public/assets/manifest-*.json"].existing
+        config.includes += FileList["public/assets/manifest.yml"].existing
+      end
 
       def default_app_name
         File.basename(File.expand_path(defined?(::Rails.root) ? ::Rails.root : (defined?(RAILS_ROOT) ? RAILS_ROOT : Dir.getwd)))

data/lib/warbler/traits/war.rb

@@ -76,7 +76,7 @@ module Warbler
       def update_archive(jar)
         add_public_files(jar)
         add_webxml(jar)
-        move_jars_to_webinf_lib(jar)
+        move_jars_to_webinf_lib(jar) if config.move_jars_to_webinf_lib
         add_runnables(jar) if config.features.include?("runnable")
         add_executables(jar) if config.features.include?("executable")
         add_gemjar(jar) if config.features.include?("gemjar")

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/pom.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>rubygems</groupId>
+  <artifactId>warbler</artifactId>
+  <version>1.4.1.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,
+Rails, Merb, or Rack application. Warbler provides a minimal,
+flexible, Ruby-like way to bundle up all of your application files for
+deployment to a Java environment.</description>
+  <url>http://caldersphere.rubyforge.org/warbler</url>
+  <properties>
+    <tesla.dump.readOnly>true</tesla.dump.readOnly>
+    <jruby.plugins.version>1.0.0-rc4</jruby.plugins.version>
+    <tesla.dump.pom>pom.xml</tesla.dump.pom>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>rake</artifactId>
+      <version>[0.9.6,)</version>
+      <type>gem</type>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>jruby-jars</artifactId>
+      <version>[1.5.6,2.0)</version>
+      <type>gem</type>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>jruby-rack</artifactId>
+      <version>[1.0.0,)</version>
+      <type>gem</type>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>rubyzip</artifactId>
+      <version>[0.9,1.1)</version>
+      <type>gem</type>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>ruby-maven</artifactId>
+      <version>[3.1.1.0.0,3.1.1.0.0.0.0.0.0.1)</version>
+      <type>gem</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>rspec</artifactId>
+      <version>[2.10,2.99999]</version>
+      <type>gem</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>rdoc</artifactId>
+      <version>[2.4.2,)</version>
+      <type>gem</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby</artifactId>
+      <version>1.7.8</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>8.1.9.v20130131</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>rubygems-releases</id>
+      <url>http://rubygems-proxy.torquebox.org/releases</url>
+    </repository>
+  </repositories>
+  <build>
+    <sourceDirectory>ext</sourceDirectory>
+    <extensions>
+      <extension>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-extension</artifactId>
+        <version>${jruby.plugins.version}</version>
+      </extension>
+    </extensions>
+    <directory>${basedir}/pkg</directory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <outputDirectory>lib</outputDirectory>
+          <finalName>warbler_jar</finalName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>lib</directory>
+              <includes>
+                <include>warbler_jar.jar</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <configuration>
+          <gemspec>warbler.gemspec</gemspec>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <projectsDirectory>integration</projectsDirectory>
+              <streamLogs>true</streamLogs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

data/spec/warbler/jar_spec.rb

@@ -558,16 +558,32 @@ describe Warbler::Jar do
         rm_f FileList["app/sample.jar", "lib/existing.jar"]
       end
 
-      it "moves jar files to WEB-INF/lib" do
-        jar.apply(config)
-        file_list(%r{WEB-INF/lib/app-sample.jar}).should_not be_empty
-        file_list(%r{WEB-INF/app/sample.jar}).should_not be_empty
+      context "with move_jars_to_webinf_lib set to true" do
+        before :each do
+          use_config do |config|
+            config.move_jars_to_webinf_lib = true
+          end
+        end
+
+        it "moves jar files to WEB-INF/lib" do
+          jar.apply(config)
+          file_list(%r{WEB-INF/lib/app-sample.jar}).should_not be_empty
+          file_list(%r{WEB-INF/app/sample.jar}).should_not be_empty
+        end
+
+        it "leaves jar files alone that are already in WEB-INF/lib" do
+          jar.apply(config)
+          file_list(%r{WEB-INF/lib/lib-existing.jar}).should be_empty
+          file_list(%r{WEB-INF/lib/existing.jar}).should_not be_empty
+        end
       end
 
-      it "leaves jar files alone that are already in WEB-INF/lib" do
-        jar.apply(config)
-        file_list(%r{WEB-INF/lib/lib-existing.jar}).should be_empty
-        file_list(%r{WEB-INF/lib/existing.jar}).should_not be_empty
+      context "with move_jars_to_webinf_lib not set" do
+        it "moves jar files to WEB-INF/lib" do
+          jar.apply(config)
+          file_list(%r{WEB-INF/lib/app-sample.jar}).should be_empty
+          file_list(%r{WEB-INF/app/sample.jar}).should_not be_empty
+        end
       end
     end
 
@@ -673,6 +689,23 @@ describe Warbler::Jar do
         end
       end
 
+      context "with asset_pipeline" do
+        let (:manifest_file) { "public/assets/manifest.yml" }
+
+        before do
+          mkdir File.dirname(manifest_file)
+          File.open(manifest_file, "w")
+        end
+
+        after do
+          rm_rf File.dirname(manifest_file)
+        end
+
+        it "automatically adds asset pipeline manifest file to the included files" do
+          config.includes.should include("public/assets/manifest.yml")
+        end
+      end
+
       context "with threadsafe! enabled in production.rb" do
         before :each do
           cp "config/environments/production.rb", "config/environments/production.rb.orig"
@@ -701,6 +734,23 @@ describe Warbler::Jar do
 
       context "with rails version 4" do
 
+        let (:manifest_file) { "public/assets/manifest-1234.json" }
+
+        shared_examples_for "asset pipeline" do
+          it "automatically adds asset pipeline manifest file to the included files" do
+            config.includes.should include(manifest_file)
+          end
+        end
+
+        before do
+          mkdir File.dirname(manifest_file)
+          File.open(manifest_file, "w")
+        end
+
+        after do
+          rm_rf File.dirname(manifest_file)
+        end
+
         context "When rails version is specified in Gemfile" do
           before :each do
             File.open("Gemfile", "a") { |f| f.puts "gem 'rails', '4.0.0'" }
@@ -711,6 +761,7 @@ describe Warbler::Jar do
           end
 
           it_should_behave_like "threaded environment"
+          it_should_behave_like "asset pipeline"
         end
 
         context "when rails version is not specified in Gemfile" do
@@ -725,6 +776,7 @@ describe Warbler::Jar do
           end
 
           it_should_behave_like "threaded environment"
+          it_should_behave_like "asset pipeline"
         end
       end
 

data/warble.rb

@@ -100,6 +100,11 @@ Warbler::Config.new do |config|
   # Sets default (prefixed) parameters for the executables
   # config.executable_params = "do:something"
 
+  # If set to true, moves jar files into WEB-INF/lib. Prior to version 1.4.2 of Warbler this was done
+  # by default. But since 1.4.2 this config defaults to false. It may need to be set to true for
+  # web servers that do not explode the WAR file.
+  # config.move_jars_to_webinf_lib = false
+
   # === War files only below here ===
 
   # Path to the pre-bundled gem directory inside the war file. Default

data/warbler.gemspec

@@ -25,10 +25,12 @@ deployment to a Java environment.}
   gem.rubyforge_project = "caldersphere"
 
   gem.add_runtime_dependency 'rake', [">= 0.9.6"]
-  gem.add_runtime_dependency 'jruby-jars', [">= 1.5.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 'rubyzip', [">= 0.9", "< 1.1"]
-  gem.add_development_dependency 'jbundler', "~> 0.5"
+  gem.add_development_dependency 'jbundler', "~> 0.5.5"
+  gem.add_development_dependency 'ruby-maven', '~> 3.1.1.0'
   gem.add_development_dependency 'rspec', "~> 2.10"
   gem.add_development_dependency 'rdoc', ">= 2.4.2"
 end

metadata

@@ -1,124 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
+  prerelease: 
 platform: ruby
 authors:
 - Nick Sieger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-jars
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
-  requirement: !ruby/object:Gem::Requirement
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
-  prerelease: false
-  type: :runtime
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jruby-rack
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.9'
     - - <
       - !ruby/object:Gem::Version
         version: '1.1'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.9'
     - - <
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jbundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-  prerelease: false
+        version: 3.1.1.0
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 3.1.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdoc
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
-  prerelease: false
   type: :development
-description: |-
-  Warbler is a gem to make a Java jar or war file out of any Ruby,
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+description: ! 'Warbler is a gem to make a Java jar or war file out of any Ruby,
+
   Rails, Merb, or Rack application. Warbler provides a minimal,
+
   flexible, Ruby-like way to bundle up all of your application files for
-  deployment to a Java environment.
+
+  deployment to a Java environment.'
 email: nick@nicksieger.com
 executables:
 - warble
@@ -130,6 +169,7 @@ files:
 - Gemfile
 - History.txt
 - LICENSE.txt
+- Mavenfile
 - README.rdoc
 - Rakefile
 - bin/warble
@@ -140,7 +180,7 @@ files:
 - ext/jetty/pom.xml
 - ext/jetty/src/main/java/JettyWarMain.java
 - ext/jetty/src/main/resources/webdefault.xml
-- integration/gem-initializer/pom.xml
+- integration/Rakefile
 - integration/pom.xml
 - integration/rails4_test/pom.xml
 - integration/rails4_test/src/main/ruby/Gemfile
@@ -229,6 +269,7 @@ files:
 - lib/warbler/gems.rb
 - lib/warbler/jar.rb
 - lib/warbler/pathmap_helper.rb
+- lib/warbler/platform_helper.rb
 - lib/warbler/rake_helper.rb
 - lib/warbler/scripts/rails.rb
 - lib/warbler/task.rb
@@ -254,6 +295,7 @@ files:
 - lib/warbler/web_server.rb
 - lib/warbler/zip_support.rb
 - lib/warbler_jar.jar
+- pom.xml
 - spec/drb_default_id_conv.rb
 - spec/drb_helper.rb
 - spec/sample_bundler/.bundle/config
@@ -342,8 +384,7 @@ files:
 homepage: http://caldersphere.rubyforge.org/warbler
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - --main
 - README.rdoc
@@ -353,23 +394,25 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: caldersphere
-rubygems_version: 2.1.9
-signing_key:
-specification_version: 4
+rubygems_version: 1.8.28
+signing_key: 
+specification_version: 3
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files:
-- integration/gem-initializer/pom.xml
+- integration/Rakefile
 - integration/pom.xml
 - integration/rails4_test/pom.xml
 - integration/rails4_test/src/main/ruby/Gemfile

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4263713e65c4c0f07c101ab6e8859f9c2f153f55
-  data.tar.gz: 8156a547e769eead7e69635950ad5066b671deec
-SHA512:
-  metadata.gz: f39deef15841bb1ad34144a87f898f9180036b3f7bf9a13f95d17f3952ef71e22c69f9f9610befba1b0615e888a15318e978219ca481c434accd382ee0027bd6
-  data.tar.gz: 014b087fd609ae7c54a321fb935aebeccec3a13bc6a72fb8ab05c2b5e7ce31691e81bb8248d3fca7fa33605661a1595f20d01a862da019f17a8da12511526acd

data/integration/gem-initializer/pom.xml

@@ -1,68 +0,0 @@
-<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>de.saumya.mojo</groupId>
-        <artifactId>jruby-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>build-warbler</id>
-            <inherited>true</inherited>
-            <phase>compile</phase>
-            <goals>
-              <goal>jruby</goal>
-            </goals>
-            <configuration>
-              <args>-C../../ -S gem build warbler.gemspec</args>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>de.saumya.mojo</groupId>
-        <artifactId>jruby-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>install-warbler</id>
-            <inherited>true</inherited>
-            <phase>compile</phase>
-            <goals>
-              <goal>jruby</goal>
-            </goals>
-            <configuration>
-              <args>-S gem install ${basedir}/../../warbler-${warbler.version}.gem</args>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>de.saumya.mojo</groupId>
-        <artifactId>jruby-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>install-bundler</id>
-            <inherited>true</inherited>
-            <phase>compile</phase>
-            <goals>
-              <goal>jruby</goal>
-            </goals>
-            <configuration>
-              <args>-S gem install bundler</args>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>