warbler 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 218126abf1ff5e8886c7d9d83efe2a59e2be9dd2
-  data.tar.gz: 2e21c4ae9e9f89c80cbdf49b756954f6c1196f28
+  metadata.gz: adcf60dd9c5beca381437bfffd9daeb02ec4f6fb
+  data.tar.gz: d83655891a2cf7374b5a2ba9a78ce42c0c97553f
 SHA512:
-  metadata.gz: af36e2a2b51ca6992acdb4878fb954d4e28b4d6881a5f22e50b86cba6cd68f748b9f37a63e3b2ae690238687910cd2ae31059671150f65e7e36880002eb22bba
-  data.tar.gz: f73c4d6797f23a5e3780c921485b6302057d7673d2e7404efa23f00ba439cbbb504227f45abb441a74e243605405f95e34bfec1a2af81a4108f952203e0d587f
+  metadata.gz: 072c00735322852bcd2dbabdd9d49c5d0c7730be4900799011d480a99e02ece106d1b77f288d68bee868d2f6aba162d6c6c5beeaf0c3dfa82165e0870dde76da
+  data.tar.gz: 8f7e1cd06ffc11a0d337aee62a3c6474e97189ec1bc14277e16fd8e196470ae3316f5d8395b8ef38f07119ae1f2ee60d75cf194c1c7a2b857c45a0460cb09791

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
 branches:
   only:
     - master
+    - 2.x-dev
 env:
   - JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
   - JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"

data/History.txt

@@ -1,6 +1,10 @@
 == Master
 
+- Added the ability to set custom port for Jetty launcher with
+  warbler.port or PORT env var
+
 == 1.4.6
+- #318: polish *scripts/rails* - require_relative should no longer be used
 - #315: Removed custom Jetty launcher in favor of jetty-runner
 - #316: Sprockets manifest name change
 - #313: Update Jetty to 9.2.10

data/README.rdoc

@@ -7,6 +7,8 @@ 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
 Ruby applications to assemble and Just Work.
 
+Version 1.4.x of Warbler supports versions of JRuby up to 1.7.x. The {2.x-dev branch}[https://github.com/jruby/warbler/tree/2.x-dev] contains work related to JRuby 9k.
+
 == Getting Started
 
 1. Install the gem: <tt>gem install warbler</tt>.

data/ext/WarMain.java

@@ -59,7 +59,7 @@ import java.util.Set;
  * </pre>
  */
 public class WarMain extends JarMain {
-    
+
     static final String MAIN = "/" + WarMain.class.getName().replace('.', '/') + ".class";
     static final String WEBSERVER_PROPERTIES = "/WEB-INF/webserver.properties";
     static final String WEBSERVER_JAR = "/WEB-INF/webserver.jar";
@@ -78,7 +78,7 @@ public class WarMain extends JarMain {
      */
     private final String executable;
     private final String[] executableArgv;
-            
+
     private File webroot;
 
     WarMain(final String[] args) {
@@ -102,12 +102,12 @@ public class WarMain extends JarMain {
                 // The rails executable doesn't play well with ScriptingContainer, so we've packaged the
                 // same script that would have been generated by `rake rails:update:bin`
                 execArg = "./META-INF/rails.rb";
-            } 
+            }
 
             executable = execArg;
         }
     }
-    
+
     private URL extractWebserver() throws Exception {
         this.webroot = File.createTempFile("warbler", "webroot");
         this.webroot.delete();
@@ -139,9 +139,13 @@ public class WarMain extends JarMain {
             if ( is != null ) props.load(is);
         } catch (Exception e) { }
 
+        String port = System.getProperty("warbler.port", System.getenv("PORT"));
+        port = port == null ? "8080" : port;
         for (Map.Entry entry : props.entrySet()) {
             String val = (String) entry.getValue();
-            val = val.replace("{{warfile}}", archive).replace("{{webroot}}", webroot.getAbsolutePath());
+            val = val.replace("{{warfile}}", archive).
+                      replace("{{port}}", port).
+                      replace("{{webroot}}", webroot.getAbsolutePath());
             entry.setValue(val);
         }
 
@@ -198,15 +202,15 @@ public class WarMain extends JarMain {
         return newArgs;
     }
 
-    // JarMain overrides to make WarMain "launchable" 
+    // JarMain overrides to make WarMain "launchable"
     // e.g. java -jar rails.war -S rake db:migrate
-    
+
     @Override
     protected String getExtractEntryPath(final JarEntry entry) {
         final String name = entry.getName();
         final String start = "WEB-INF";
         if ( name.startsWith(start) ) {
-            // WEB-INF/app/controllers/application_controller.rb -> 
+            // WEB-INF/app/controllers/application_controller.rb ->
             // app/controllers/application_controller.rb
             return name.substring(start.length());
         }
@@ -216,14 +220,14 @@ public class WarMain extends JarMain {
         }
         return "/" + name;
     }
-    
+
     @Override
     protected URL extractEntry(final JarEntry entry, final String path) throws Exception {
         // always extract but only return class-path entry URLs :
         final URL entryURL = super.extractEntry(entry, path);
         return path.endsWith(".jar") ? entryURL : null;
     }
-    
+
     @Override
     protected int launchJRuby(final URL[] jars) throws Exception {
         final Object scriptingContainer = newScriptingContainer(jars);
@@ -234,31 +238,31 @@ public class WarMain extends JarMain {
 
         final Object provider = invokeMethod(scriptingContainer, "getProvider");
         final Object rubyInstanceConfig = invokeMethod(provider, "getRubyInstanceConfig");
-        
+
         invokeMethod(rubyInstanceConfig, "setUpdateNativeENVEnabled", new Class[] { Boolean.TYPE }, false);
-        
+
         final String executablePath = locateExecutable(scriptingContainer);
         if ( executablePath == null ) {
             throw new IllegalStateException("failed to locate gem executable: '" + executable + "'");
         }
         invokeMethod(scriptingContainer, "setScriptFilename", executablePath);
-        
+
         invokeMethod(rubyInstanceConfig, "processArguments", (Object) arguments);
-        
+
         Object runtime = invokeMethod(scriptingContainer, "getRuntime");
         Object executableInput =
             new SequenceInputStream(new ByteArrayInputStream(executableScriptEnvPrefix().getBytes()),
                                     (InputStream) invokeMethod(rubyInstanceConfig, "getScriptSource"));
-        
+
         debug("invoking " + executablePath + " with: " + Arrays.toString(executableArgv));
-        
-        Object outcome = invokeMethod(runtime, "runFromMain", 
-                new Class[] { InputStream.class, String.class }, 
-                executableInput, executablePath 
+
+        Object outcome = invokeMethod(runtime, "runFromMain",
+                new Class[] { InputStream.class, String.class },
+                executableInput, executablePath
         );
         return ( outcome instanceof Number ) ? ( (Number) outcome ).intValue() : 0;
     }
-    
+
     protected String locateExecutable(final Object scriptingContainer) throws Exception {
         if ( executable == null ) {
             throw new IllegalStateException("no executable");

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

data/lib/warbler/web_server.rb

@@ -124,9 +124,11 @@ PROPS
       super
       jar.files["WEB-INF/webserver.properties"] = StringIO.new(<<-PROPS)
 mainclass = org.eclipse.jetty.runner.Runner
-args = args0
+args = args0,args1,args2
 props = jetty.home
-args0 = {{warfile}}
+args0 = --port
+args1 = {{port}}
+args2 = {{warfile}}
 jetty.home = {{webroot}}
 PROPS
     end

metadata

@@ -1,145 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Nick Sieger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-jars
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-rack
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.2'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jbundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: ruby-maven
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     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,
   Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way to
@@ -150,8 +150,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - History.txt
 - LICENSE.txt
@@ -370,29 +370,29 @@ homepage: https://github.com/jruby/warbler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- "--main"
+- --main
 - README.rdoc
-- "-H"
-- "-f"
+- -H
+- -f
 - darkfish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.5
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files: