rios 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,19 +1,33 @@
-= rios
+= Rios - A proxy framework for command line interfaces
 
-Description goes here.
+== Description
 
-== Contributing to rios
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+Rios is a proxy framework which works as a proxy for command line
+applications and allows developer to hook input/output of the
+applications in a blazingly simple way.
 
-== Copyright
+== Installation
 
-Copyright (c) 2011 mooz. See LICENSE.txt for
-further details.
+  # gem install rios
 
+== Usage
+
+=== Shadow certain word
+
+  #!/usr/bin/env ruby
+  
+  require "rios/easy"
+  
+  on_output { |s|
+    s.gsub(/vim/i) { |match| "***" }
+  }
+  
+  listen
+
+== Author
+
+mooz <mailto:stillpedant@gmail.com>
+
+== License
+
+The MIT License.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/ext/rios/util.c

@@ -7,8 +7,11 @@ VALUE Util = Qnil;
 void Init_util() {
     Rios = rb_define_module("Rios");
     Util = rb_define_module_under(Rios, "Util");
-    /* rb_define_method(Util, "openpty", method_openpty, 1); */
+
     rb_define_singleton_method(Util, "openpty", method_openpty, 1);
+    rb_define_singleton_method(Util, "set_controlling_tty", method_set_controlling_tty, 2);
+
+    rb_define_const(Util, "BUFSIZ", INT2NUM(BUFSIZ));
 }
 
 /* Rios::Util::openpty */
@@ -26,3 +29,7 @@ VALUE method_openpty(VALUE self, VALUE fd) {
 
     return rb_ary_new3(2, INT2NUM(master), INT2NUM(slave));
 }
+
+VALUE method_set_controlling_tty(VALUE self, VALUE tty, VALUE source) {
+    return INT2NUM(ioctl(NUM2INT(tty), TIOCSCTTY, NUM2INT(source)));
+}

data/ext/rios/util.h

@@ -2,4 +2,4 @@
 
 void Init_util();
 VALUE method_openpty(VALUE self, VALUE fd);
-
+VALUE method_set_controlling_tty(VALUE self, VALUE tty, VALUE source);

data/lib/rios/easy.rb

@@ -0,0 +1,25 @@
+require "rios/proxy"
+
+module Rios
+  module Easy
+    @@proxy = Rios::Proxy.new
+
+    # Inspired from Sinatra
+    def self.delegate(*methods)
+      methods.each do |method_name|
+        eval <<-RUBY, binding, '(__DELEGATE__)', 1
+          def #{method_name}(*args, &block)
+            @@proxy.send(#{method_name.inspect}, *args, &block)
+          end
+          private #{method_name.inspect}
+        RUBY
+      end
+    end
+
+    delegate :on_input, :on_output, :on_finish, :input, :output, :listen
+  end
+end
+
+class Object
+  include Rios::Easy
+end

data/lib/rios/proxy.rb

@@ -3,7 +3,6 @@ require "rios/terminal"
 
 module Rios
   class Proxy
-    BUFSIZE = 128
     DEFAULT_COMMAND = ENV["SHELL"]
 
     def initialize
@@ -11,6 +10,7 @@ module Rios
       @input_filters  = []
       @output_filters = []
       @on_finishes    = []
+      @pty_lock       = Mutex.new
     end
 
     ##
@@ -34,13 +34,17 @@ module Rios
     ##
     # emulate user input
     def input(string)
-      terminal.master.syswrite(string)
+      @pty_lock.synchronize {
+        terminal.master.syswrite(string)
+      }
     end
 
     ##
     # output string to the stdout (usually terminal)
     def output(string)
-      $stdout.syswrite(string)
+      @pty_lock.synchronize {
+        $stdout.syswrite(string)
+      }
     end
 
     ##
@@ -96,7 +100,7 @@ module Rios
       terminal.slave.close
 
       begin
-        while s = $stdin.sysread(BUFSIZE) do
+        while s = $stdin.sysread(Util::BUFSIZ) do
           input(apply_filters(s, @input_filters))
         end
       rescue
@@ -111,7 +115,7 @@ module Rios
       terminal.slave.close
 
       begin
-        while s = terminal.master.sysread(BUFSIZE) do
+        while s = terminal.master.sysread(Util::BUFSIZ) do
           output(apply_filters(s, @output_filters))
         end
       rescue
@@ -121,6 +125,9 @@ module Rios
     end
 
     def do_command(block)
+      Process.setsid()
+      Util::set_controlling_tty(terminal.slave.fileno, $stdin.fileno)
+
       terminal.master.close
       $stdin.reopen(terminal.slave)
       $stdout.reopen(terminal.slave)
@@ -129,6 +136,8 @@ module Rios
 
       if block
         block.call
+      elsif @command.class == Array
+        exec(*@command)
       else
         exec(@command)
       end

data/rios.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rios}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mooz"]
-  s.date = %q{2011-07-15}
+  s.date = %q{2011-07-16}
   s.default_executable = %q{script.rb}
   s.description = %q{Rios is a proxy framework which works as a proxy
  for command line applications and allows developer to hook input/output
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "Gemfile",
+    "README.rdoc",
     "Rakefile",
     "VERSION",
     "bin/script.rb",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
     "ext/rios/util.c",
     "ext/rios/util.h",
     "lib/rios.rb",
+    "lib/rios/easy.rb",
     "lib/rios/proxy.rb",
     "lib/rios/terminal.rb",
     "rios.gemspec"

metadata

@@ -2,7 +2,7 @@
 name: rios
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - mooz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 +09:00
+date: 2011-07-16 00:00:00 +09:00
 default_executable: script.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Gemfile
+- README.rdoc
 - Rakefile
 - VERSION
 - bin/script.rb
@@ -89,11 +90,11 @@ files:
 - ext/rios/util.c
 - ext/rios/util.h
 - lib/rios.rb
+- lib/rios/easy.rb
 - lib/rios/proxy.rb
 - lib/rios/terminal.rb
 - rios.gemspec
 - LICENSE.txt
-- README.rdoc
 has_rdoc: true
 homepage: https://github.com/mooz/rios
 licenses: 
@@ -108,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 998816175
+      hash: -339107533
       segments: 
       - 0
       version: "0"