warbler 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4464dec04874d3dce2dd2ffd5b4c5ee82a0d475
-  data.tar.gz: cb9ea2082c156117e3990ac48012c9db695c379a
+  metadata.gz: 98d05a82e2e4f5ccfc47ffc014a1b4baf1872510
+  data.tar.gz: 27f3d80a4e3231a1120e72a13173ebcd2cc7ce64
 SHA512:
-  metadata.gz: 64e0e83ebff4d7b073f90009ce1c47627fbea84799919f7842ba03b1fe91dcd5d9d331506dc7bb0838dd0f09b39bac3bfec4868bec084730fc83e8befa88aca9
-  data.tar.gz: 784b4e947ec1c06ec230f15d5cc566d33dc964a99c417c5d417f5a43af5c0f97f753a55b3b0b8b3715ac5c0505ea43cb98cb6d31823a78068b6cc3b0f1b5046e
+  metadata.gz: 1b220ad7086cb9ceef5db6e1fc80d863e150bf0e8d6e0a5aa9cfd5b26c225f0e036a73dbb6bee9c6e774535e79c0b9112fc8a1a1e054057b9059d5831f253c67
+  data.tar.gz: 02e5f1796a08654fe5416e20a95f5e87abef27bf3d77870dbec64233e06864ed96fd9f880d0e0184d399fa962cfa49818691d524e4da0cec2e85f99a56c0408f

data/History.txt

@@ -1,3 +1,14 @@
+== 1.4.4
+- #271: LoadError while excute rake command with runnable .war archive
+- #273: filtering support with `config.move_jars_to_webinf_lib`
+- #270: don't swallow compiler errors with backticks
+- #265: Compile feature only compiles application sources (not gems)
+- #264: JBundler with compiled feature crashes with java.lang.ClassNotFoundException: org.jruby.Main
+- #269: Argument list too long
+- #236: Adds comment hinting at how to put a display name in web.xml.erb file.
+- #275: for jruby-1.7.13 we do not want to force load bouncy-castle jars
+- #276: unnecessary rubyzip dependency on "< 1.1"
+
 == 1.4.3
 - Fixed a bug w/ symlinks that was introduced around jruby-1.7.10
 - #258: Bytecode version option for compiled class files

data/README.rdoc

@@ -238,7 +238,7 @@ itself continues to support Ruby 1.8. However, many gems are choosing
 to drop 1.8 support; one of these gems is
 {rubyzip}(https://github.com/rubyzip/rubyzip), which Warbler relies
 on. If you need to use Warbler in a 1.8 environment, you will need to
-lock the `rubyzip` gem to a version before 1.0.0.
+lock the <tt>rubyzip</tt> gem to a version before 1.0.0.
 
 == Troubleshooting
 

data/ext/WarMain.java

@@ -308,10 +308,18 @@ public class WarMain extends JarMain {
 
     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);
             }
         }
 
@@ -322,14 +330,9 @@ public class WarMain extends JarMain {
             "$: << \"" + 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\n" +
-            "  if jruby_minor_version >= 5\n" +
-            "    require 'bcpkix-jdk15on-1.47.jar'\n" +
-            "    require 'bcprov-jdk15on-1.47.jar'\n" +
-            "  else\n" +
-            "    require 'bcpkix-jdk15on-147.jar'\n" +
-            "    require 'bcprov-jdk15on-147.jar'\n" +
-            "  end\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");

data/integration/pom.xml

@@ -18,9 +18,9 @@
   <properties>
     <version.jruby-maven-plugins>1.0.0-rc</version.jruby-maven-plugins>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jruby.version>1.7.12</jruby.version>
+    <jruby.version>1.7.13</jruby.version>
     <!-- prereleased gems ARE snapshots -->
-    <warbler.version>1.4.3-SNAPSHOT</warbler.version>
+    <warbler.version>1.4.4-SNAPSHOT</warbler.version>
     <gem.home>${session.executionRootDirectory}/target/rubygems</gem.home>
     <gem.path>${session.executionRootDirectory}/target/rubygems</gem.path>
   </properties>
@@ -146,16 +146,13 @@
             <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 ${gem.home}/bin/bundle install</args>
               </configuration>
             </execution>
-	     
             <execution>
               <id>create-war</id>
               <goals><goal>jruby</goal></goals>

data/lib/warbler/config.rb

@@ -116,6 +116,10 @@ module Warbler
     # compile all .rb files in the application.
     attr_accessor :compiled_ruby_files
 
+    # Determines if ruby files in supporting gems will be compiled.
+    # Ignored unless compile feature is used.
+    attr_accessor :compile_gems
+
     # Warbler writes an "init" file into the war at this location. JRuby-Rack and possibly other
     # launchers may use this to initialize the Ruby environment.
     attr_accessor :init_filename
@@ -204,6 +208,7 @@ module Warbler
       @script_files      = []
       @warbler_scripts = "#{WARBLER_HOME}/lib/warbler/scripts"
       @move_jars_to_webinf_lib = false
+      @compile_gems      = false
 
       before_configure
       yield self if block_given?

data/lib/warbler/jar.rb

@@ -36,13 +36,20 @@ module Warbler
     end
 
     def compile(config)
+      find_gems_files(config)
       # Compiling all Ruby files we can find -- do we need to allow an
       # option to configure what gets compiled?
-      return if config.compiled_ruby_files.nil? || config.compiled_ruby_files.empty?
+      return if (config.compiled_ruby_files.nil? || config.compiled_ruby_files.empty?) && files.empty?
 
-      compiled_ruby_files = config.compiled_ruby_files - config.excludes.to_a
-      run_javac(config, compiled_ruby_files)
-      replace_compiled_ruby_files(config, compiled_ruby_files)
+      if config.compile_gems
+        ruby_files = gather_all_rb_files(config)
+        run_javac(config, ruby_files.values)
+        replace_compiled_ruby_files_and_gems(config, ruby_files)
+      else
+        compiled_ruby_files = config.compiled_ruby_files - config.excludes.to_a
+        run_javac(config, compiled_ruby_files)
+        replace_compiled_ruby_files(config, compiled_ruby_files)
+      end
     end
 
     def run_javac(config, compiled_ruby_files)
@@ -51,16 +58,20 @@ module Warbler
       else
         compat_version = ''
       end
-      # Need to use the version of JRuby in the application to compile it
-      javac_cmd = %Q{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} #{java_version(config)} org.jruby.Main #{compat_version} -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
-      if which('env')
-        system %Q{env -i #{javac_cmd}}
-      else
-        system javac_cmd
+
+      compiled_ruby_files.each_slice(2500) do |slice|
+        # Need to use the version of JRuby in the application to compile it
+        javac_cmd = %Q{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} #{java_version(config)} org.jruby.Main #{compat_version} -S jrubyc \"#{slice.join('" "')}\"}
+        if which('env')
+          system %Q{env -i #{javac_cmd}}
+        else
+          system javac_cmd
+        end
+        raise "Compile failed" if $?.exitstatus > 0
       end
-      raise "Compile failed" if $?.exitstatus > 0
+      @compiled = true
     end
-    
+
     def java_version(config)
       config.bytecode_version ? "-Djava.specification.version=#{config.bytecode_version}" : ''
     end
@@ -75,6 +86,55 @@ module Warbler
       end
     end
 
+    def replace_compiled_ruby_files_and_gems(config, compiled_ruby_files)
+      # Exclude the rb files and recreate them. This
+      # prevents the original contents being used.
+      config.excludes += compiled_ruby_files.keys
+
+      compiled_ruby_files.each do |inside_jar, file_system_location|
+        # The gems are already inside the gems folder inside the jar, however when using the :gems pathmap, they will
+        # get put into the gems/gems folder, to prevent this we chop off the first gems folder directory
+        inside_jar = inside_jar.dup
+        if inside_jar.split(File::SEPARATOR).first == 'gems'
+          inside_jar = inside_jar.split(File::SEPARATOR)[1..-1].join(File::SEPARATOR)
+          pathmap = :gems
+        else
+          pathmap = :application
+        end
+        files[apply_pathmaps(config, inside_jar, pathmap)] = StringIO.new("load __FILE__.sub(/\.rb$/, '.class')")
+        files[apply_pathmaps(config, inside_jar.sub(/\.rb$/, '.class'), pathmap)] = file_system_location.sub(/\.rb$/, '.class')
+      end
+    end
+
+    #
+    def gather_all_rb_files(config)
+      FileUtils.mkdir_p('tmp')
+      # Gather all the files in the files list and copy them to the tmp directory
+      gems_to_compile = files.select {|k, f| !f.is_a?(StringIO) && f =~ /\.rb$/ }
+      # 1.8.7 Support, convert back to hash
+      if gems_to_compile.is_a?(Array)
+        gems_to_compile = gems_to_compile.inject({}) {|h,z| h.merge!(z[0] => z[1]) }
+      end
+      gems_to_compile.each do |jar_file, rb|
+        FileUtils.mkdir_p(File.dirname(File.join('tmp', jar_file)))
+        new_rb = File.join('tmp', jar_file)
+        FileUtils.copy(rb, new_rb)
+        gems_to_compile[jar_file] = new_rb
+      end
+      # Gather all the application files which the user wrote (not dependencies)
+      main_files_to_compile = config.compiled_ruby_files - config.excludes.to_a
+      main_files_to_compile.each do |f|
+        FileUtils.mkdir_p(File.dirname(File.join('tmp', f)))
+        FileUtils.copy(f, File.join('tmp', f))
+      end
+      main_files_to_compile = main_files_to_compile.inject({}) {|h,f| h.merge!(f => f) }
+      files.keys.each do |k|
+        # Update files list to point to the temporary file
+        files[k] = gems_to_compile[k] || main_files_to_compile[k] || files[k]
+      end
+      main_files_to_compile.merge(gems_to_compile)
+    end
+
     # Apply the information in a Warbler::Config object in order to
     # look for files to put into this war file.
     def apply(config)
@@ -133,7 +193,9 @@ module Warbler
 
     # Add gems to WEB-INF/gems
     def find_gems_files(config)
-      config.gems.specs(config.gem_dependencies).each {|spec| find_single_gem_files(config, spec) }
+      unless @compiled and config.compile_gems
+        config.gems.specs(config.gem_dependencies).each {|spec| find_single_gem_files(config, spec) }
+      end
     end
 
     # Add a single gem to WEB-INF/gems

data/lib/warbler/traits.rb

@@ -97,6 +97,11 @@ module Warbler
         config.webxml["gem"]["path"] = config.gem_path if config.webxml
       end
     end
+
+    def jruby_jars
+      require 'jruby-jars'
+      FileList[JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path]
+    end
   end
 end
 

data/lib/warbler/traits/jar.rb

@@ -51,8 +51,7 @@ module Warbler
       end
 
       def default_jar_files
-        require 'jruby-jars'
-        FileList[JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path]
+        jruby_jars
       end
     end
   end

data/lib/warbler/traits/jbundler.rb

@@ -37,11 +37,10 @@ module Warbler
         else
           raise 'jbundler support needs jruby to create a local config: jruby -S jbundle install'
         end
-        # use only the jars from jbundler
-        config.java_libs.clear
-        JBUNDLER_CLASSPATH.each do |jar|
-          config.java_libs << jar
-        end
+        # use only the jars from jbundler and jruby
+        config.java_libs += jruby_jars
+        config.java_libs += JBUNDLER_CLASSPATH
+        config.java_libs.uniq! {|lib| lib.split(File::SEPARATOR).last }
         config.init_contents << "#{config.warbler_templates}/jbundler.erb"
       end
     end

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) if config.move_jars_to_webinf_lib
+        move_jars_to_webinf_lib(jar, 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")
@@ -110,7 +110,7 @@ module Warbler
           jar.files["#{klass}.class"] = jar.entry_in_jar(WARBLER_JAR, "#{klass}.class")
         end
       end
-      
+
       def add_executables(jar)
         webserver = WEB_SERVERS[config.webserver.to_s]
         webserver.add(jar)
@@ -131,10 +131,21 @@ module Warbler
         gem_jar.create("tmp/gems.jar")
       end
 
-      def move_jars_to_webinf_lib(jar)
-        jar.files.keys.select {|k| k =~ /^WEB-INF\/.*\.jar$/ }.each do |k|
-          next if k =~ /^WEB-INF\/lib\/([^\/]+)\.jar$/ # skip jars already in WEB-INF/lib
-          jar.files["WEB-INF/lib/#{k.sub('WEB-INF','')[1..-1].gsub(/[\/\\]/,'-')}"] = jar.files[k]
+      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_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/', '')
+              # exclude default jar (if it's not matched by selector) :
+              jar.files.delete(k) unless selector =~ File.basename(k)
+            end
+            next
+          end
+          next unless selector =~ File.basename(k)
+          name = k.sub('WEB-INF', '')[1..-1].gsub(/[\/\\]/, '-')
+          jar.files["WEB-INF/lib/#{name}"] = jar.files[k]
           jar.files[k] = empty_jar
         end
       end
@@ -155,7 +166,7 @@ module Warbler
 
       # Helper class for holding arbitrary config.webxml values for injecting into +web.xml+.
       class WebxmlOpenStruct < OpenStruct
-        
+
         %w(java com org javax gem).each do |name|
           class_eval "def #{name}; method_missing(:#{name}); end"
         end

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>warbler</artifactId>
-  <version>1.4.3-SNAPSHOT</version>
+  <version>1.4.4-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,

data/spec/spec_helper.rb

@@ -75,7 +75,7 @@ module ExampleGroupHelpers
 
   def cleanup_temp_files(*except_files)
     after(:each) do
-      FileUtils.rm_rf FileList[*(["log", ".bundle", "tmp/war"] - except_files)]
+      FileUtils.rm_rf FileList[*(["log", ".bundle", "tmp"] - except_files)]
       FileUtils.rm_f  FileList[*(["*.war", "*.foobar", "**/config.ru", "*web.xml*", "config/web.xml*",
                                  "config/warble.rb", "file.txt", 'manifest', '*Gemfile*', 'MANIFEST.MF*', 'init.rb*',
                                  '**/*.class'] - except_files)]
@@ -94,7 +94,7 @@ module ExampleGroupHelpers
         ready, error = nil, nil
         300.times do # timeout 30 secs (300 * 0.1)
           begin
-            break if ready = drbclient.ready? 
+            break if ready = drbclient.ready?
           rescue DRb::DRbConnError => e
             error = e; sleep 0.1
           end
@@ -134,7 +134,7 @@ module ExampleGroupHelpers
     before :each do
       webserver = double('server').as_null_object
       webserver.stub(:main_class).and_return 'WarMain.class'
-      webserver.stub(:add).and_return do |jar|
+      webserver.stub(:add) do |jar|
         jar.files['WEB-INF/webserver.jar'] = StringIO.new
       end
       Warbler::WEB_SERVERS['test'] = webserver

data/spec/warbler/application_spec.rb

@@ -45,10 +45,10 @@ describe Warbler::Application do
   end
 
   it "should copy a fresh config file into place" do
-    File.exists?("config/warble.rb").should_not be_true
+    File.exists?("config/warble.rb").should_not be true
     ARGV.unshift "config"
     silence { Warbler::Application.new.run }
-    File.exists?("config/warble.rb").should be_true
+    File.exists?("config/warble.rb").should be true
   end
 
   it "should refuse to copy over an existing config file" do
@@ -71,13 +71,13 @@ describe Warbler::Application do
     mkdir_p "lib/tasks/warbler"
     ARGV.unshift "pluginize"
     silence { Warbler::Application.new.run }
-    File.exist?("lib/tasks/warbler/warbler.rake").should_not be_true
+    File.exist?("lib/tasks/warbler/warbler.rake").should_not be true
   end
 
   it "should define a pluginize task for adding the tasks to a Rails application" do
     ARGV.unshift "pluginize"
     silence { Warbler::Application.new.run }
-    File.exist?("lib/tasks/warbler/warbler.rake").should be_true
+    File.exist?("lib/tasks/warbler/warbler.rake").should be true
   end
 
   it "should provide a means to load the project Rakefile" do

data/spec/warbler/bundler_spec.rb

@@ -6,6 +6,7 @@
 #++
 
 require File.expand_path('../../spec_helper', __FILE__)
+require 'open3'
 
 describe Warbler::Jar, "with Bundler" do
   use_fresh_rake_application
@@ -79,8 +80,13 @@ describe Warbler::Jar, "with Bundler" do
         end
         jar.apply(config)
         jar.create('foo.war')
-        `java -jar foo.war -S rake -T`
-        $?.exitstatus.should == 0
+        if RUBY_VERSION >= '1.9'
+          stdin, stdout, stderr, wait_thr = Open3.popen3('java -jar foo.war -S rake -T')
+          wait_thr.value.success?.should be(true), stderr.readlines.join
+        else
+          `java -jar foo.war -S rake -T`
+          $?.exitstatus.should == 0
+        end
       end
     end
 
@@ -156,7 +162,7 @@ describe Warbler::Jar, "with Bundler" do
 
     it "includes the bundler gem" do
       jar.apply(config)
-      config.gems.detect{|k,v| k.name == 'bundler'}.should_not be_nil
+      config.gems.detect{|k,v| k.name == 'bundler'}.should_not be nil
       file_list(/bundler-/).should_not be_empty
     end
 

data/spec/warbler/config_spec.rb

@@ -23,7 +23,7 @@ describe Warbler::Config do
       config = Warbler::Config.new
       config.includes.should be_empty
       config.jar_name.size.should > 0
-      config.override_gem_home.should be_true
+      config.override_gem_home.should be true
     end
   end
 
@@ -43,7 +43,7 @@ describe Warbler::Config do
       config.webxml.should be_kind_of(OpenStruct)
       config.pathmaps.should be_kind_of(OpenStruct)
       config.pathmaps.public_html.should == ["%{public/,}p"]
-      config.override_gem_home.should be_true
+      config.override_gem_home.should be true
     end
 
     it "should allow configuration through an initializer block" do

data/spec/warbler/jar_spec.rb

@@ -176,6 +176,34 @@ describe Warbler::Jar do
         file_list(%r{^sample_jar/lib/sample_jar\.class$}).should be_empty
         jar.contents('sample_jar/lib/sample_jar.rb').should_not =~ /load __FILE__\.sub/
       end
+
+      it "compiles included gems when compile_gems is true" do
+        config.compile_gems = true
+        config.compiled_ruby_files = %w(lib/sample_jar.rb)
+        jar.compile(config)
+        jar.apply(config)
+        file_list(%r{sample_jar.*\.rb$}).size.should == 2
+        if RUBY_VERSION >= '1.9'
+          file_list(%r{gems.*\.class$}).size.should == 73
+        else
+          # 1.8.7 uses an older version of rubyzip and so the number of files compiled changes
+          file_list(%r{gems.*\.class$}).size.should == 32
+        end
+      end
+
+      it "does not compile included gems by default" do
+        config.compiled_ruby_files = %w(lib/sample_jar.rb)
+        jar.compile(config)
+        jar.apply(config)
+        file_list(%r{sample_jar.*\.rb$}).size.should == 2
+        if RUBY_VERSION >= '1.9'
+          file_list(%r{gems.*\.class$}).size.should == 0
+        else
+          # 1.8.7 uses an older version of rubyzip and so the number of files compiled changes
+          file_list(%r{gems.*\.class$}).size.should == 0
+        end
+      end
+
     end
 
     context "with a gemspec without a default executable" do
@@ -443,7 +471,7 @@ describe Warbler::Jar do
       mkdir_p "config"
       File.open("config/web.xml.erb", "w") {|f| f << "Hi <%= webxml.public.root %>" }
       jar.apply(config)
-      jar.files["WEB-INF/web.xml"].should_not be_nil
+      jar.files["WEB-INF/web.xml"].should_not be nil
       jar.files["WEB-INF/web.xml"].read.should == "Hi /"
     end
 
@@ -594,6 +622,36 @@ describe Warbler::Jar do
           file_list(%r{WEB-INF/app/sample.jar}).should_not be_empty
         end
       end
+
+      context "with move_jars_to_webinf_lib set to regexp" do
+        before :each do
+          use_config do |config|
+            config.move_jars_to_webinf_lib = /sample/
+          end
+        end
+
+        before :each do
+          touch FileList["app/another.jar", "app/sample2.jar"]
+        end
+        after :each do
+          rm_f FileList["app/another.jar", "app/sample2.jar"]
+        end
+
+        it "moves jar files that match 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/lib/app-sample2.jar}).should_not be_empty
+          file_list(%r{WEB-INF/lib/.*?another.jar}).should be_empty
+        end
+
+        it "removes default jars not matched by filter from WEB-INF/lib" do
+          jar.apply(config)
+          file_list(%r{WEB-INF/lib/jruby-rack.*\.jar}).should be_empty
+          file_list(%r{WEB-INF/lib/jruby-core.*\.jar}).should be_empty
+        end
+
+      end
+
     end
 
     context "with the executable feature" do
@@ -995,4 +1053,3 @@ describe Warbler::Jar do
     end
   end
 end
-

data/spec/warbler/jbundler_spec.rb

@@ -70,7 +70,7 @@ describe Warbler::Jar, "with JBundler" do
     it "does not include the jbundler gem (as it is in the development group)" do
       pending( "needs JRuby to work" ) unless defined? JRUBY_VERSION
       jar.apply(config)
-      config.gems.detect{|k,v| k.name == 'jbundler'}.should be_nil
+      config.gems.detect{|k,v| k.name == 'jbundler'}.should be nil
       file_list(/jbundler-/).should be_empty
     end
 

data/spec/warbler/task_spec.rb

@@ -138,7 +138,7 @@ describe Warbler::Task do
       class_file_bytes = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.class') {|io| io.read }
       java_class_header     = class_file_bytes[0..3]
       bytecode_version      = class_file_bytes[6..7]
-      
+
       java_class_header.should == java_class_magic_number
       bytecode_version.should == java6_version_bytes
     end
@@ -147,13 +147,13 @@ describe Warbler::Task do
   it "should delete .class files after finishing the jar" do
     config.features << "compiled"
     silence { run_task "warble" }
-    File.exist?('app/helpers/application_helper.class').should be_false
+    File.exist?('app/helpers/application_helper.class').should be false
   end
 
   context "where symlinks are available" do
     begin
       FileUtils.ln_s "README.txt", "r.txt.symlink", :verbose => false
-      
+
       it "should process symlinks by storing a file in the archive that has the same contents as the source" do
         File.open("config/special.txt", "wb") {|f| f << "special"}
         Dir.chdir("config") { FileUtils.ln_s "special.txt", "link.txt" }
@@ -169,9 +169,9 @@ describe Warbler::Task do
         Dir.chdir("lib") { FileUtils.ln_s "tasks", "rakelib" }
         silence { run_task "warble" }
         Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
-          zf.find_entry("WEB-INF/lib/tasks/utils.rake").should_not be_nil
-          zf.find_entry("WEB-INF/lib/rakelib/").should_not be_nil
-          zf.find_entry("WEB-INF/lib/rakelib/utils.rake").should_not be_nil if defined?(JRUBY_VERSION)
+          zf.find_entry("WEB-INF/lib/tasks/utils.rake").should_not be nil
+          zf.find_entry("WEB-INF/lib/rakelib/").should_not be nil
+          zf.find_entry("WEB-INF/lib/rakelib/utils.rake").should_not be nil if defined?(JRUBY_VERSION)
         end
       end
 
@@ -181,7 +181,7 @@ describe Warbler::Task do
   end
 
   context "with a Bundler Gemfile" do
-    
+
     run_out_of_process_with_drb if DRB = true
 
     after do
@@ -194,18 +194,18 @@ describe Warbler::Task do
 
     it "includes gems from the Gemfile" do
       File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
-      
+
       if DRB
         drbclient.run_task "warble"
         config = drbclient.config
       else
-       silence { run_task "warble" } 
+       silence { run_task "warble" }
       end
-      
+
       Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
         rspec = config.gems.keys.detect { |spec| spec.name == 'rspec' }
-        rspec.should_not be_nil, "expected rspec gem among: #{config.gems.keys.join(' ')}"
-        zf.find_entry("WEB-INF/gems/specifications/rspec-#{rspec.version}.gemspec").should_not be_nil
+        rspec.should_not be(nil), "expected rspec gem among: #{config.gems.keys.join(' ')}"
+        zf.find_entry("WEB-INF/gems/specifications/rspec-#{rspec.version}.gemspec").should_not be nil
       end
     end
   end

data/warble.rb

@@ -88,7 +88,11 @@ Warbler::Config.new do |config|
   # files will be compiled. Default is to compile all \.rb files in
   # the application.
   # config.compiled_ruby_files = FileList['app/**/*.rb']
-  
+
+  # Determines if ruby files in supporting gems will be compiled.
+  # Ignored unless compile feature is used.
+  # config.compile_gems = false
+
   # When set it specify the bytecode version for compiled class files
   # config.bytecode_version = "1.6"
 
@@ -97,15 +101,18 @@ Warbler::Config.new do |config|
   # GEM_HOME if it is set.
   # config.override_gem_home = true
 
-  # Allows for specifing custom executables 
+  # Allows for specifing custom executables
   # config.executable = ["rake", "bin/rake"]
-  
+
   # 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.
+  # Alternatively, this option can be set to a regular expression, which will
+  # act as a jar selector -- only jar files that match the pattern will be 
+  # included in the archive.
   # config.move_jars_to_webinf_lib = false
 
   # === War files only below here ===

data/warbler.gemspec

@@ -6,15 +6,14 @@ Gem::Specification.new do |gem|
   gem.name = "warbler"
   gem.version = Warbler::VERSION
   gem.platform = Gem::Platform::RUBY
-  gem.homepage = "http://caldersphere.rubyforge.org/warbler"
+  gem.homepage = "https://github.com/jruby/warbler"
   gem.license = 'MIT'
   gem.authors = ["Nick Sieger"]
   gem.email = "nick@nicksieger.com"
   gem.summary = "Warbler chirpily constructs .war files of your Rails applications."
   gem.description = %q{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.}
+Rails, 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.}
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features,integration}/*`.split("\n")
@@ -22,13 +21,12 @@ deployment to a Java environment.}
   gem.require_paths = ["lib"]
 
   gem.rdoc_options = ["--main", "README.rdoc", "-H", "-f", "darkfish"]
-  gem.rubyforge_project = "caldersphere"
 
   gem.add_runtime_dependency 'rake', [">= 0.9.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_runtime_dependency 'rubyzip', [">= 0.9", "< 1.2"]
   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"

data/web.xml.erb

@@ -2,6 +2,8 @@
   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
   "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
+<!-- <display-name>Uncomment and put name :here: for Tomcat Dashboard</display-name> -->
+
 <% webxml.context_params.each do |k,v| %>
   <context-param>
     <param-name><%= k %></param-name>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,7 +67,7 @@ dependencies:
         version: '0.9'
     - - <
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -75,7 +75,7 @@ dependencies:
         version: '0.9'
     - - <
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -136,9 +136,8 @@ dependencies:
   type: :development
 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.
+  Rails, 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.
 email: nick@nicksieger.com
 executables:
 - warble
@@ -362,7 +361,7 @@ files:
 - warble.rb
 - warbler.gemspec
 - web.xml.erb
-homepage: http://caldersphere.rubyforge.org/warbler
+homepage: https://github.com/jruby/warbler
 licenses:
 - MIT
 metadata: {}
@@ -386,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: caldersphere
+rubyforge_project:
 rubygems_version: 2.2.2
 signing_key:
 specification_version: 4