jruby_bridge 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5367f5e9bf3e3c2bedc9a87cf8a4aca9689a2b8a
-  data.tar.gz: 9180d4e1e93394da2f89b0b3425b1fe0c6ee412a
+  metadata.gz: f9beee728f6a583e04f6f653479da6e7bec39038
+  data.tar.gz: 219edc056495a588e65b91a59e0b787810856d4d
 SHA512:
-  metadata.gz: efa6be4f5888e1ab81e64c28820a732aed2a72636b760107b76dd49ea63fe7015ff5378c304d6384b519be0799d467b1f813528d88bf5f2e56619aeee6f7530b
-  data.tar.gz: 42e0731d46a569210842806b83b569921facd185109ed123aa5488e83ac5d985dfe15b2f58a6191226e057f7e3e3b39ae264f7f62725f1723b11cf9cf72fe8f9
+  metadata.gz: 3769be6dd75a0457b1d9aedbbe6fb18df18cb1561d835cd4b3c124ef0a3c6150e08305915d32ed38ba7d0f57a9a657cccdeb05714ae4c201b801b0b1edc3ef97
+  data.tar.gz: a01669962d0f067a3adb79445cda681af241ba7cb9a9bcf1d74e312f23de1d9573442cd8d83861715581b07cedcd8669eddd05d37dea9e16907ee52c54a6cb57

data/README.md

@@ -28,6 +28,17 @@ Then pat a kitten :tiger:
 ```ruby
 require 'jruby_bridge'
 
+# Make sure JRuby has the right classes loaded
+JRubyBridge::Service.remote_require 'kittens', 'puppies'
+
+# Or, if you've got a Rails stack you want loaded, you could use the
+# following code in an initializer to make sure JRuby has access to all
+# your classes.
+#
+# # config/initializers/jruby_bridge.rb
+# JRubyBridge::Service.remote_require File.dirname(__FILE__) + '/../environment'
+
+
 # Start the JRuby service process
 JRubyBridge::Service.with_service do
 

data/lib/jruby_bridge/object_proxy.rb

@@ -10,14 +10,18 @@ new instances to reside on the JRuby DRb service.
 
     def self.included(base)
       base.class_eval do
+
         include DRb::DRbUndumped
 
-        def self.new(*args)
-          service = Service.new_drb_object
-          service.proxy_new(self, *args)
+        class << self
+          alias :proxied_new :new
+          def new(*args)
+            Service.new_drb_object.remote_proxied_new self, *args
+          end
         end
-      end
-    end
+
+      end # base.class_eval
+    end # self.included
 
   end
 end

data/lib/jruby_bridge/service.rb

@@ -8,9 +8,6 @@ DRuby to communicate between them.
 =end
 module JRubyBridge
 
-  class JRubyExecError < StandardError; end
-  class DRbConnectionError < StandardError; end
-
 =begin rdoc
 A Ruby-managed JRuby application.
 =end
@@ -22,12 +19,14 @@ A Ruby-managed JRuby application.
     # Time to allow JRuby to initialize, in 100-ms increments
     TIMEOUT = 300
 
-    def proxy_new(klass, *args)
-      klass.new *args
+    # Objects created from within this instance
+    # reside in the JRuby process
+    def remote_proxied_new(klass, *args)
+      klass.proxied_new *args
     end
 
-    def stop
-      DRb.stop_service
+    def self.remote_require(*args)
+      @remote_requires = args
     end
 
     def self.with_service(&block)
@@ -39,9 +38,9 @@ A Ruby-managed JRuby application.
 
     def self.start
       return @pid if @pid
-      cls = self
+      _self = self
       @pid = Process.fork do
-        exit(cls.exec PORT)
+        exit _self.exec(PORT)
       end
       # TODO : check child exit status and raise JRubyExecError
       Process.detach(@pid)
@@ -61,19 +60,29 @@ A Ruby-managed JRuby application.
     end
 
     def self.stop
-      service_send :stop
+      new_drb_object.stop
+    end
+
+    def stop
+      DRb.stop_service
     end
 
     # Replace current process with JRuby running JRubyBridge::Service
     def self.exec(port)
-      jruby = get_jruby
-      command = "#{jruby} #{DAEMON} #{port || ''}"
-      puts "Running #{command}"
-      Kernel.exec command if jruby
-
-      # Note: a raised exception goes nowhere: instead use exit status
-      $stderr.puts "No JRUBY found!"
-      return 1
+      unless jruby = get_jruby
+        # Note: a raised exception goes nowhere: instead use exit status
+        $stderr.puts "No JRuby found!"
+        return 1
+      end
+
+      command = [
+        jruby,
+        @remote_requires.map { |path| %Q(-r"#{path}") },
+        DAEMON,
+        port
+      ].compact.join(' ')
+
+      Kernel.exec command
     end
 
     # Called by the server script in JRuby context
@@ -82,9 +91,9 @@ A Ruby-managed JRuby application.
 
       DRb.start_service "druby://localhost:#{port.to_i}", self.new
 
-      cls = self
-      trap('HUP') { DRb.stop_service; cls.drb_start(port) }
-      trap('INT') { puts 'Stopping jruby service'; DRb.stop_service }
+      _self = self
+      trap('HUP') { DRb.stop_service; _self.drb_start(port) }
+      trap('INT') { DRb.stop_service }
 
       DRb.thread.join
     end
@@ -109,17 +118,8 @@ A Ruby-managed JRuby application.
       "rvm #{jruby.strip.split(' ').first} do ruby "
     end
 
-    # this will return a new DRuby connection
-    def self.service_send(method, *args)
-      begin
-        new_drb_object.tap { |obj| obj.send(method, *args) }
-      rescue DRb::DRbConnError => e
-        # $stderr.puts e.backtrace.join("\n")
-        raise DRbConnectionError.new(e.message)
-      end
-    end
-
     def self.new_drb_object
+      # This returns a proxied instance of Service
       DRb::DRbObject.new_with_uri(default_uri)
     end
 

data/lib/jruby_bridge/version.rb

@@ -1,3 +1,3 @@
 module JrubyBridge
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_bridge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - mkfs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler