theine 0.0.10.rc1 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 44a70acdfb48ffa54a63ec3720c61082f30342d2
+  data.tar.gz: 3a3c2dd8947da2b1f637f4950c08ca5511dea769
+SHA512:
+  metadata.gz: d57a7544fd0f61d71a851aba79decded6ef277652a1e3f779c914d32dcf1ea7f12f0f805650714b5f11b597dab272dacb59afea8e671a15028b86ce81ecb15d4
+  data.tar.gz: fe22098198bb33413f763bd98de9117c2754c6ad3b00ccc4ae7fca432e73e9d1d1159b9e49e4115af076d4aa32d4dbfc0d3a5a7416518ab7dcfd0e30890ac185

data/lib/theine/client.rb

@@ -2,79 +2,6 @@ require 'drb/drb'
 require 'readline'
 require_relative './config'
 
-class IOUndumpedProxy
-  include DRb::DRbUndumped
-
-  def initialize(obj)
-    @obj = obj
-    create_method_proxies
-  end
-
-  def completion_proc=(val)
-    if @obj.respond_to? :completion_proc=
-      @obj.completion_proc = val
-    end
-  end
-
-  def completion_proc
-    @obj.completion_proc if @obj.respond_to? :completion_proc
-  end
-
-  def readline(prompt)
-    if ::Readline == @obj
-      @obj.readline(prompt, true)
-    elsif @obj.method(:readline).arity == 1
-      @obj.readline(prompt)
-    else
-      $stdout.print prompt
-      @obj.readline
-    end
-  end
-
-  def readline_arity
-    method(:readline).arity
-  rescue NameError
-    0
-  end
-
-  def <<(data)
-    @obj << data
-    self
-  end
-
-  # Some versions of Pry expect $stdout or its output objects to respond to
-  # this message.
-  def tty?
-    false
-  end
-
-private
-  # http://www.ruby-doc.org/core-1.9.3/IO.html
-  # Creating method proxies. We take this approach so that method.arity will
-  # give the correct result (if we just used *args it would always return -1).
-  # Can't use SimpleDelegator, won't work over DRb
-  def create_method_proxies
-    (@obj.public_methods - public_methods).each do |meth|
-      next unless @obj.respond_to?(meth)
-      arity = @obj.method(meth).arity
-      if arity >= 0
-        args = arity.times.map { |i| "a#{i+1}" }
-      else
-        args = (arity.abs - 1).times.map { |i| "a#{i+1}" }
-        args << "*args"
-        args = args
-      end
-      args = (args + ["&block"]).join(", ")
-
-      singleton_class.class_eval <<-EOS
-        def #{meth}(#{args})
-          @obj.send(:#{meth}, #{args})
-        end
-      EOS
-    end
-  end
-end
-
 module Theine
   class Client
     def self.start
@@ -85,29 +12,20 @@ module Theine
 
     def initialize
       @config = ConfigReader.new(Dir.pwd)
-      reset_argv!
-      trap_signals
+      @argv = ARGV.dup
       begin
         connect_worker
-        redirect_io
         run_command
-      ensure
-        stop
+        attach_screen
+        exit_prompt
       end
     end
 
-    def stop(sleep_for = 0.1)
-      begin
-        if @worker
-          %x[kill -2 #{@worker.pid}] # TODO: if client was term-ed, term worker (maybe term)
-          sleep(sleep_for) if sleep_for > 0 # to finish receiving IO
-        end
-      rescue DRb::DRbConnError
-      end
-      exit(0)
+  private
+    def attach_screen
+      exec("screen -r theine#{@port}")
     end
 
-  private
     def run_command
       case @argv[0]
       when "rake"
@@ -117,51 +35,22 @@ module Theine
         @argv.shift
         @worker.command_rspec(@argv)
       else
-        if ["c", "console"].include?(@argv[0])
-          load_pry_history
-        end
         @worker.command_rails(@argv)
       end
     rescue DRb::DRbConnError
       $stderr.puts "\nTheine closed the connection."
     end
 
-    def load_pry_history
-      history_file = File.expand_path("~/.pry_history")
-      if File.exist?(history_file)
-        File.readlines(history_file).pop(100).each do |line|
-          Readline::HISTORY << line[0, line.size-1]
-        end
-      end
-    end
-
-    def reset_argv!
-      @argv = ARGV.dup
-      ARGV.clear
-    end
-
-    def trap_signals
-      trap('INT') { exit(0) } # TODO: is this needed?
-      trap('TERM') { exit(0) }
-    end
-
-    def redirect_io
-      # Need to be careful that these don't get garbage collected
-      $stdin_undumped = @worker.stdin = IOUndumpedProxy.new(Readline)
-      $stdout_undumped = @worker.stdout = IOUndumpedProxy.new($stdout)
-      $stderr_undumped = @worker.stderr = IOUndumpedProxy.new($stderr)
-    end
-
     def connect_worker
       balancer = wait_until_result("Cannot connect to theine server. Waiting") do
         object = DRbObject.new_with_uri("druby://localhost:#{config.base_port}")
         object.respond_to?(:get_port) # test if connected
         object
       end
-      port = wait_until_result("Waiting for Theine worker...") do
+      @port = wait_until_result("Waiting for Theine worker...") do
         balancer.get_port
       end
-      @worker = DRbObject.new_with_uri("druby://localhost:#{port}")
+      @worker = DRbObject.new_with_uri("druby://localhost:#{@port}")
     end
 
     WaitResultNoResultError = Class.new(StandardError)

data/lib/theine/server.rb

@@ -12,7 +12,9 @@ module Theine
       @config = ConfigReader.new(Dir.pwd)
 
       @workers = []
-      @spawning = []
+      @workers_in_use = []
+      @worker_pids = {}
+      @spawning_workers = []
 
       @available_ports = ((config.base_port + 1)..config.max_port).to_a
       @check_mutex = Mutex.new
@@ -23,33 +25,48 @@ module Theine
 
     def add_worker
       path = File.expand_path('../worker.rb', __FILE__)
-      port = @available_ports.shift
+      port = @workers_mutex.synchronize { @available_ports.shift }
       puts "(spawn #{port})"
-      spawn("ruby", path, config.base_port.to_s, port.to_s, config.rails_root)
-      @workers_mutex.synchronize { @spawning << 1 }
+      spawn("screen", "-d", "-m", "-S", worker_session_name(port),
+        "sh", "-c",
+        "ruby #{path} #{config.base_port.to_s} #{port.to_s} #{config.rails_root}; read -p 'Press [Enter] to exit...\n'")
+      @workers_mutex.synchronize { @spawning_workers << port }
+    end
+
+    def worker_session_name(port)
+      "theine#{port}"
+    end
+
+    def set_worker_pid(port, pid)
+      @workers_mutex.synchronize do
+        @worker_pids[port] = pid
+      end
     end
 
     def worker_boot(port)
       puts "+ worker #{port}"
 
       @workers_mutex.synchronize do
-        @spawning.pop
+        @spawning_workers.delete(port)
         @workers << port
       end
     end
 
     def worker_done(port)
       puts "- worker #{port}"
+      @workers_mutex.synchronize do
+        @workers_in_use.delete(port)
+        @available_ports << port
+      end
     end
 
-    def get_port
-      add_worker if all_size == 0
+    def get_port(spawn_new = true)
+      add_worker if spawn_new && all_size == 0
 
-      port = @workers_mutex.synchronize do
-        @workers.shift
-      end
+      port = @workers_mutex.synchronize { @workers.shift }
+      @workers_mutex.synchronize { @workers_in_use << port } if port
 
-      Thread.new { check_min_free_workers }
+      Thread.new { check_min_free_workers } if spawn_new
 
       port
     end
@@ -60,7 +77,7 @@ module Theine
         # do this in thread
         while all_size < config.min_free_workers
           unless config.spawn_parallel
-            sleep 0.1 until @workers_mutex.synchronize { @spawning.empty? }
+            sleep 0.1 until @workers_mutex.synchronize { @spawning_workers.empty? }
           end
           add_worker
         end
@@ -69,10 +86,43 @@ module Theine
     end
 
     def all_size
-      @workers_mutex.synchronize { @workers.size + @spawning.size }
+      @workers_mutex.synchronize { @workers.size + @spawning_workers.size }
+    end
+
+    def stop!
+      if spawning_worker_pids.include?(nil)
+        puts "Waiting for workers to quit..."
+        sleep 0.1 while spawning_worker_pids.include?(nil)
+      end
+
+      @workers_mutex.synchronize do
+        (@spawning_workers + @workers_in_use + @workers).each do |port|
+          kill_worker(port)
+        end
+      end
+      exit(0)
     end
   private
+    def kill_worker(port)
+      print "- worker #{port}"
+      worker_pid = @worker_pids[port]
+      worker_pid ||= DRbObject.new_with_uri("druby://localhost:#{port}").pid
+      system("kill -9 #{worker_pid} > /dev/null 2>&1")
+      session_name = worker_session_name(port)
+      system("screen -S #{session_name} -X quit > /dev/null 2>&1")
+      puts "."
+    rescue
+    end
+
+    def spawning_worker_pids
+      @spawning_workers.map { |port| @worker_pids[port] }
+    end
+
     def run
+      trap("INT") { stop! }
+      trap("TERM") { stop! }
+      system("screen -wipe > /dev/null 2>&1")
+
       DRb.start_service("druby://localhost:#{config.base_port}", self)
       check_min_free_workers
       DRb.thread.join
@@ -80,5 +130,4 @@ module Theine
   end
 end
 
-server = Theine::Server.new
-
+Theine::Server.new

data/lib/theine/worker.rb

@@ -1,139 +1,82 @@
-root_path = ARGV[2]
-APP_PATH = "#{root_path}/config/application"
-require "#{root_path}/config/boot"
-require "#{root_path}/config/environment"
+RAILS_ROOT_PATH = ARGV[2]
+APP_PATH = "#{RAILS_ROOT_PATH}/config/application"
 require 'drb/drb'
-require 'delegate'
-
-$real_stdout = $stdout
-$real_stderr = $stderr
 
 module Theine
-  class InputProxy < SimpleDelegator
-    # Reads a line from the input
-    def readline(prompt)
-      case readline_arity
-      when 1 then __getobj__.readline(prompt)
-      else        __getobj__.readline
-      end
-    end
-  end
-
   class Worker
-    attr_reader :stdin, :stdout, :stderr
+    attr_reader :command_proc
 
     def initialize
       @pumps = []
+      @command_proc = proc { }
     end
 
-    def command_rails(argv)
-      rails_reload!
+    def boot
+      require "#{RAILS_ROOT_PATH}/config/boot"
+      require "#{RAILS_ROOT_PATH}/config/environment"
+    end
 
+    def command_rails(argv)
       ARGV.clear
       ARGV.concat(argv)
 
-      require 'pry'
-      ::Rails.application.config.console = ::Pry
-      pry_setup
-
-      require 'rails/commands'
-      sleep 0.1 # allow Pumps to finish
-      DRb.stop_service
+      set_command do
+        require 'rails/commands'
+      end
     end
 
     def command_rake(argv)
-      pry_setup
-      ::Rails.application.load_tasks
-      argv.each do |task|
-        ::Rake::Task[task].invoke
+      set_command do
+        ::Rails.application.load_tasks
+        argv.each do |task|
+          ::Rake::Task[task].invoke
+        end
       end
     end
 
     def command_rspec(argv)
-      pry_setup
-      require 'rspec/core'
-      ::RSpec::Core::Runner.run(argv, $stderr, $stdout)
-    end
-
-    def pry_setup
-      ::Pry.config.input = stdin
-      ::Pry.config.output = stdout
-    end
-
-    def stdin=(value)
-      @stdin = InputProxy.new(value)
-      $stdin = @stdin
-    end
-
-    def stdout=(value)
-      patch_out_io($stdout, value)
-      @stdout = value
-      r, w = IO.pipe
-      $stdout = w
-      @pumps << Pump.new(r, @stdout)
-    end
-
-    def stderr=(value)
-      patch_out_io($stderr, value)
-      @stderr = value
-      r, w = IO.pipe
-      $stderr = w
-      @pumps << Pump.new(r, @stderr)
+      set_command do
+        require 'rspec/core'
+        ::RSpec::Core::Runner.run(argv, $stderr, $stdout)
+      end
     end
 
     def pid
       ::Process.pid
     end
 
+    def stop!
+      exit(1)
+    end
   private
-    def patch_out_io(io, write_to)
-      # This is done because Rails 'remembers' $stdout in some places when it's
-      # loaded, for example for logging SQL in the Rails console.
-      # We have to pre-load Rails and at that point we do not know what to change
-      # $stdout to, so this is why we patch it here.
-      io.singleton_class.send :define_method, :write do |*args, &block|
-        write_to.write(*args, &block)
-      end
+    def set_command(&block)
+      rails_reload!
+      @command_proc = block
+      DRb.stop_service
     end
 
     def rails_reload!
       ActionDispatch::Reloader.cleanup!
       ActionDispatch::Reloader.prepare!
     end
-
-    class Pump < Thread
-      def initialize(input, output)
-        if output
-          @input = input
-          @output = output
-          super(&method(:main))
-        else
-          close_stream(input)
-        end
-      end
-
-    private
-      def main
-        while buf = @input.sysread(1024)
-          @output.print(buf)
-          @output.flush
-        end
-      ensure
-        @output.close
-      end
-    end
   end
 end
 
 base_port = ARGV[0]
-worker_port = ARGV[1]
-DRb.start_service("druby://localhost:#{worker_port}", Theine::Worker.new)
+worker_port = ARGV[1].to_i
+
+worker = Theine::Worker.new
 
 balancer = DRbObject.new_with_uri("druby://localhost:#{base_port}")
+balancer.set_worker_pid(worker_port, worker.pid)
+
+worker.boot
+DRb.start_service("druby://localhost:#{worker_port}", worker)
 balancer.worker_boot(worker_port)
 
 begin
   DRb.thread.join
+  worker.command_proc.call
 ensure
   balancer.worker_done(worker_port)
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: theine
 version: !ruby/object:Gem::Version
-  prerelease: 7
-  version: 0.0.10.rc1
+  version: 0.0.10
 platform: ruby
 authors:
 - Jan Berdajs
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 description: A Rails preloader for JRuby
 email: mrbrdo@mrbrdo.net
 executables:
@@ -49,7 +46,8 @@ files:
 homepage: https://github.com/mrbrdo/theine
 licenses:
 - MIT
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -58,17 +56,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.0.6
+signing_key: 
+specification_version: 4
 summary: Theine
 test_files: []