hokaido 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b934e4a7e01d32d6366179ef660e484fe5ddeb
-  data.tar.gz: a7b298c2e37776c1ee1a58a50ff705d33851b6fe
+  metadata.gz: ba9d4544676c2a17748b534f434b318b223331c6
+  data.tar.gz: a1602cea4d9d03375373f6eacab8f82bb96d0cb3
 SHA512:
-  metadata.gz: 5e2cd0b75c3665e2a3e430a4c6f8a80a90285dddf79a93e5e7a91caf6460f8cc41e2826a286915569f5f839b8ca8e4ccac7eb6761969fafc3037335a0ec69d2f
-  data.tar.gz: 64a50a2095150a07fcc29e025fe06a8d2d19931e673ce323e13a55e081d832916cce5a7facdde73bdeae2ba503aa418e13ac6647842af8e67b608616a9018d27
+  metadata.gz: 713597c50d91a3ec475322f6fadfc27a166f0f1cc1841ad6e00c52492585789bdc57ed33f1d48bfc20a6b0b72e3bc277da054ff51633e24c558de483bc6c051f
+  data.tar.gz: 9baffd608a5d42bc64b2a546f22f986d437bcf9903324f01427811c555b688da329e03ba411bef6aa7e6002f9171ad113359ef10429b5db8ddaad0382bb0b73e

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/bin/hokaido

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'hokaido/cli'
+require 'hokaido'
 
 Hokaido::CLI.start

data/hokaido.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'hokaido/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "hokaido"
+  spec.name          = 'hokaido'
   spec.version       = Hokaido::VERSION
   spec.authors       = %w(ursm hibariya)
   spec.email         = %w(ursm@ursm.jp celluloid.key@gmail.com)
@@ -17,8 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'celluloid'
   spec.add_runtime_dependency 'ruby-terminfo'
+  spec.add_runtime_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/hokaido.rb

@@ -1,4 +1,8 @@
 require 'hokaido/version'
 
 module Hokaido
+  autoload :Broadcast, 'hokaido/broadcast'
+  autoload :CLI,       'hokaido/cli'
+  autoload :Server,    'hokaido/server'
+  autoload :Watcher,   'hokaido/watcher'
 end

data/lib/hokaido/broadcast.rb

@@ -0,0 +1,80 @@
+require 'celluloid'
+require 'io/console'
+require 'pty'
+require 'socket'
+require 'terminfo'
+
+module Hokaido
+  class Broadcast
+    class Connection
+      include Celluloid
+
+      def initialize(host, port)
+        @socket = TCPSocket.new(host, port)
+
+        @socket.puts 'broadcast'
+      end
+
+      def send(data)
+        @socket.write data
+      end
+    end
+
+    class OutputHandler
+      include Celluloid
+
+      def initialize(ptyout, connection)
+        @ptyout, @connection = ptyout, connection
+
+        async.run
+      end
+
+      def run
+        while chunk = @ptyout.readpartial(4096)
+          $stdout.write chunk
+          @connection.async.send chunk
+        end
+
+        terminate
+      end
+    end
+
+    class InputHandler
+      include Celluloid
+
+      def initialize(ptyin)
+        @ptyin = ptyin
+
+        async.run
+      end
+
+      def run
+        while char = $stdin.getch
+          @ptyin.putc char
+        end
+
+        terminate
+      end
+    end
+
+    class Command
+      include Celluloid
+
+      def initialize(command, host, port)
+        ptyout, ptyin, pid = PTY.getpty(command)
+        connection         = Connection.new_link(host, port)
+
+        OutputHandler.new_link ptyout, connection
+        InputHandler.new_link ptyin
+
+        async.wait_for_exit pid
+      end
+
+      def wait_for_exit(pid)
+        Process.waitpid pid
+
+        terminate
+      end
+    end
+  end
+end

data/lib/hokaido/cli.rb

@@ -1,9 +1,7 @@
-require 'io/console'
-require 'pty'
+require 'celluloid/autostart'
 require 'socket'
 require 'terminfo'
 require 'thor'
-require 'thread'
 
 module Hokaido
   class CLI < Thor
@@ -12,79 +10,22 @@ module Hokaido
 
     desc :broadcast, 'Broadcast a session'
     def broadcast(command = ENV['SHELL'])
-      pty_out, pty_in, pid = *PTY.getpty(command)
-      nonbloq              = Queue.new
-
-      trap :SIGWINCH do
-        TermInfo.tiocswinsz pty_in, *TermInfo.screen_size
-      end
-
-      Thread.abort_on_exception = true
-
-      Thread.start do
-        server = TCPSocket.open(*options.values_at(:host, :port))
-        server.puts 'write'
-
-        while chunk = nonbloq.deq
-          server.write chunk
-        end
-      end
-
-      Thread.start do
-        while chunk = pty_out.readpartial(4096)
-          $stdout.write chunk
-          nonbloq.enq chunk
-        end
-      end
-
-      Thread.start do
-        TermInfo.tiocswinsz pty_in, *TermInfo.screen_size
-
-        while char = $stdin.getch
-          pty_in.putc char
-        end
-      end
-
-      Process.waitpid pid
+      Hokaido::Broadcast::Command.run command, *options.values_at(:host, :port)
     end
 
     desc :server, 'Start server'
     def server
-      queue  = Queue.new
-      server = TCPServer.open(*options.values_at(:host, :port))
-
-      loop do
-        Thread.start server.accept do |client|
-          case client.gets.chomp
-          when 'write'
-            client.puts ':)'
-
-            while chunk = client.readpartial(4096)
-              queue.enq chunk
-            end
-          when 'read'
-            client.puts '=)'
-
-            while chunk = queue.deq
-              client.write chunk
-            end
-          else
-            client.puts ':('
-          end
-
-          client.close
-        end
-      end
+      server = Server.run(*options.values_at(:host, :port))
     rescue Interrupt
-      server.close
-
       exit
+    ensure
+      server.terminate if server
     end
 
     desc :watch, 'Watch a session'
     def watch
       server = TCPSocket.open(*options.values_at(:host, :port))
-      server.puts 'read'
+      server.puts 'watch'
 
       while chunk = server.readpartial(4096)
         $stdout.write chunk

data/lib/hokaido/server.rb

@@ -0,0 +1,69 @@
+require 'celluloid'
+require 'celluloid/notifications'
+require 'socket'
+
+module Hokaido
+  class ConnectionHandler
+    include Celluloid
+    include Celluloid::Notifications
+
+    def initialize(connection)
+      @connection = connection
+
+      async.run
+    end
+
+    def run
+      _, port, host = @connection.peeraddr
+
+      puts "#{host}:#{port} connected"
+
+      case @connection.gets.chomp
+      when 'broadcast'
+        @connection.puts ':)'
+
+        loop do
+          publish 'broadcast', @connection.readpartial(4096)
+        end
+      when 'watch'
+        @connection.puts '=)'
+
+        watcher = Watcher.new_link(@connection)
+
+        loop do
+          @connection.readpartial(4096) # XXX wait for connection closed
+        end
+      else
+        @connection.puts ':('
+      end
+    rescue Errno::ECONNRESET
+      # do nothing, connetion reset by peer
+    ensure
+      puts "#{host}:#{port} disconnected"
+
+      @connection.close
+    end
+  end
+
+  class Server
+    include Celluloid
+
+    finalizer :shutdown
+
+    def initialize(host, port)
+      @server = TCPServer.new(host, port)
+
+      async.run
+    end
+
+    def shutdown
+      @server.close if @server
+    end
+
+    def run
+      loop do
+        ConnectionHandler.new_link @server.accept
+      end
+    end
+  end
+end

data/lib/hokaido/version.rb

@@ -1,3 +1,3 @@
 module Hokaido
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/hokaido/watcher.rb

@@ -0,0 +1,19 @@
+require 'celluloid'
+require 'celluloid/notifications'
+
+module Hokaido
+  class Watcher
+    include Celluloid
+    include Celluloid::Notifications
+
+    def initialize(socket)
+      @socket = socket
+
+      subscribe 'broadcast', :received
+    end
+
+    def received(topic, chunk)
+      @socket.write chunk
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hokaido
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ursm
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,8 +98,11 @@ files:
 - bin/hokaido
 - hokaido.gemspec
 - lib/hokaido.rb
+- lib/hokaido/broadcast.rb
 - lib/hokaido/cli.rb
+- lib/hokaido/server.rb
 - lib/hokaido/version.rb
+- lib/hokaido/watcher.rb
 homepage: https://github.com/ursmhbry/hokaido
 licenses:
 - MIT