warbler 1.4.10 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 193f10998499ba07232b514ad698a49b648552ee
-  data.tar.gz: c7ac8f3a09baaa3f93d7aef10a1cdf7eec9253d9
+  metadata.gz: 4d3af37ee387e01352e92875710cf763c45b05f9
+  data.tar.gz: 747124311e18f4c18b21e7c7232dc113468fcd27
 SHA512:
-  metadata.gz: c41353fe596a7547303aec2da758d395ecdaa3326515a92c01d7abd69a1669420ec6392270d31c8737d4e090244a0d595ecbadb5b49b08fd6f286d3af11b589b
-  data.tar.gz: c9bc63f6a746dd771959d4e2ac33dd5de5fbcdd46f1c1896d54417334e786d8244a3fa5192cbf937222dcf9d099f4ce1899984663276a5687e01c18c101f3a4b
+  metadata.gz: 3414140028e4b7ff61c4c4d392e6b279ce7af0e87c2631061fe1b73893dfae0e6879e9dfc1e8946905bd0c33f2160c1cc1a281350ffa2223e9ca08c62b6bbcae
+  data.tar.gz: ba036780cf02f618ec08035fa126b9f873a50db08d000cf209a3f34af05ef492e55719cc02b82fe14bf177a4030ac5470fdb67d887b6d55e8b3147f3c1bd9f27

data/.travis.yml

@@ -1,40 +1,19 @@
-sudo: false
-language: ruby
-script: bundle exec rake spec
 rvm:
-  - jruby-1.7.24
+  - jruby-9.0.0.0.pre1
+jdk:
+  - oraclejdk8
 branches:
   only:
     - master
-    - /-dev|-feature|-fix/
-before_install:
-  - ([ "$BUNDLER_VERSION" ] && gem uninstall bundler --all --force && gem install bundler -v "$BUNDLER_VERSION") || true
-  - bundle --version
-before_script:
-  - export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+    - 2.x-dev
 env:
-  - BUNDLER_VERSION="~> 1.10"
+  - JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
 matrix:
   include:
-    - rvm: jruby-1.7.24
-      env: JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.7.9" RAKE_VERSION="~> 10.2.2"
-    - rvm: jruby-1.7.24
-      env: JRUBY_OPTS="--1.9" BUNDLER_VERSION="~> 1.11.2" RAKE_VERSION="~> 10.3.2"
-    - rvm: jruby-1.7.8
-      env: JRUBY_OPTS="--1.8" BUNDLER_VERSION="~> 1.8.9" RAKE_VERSION="~> 10.1.1"
-    - rvm: jruby-1.7.16
-      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.10.2" RAKE_VERSION="~> 10.4.2"
-    - rvm: 1.8.7
-      env: BUNDLER_VERSION="~> 1.6.9" RAKE_VERSION="~> 10.4.2"
-    - rvm: 1.9.2
-      env: BUNDLER_VERSION="~> 1.7.9" RAKE_VERSION="~> 10.5.0"
-    - rvm: 1.9.3
-      env: BUNDLER_VERSION="~> 1.8.9" RAKE_VERSION="~> 10.2.2"
-    - rvm: jruby-1.7.24
-      env: MAVEN_OPTS="-XX:MaxPermSize=128m"
-      script: mvn clean verify
+    - rvm: jruby-head
+      env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
   allow_failures:
-    - script: mvn clean verify
+    - rvm: jruby-head
 notifications:
   irc:
     channels:
@@ -43,3 +22,7 @@ notifications:
     on_failure: always
     template:
       - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
+before_install:
+  - sudo apt-get update && sudo apt-get install git
+  - git fetch --unshallow
+  - gem install bundler --pre

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org/"
+source "http://rubygems.org/"
 
 gemspec
 
@@ -8,14 +8,3 @@ group :development do
   gem "childprocess", :platform => :mri
   gem "maven-tools", "~> 0.34.5"
 end
-
-group :development, :test do
-  gem 'rdoc', '~> 3.10', :require => nil
-  gem 'rake', ENV['RAKE_VERSION'], :require => nil if ENV['RAKE_VERSION']
-end
-
-if ENV['RUBYZIP_VERSION']
-  gem 'rubyzip', ENV['RUBYZIP_VERSION']
-elsif RUBY_VERSION < "1.9"
-  gem 'rubyzip', '~> 0.9'
-end

data/History.txt

@@ -1,14 +1,12 @@
-== Master
+== 2x-dev
 
-== 1.4.9
 
-- Fixed a bug in detecting default PORT for executable WAR
-- #332: Warbler not picking up new Bundler convention of 'exe' directory for executables
+- Added the ability to set custom port for Jetty launcher with
+  warbler.port or PORT env var
 
 == 1.4.7
 
-- Added the ability to set custom port for Jetty launcher with
-  warbler.port or PORT env var
+- #319: Adds capacity to use the jruby-jars gem version for JRuby 9k.
 
 == 1.4.6
 - #318: polish *scripts/rails* - require_relative should no longer be used
@@ -261,7 +259,7 @@
 - RailsConf 2009 edition.
 - Only bundled JRuby and JRuby-Rack upgrades. Bug fixes will have to come in 0.9.14.
 - This should also be the last release with bundled JRuby and JRuby-Rack.
-- Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows 
+- Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows
   Rails 2.3 to work with Warbler.
 
 == 0.9.12

data/Mavenfile

@@ -7,8 +7,7 @@ gemspec( :jar => 'warbler_jar.jar',
 
 # just dump the POM as pom.xml as read-only file
 properties( 'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readOnly' => true,
-            'jruby.plugins.version' => '1.0.10' )
+            'tesla.dump.readOnly' => true )
 
 # dependencies needed for compilation
 scope :provided do

data/README.rdoc

@@ -1,7 +1,7 @@
 = Warbler {<img src="https://badge.fury.io/rb/warbler.svg" alt="Gem Version" />}[http://badge.fury.io/rb/warbler] {<img src="https://travis-ci.org/jruby/warbler.png" />}[https://travis-ci.org/jruby/warbler]
 
-Warbler is a gem to make a Java jar or war file out of any Ruby, Rails or Rack
-application. Warbler provides a minimal, flexible, Ruby-like way to bundle up
+Warbler is a gem to make a Java jar or war file out of any Ruby, 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.
 
 Warbler provides a sane set of out-of-the box defaults that should allow most
@@ -18,7 +18,7 @@ Version 1.4.x of Warbler supports versions of JRuby up to 1.7.x. The {2.x-dev br
 3. Choose one:
 
 * For a web project, deploy your +myapp.war+ file to your favorite Java application server.
-
+ 
 * For a standalone applications, just run it: <tt>java -jar myapp.jar</tt>.
 
 == Usage
@@ -43,9 +43,9 @@ Type <tt>warble</tt> to create the jar or war file.
 
 == Features
 
-Warbler "features" are small Rake tasks that run before the creation of the war
-file and make manipulations to the archive structure. For instance, the
-+executable+ feature makes your war file capable of running on its own,
+Warbler "features" are small Rake tasks that run before the creation of the war 
+file and make manipulations to the archive structure. For instance, the 
++executable+ feature makes your war file capable of running on its own, 
 without a servlet container (using an embedded web server) :
 
     warble executable war
@@ -64,73 +64,73 @@ Currently, the following features are available :
   number of files in the .war. This is mostly useful for Google
   AppEngine where the number of files per application has a limit.
   (Note: not applicable for jar-based applications.)
-* +runnable+: This makes a (standard Java) runnable .war archive thus you can
-  execute binary bundled (gem) commands e.g. "rake". You should use the -S
-  switch to specify the binary followed by any arguments in takes e.g.
+* +runnable+: This makes a (standard Java) runnable .war archive thus you can 
+  execute binary bundled (gem) commands e.g. "rake". You should use the -S 
+  switch to specify the binary followed by any arguments in takes e.g. 
   <tt>java -jar myrailsapp.war -S rake db:migrate</tt>.
-* +executable+: This bundles an embedded web server into the .war so that it
-  can either be deployed into a traditional java web server or run as a
+* +executable+: This bundles an embedded web server into the .war so that it 
+  can either be deployed into a traditional java web server or run as a 
   standalone application using <tt>java -jar myapp.war</tt>.
   (Note: jar-based applications are executable by default.)
 * +compiled+: This uses +jrubyc+ to precompile all .rb files in your application
-  to .class files and includes those in the .war instead of the Ruby sources.
-  NOTE: The war file will still contain .rb files, but they will be short stubs
+  to .class files and includes those in the .war instead of the Ruby sources. 
+  NOTE: The war file will still contain .rb files, but they will be short stubs 
   containing the following code : <tt>load __FILE__.sub(/\.rb$/, '.class')</tt>
 
-Features may form the basis for a third-party plugin system (in the future)
+Features may form the basis for a third-party plugin system (in the future) 
 if there is demand.
 
-NOTE: Feature tasks must be included in the same command invocation and
-inserted before the +war+ task in order to take effect. For example,
-<tt>warble compiled; warble war</tt> does not compile and obfuscate +.rb+
-sources because the second invocation of +warble+ does not run the +compiled+
+NOTE: Feature tasks must be included in the same command invocation and 
+inserted before the +war+ task in order to take effect. For example, 
+<tt>warble compiled; warble war</tt> does not compile and obfuscate +.rb+ 
+sources because the second invocation of +warble+ does not run the +compiled+ 
 feature and creates a basic war with the sources included, make sure you run :
 
     warble compiled war
 
-or, if it's important that the war always be compiled, use the option above to
+or, if it's important that the war always be compiled, use the option above to 
 put the feature in your <tt>config/warble.rb</tt>.
 
 == War or Jar?
 
-War-based projects are for Rails, Merb, or Rack-based web applications.
-They usually contain a +config/environment.rb+ file, a +config/init.rb+ file,
+War-based projects are for Rails, Merb, or Rack-based web applications. 
+They usually contain a +config/environment.rb+ file, a +config/init.rb+ file, 
 or a +config.ru+ file.
-The presence of these files are used to determine if the project is a web
+The presence of these files are used to determine if the project is a web 
 application, and thus a Java EE compatible war file is built for the project.
 
-Jar-based projects are for standalone Ruby applications. Usually a Ruby
-application has a launcher script in the +bin+ directory and Ruby code
-in the <tt>lib</tt> directory. Warbler packages the application so that
+Jar-based projects are for standalone Ruby applications. Usually a Ruby 
+application has a launcher script in the +bin+ directory and Ruby code 
+in the <tt>lib</tt> directory. Warbler packages the application so that 
 <tt>java -jar myapp.jar</tt> runs the launcher script.
 
 == Jar Files
 
 === Gem Specification (gemspec) Files
 
-If your project has a <tt>.gemspec</tt> file in the top directory, it will be
-used to configure the project's dependencies, launcher script, require paths,
-and the files to be included in the archive. For best results make sure your
+If your project has a <tt>.gemspec</tt> file in the top directory, it will be 
+used to configure the project's dependencies, launcher script, require paths, 
+and the files to be included in the archive. For best results make sure your 
 gemspec specifies all of the following attributes:
 
 * +executables+
 * +require_paths+
 * runtime dependencies added with +add_dependency+
 
-If your project do not have a <tt>.gemspec</tt>, Warbler will attempt to guess
-the launcher from the contents of the <tt>bin</tt> directory and use the
-<tt>lib</tt> directory as the lone require path. All files in the project
+If your project do not have a <tt>.gemspec</tt>, Warbler will attempt to guess 
+the launcher from the contents of the <tt>bin</tt> directory and use the 
+<tt>lib</tt> directory as the lone require path. All files in the project 
 will be included in the archive.
 
 === Bundler
 
-Applications that use Bundler[http://gembundler.com/], detected via presence of
-a +Gemfile+, will have the gems packaged up into the archive along with the
-Gemfile. The Bundler groups named ":development", ":test" and ":assets" will be
-excluded by default, unless you specify with <tt>config.bundle_without</tt> in
+Applications that use Bundler[http://gembundler.com/], detected via presence of 
+a +Gemfile+, will have the gems packaged up into the archive along with the 
+Gemfile. The Bundler groups named ":development", ":test" and ":assets" will be 
+excluded by default, unless you specify with <tt>config.bundle_without</tt> in 
 +config/warble.rb+.
 
-Warbler supports Bundler for gems and git repositories, but not for plain path
+Warbler supports Bundler for gems and git repositories, but not for plain path 
 components. Warbler will warn when a +:path+ component is found in the +Gemfile+
 and will refuse to include it in the archive.
 
@@ -146,18 +146,18 @@ via presence of a +Jarfile+, will have the jars packaged up into the archive. th
 Rails applications are detected automatically and configured appropriately.
 The following items are set up for you:
 
-* Your application runs in the +production+ environment by default.
+* Your application runs in the +production+ environment by default. 
   Change it in +config/warble.rb+ (see below).
 * The Rails gem is packaged if you haven't vendored Rails (Rails <= 2.x).
 * Other gems configured in Rails.configuration.gems are packaged (2.1 - 2.3)
-* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
+* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and 
   runtime pooling is disabled.
 
 === Other Rack-based applications
 
-If you have a +config.ru+ file in the top directory or one of the immediate
-subdirectories of your application, it will be included and used as the rackup
-script for your Rack-based application. You will probably need to specify
+If you have a +config.ru+ file in the top directory or one of the immediate 
+subdirectories of your application, it will be included and used as the rackup 
+script for your Rack-based application. You will probably need to specify 
 framework and application gems in +config/warble.rb+ unless you're using Bundler
 to manage your gems. <tt>ENV['RACK_ENV']</tt> will be set to +production+.
 
@@ -166,13 +166,13 @@ of how to configure Warbler to package Camping and Sinatra apps.
 
 === Configuration auto-detect notes
 
-* Warbler will load the +environment+ Rake task in a Rails application to try
-  to detect some configuration. If you don't have database access in the
-  environment where you package your application, you may wish to set
-  <tt>Warbler.framework_detection = false</tt> at the top of +config.rb+.
-  In this case you may need to specify additional details such as booter, gems
+* Warbler will load the +environment+ Rake task in a Rails application to try 
+  to detect some configuration. If you don't have database access in the 
+  environment where you package your application, you may wish to set 
+  <tt>Warbler.framework_detection = false</tt> at the top of +config.rb+. 
+  In this case you may need to specify additional details such as booter, gems 
   and other settings that would normally be gleaned from the app configuration.
-* Is it possible to more generally detect what gems an application uses?
+* Is it possible to more generally detect what gems an application uses? 
   <tt>Gem.loaded_specs</tt> is available, but the application needs to be
   loaded first before its contents are reliable.
 
@@ -185,7 +185,7 @@ doing this. With the gem, simply run
 
     warble config
 
-Finally, edit the +config/warble.rb+ to your taste. The generated file is
+Finally, edit the +config/warble.rb+ to your taste. The generated file is 
 fully-documented with the available options and default values.
 
 === War layout
@@ -244,7 +244,7 @@ lock the <tt>rubyzip</tt> gem to a version before 1.0.0.
 
 == Troubleshooting
 
-If Warbler isn't packaging the files you were expecting, use the +war:debug+
+If Warbler isn't packaging the files you were expecting, use the +war:debug+ 
 task to give you more insight into what's going on.
 
 If you think you found a bug, please file one at
@@ -262,7 +262,7 @@ https://github.com/jruby/warbler/tarball/master.
 
 == Development
 
-You can develop Warbler with any implementation of Ruby. To write Warbler code
+You can develop Warbler with any implementation of Ruby. To write Warbler code 
 and run specs, you need to have Bundler installed and run <tt>bundle</tt> once.
 
 After that, simply run <tt>rake</tt>.
@@ -284,8 +284,6 @@ http://maven.apache.org/ Be aware the homebrew installs 3.0.5, which doesn't wor
 
 Warbler is provided under the terms of the MIT license.
 
-Warbler (c) 2013-2015 The JRuby project
-
-Warbler (c) 2010-2012 Engine Yard, Inc.
+Warbler (c) 2010-2013 Engine Yard, Inc.
 
 Warbler (c) 2007-2009 Sun Microsystems, Inc.

data/Rakefile

@@ -6,15 +6,15 @@
 # See the file LICENSE.txt for details.
 #++
 
-begin
-  require 'bundler'
-rescue LoadError
-  warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies.\n\n"
-else
-  require 'bundler/gem_helper'
-  Bundler::GemHelper.install_tasks :dir => File.dirname(__FILE__)
+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'
+gem_helper = Bundler::GemHelper.new(File.dirname(__FILE__))
+gem_helper.install
+gemspec = gem_helper.gemspec
+
 require 'rake/clean'
 CLEAN << "pkg" << "doc" << Dir['integration/**/target']
 
@@ -42,13 +42,8 @@ end
 # the jar tasks is part of maven-tasks
 task :build => :jar
 
-load_gemspec = lambda do
-  Gem::Specification.load(File.expand_path('warbler.gemspec', File.dirname(__FILE__)))
-end
-
 require 'rdoc/task'
 RDoc::Task.new(:docs) do |rd|
-  gemspec = load_gemspec.call
   rd.rdoc_dir = "doc"
   rd.rdoc_files.include("README.rdoc", "History.txt", "LICENSE.txt")
   rd.rdoc_files += gemspec.require_paths
@@ -59,7 +54,6 @@ end
 task :release_docs => :docs do
   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml"))) rescue nil
   if config
-    gemspec = load_gemspec.call
     dir  = "/var/www/gforge-projects/#{gemspec.rubyforge_project}/#{gemspec.name}"
     dest = "#{config["username"]}@rubyforge.org:#{dir}"
     sh %{rsync -rl --delete doc/ #{dest}}

data/ext/JarMain.java

@@ -28,6 +28,8 @@ public class JarMain implements Runnable {
 
     static final String MAIN = "/" + JarMain.class.getName().replace('.', '/') + ".class";
 
+    final boolean debug = isDebug();
+
     protected final String[] args;
     protected final String archive;
     private final String path;
@@ -124,7 +126,7 @@ public class JarMain implements Runnable {
     }
 
     protected Object newScriptingContainer(final URL[] jars) throws Exception {
-        setSystemProperty("org.jruby.embed.class.path", "");
+        System.setProperty("org.jruby.embed.class.path", "");
         classLoader = new URLClassLoader(jars);
         Class scriptingContainerClass = Class.forName("org.jruby.embed.ScriptingContainer", true, classLoader);
         Object scriptingContainer = scriptingContainerClass.newInstance();
@@ -162,12 +164,12 @@ public class JarMain implements Runnable {
     }
 
     protected void debug(String msg, Throwable t) {
-        if ( isDebug() ) System.out.println(msg);
-        if ( isDebug() && t != null ) t.printStackTrace(System.out);
+        if (debug) System.out.println(msg);
+        if (debug && t != null) t.printStackTrace(System.out);
     }
 
     protected static void debug(Throwable t) {
-        if ( isDebug() ) t.printStackTrace(System.out);
+        if (isDebug()) t.printStackTrace(System.out);
     }
 
     protected void warn(String msg) {
@@ -223,9 +225,9 @@ public class JarMain implements Runnable {
     }
 
     protected static void doStart(final JarMain main) {
-        int exit;
         try {
-            exit = main.start();
+            int exit = main.start();
+            if (isSystemExitEnabled()) System.exit(exit);
         }
         catch (Exception e) {
             Throwable t = e;
@@ -233,13 +235,7 @@ public class JarMain implements Runnable {
                 t = t.getCause();
             }
             error(e.toString(), t);
-            exit = 1;
-        }
-        try {
-            if ( isSystemExitEnabled() ) System.exit(exit);
-        }
-        catch (SecurityException e) {
-            debug(e);
+            System.exit(1);
         }
     }
 
@@ -266,59 +262,17 @@ public class JarMain implements Runnable {
         }
     }
 
-    private static final boolean debug;
-    static {
-        debug = Boolean.parseBoolean( getSystemProperty("warbler.debug", "false") );
+    static boolean isDebug() {
+        return Boolean.getBoolean("warbler.debug");
     }
 
-    static boolean isDebug() { return debug; }
-
     /**
      * if warbler.skip_system_exit system property is defined, we will not
      * call System.exit in the normal flow. System.exit can cause problems
      * for wrappers like procrun
      */
     private static boolean isSystemExitEnabled(){
-        return getSystemProperty("warbler.skip_system_exit") == null; //omission enables System.exit use
-    }
-
-    static String getSystemProperty(final String name) {
-        return getSystemProperty(name, null);
-    }
-
-    static String getSystemProperty(final String name, final String defaultValue) {
-        try {
-            return System.getProperty(name, defaultValue);
-        }
-        catch (SecurityException e) {
-            return defaultValue;
-        }
-    }
-
-    static boolean setSystemProperty(final String name, final String value) {
-        try {
-            System.setProperty(name, value);
-            return true;
-        }
-        catch (SecurityException e) {
-            return false;
-        }
-    }
-
-    static String getENV(final String name) {
-        return getENV(name, null);
-    }
-
-    static String getENV(final String name, final String defaultValue) {
-        try {
-            if ( System.getenv().containsKey(name) ) {
-                return System.getenv().get(name);
-            }
-            return defaultValue;
-        }
-        catch (SecurityException e) {
-            return defaultValue;
-        }
+        return System.getProperty("warbler.skip_system_exit") == null; //omission enables System.exit use
     }
 
 }