ringleader 1.1.7 → 1.1.8

data/lib/ringleader.rb

@@ -16,6 +16,7 @@ require 'sys/proctable'
 module Ringleader
 end
 
+require 'ringleader/celluloid_fix'
 require "ringleader/config"
 require "ringleader/name_logger"
 require "ringleader/wait_for_exit"

data/lib/ringleader/celluloid_fix.rb

@@ -0,0 +1,139 @@
+# FIXME: see zerowidth/ringleader#36 and celluloid/celluloid-io#23. If the
+# celluloid issue is ever merged, this monkeypatch / wholesale rewrite needs to
+# go away.
+
+require 'nio'
+
+module Celluloid
+  module IO
+    # React to external I/O events. This is kinda sorta supposed to resemble the
+    # Reactor design pattern.
+    class Reactor
+      extend Forwardable
+
+      # Unblock the reactor (i.e. to signal it from another thread)
+      def_delegator :@selector, :wakeup
+      # Terminate the reactor
+      def_delegator :@selector, :close, :shutdown
+
+      def initialize
+        @selector = NIO::Selector.new
+        @monitors = {}
+      end
+
+      # Wait for the given IO object to become readable
+      def wait_readable(io)
+        wait io do |monitor|
+          monitor.wait_readable
+        end
+      end
+
+      # Wait for the given IO object to become writable
+      def wait_writable(io)
+        wait io do |monitor|
+          monitor.wait_writable
+        end
+      end
+
+      # Wait for the given IO operation to complete
+      def wait(io)
+        # zomg ugly type conversion :(
+        unless io.is_a?(::IO) or io.is_a?(OpenSSL::SSL::SSLSocket)
+          if io.respond_to? :to_io
+            io = io.to_io
+          elsif ::IO.respond_to? :try_convert
+            io = ::IO.try_convert(io)
+          end
+
+          raise TypeError, "can't convert #{io.class} into IO" unless io.is_a?(::IO)
+        end
+
+        unless monitor = @monitors[io]
+          monitor = Monitor.new(@selector, io)
+          @monitors[io] = monitor
+        end
+
+        yield monitor
+      end
+
+      # Run the reactor, waiting for events or wakeup signal
+      def run_once(timeout = nil)
+        @selector.select(timeout) do |monitor|
+          monitor.value.resume
+        end
+      end
+
+      class Monitor
+        def initialize(selector, io)
+          @selector = selector
+          @io = io
+          @interests = {}
+        end
+
+        def wait_readable
+          wait :r
+        end
+
+        def wait_writable
+          wait :w
+        end
+
+        def wait(interest)
+          raise "Already waiting for #{interest.inspect}" if @interests.include?(interest)
+          @interests[interest] = Task.current
+          reregister
+          Task.suspend :iowait
+        end
+
+        def reregister
+          if @monitor
+            @monitor.close
+            @monitor = nil
+          end
+
+          if interests_symbol
+            @monitor = @selector.register(@io, interests_symbol)
+            @monitor.value = self
+          end
+        end
+
+        def interests_symbol
+          case @interests.keys
+          when [:r]
+            :r
+          when [:w]
+            :w
+          when [:r, :w]
+            :rw
+          end
+        end
+
+        def resume
+          raise "No monitor" unless @monitor
+
+          if @monitor.readable?
+            resume_for :r
+          end
+
+          if @monitor.writable?
+            resume_for :w
+          end
+
+          reregister
+        end
+
+        def resume_for(interest)
+          task = @interests.delete(interest)
+
+          if task
+            if task.running?
+              task.resume
+            else
+              raise "reactor attempted to resume a dead task"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/ringleader.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Ringleader::VERSION
   gem.required_ruby_version = "> 1.9.3"
 
-  gem.add_dependency "celluloid", "~> 0.14.0"
-  gem.add_dependency "celluloid-io", "~> 0.14.0"
+  gem.add_dependency "celluloid", "~> 0.15.0"
+  gem.add_dependency "celluloid-io", "~> 0.15.0"
   gem.add_dependency "reel", "~> 0.3.0"
   gem.add_dependency "trollop", "~> 1.16.2"
   gem.add_dependency "rainbow", "~> 1.1.4"

data/spec/fixtures/chruby.yml

@@ -1,6 +1,6 @@
 ---
 chruby_app:
-  dir: "~/apps/main"
+  dir: "/Users/demo/apps/main"
   chruby: "foreman start"
   server_port: 3000
   app_port: 4000

data/spec/ringleader/config_spec.rb

@@ -86,7 +86,7 @@ describe Ringleader::Config do
   context "with a config with an 'chruby' key instead of a 'command'" do
     it "replaces the command with a command to use chruby" do
       config = Ringleader::Config.new "spec/fixtures/chruby.yml"
-      expect(config.apps["chruby_app"].command).to eq("source /usr/local/share/chruby/chruby.sh ; source /usr/local/share/chruby/auto.sh ; cd /Users/tapajos/apps/main ; foreman start")
+      expect(config.apps["chruby_app"].command).to eq("source /usr/local/share/chruby/chruby.sh ; source /usr/local/share/chruby/auto.sh ; cd /Users/demo/apps/main ; foreman start")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ files:
 - lib/ringleader.rb
 - lib/ringleader/app.rb
 - lib/ringleader/app_serializer.rb
+- lib/ringleader/celluloid_fix.rb
 - lib/ringleader/cli.rb
 - lib/ringleader/config.rb
 - lib/ringleader/controller.rb
@@ -278,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 540788086839220184
+      hash: 2596261918463299872
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23