rash-command-shell 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6654b1ecfaff25cb1008143b0c7718d5d36f6d7e3d3d3764ac77aff47c47e6ea
-  data.tar.gz: 49436d272bf4a5bac674862c1541fe66f335751cf853482f027925b1e6d6f421
+  metadata.gz: 45f54bfa6b60f6a2a35a32d087ad1a722fb88f36fcd46933ae7145ee9dfc944d
+  data.tar.gz: 4dd605ed6fcbfb8a5fbacbd4ff11075933e3e6829785f7605442822f4e5fd508
 SHA512:
-  metadata.gz: 6e587842b8b49be6832f6c0f05a4ed5a48605712a2cff5b98684c00061292f4d332dba8e63dda380ffff2775535e33c78060649e0d34e1c2c9904b0b3665dad9
-  data.tar.gz: 7b3ff24eb70080a2f70d1e39bcddb07b0d675465ff70e00e90e9e140443bec1c78c9bea22c47d52c9bd9685e01b4a9808736f373c6669bc9f7bb0743b11f635b
+  metadata.gz: 55dde4dead963ce469de63b5c7490224d3d29ca406aafb3ef1d1fd0c2813d3433ba258ed433629fc7983cbe9a399560cf7dee912df871e86cf8c491f3ad83a3b
+  data.tar.gz: 5fe62b4dcc77acb7774f8b06360d4a4768b6b7bd63633886c40fbdbc7e0af41bd4240cbb1c867912ee11eec287e61f19f468ab9b354ac842346e5b46f6a9caea

data/bin/rash

@@ -4,7 +4,7 @@ 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
+  puts "Version 0.4.0" # I may forget to update this
 elsif File.exists?(ARGV[0]) && !File.directory?(ARGV[0])
   require "rash"
   file = ARGV.shift

data/lib/rash.rb

@@ -14,7 +14,21 @@ class Environment
     ENV["OLDPWD"] = old.to_s
     Dir.pwd
   end
-  
+
+  # Note that this works regardless of which version of chdir is used.
+  def push_dir(dir = nil)
+    @directory_stack.push(Dir.pwd)
+    self.chdir(dir)
+  end
+
+  def pop_dir
+    self.chdir(@directory_stack.pop) if @directory_stack.size > 0
+  end
+
+  def dirs
+    @directory_stack
+  end
+
   def add_path(path) 
     ENV["PATH"] += File::PATH_SEPARATOR + (path.respond_to?(:path) ? path.path : path.to_s)
   end
@@ -76,6 +90,8 @@ class Environment
 
     @active_pipelines = []
 
+    @directory_stack = []
+
     @prompt = {
       AUTO_INDENT: true,
       RETURN: ""
@@ -121,6 +137,17 @@ def cd(dir = nil)
   $env.chdir(d)
 end
 
+def pushd(dir = nil)
+  case dir
+  when File, Dir
+    dir = dir.path if File.directory(dir.path)
+  end
+  $env.push_dir(dir)
+end
+
+def popd
+  $env.pop_dir
+end
 
 def run(file, *args)
   filename = file.to_s

data/lib/rash/ext/filesystem.rb

@@ -16,20 +16,26 @@ class Environment
     Dir.pwd
   end
 
-  def local_def(name, &block)
-    @working_directory.add_local_method(name.to_sym, &block)
+  def local_def(name, locked: false, &block)
+    @working_directory.add_local_method(name, &block)
+    @working_directory.lock_method(name) if locked
+    name.to_sym
   end
 
   def local_undef(name)
-    @working_directory.clear_local_method(name.to_sym)
+    @working_directory.clear_local_method(name)
   end
 
   def local_method?(name)
-    @working_directory.local_methods.key?(name.to_sym)
+    @working_directory.local_method?(name)
+  end
+
+  def local_methods
+    @working_directory.local_methods
   end
 
   def local_call(name, *args, &block)
-    @working_directory.local_methods[name.to_sym].call(*args, &block)
+    @working_directory.local_method(name).call(*args, &block)
   end
 
   private
@@ -65,7 +71,6 @@ class Environment
   end
 
   class Directory
-    attr_reader :local_methods
     attr_reader :parent, :children
 
     def self.root(dir)
@@ -76,7 +81,31 @@ class Environment
       @path = Dir.new(dir)
       @parent = parent
       @children = []
-      @local_methods = parent&.local_methods.dup || {}
+      @local_methods = parent&.unlocked_local_methods || {}
+      @locked_methods = []
+    end
+
+    def local_method(name)
+      @local_methods[name.to_sym]
+    end
+
+    def local_methods
+      @local_methods.keys
+    end
+
+    def unlocked_local_methods
+      @local_methods.filter{|k, v| !@locked_methods.include?(k)}
+    end
+
+    def lock_method(name)
+      n = name.to_sym
+      raise NameError.new("#{name} is not a local method", n) unless @local_methods.key?(n)
+      @locked_methods << n unless @locked_methods.include?(n)
+      n
+    end
+
+    def local_method?(name)
+      @local_methods.key?(name.to_sym)
     end
 
     def root?
@@ -103,14 +132,14 @@ class Environment
 
     def add_local_method(name, &block)
       raise ArgumentError.new "no method body provided" unless block_given?
-      @local_methods[name] = block # if name already exists, its function is overriden
-      name
+      @local_methods[name.to_sym] = block # if name already exists, its function is overriden
+      name.to_sym
     end
 
     # might not be useful
     def clear_local_method(name)
-      @local_methods.delete(name)
-      name
+      @local_methods.delete(name.to_sym)
+      name.to_sym
     end
 
     def to_s

data/lib/rash/jobcontrol.rb

@@ -1,6 +1,6 @@
 class Environment
   def jobs
-    @active_jobs.keep_if {|pid| Process.kill(0, pid) rescue false}
+    @active_jobs.keep_if{|pid| Process.kill(0, pid) rescue false}.dup
   end
 
   def async(&block)

data/lib/rash/pipeline.rb

@@ -4,6 +4,10 @@ class Environment
     @in_pipeline
   end
 
+  def synced_pipeline?
+    @in_pipeline && @synchronous_pipeline
+  end
+
   def make_pipeline(&block) 
     raise IOError.new("pipelining already enabled") if @in_pipeline
     start_pipeline
@@ -14,9 +18,21 @@ class Environment
     end
     nil
   end
+
+  def make_sync_pipeline(&block)
+    raise IOError.new("pipelining already enabled") if @in_pipeline
+    start_sync_pipeline
+    begin
+      block.call
+    ensure
+      end_sync_pipeline
+    end
+    nil
+  end
   
   def as_pipe_command(&block)
     raise IOError.new("pipelining not enabled") unless @in_pipeline
+    return as_sync_pipe_command(&block) if @synchronous_pipeline
     
     input = (@active_pipelines.empty? ? $stdin : @active_pipelines.last.reader)
     @active_pipelines << Pipeline.new
@@ -38,28 +54,81 @@ class Environment
     nil
   end
 
+  def as_sync_pipe_command(&block)
+    raise IOError.new("pipelining not enabled") unless @in_pipeline
+    raise IOError.new("pipeline is not synchronous") unless @synchronous_pipeline
+   
+    @next_pipe.close
+    @next_pipe = Pipeline.new # flush the output pipe
+    @prev_pipe.writer.close
+
+    input = (@first_sync_command ? $stdin : @prev_pipe.reader)
+    @first_sync_command = false
+    output = @next_pipe.writer
+    error = ($stderr == $stdout ? @next_pipe.writer : $stdin)
+
+    pid = fork do
+      @in_pipeline = false
+      @synchronous_pipeline = false
+      $stdin = input
+      $stdout = output
+      $stderr = error
+      block.call
+      exit!(true)
+    end
+
+    Process.wait(pid)
+    @prev_pipe, @next_pipe = @next_pipe, @prev_pipe
+    nil
+  end
+
   private
   
   def start_pipeline
     @in_pipeline = true
   end
 
+  def start_sync_pipeline
+    @in_pipeline = true
+    @synchronous_pipeline = true
+    @first_sync_command = true
+    @prev_pipe = Pipeline.new
+    @next_pipe = Pipeline.new
+  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
+      begin
+        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}
+      ensure
+        @active_pipelines.clear
+      end
     end
   end
 
+  def end_sync_pipeline
+    raise IOError.new("pipelining not enabled") unless @in_pipeline
+    raise IOError.new("pipeline is not synchronous") unless @synchronous_pipeline
+    @next_pipe.close
+    @prev_pipe.writer.close
+    IO.copy_stream(@prev_pipe.reader, $stdout)
+    @prev_pipe.close
+
+    @next_pipe = @prev_pipe = @first_sync_command = nil
+    @synchronous_pipeline = @in_pipeline = false
+  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
+    return add_sync_pipeline(m, *args) if @synchronous_pipeline
+
     input = (@active_pipelines.empty? ? $stdin : @active_pipelines.last.reader)
     @active_pipelines << Pipeline.new
     output = @active_pipelines.last.writer
@@ -73,6 +142,23 @@ class Environment
     @active_pipelines.last.link_process(pid)
   end
 
+  def add_sync_pipeline(m, *args)
+    raise IOError.new("pipelining not enabled") unless @in_pipeline
+    raise IOError.new("pipeline is not synchronous") unless @synchronous_pipeline
+
+    # Ensure pipe is empty for writing
+    @next_pipe.close
+    @next_pipe = Pipeline.new
+    @prev_pipe.writer.close
+
+    input = (@first_sync_command ? $stdin : @prev_pipe.reader)
+    @first_sync_command = false
+    error = ($stderr == $stdout ? @next_pipe.writer : $stdin)
+    system_command(m, *args, out: @next_pipe.writer, input: input, err: error, except: true)
+    @prev_pipe, @next_pipe = @next_pipe, @prev_pipe
+    nil
+  end
+
   class Pipeline
     attr_reader :writer, :reader, :pid
 
@@ -103,6 +189,10 @@ class Environment
 end
 
 
-def in_pipeline(&block) 
-  $env.make_pipeline(&block)
+def in_pipeline(async: true, &block)
+  if async
+    $env.make_pipeline(&block)
+  else
+    $env.make_sync_pipeline(&block)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rash-command-shell
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kellen Watt
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: A Ruby-based shell
+description: A Ruby-based command shell
 email:
 executables:
 - rash