warbler 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376781bdadb7244aa3c5922f98c1b1025f40c9c0
-  data.tar.gz: 1770365dde33c4c23d2a381357c751bc8deded5e
+  metadata.gz: 62857e66b600cbaa2a79c76f1f184cbd73c33171
+  data.tar.gz: d2758474c41625d2d5d61b779e6d7d8c50545791
 SHA512:
-  metadata.gz: 7c1433a950c083cd92bfee72dd3476be179d96cff5e371eabb339cedfbcffd2de8d9567effd63ab4e483e465ea03fa2c77411215c159e37379a4b7aaa997e5a8
-  data.tar.gz: 68cca194a69ffc051afce73800d58460373af2e2d0ee7ce629a4b5d635db84781d6f50ab82cb575aaa2ee89b898aeb1574b2f75a4fffccd0ca9ec27a38bc4186
+  metadata.gz: 37bcb9035a8bc0723c2faa6ca06e00f2e339581c811360dbc1fadb7cc9adc0bfdc46cbee7292c9513c60242a59d76188ba8672b2f3e4dc81721e2452e8646350
+  data.tar.gz: 12637d24a34f8b5568ea74e6f480ee02a539f59bd7b1067079d49c299dac7d2ea0b16a8fee8ab164c3fb3bcf57632109067169f7576c0f5fe1b3a1148abad55e

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org/"
+source "https://rubygems.org/"
 
 gemspec
 

data/History.txt

@@ -1,5 +1,9 @@
 == Master
 
+== 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
 
 == 1.4.7
 

data/Mavenfile

@@ -7,7 +7,8 @@ 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 )
+            'tesla.dump.readOnly' => true,
+            'jruby.plugins.version' => '1.0.10' )
 
 # 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,6 +284,8 @@ 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) 2010-2013 Engine Yard, Inc.
+Warbler (c) 2013-2015 The JRuby project
+
+Warbler (c) 2010-2012 Engine Yard, Inc.
 
 Warbler (c) 2007-2009 Sun Microsystems, Inc.

data/ext/JarMain.java

@@ -28,8 +28,6 @@ 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;
@@ -126,7 +124,7 @@ public class JarMain implements Runnable {
     }
 
     protected Object newScriptingContainer(final URL[] jars) throws Exception {
-        System.setProperty("org.jruby.embed.class.path", "");
+        setSystemProperty("org.jruby.embed.class.path", "");
         classLoader = new URLClassLoader(jars);
         Class scriptingContainerClass = Class.forName("org.jruby.embed.ScriptingContainer", true, classLoader);
         Object scriptingContainer = scriptingContainerClass.newInstance();
@@ -164,12 +162,12 @@ public class JarMain implements Runnable {
     }
 
     protected void debug(String msg, Throwable t) {
-        if (debug) System.out.println(msg);
-        if (debug && t != null) t.printStackTrace(System.out);
+        if ( isDebug() ) System.out.println(msg);
+        if ( isDebug() && 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) {
@@ -225,9 +223,9 @@ public class JarMain implements Runnable {
     }
 
     protected static void doStart(final JarMain main) {
+        int exit;
         try {
-            int exit = main.start();
-            if (isSystemExitEnabled()) System.exit(exit);
+            exit = main.start();
         }
         catch (Exception e) {
             Throwable t = e;
@@ -235,7 +233,13 @@ public class JarMain implements Runnable {
                 t = t.getCause();
             }
             error(e.toString(), t);
-            System.exit(1);
+            exit = 1;
+        }
+        try {
+            if ( isSystemExitEnabled() ) System.exit(exit);
+        }
+        catch (SecurityException e) {
+            debug(e);
         }
     }
 
@@ -262,17 +266,59 @@ public class JarMain implements Runnable {
         }
     }
 
-    static boolean isDebug() {
-        return Boolean.getBoolean("warbler.debug");
+    private static final boolean debug;
+    static {
+        debug = Boolean.parseBoolean( getSystemProperty("warbler.debug", "false") );
     }
 
+    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 System.getProperty("warbler.skip_system_exit") == null; //omission enables System.exit use
+        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;
+        }
     }
 
 }

data/ext/WarMain.java

@@ -140,12 +140,12 @@ public class WarMain extends JarMain {
             if ( is != null ) props.load(is);
         } catch (Exception e) { }
 
-        String port = System.getProperty("warbler.port", System.getenv("PORT"));
+        String port = getSystemProperty("warbler.port", getENV("PORT"));
         port = port == null ? "8080" : port;
-        String webserverConfig = System.getProperty("warbler.webserver_config", System.getenv("WARBLER_WEBSERVER_CONFIG"));
+        String webserverConfig = getSystemProperty("warbler.webserver_config", getENV("WARBLER_WEBSERVER_CONFIG"));
         String embeddedWebserverConfig = new URI("jar", entryPath(WEBSERVER_CONFIG), null).toURL().toString();
         webserverConfig = webserverConfig == null ? embeddedWebserverConfig : webserverConfig;
-        for (Map.Entry entry : props.entrySet()) {
+        for ( Map.Entry entry : props.entrySet() ) {
             String val = (String) entry.getValue();
             val = val.replace("{{warfile}}", archive).
                       replace("{{port}}", port).
@@ -156,8 +156,8 @@ public class WarMain extends JarMain {
 
         if (props.getProperty("props") != null) {
             String[] propsToSet = props.getProperty("props").split(",");
-            for (String key : propsToSet) {
-                System.setProperty(key, props.getProperty(key));
+            for ( String key : propsToSet ) {
+                setSystemProperty(key, props.getProperty(key));
             }
         }
 

data/lib/warbler/traits/gemspec.rb

@@ -55,15 +55,32 @@ module Warbler
 
       def default_executable
         if !@spec.executables.empty?
-          "bin/#{@spec.executables.first}"
+          bundler_version =
+            Gem.loaded_specs.include?("bundler") ?
+              Gem.loaded_specs["bundler"].version :
+              Gem::Version.create("0.0.0")
+          if (bundler_version <=> Gem::Version.create("1.8.0")) < 0
+            "bin/#{@spec.executables.first}"
+          else
+            exe_script = @spec.executables.first
+            if File.exists?("exe/#{exe_script}")
+              "exe/#{exe_script}"
+            elsif File.exists?("bin/#{exe_script}")
+              "bin/#{exe_script}"
+            else
+              raise "No `#{exe_script}` executable script found"
+            end
+          end
+        elsif exe = Dir['bin/*'].sort.first
+          warn "No default executable found in #{@spec_file}, using bin/#{exe}"
+          exe
+        elsif exe = Dir['exe/*'].sort.first
+          warn "No default executable found in #{@spec_file}, using exe/#{exe}"
+          exe
         else
-          exe = Dir['bin/*'].sort.first
           raise "No executable script found" unless exe
-          warn "No default executable found in #{@spec_file}, using #{exe}"
-          exe
         end
       end
-
     end
   end
 end

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>warbler</artifactId>
-  <version>1.4.8.dev-SNAPSHOT</version>
+  <version>1.4.8</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,
@@ -13,7 +13,7 @@ bundle up all of your application files for deployment to a Java environment.</d
   <url>https://github.com/jruby/warbler</url>
   <properties>
     <tesla.dump.readOnly>true</tesla.dump.readOnly>
-    <jruby.plugins.version>1.0.0</jruby.plugins.version>
+    <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
   </properties>

data/spec/warbler/web_server_spec.rb

@@ -29,13 +29,13 @@ describe Warbler::WebServer::Artifact do
   it "uses default (maven) local repository" do
     ENV['HOME'] = '/home/borg'
     ENV.delete('M2_HOME'); ENV.delete('MAVEN_HOME')
-    expect( sample_artifact.local_repository ).to eql "/home/borg/.m2/repository"
+    sample_artifact.local_repository.should == "/home/borg/.m2/repository"
   end
 
   it "detects a custom maven repository setting" do
     ENV['HOME'] = '/home/borg'
     ENV['M2_HOME'] = File.expand_path('../m2_home', File.dirname(__FILE__))
-    expect( sample_artifact.local_repository ).to eql '/usr/local/maven/repo'
+    sample_artifact.local_repository.should == '/usr/local/maven/repo'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -392,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
@@ -563,4 +563,3 @@ test_files:
 - spec/warbler/traits_spec.rb
 - spec/warbler/war_spec.rb
 - spec/warbler/web_server_spec.rb
-has_rdoc: