jubilee 2.0.0.alpha1-java → 2.0.0.beta-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77c3b1eb92007a671a033614f6e9d6d180a7a39
-  data.tar.gz: 35b271e8177901264b12c8de526237dcb5921e11
+  metadata.gz: eb61786745898bab811507f1d76d6bbdc77e5485
+  data.tar.gz: 03df7c9f9b145f2287a1b453aef1e1159a85a899
 SHA512:
-  metadata.gz: d2d2f76613e7482d3244ffa51adc727459fd171ae3a710421733de3e6f2e5bb41a7f1da20b4113242a64453cf12b66b22ac2ab89269d92493b18a04ebc8565b9
-  data.tar.gz: 5822d5d9c68560a83b73194f2d9e23e6819c423eabd780cd770c52ffa1c5a0abda8c59abef3a7bec1972c809c7350e9607bfefcc4c4879518bdc932e4be84fd4
+  metadata.gz: 707de86b4d5b2bda6e5a10726209642f7d703533b59e7b6069683efa4202b960213118a384771150f27d2fa4848547641abb273788f5d64397dee5ca247ac362
+  data.tar.gz: a2fa31e40c0dae6c7e4e023c3293c157fd54984530277bdc1c586abee40ed6f078ddf228067bf0de2a554d78686954a35c5bb489913018844e07180d0a509b56

data/examples/chatapp/Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 gem 'sinatra'
 gem 'haml'
 
-gem 'jubilee'
+gem 'jubilee', '2.0.0.alpha1'

data/examples/chatapp/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     ffi (1.9.3-java)
     haml (4.0.4)
       tilt
-    jubilee (1.1.3-java)
+    jubilee (2.0.0.alpha1-java)
       rack (>= 1.4.1)
       spoon (~> 0.0.4)
     rack (1.5.2)
@@ -23,5 +23,5 @@ PLATFORMS
 
 DEPENDENCIES
   haml
-  jubilee
+  jubilee (= 2.0.0.alpha1)
   sinatra

data/java/src/org/jruby/jubilee/Const.java

@@ -8,7 +8,7 @@ package org.jruby.jubilee;
  */
 public final class Const {
 
-    public static final String JUBILEE_VERSION = "Jubilee(1.1.0)";
+    public static final String JUBILEE_VERSION = "Jubilee(2.0.0)";
     public static final String HTTP_11 = "HTTP/1.1";
     public static final String HTTP_10 = "HTTP/1.0";
 

data/java/src/org/jruby/jubilee/JubileeVerticle.java

@@ -50,7 +50,9 @@ public class JubileeVerticle extends Verticle {
       if (config.containsField("event_bus")) {
         JsonArray allowAll = new JsonArray();
         allowAll.add(new JsonObject());
-        vertx.createSockJSServer(httpServer).bridge(config.getObject("event_bus"), allowAll, allowAll);
+        JsonObject ebconf = new JsonObject();
+        ebconf.putString("prefix", config.getString("event_bus"));
+        vertx.createSockJSServer(httpServer).bridge(ebconf, allowAll, allowAll);
       }
       if (ssl) httpServer.setSSL(true).setKeyStorePath(config.getString("keystore_path"))
               .setKeyStorePassword(config.getString("keystore_password"));

data/java/src/org/jruby/jubilee/RubyPlatformManager.java

@@ -2,6 +2,7 @@ package org.jruby.jubilee;
 
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.jubilee.vertx.JubileeVertx;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -11,6 +12,11 @@ import org.vertx.java.core.json.JsonObject;
 import org.vertx.java.platform.PlatformLocator;
 import org.vertx.java.platform.PlatformManager;
 
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,7 +45,23 @@ public class RubyPlatformManager extends RubyObject {
   @JRubyMethod
   public IRubyObject initialize(ThreadContext context, IRubyObject config) {
     RubyHash options = config.convertToHash();
-    pm = PlatformLocator.factory.createPlatformManager();
+    Ruby runtime = context.runtime;
+    RubySymbol clustered_k = runtime.newSymbol("clustered");
+    RubySymbol cluster_host_k = runtime.newSymbol("cluster_host");
+    RubySymbol cluster_port_k = runtime.newSymbol("cluster_port");
+    if (options.containsKey(clustered_k) && options.op_aref(context, clustered_k).isTrue()) {
+      int clusterPort = 0;
+      String clusterHost = null;
+      if (options.containsKey(cluster_port_k))
+        clusterPort = RubyNumeric.num2int(options.op_aref(context, cluster_port_k));
+      if (options.containsKey(cluster_host_k))
+        clusterHost = options.op_aref(context, cluster_host_k).asJavaString();
+      if (clusterHost == null) clusterHost = getDefaultAddress();
+      pm = PlatformLocator.factory.createPlatformManager(clusterPort, clusterHost);
+    } else {
+      pm = PlatformLocator.factory.createPlatformManager();
+    }
+    JubileeVertx.init(pm.vertx());
     int ins = RubyNumeric.num2int(options.op_aref(context, RubySymbol.newSymbol(context.runtime, "instances")));
     pm.deployVerticle("org.jruby.jubilee.JubileeVerticle", new JsonObject(parseOptions(options)),
             context.runtime.getJRubyClassLoader().getURLs(), ins, null, new AsyncResultHandler<String>() {
@@ -99,4 +121,30 @@ public class RubyPlatformManager extends RubyObject {
     map.put("ruby", runtime);
     return map;
   }
+  /*
+  Get default interface to use since the user hasn't specified one
+   */
+  private String getDefaultAddress() {
+    Enumeration<NetworkInterface> nets;
+    try {
+      nets = NetworkInterface.getNetworkInterfaces();
+    } catch (SocketException e) {
+      return null;
+    }
+    NetworkInterface netinf;
+    while (nets.hasMoreElements()) {
+      netinf = nets.nextElement();
+
+      Enumeration<InetAddress> addresses = netinf.getInetAddresses();
+
+      while (addresses.hasMoreElements()) {
+        InetAddress address = addresses.nextElement();
+        if (!address.isAnyLocalAddress() && !address.isMulticastAddress()
+                && !(address instanceof Inet6Address)) {
+          return address.getHostAddress();
+        }
+      }
+    }
+    return null;
+  }
 }

data/java/src/org/jruby/jubilee/vertx/JubileeVertx.java

@@ -1,7 +1,6 @@
 package org.jruby.jubilee.vertx;
 
 import org.vertx.java.core.Vertx;
-import org.vertx.java.core.VertxFactory;
 
 /**
  * Created with IntelliJ IDEA.
@@ -13,24 +12,14 @@ public class JubileeVertx {
   public static Vertx vertx;
   private JubileeVertx() {
   }
-  public static synchronized Vertx init(int port, String host) {
-    if (JubileeVertx.vertx != null) return vertx;
-    JubileeVertx.vertx = VertxFactory.newVertx(port, host);
-    return JubileeVertx.vertx;
-  }
-  public static synchronized Vertx init(String host) {
-    if (JubileeVertx.vertx != null) return vertx;
-    JubileeVertx.vertx = VertxFactory.newVertx(host);
-    return JubileeVertx.vertx;
-  }
-  public static synchronized Vertx init() {
-    if (JubileeVertx.vertx != null) return vertx;
-    JubileeVertx.vertx = VertxFactory.newVertx();
-    return JubileeVertx.vertx;
+
+  public static void init(Vertx vertx) {
+    JubileeVertx.vertx = vertx;
   }
 
   public synchronized static Vertx vertx() {
-    if (JubileeVertx.vertx == null) init();
+    if (JubileeVertx.vertx == null)
+      throw new RuntimeException("vertx is not initialized, do you run in jubilee server?");
     return JubileeVertx.vertx;
   }
 }

data/lib/jubilee/cli.rb

@@ -107,7 +107,7 @@ module Jubilee
         o.separator ""
         o.separator "Clustering options:"
         o.on "--cluster", "Enable clustering" do
-          @options[:cluster_host] = "0.0.0.0"
+          @options[:clustered] = true
         end
         o.on "--cluster-port PORT", "If the cluster option has also been specified then this determines which port will be used for cluster communication with other Vert.x instances. Default is 0 -which means 'chose a free ephemeral port. You don't usually need to specify this parameter unless you really need to bind to a specific port." do |port|
           @options[:cluster_port] = port.to_i

data/lib/jubilee/configuration.rb

@@ -16,17 +16,6 @@ module Jubilee
       @block = block
 
       reload
-      # initialize vertx as early as possible
-      # XXX vertx is managed by PlatformManager now
-      if chost = @options[:cluster_host]
-        if cport = @options[:cluster_port]
-          org.jruby.jubilee.vertx.JubileeVertx.init(cport.to_java(:int), chost.to_java)
-        else
-          org.jruby.jubilee.vertx.JubileeVertx.init(chost.to_java)
-        end
-      else
-        org.jruby.jubilee.vertx.JubileeVertx.init()
-      end
     end
 
     def reload

data/lib/jubilee/version.rb

@@ -3,7 +3,7 @@ module Jubilee
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    BUILD = "alpha1"
+    BUILD = "beta"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jubilee
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha1
+  version: 2.0.0.beta
 platform: java
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack