rash-command-shell 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6769401d090279e0c3f7b3a2e26a52c59af013196c84e9b42ec09e5d9e5b5a42
-  data.tar.gz: 9a93bc36eb0316ba762cefa301457b9537df4009ee8127ae8c8691bdb18eecaa
+  metadata.gz: 8d2870af889b41fda5f16c62f4f181c09ae843cc61ef4391596078c723c13269
+  data.tar.gz: 0e4e282af5b0940e63478b62985238e427969f2d95e7fccb6e25afc7f18f7c3b
 SHA512:
-  metadata.gz: 1462afc1e5767594c11f45104046618a3c5158cab07ad1315fe2e46b7ed64cea0c2972516338086cbb5e6ae2ba3f99e7e442873bc7213d72830697f36adf3cdd
-  data.tar.gz: c296445d776d3dcde932617030279866961e1f77126e9551d08a5e31835dc0d583b710ba34a8382b245b6c142b1d51ab02081ef0a744b29556d4aef06a830933
+  metadata.gz: ca2658254fe315de5c6902a301d1a5d7f210e68630f9ac0677d811af697a2b334e6f185882d4ac8e725e56ee3e8dad777f8b09e7a5db9159914fb2dbecf9a589
+  data.tar.gz: 2820b7e820e1a28fdf87e898cc284b8c8a9be53193fd72047b61cc6036ba51eb2fa92e2b0dc687e73f258a8af7854a89320230bf349b71cc8d5d3e09ee46ca62

data/bin/rash

@@ -2,6 +2,9 @@
 
 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

data/lib/rash.rb

@@ -1,7 +1,6 @@
 class Environment
   
   attr_reader :aliasing_disabled
-  attr_reader :superuser_mode
   attr_reader :umask
 
   def initialize
@@ -56,6 +55,14 @@ class Environment
       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
 
@@ -75,6 +82,23 @@ class Environment
     }
     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"
@@ -103,13 +127,16 @@ 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, umask: $env.umask})
+  $env.dispatch(exe, *args, literal: true)
+  # system(exe, *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, umask: $env.umask})
 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`
@@ -141,17 +168,10 @@ 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, 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, umask: $env.umask})
-    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/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,8 +34,6 @@ class Environment
 
   private
 
-  LOCAL_FUNCTIONS_ENABLED = true
-
   # from and to are strings
   def traverse_filetree(from, to)
     abs_from = File.expand_path(from)
@@ -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, exception: true, umask: $env.umask})
-    else
-      system(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: $stdout, err: $stderr, in: $stdin, umask: $env.umask})
-    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

@@ -4,11 +4,48 @@ class Environment
     @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)
@@ -20,13 +57,15 @@ class Environment
     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(*$env.resolve_alias(m), *args.flatten.map{|a| a.to_s}, {out: output, in: input, err: error, exception: true, umask: @umask})
+      system_command(m, *args, out: output, input: input, err: error, except: true)
       output.close
       exit!(true)
     end
@@ -34,26 +73,6 @@ class Environment
     @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
 
@@ -85,11 +104,5 @@ 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
+  $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.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Kellen Watt