rash-command-shell 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925fc43795fdb6dedccf7680890bad76aa0f4e2294bf4db6eef10bfb67e6cdc4
-  data.tar.gz: 4f57d6387ecfdf2261e491edce9c8f38b2bccc3de23eb16096df0d8312acb444
+  metadata.gz: 6769401d090279e0c3f7b3a2e26a52c59af013196c84e9b42ec09e5d9e5b5a42
+  data.tar.gz: 9a93bc36eb0316ba762cefa301457b9537df4009ee8127ae8c8691bdb18eecaa
 SHA512:
-  metadata.gz: d2f3aae4dbd89d00963b235a28f6901fdfc7f4aa4dbe1ec592656f1c9acddc48dfd874a77395fd1a4d2e81e2c8c08f1c700f76ae76049d265f148f5985cb294d
-  data.tar.gz: 69a3a6d0623f316ba75c8a14a3eefde9f2e81214656b9f86836ade185dc83f300be0b97d5df90f383cd106ee71a000ce20ec02bbe2de63aa2d8ceb97cb06560b
+  metadata.gz: 1462afc1e5767594c11f45104046618a3c5158cab07ad1315fe2e46b7ed64cea0c2972516338086cbb5e6ae2ba3f99e7e442873bc7213d72830697f36adf3cdd
+  data.tar.gz: c296445d776d3dcde932617030279866961e1f77126e9551d08a5e31835dc0d583b710ba34a8382b245b6c142b1d51ab02081ef0a744b29556d4aef06a830933

data/lib/rash.rb

@@ -2,6 +2,7 @@ class Environment
   
   attr_reader :aliasing_disabled
   attr_reader :superuser_mode
+  attr_reader :umask
 
   def initialize
     common_init
@@ -28,6 +29,11 @@ class Environment
       super
     end
   end
+  
+  def umask=(mask)
+    File.umask(mask)
+    @umask = mask
+  end
 
   def as_superuser(&block)
     @superuser_mode = true
@@ -37,16 +43,32 @@ class Environment
       @superuser_mode = false
     end
   end
-  
+
+  def with_limits(limits, &block)
+    if block_given?
+      pid = fork do
+        limits.each {|resource, limit| Process.setrlimit(resource, *limit)}
+        block.call
+        exit!(true)
+      end
+      Process.wait(pid)
+    else
+      limits.each {|resource, limit| Process.setrlimit(resource, *limit)}
+    end
+  end
+
   private
 
   def common_init
     @working_directory = Dir.pwd
+    @umask = File.umask
 
     @aliases = {}
     @aliasing_disabled = false
     @active_jobs = []
 
+    @active_pipelines = []
+
     @prompt = {
       AUTO_INDENT: true,
       RETURN: ""
@@ -58,6 +80,7 @@ end
 require_relative "rash/redirection"
 require_relative "rash/aliasing"
 require_relative "rash/jobcontrol"
+require_relative "rash/pipeline"
 
 $env = Environment.new
 
@@ -80,7 +103,7 @@ def run(file, *args)
   unless File.executable?(exe)
     raise SystemCallError.new("No such executable file - #{exe}", Errno::ENOENT::Errno)
   end
-  system(exe, *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin})
+  system(exe, *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, umask: $env.umask})
 end
 
 alias cmd __send__
@@ -118,13 +141,16 @@ end
 
 # Note that I defy convention and don't define `respond_to_missing?`. This
 # is because doing so screws with irb.
+# This code is a nightmarish monstrosity. I need some kind of "dispatch" method on Environment
 def self.method_missing(m, *args, &block) 
   exe = which(m.to_s)
   if exe || ($env.alias?(m) && !$env.aliasing_disabled)
     if $env.superuser_mode
-      system("sudo", *$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, exception: true}) 
+      system("sudo", *$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, exception: true, umask: $env.umask}) 
+    elsif $env.pipelined? # implicitly disallowing superuser_mode for now. Need to refactor to allow
+      $env.add_pipeline(m, *args)
     else
-      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin})
+      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, umask: $env.umask})
     end
   else
     super

data/lib/rash/ext/filesystem.rb

@@ -126,9 +126,9 @@ def self.method_missing(m, *args, &block)
     $env.local_call(m, *args, &block)
   elsif exe || ($env.alias?(m) && !$env.aliasing_disabled)
     if $env.superuser_mode
-      system("sudo", *$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin})
+      system("sudo", *$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, exception: true, umask: $env.umask})
     else
-      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin})
+      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, umask: $env.umask})
     end
   else
     super

data/lib/rash/pipeline.rb

@@ -0,0 +1,95 @@
+class Environment
+
+  def pipelined?
+    @in_pipeline
+  end
+
+  def start_pipeline
+    @in_pipeline = true
+  end
+
+  def end_pipeline
+    @in_pipeline = false
+    if @active_pipelines.size > 0
+      Process.wait(@active_pipelines.last.pid)
+      @active_pipelines.last.writer.close # probably redundant, but leaving it for now
+      IO.copy_stream(@active_pipelines.last.reader, $stdout)
+      @active_pipelines.pop.close
+      @active_pipelines.reverse_each {|pipe| pipe.terminate}
+      @active_pipelines.clear
+    end
+  end
+
+  def add_pipeline(m, *args)
+    input = (@active_pipelines.empty? ? $stdin : @active_pipelines.last.reader)
+    @active_pipelines << Pipeline.new
+    output = @active_pipelines.last.writer
+    error = ($stderr == $stdout ? output : $stderr)
+    pid = fork do # might not be necessary, spawn might cover it. Not risking it before testing
+      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: output, in: input, err: error, exception: true, umask: @umask})
+      output.close
+      exit!(true)
+    end
+    output.close
+    @active_pipelines.last.link_process(pid)
+  end
+
+  def as_pipe(&block)
+    input = (@active_pipelines.empty? ? $stdin : @active_pipelines.last.reader)
+    @active_pipelines << Pipeline.new
+    output = @active_pipelines.last.writer
+    error = ($stderr == $stdout ? output : $stderr)
+    pid = fork do
+      @in_pipeline = false
+      $stdin = input
+      $stdout = output
+      $stderr = error
+      block.call
+      output.close
+      exit!(true)
+    end
+    output.close
+    @active_pipelines.last.link_process(pid)
+  end
+
+  private
+
+  class Pipeline
+    attr_reader :writer, :reader, :pid
+
+    def initialize
+      @reader, @writer = IO.pipe
+    end
+
+    def link_process(pid)
+      @pid ||= pid
+      self
+    end
+
+    def close
+      @writer.close
+      @reader.close
+    end
+
+    def terminate
+      self.close
+      Process.kill(:PIPE, @pid)
+      Process.wait(@pid)
+    end
+
+    def to_s
+      @pid
+    end
+  end
+end
+
+
+def in_pipeline(&block) 
+  raise IOError.new("pipelining already enabled") if $env.pipelined?
+  $env.start_pipeline
+  begin
+    block.call
+  ensure
+    $env.end_pipeline
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rash-command-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Kellen Watt
@@ -36,6 +36,7 @@ files:
 - lib/rash/aliasing.rb
 - lib/rash/ext/filesystem.rb
 - lib/rash/jobcontrol.rb
+- lib/rash/pipeline.rb
 - lib/rash/prompt/irb.rb
 - lib/rash/redirection.rb
 homepage: https://github.com/KellenWatt/rash