rubysh 0.1.1 → 0.1.2

data/examples/self_tee_example.rb

@@ -0,0 +1,14 @@
+class SelfTeeExample
+  def run
+    require 'rubysh/plugin/self_tee'
+    Rubysh::Plugin::SelfTee.start('/tmp/logfile.txt', [1, 2])
+
+    puts "this is a line"
+    $stderr.puts "this is another line"
+    puts "so is this"
+  end
+end
+
+if $0 == __FILE__
+  SelfTeeExample.new.run
+end

data/lib/rubysh/plugin/self_tee.rb

@@ -0,0 +1,67 @@
+require 'rubysh'
+
+# This is currently unstable. (I'm likely going to flesh out a real
+# plugin interface.)
+
+module Rubysh::Plugin
+  class SelfTee
+    def self.start(logfile, fd_nums)
+      fd_map = {}
+      fd_nums.each do |fd_num|
+        fd = IO.new(fd_num)
+        fd.autoclose = false
+        fd_map[fd] = IO.pipe
+      end
+
+      fork {child_actions(logfile, fd_map)}
+      parent_actions(fd_map)
+    end
+
+    def self.parent_actions(fd_map)
+      fd_map.each do |fd, (read, write)|
+        read.close
+        Rubysh::Util.dup2(write, fd)
+      end
+    end
+
+    def self.child_actions(logfile, fd_map)
+      runner = self.new(logfile, fd_map)
+      runner.run
+    end
+
+    def initialize(filename, fd_map)
+      @logfile = File.open(filename, 'a')
+      fd_map.each do |fd, (read, write)|
+        write.close
+      end
+
+      @readers = {}
+      fd_map.map {|fd, (read, write)| @readers[read] = fd}
+    end
+
+    def format_line(fd, line)
+      now = Time.now
+      now_fmt = now.strftime("%Y-%m-%d %H:%M:%S")
+      ms_fmt = sprintf("%06d", now.usec)
+
+      output = "[#{now_fmt}.#{ms_fmt}] #{fd.fileno}: #{line.inspect}"
+      output << "\n" unless output.end_with?("\n")
+      output
+    end
+
+    def run
+      parallel_io = Rubysh::Subprocess::ParallelIO.new(@readers, [])
+      parallel_io.on_read do |fd, data|
+        next if data == Rubysh::Subprocess::ParallelIO::EOF
+
+        formatted = format_line(fd, data)
+        @logfile.write(formatted)
+        @logfile.flush
+
+        fd.write(data)
+        fd.flush
+      end
+      parallel_io.run
+    end
+  end
+end

data/lib/rubysh/version.rb

@@ -1,3 +1,3 @@
 module Rubysh
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -88,6 +88,7 @@ files:
 - README.md
 - Rakefile
 - examples/dots.sh
+- examples/self_tee_example.rb
 - lib/rubysh.rb
 - lib/rubysh/base_command.rb
 - lib/rubysh/base_directive.rb
@@ -96,6 +97,7 @@ files:
 - lib/rubysh/fd.rb
 - lib/rubysh/pipe.rb
 - lib/rubysh/pipeline.rb
+- lib/rubysh/plugin/self_tee.rb
 - lib/rubysh/redirect.rb
 - lib/rubysh/runner.rb
 - lib/rubysh/subprocess.rb
@@ -140,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2837385941821063747
+      hash: 3657158191567713340
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2837385941821063747
+      hash: 3657158191567713340
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23