rash-command-shell 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19cb922bc55b83424f375e375c2015dff74690720b4d611357646bfd11e04c44
-  data.tar.gz: 48ce02ad077cd0a89a7fc62987907cbfc0ca80997e398c6e9699ac4beacf4521
+  metadata.gz: f1656e8fb0ce00b1053a2fb71e551e4cec9108f31b41e6bff096a48f2a39a45a
+  data.tar.gz: fc0fc83b298541d1b8593a484660b9ba3e1f9470f226e0db2062316650557234
 SHA512:
-  metadata.gz: 6e1d9cd6e7270bd206d79db56b9ca20e2bab9b976c7e76b835c3af078e9a16816714807b8c96eafdc5f403369404bce243c31105bd33869fabb5fbffba65adf7
-  data.tar.gz: 6e36ba48448f4aed666807150a8819855ccb2e8802093f56cfc6f357277cd24a6ff91c43de0889affd15fddd2d642b1601ffcd7c347949766a434c124b1d7b1b
+  metadata.gz: 275fa36281ff54847e61457ee9f1c4dc8cf0284766d80826b1cce90ae01e0c23384c3ed5f532121566a709318546ebd62749944b3ecf52951cd43dcbdcca0231
+  data.tar.gz: 2b11e91d955014d576ab6a90ff3650458631592f86f5a3d2508d5800d174470365e79959e11f721f516b693957bb72ae2c12eb4c66270464cf9eb45d2d70b546

data/bin/rash

@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
 
-if ARGV.size == 0
-  exec("irb", "-r", "rash")
-else
+if ARGV.empty?
+  exec("irb", "-r", "rash", *ARGV)
+elsif ARGV[0] =~ /(-)?-v(ersion)?/
+  puts "Rash (c) 2020 Kellen Watt"
+  puts "Version 0.2.2" # I may forget to update this
+elsif File.exists?(ARGV[0]) && !File.directory?(ARGV[0])
   require "rash"
   file = ARGV.shift
   load file
+else
+  $stderr.puts "#{File.basename($0)}: #{ARGV[0]}: No such file or directory"
+  exit 1
 end

data/lib/rash.rb

@@ -1,7 +1,7 @@
 class Environment
   
   attr_reader :aliasing_disabled
-  attr_reader :superuser_mode
+  attr_reader :umask
 
   def initialize
     common_init
@@ -28,6 +28,11 @@ class Environment
       super
     end
   end
+  
+  def umask=(mask)
+    File.umask(mask)
+    @umask = mask
+  end
 
   def as_superuser(&block)
     @superuser_mode = true
@@ -37,27 +42,70 @@ 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
   
+  def dispatch(m, *args)
+    if @in_pipeline
+      add_pipeline(m, *args)
+    else
+      system_command(m, *args)
+    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: ""
     }
     ENV["RASHDIR"] = File.dirname(__FILE__)
   end
+
+  def resolve_command(m, *args, literal: false) 
+    (literal ? [m.to_s] : resolve_alias(m)) + args.flatten.map{|a| a.to_s} 
+  end
+  
+  def system_command(m, *args, except: false, literal: false, out: nil, input: nil, err: nil)
+    command = resolve_command(m, *args, literal: literal)
+    command.unshift("sudo") if @superuser_mode
+    opts = {out: out || $stdout, 
+            err: err || $stderr, 
+            in: input || $stdin, 
+            exception: except || @superuser_mode,
+            umask: @umask}
+
+    system(*command, opts)
+  end
+
 end
 
 require_relative "rash/redirection"
 require_relative "rash/aliasing"
 require_relative "rash/jobcontrol"
+require_relative "rash/pipeline"
+require_relative "rash/capturing"
 
 $env = Environment.new
 
@@ -65,7 +113,12 @@ $env = Environment.new
 # note for later documentation: any aliases of cd must be functions, not 
 # environmental aliases. Limitation of implementation.
 def cd(dir = nil)
-  $env.chdir(dir)
+  d = dir
+  case d
+  when File, Dir
+    d = d.path if File.directory?(d.path)
+  end
+  $env.chdir(d)
 end
 
 
@@ -75,12 +128,15 @@ 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})
+  $env.dispatch(exe, *args, literal: true)
 end
 
+alias cmd __send__
 
 # Defines `bash` psuedo-compatibility. Filesystem effects happen like normal 
 # and environmental variable changes are copied
+#
+# This is an artifact of an old design and is deprecated until further notice.
 def sourcesh(file) 
   bash_env = lambda do |cmd = nil|
     tmpenv = `#{cmd + ';' if cmd} printenv`
@@ -95,7 +151,7 @@ end
 
 
 def which(command)
-  cmd = File.expand_path(command)
+  cmd = File.expand_path(command.to_s)
   return cmd if File.executable?(cmd) && !File.directory?(cmd)
   
   exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
@@ -115,11 +171,7 @@ end
 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}) 
-    else
-      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin})
-    end
+    $env.dispatch(m, *args)
   else
     super
   end

data/lib/rash/aliasing.rb

@@ -7,26 +7,12 @@ class Environment
     @aliases.delete(func.to_sym)
   end
 
-  # recursive aliases not currently possible. In the works
-  def resolve_alias(f)
-    result = [f.to_s]
-    aliases = @aliases.dup
-    found_alias = true
-    while found_alias
-      found_alias = false
-      if aliases.has_key?(result[0].to_sym)
-        found_alias = true
-        match = result[0].to_sym
-        result[0] = aliases[match]
-        aliases.delete(match)
-        result.flatten! 
-      end
-    end
-    result
-  end
- 
   def alias?(f)
-    @aliases.has_key?(f.to_sym)
+    @aliases.key?(f.to_sym)
+  end
+
+  def aliases
+    @aliases.dup
   end
 
   def without_aliasing
@@ -52,4 +38,25 @@ class Environment
       end
     end
   end
+  
+  private
+
+  # Unless given a compelling reason, this doesn't need to be public. For most 
+  # purposes, some combination of `alias?` and `aliases` should be sufficient.
+  def resolve_alias(f)
+    result = [f.to_s]
+    aliases = @aliases.dup
+    found_alias = true
+    while found_alias
+      found_alias = false
+      if aliases.has_key?(result[0].to_sym)
+        found_alias = true
+        match = result[0].to_sym
+        result[0] = aliases[match]
+        aliases.delete(match)
+        result.flatten! 
+      end
+    end
+    result
+  end
 end

data/lib/rash/capturing.rb

@@ -0,0 +1,42 @@
+class Environment
+  def capture_block(&block)
+    raise ArgumentError.new("no block provided") unless block_given?
+    result = nil
+    begin
+      reader, writer = IO.pipe
+      self.stdout = writer
+      block.call
+    ensure
+      reset_stdout
+      writer.close
+      result = reader.read
+      reader.close
+    end
+    result
+  end
+
+  def capture_command(m, *args)
+    raise NameError.new("no such command", m) unless which(m) || ($env.alias?(m) && !$env.aliasing_disabled)
+    result = nil
+    begin 
+      reader, writer = IO.pipe
+      system_command(m, *args, out: writer)
+    ensure
+      writer.close
+      result = reader.read
+      reader.close
+    end
+    result
+  end
+end
+
+# This explicitly doesn't support pipelining, as the output is ripped out of sequence.
+def capture(*cmd, &block)
+  if block_given?
+    $env.capture_block(&block)
+  elsif cmd.size > 0 && (which(cmd[0]) || ($env.alias?(m) && !$env.aliasing_disabled))
+    $env.capture_command(cmd[0].to_s, *cmd[1..])
+  else
+    raise ArgumentError.new("nothing to capture from")
+  end
+end

data/lib/rash/ext/filesystem.rb

@@ -2,6 +2,7 @@ class Environment
 
   RASH_LOCAL_FILE = ".rashrc.local"
 
+  # Has to be a better way of adding extensions and dynamically loading them
   def initialize
     common_init
     @working_directory = Directory.root("/") 
@@ -33,14 +34,12 @@ class Environment
 
   private
 
-  LOCAL_FUNCTIONS_ENABLED = true
-
   # from and to are strings
   def traverse_filetree(from, to)
     abs_from = File.expand_path(from)
     abs_to = File.expand_path(to)
-    raise SystemCallError(from, Errno::ENOENT::Errno) unless Dir.exists?(abs_from) 
-    raise SystemCallError(to, Errno::ENOENT::Errno) unless Dir.exists?(abs_to)
+    raise SystemCallError.new(from, Errno::ENOENT::Errno) unless Dir.exists?(abs_from) 
+    raise SystemCallError.new(to, Errno::ENOENT::Errno) unless Dir.exists?(abs_to)
     
     from_parts = (abs_from == "/" ? [""] : abs_from.split(File::SEPARATOR))
     to_parts = (abs_to == "/" ? [""] : abs_to.split(File::SEPARATOR))
@@ -120,16 +119,13 @@ class Environment
   end
 end
 
+# still could absolutely be more cleaned up, but it works
 def self.method_missing(m, *args, &block)
   exe = which(m.to_s)
   if $env.local_method?(m)
     $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})
-    else
-      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin})
-    end
+    $env.dispatch(m, *args)
   else
     super
   end

data/lib/rash/jobcontrol.rb

@@ -17,5 +17,3 @@ end
 def as_background(&block)
   $env.async(&block)
 end
-  
-

data/lib/rash/pipeline.rb

@@ -0,0 +1,108 @@
+class Environment
+
+  def pipelined?
+    @in_pipeline
+  end
+
+  def make_pipeline(&block) 
+    raise IOError.new("pipelining already enabled") if @in_pipeline
+    start_pipeline
+    begin
+      block.call
+    ensure
+      end_pipeline
+    end
+    nil
+  end
+  
+  def as_pipe_command(&block)
+    raise IOError.new("pipelining not enabled") unless @in_pipeline
+    
+    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)
+    nil
+  end
+
+  private
+  
+  def start_pipeline
+    @in_pipeline = true
+  end
+
+  def end_pipeline
+    raise IOError.new("pipelining not enabled") unless @in_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
+
+  # special method to be referenced from Environment#dispatch. Do not use directly
+  def add_pipeline(m, *args)
+    raise IOError.new("pipelining not enabled") unless @in_pipeline
+    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_command(m, *args, out: output, input: input, err: error, except: true)
+      output.close
+      exit!(true)
+    end
+    output.close
+    @active_pipelines.last.link_process(pid)
+  end
+
+  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) 
+  $env.make_pipeline(&block)
+end

data/lib/rash/redirection.rb

@@ -1,7 +1,5 @@
 class Environment
 
-  DEFAULT_IO = {in: STDIN, out: STDOUT, err: STDERR}
-
   def reset_io
     reset_stdout
     reset_stderr
@@ -78,6 +76,10 @@ class Environment
   def standard_stream?(f)
     DEFAULT_IO.values.include?(f)
   end
+  
+  private
+
+  DEFAULT_IO = {in: STDIN, out: STDOUT, err: STDERR}
 end
 
 # If you want to append, you need to get the file object yourself.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rash-command-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kellen Watt
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 description: A Ruby-based shell
 email:
 executables:
@@ -40,8 +34,10 @@ files:
 - bin/rash
 - lib/rash.rb
 - lib/rash/aliasing.rb
+- lib/rash/capturing.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
@@ -56,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="