rrails 0.2.0 → 0.3.0

data/Changes.md

@@ -1,8 +1,16 @@
-v0.2.0				2012-09-27 20:40:56 +0900
+v0.3.0				2012-10-13 14:58:02 +0900
+------------------------------------------------------------------------
+ - FIX: some command that run under 0.1 sec is not output anything .
+ - FIX: kill child process(es) when client disconnects (thanks quark-zju)
+ - MOD: change reading handling from IO.select to read_nonblocking (thanks quark-zju)
+ - FIX: rescure EOFError when reading clisocks (thanks quark-zju)
+ - FIX: port number changable.
+
+v0.2.0				2012-09-28 12:55:35 +0900
 ------------------------------------------------------------------------
- - Merge pull request #3 from kamipo/reloader thanks @kamipo
  - added reloader.
  - remove_connection is not necessary. included in establish_connection.
+ - wrote more doc.
 
 v0.1.0				2012-05-01 10:02:39 +0900
 ------------------------------------------------------------------------

data/Rakefile

@@ -42,5 +42,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rrails #{version}"
   rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('Changes.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rrails/server.rb

@@ -7,6 +7,7 @@ require 'shellwords'
 
 # FIXME: rails command require APP_PATH constants.
 APP_PATH = File.expand_path('./config/application')
+PAGE_SIZE = 4096
 
 module RemoteRails
   # server to run rails/rake command.
@@ -21,7 +22,7 @@ module RemoteRails
       @app_path = File.expand_path('./config/application')
       # should not access to outside
       @host = 'localhost'
-      @port = options[:poot] || DEFAULT_PORT[@rails_env]
+      @port = options[:port] || DEFAULT_PORT[@rails_env]
       @logger = Logger.new(options[:logfile] ? options[:logfile] : $stderr)
     end
 
@@ -45,17 +46,19 @@ module RemoteRails
       Thread.abort_on_exception = true
       loop do
         Thread.start(server.accept) do |s|
+          childpids = []
           begin
             while line = s.gets
               line.chomp!
               @logger.info("invoke: #{line}")
               start = Time.now
-              self.dispatch(s, line)
+              self.dispatch(s, line) { |pid| childpids << pid }
               finish = Time.now
               s.puts("FINISHED\t#{ finish - start }")
               @logger.info("finished: #{line}")
             end
           rescue Errno::EPIPE => e
+            Process.kill 'TERM', *childpids unless childpids.empty?
             @logger.error("client disconnect: " + e.message)
           end
         end
@@ -76,8 +79,6 @@ module RemoteRails
     end
 
     def dispatch(sock, line)
-      args = Shellwords.shellsplit(line)
-      subcmd = args.shift
       servsock_out, clisock_out = UNIXSocket.pair
       servsock_err, clisock_err = UNIXSocket.pair
       pid = fork do
@@ -86,40 +87,44 @@ module RemoteRails
         ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
         STDOUT.reopen(servsock_out)
         STDERR.reopen(servsock_err)
-        self.__send__("on_#{subcmd}", args)
+        execute *Shellwords.shellsplit(line)
       end
+      yield pid
       servsock_out.close
       servsock_err.close
+      buffers = {out: '', error: ''}
+      clisocks = {out: clisock_out, error: clisock_err}
       loop do
-        if Process.waitpid(pid, Process::WNOHANG)
-          return
-        end
-        if IO.select([clisock_out], [], [], 0.1)
-          while line = clisock_out.gets
-            line.chomp!
-            sock.puts("OUT\t#{line}")
+        [:out, :error].each do |channel|
+          begin
+            buffers[channel] << clisocks[channel].read_nonblock(PAGE_SIZE)
+            while buffers[channel][/[\n\r]/]
+              line, buffers[channel] = buffers[channel].split(/[\n\r]/, 2)
+              sock.puts("#{channel.upcase}\t#{line}")
+            end
+          rescue Errno::EAGAIN, EOFError => ex
+            sleep 0.01
           end
         end
-        if IO.select([clisock_err], [], [], 0.1)
-          while line = clisock_err.gets
-            line.chomp!
-            @logger.error(line)
-            sock.puts("ERROR\t#{line}")
-          end
+        if Process.waitpid(pid, Process::WNOHANG)
+          return
         end
       end
     end
 
-    def on_rails(args)
+    def execute(cmd, *args)
       ARGV.clear
       ARGV.concat(args)
-      require 'rails/commands'
+      case cmd
+      when 'rails'
+        require 'rails/commands'
+      when 'rake'
+        ::Rake.application.run
+      else
+        @logger.warn "#{cmd} not supported"
+        raise RuntimeError.new("#{cmd} is not supported in rrails.")
+      end
     end
 
-    def on_rake(args)
-      ARGV.clear
-      ARGV.concat(args)
-      ::Rake.application.run
-    end
   end
 end

data/rrails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rrails"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keiji, Yoshimi"]
-  s.date = "2012-09-28"
+  s.date = "2012-10-13"
   s.description = "remote run rails/rake command"
   s.email = "walf443@gmail.com"
   s.executables = ["rrails", "rrails-server"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1092235871622214733
+      hash: 4058162433151782274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: