rash-command-shell 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f54bfa6b60f6a2a35a32d087ad1a722fb88f36fcd46933ae7145ee9dfc944d
-  data.tar.gz: 4dd605ed6fcbfb8a5fbacbd4ff11075933e3e6829785f7605442822f4e5fd508
+  metadata.gz: f799801cf8b57a584f090320cbd63d7b2e54dbc0e7c66fbac9943d7b75e35417
+  data.tar.gz: 34b945f7da8b07813f405417c99d091466215b087fb709e71394ad3b551044a0
 SHA512:
-  metadata.gz: 55dde4dead963ce469de63b5c7490224d3d29ca406aafb3ef1d1fd0c2813d3433ba258ed433629fc7983cbe9a399560cf7dee912df871e86cf8c491f3ad83a3b
-  data.tar.gz: 5fe62b4dcc77acb7774f8b06360d4a4768b6b7bd63633886c40fbdbc7e0af41bd4240cbb1c867912ee11eec287e61f19f468ab9b354ac842346e5b46f6a9caea
+  metadata.gz: baa2bc0af9d01199949370a1fbea1b4682962842bab8618cdbc2c0fe4a3f30352daa3c7661da1989a21ee82b589f937ddd702b5a7ab139ecd791827e8192bdd7
+  data.tar.gz: b05cc5985f22f293f5574057217c33641db8b409b50ecfb13861b332653c4d67e617ed19980abc50af0467934f41cb8e05d50ea51aa0ba1f9f806fb028645d6e

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

data/lib/rash.rb

@@ -12,6 +12,7 @@ class Environment
     Dir.chdir(dir.nil? ? "~" : dir.to_s)
     @working_directory = Dir.pwd
     ENV["OLDPWD"] = old.to_s
+    ENV["PWD"] = Dir.pwd
     Dir.pwd
   end
 
@@ -78,6 +79,10 @@ class Environment
     end
   end
 
+  def name?(v)
+    v.kind_of?(String) || v.kind_of?(Symbol)
+  end
+
   private
 
   def common_init
@@ -192,6 +197,11 @@ def which(command)
   nil
 end
 
+# This breaks some default IRB functionality
+# def self.respond_to_missing?(m, *args)
+#   
+#   which(m.to_s) || ($env.alias?(m) && !$env.aliasing_disabled) || $env.local_method?(m) || super
+# end
 
 # Note that I defy convention and don't define `respond_to_missing?`. This
 # is because doing so screws with irb.

data/lib/rash/ext/filesystem.rb

@@ -6,13 +6,13 @@ class Environment
   def initialize
     common_init
     @working_directory = Directory.root("/") 
-    traverse_filetree("/", Dir.pwd)
   end
 
   def chdir(dir = nil)
     old = @working_directory
-    traverse_filetree(Dir.pwd, (dir.nil? ? "~" : dir.to_s))
+    traverse_filetree(@working_directory.to_s, (dir.nil? ? "~" : dir.to_s))
     ENV["OLDPWD"] = old.to_s
+    ENV["PWD"] = Dir.pwd
     Dir.pwd
   end
 
@@ -38,6 +38,26 @@ class Environment
     @working_directory.local_method(name).call(*args, &block)
   end
 
+  def local_var(name, v = nil, locked: false)
+    res = nil
+    if v.nil?
+      res = @working_directory.local_variable(name)
+    else
+      @working_directory.set_local_variable(name, v)
+      res = v
+    end
+    @working_directory.lock_variable(name) if locked
+    res
+  end
+  
+  def local_var?(name)
+    @working_directory.local_variable?(name)
+  end
+  
+  def local_vars
+    @working_directory.local_variables
+  end
+
   private
 
   # from and to are strings
@@ -83,6 +103,8 @@ class Environment
       @children = []
       @local_methods = parent&.unlocked_local_methods || {}
       @locked_methods = []
+      @local_variables = {}
+      @locked_variables = []
     end
 
     def local_method(name)
@@ -107,6 +129,55 @@ class Environment
     def local_method?(name)
       @local_methods.key?(name.to_sym)
     end
+    
+    def local_variable(name)
+      name = name.to_sym
+      @local_variables[name] || @parent&.unlocked_local_variable(name)
+    end
+    
+    def local_variable?(name)
+      @local_variables.include?(name.to_sym) || !!@parent&.unlocked_local_variable?(name.to_sym)
+    end
+    
+    def local_variables
+      @local_variables.keys + (@parent&.unlocked_local_variables).to_a
+    end
+    
+    def set_local_variable(name, value)
+      name = name.to_sym
+      if !@local_variables.key?(name) && @parent&.unlocked_local_variable?(name)
+        @parent&.set_local_variable(name, value)
+      else
+        @local_variables[name] = value
+      end
+    end
+    
+    def unlocked_local_variables
+      @local_variables.keys.filter{|k| !@locked_variables.include?(k)} + (@parent&.unlocked_local_variables).to_a
+    end
+
+    def unlocked_local_variable(name)
+      name = name.to_sym
+      @local_variables.filter{|k| !@locked_variables.include?(k)}[name] || @parent&.unlocked_local_variable(name)
+    end
+
+    def unlocked_local_variable?(name)
+      name = name.to_sym
+      @local_variables.filter{|k,_v| !@locked_variables.include?(k)}.key?(name) ||
+        !!@parent&.unlocked_local_variable?(name)
+    end
+    
+    def lock_variable(name)
+      n = name.to_sym
+      raise NameError.new("#{name} is not a local variable", n) unless @local_variables.key?(n)
+      @locked_variables << n unless @locked_variables.include?(n)
+      n
+    end
+    
+    def clear_local_variable(name)
+      @local_variables.delete(name.to_sym)
+      name.to_sym
+    end
 
     def root?
       parent.nil?
@@ -161,3 +232,4 @@ def self.method_missing(m, *args, &block)
 end
 
 $env = Environment.new
+$env.chdir(Dir.pwd)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rash-command-shell
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kellen Watt