rash-command-shell 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f799801cf8b57a584f090320cbd63d7b2e54dbc0e7c66fbac9943d7b75e35417
-  data.tar.gz: 34b945f7da8b07813f405417c99d091466215b087fb709e71394ad3b551044a0
+  metadata.gz: 00dbd88cd56e1de80255ce40b9a061048ae8ec96b70cb0dc5c36a78589e73c68
+  data.tar.gz: f31d65ea147f7c3fa5516d51b38e70c28fa3cadb482427393887f9d42ef34321
 SHA512:
-  metadata.gz: baa2bc0af9d01199949370a1fbea1b4682962842bab8618cdbc2c0fe4a3f30352daa3c7661da1989a21ee82b589f937ddd702b5a7ab139ecd791827e8192bdd7
-  data.tar.gz: b05cc5985f22f293f5574057217c33641db8b409b50ecfb13861b332653c4d67e617ed19980abc50af0467934f41cb8e05d50ea51aa0ba1f9f806fb028645d6e
+  metadata.gz: e4194630eb9dbe5b1c4ad8afb9eb09e232b801eab51d06560cc1c41404d4202ade769c22a4da4f878f9d95ca213566635b90472e6c507e66578ddd2f465921f0
+  data.tar.gz: 5a12911de5b15ed865d14773b34b2a51f0efea3a3159bf29821eda79cf0ba7459429c7e4b1d95290cf03701745b4c914e4d9b8745906985e82a113f7be8351ab

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

data/lib/rash/ext/filesystem.rb

@@ -101,22 +101,49 @@ class Environment
       @path = Dir.new(dir)
       @parent = parent
       @children = []
-      @local_methods = parent&.unlocked_local_methods || {}
+      @local_methods = {}
       @locked_methods = []
       @local_variables = {}
       @locked_variables = []
     end
 
+    ######################
+    # Local method methods
+    ######################
+
     def local_method(name)
-      @local_methods[name.to_sym]
+      name = name.to_sym
+      @local_methods[name] || @parent&.unlocked_local_method(name)
     end
 
+    def local_method?(name)
+      name = name.to_sym
+      @local_methods.key?(name) || !!@parent&.unlocked_local_method?(name)
+    end
+    
     def local_methods
-      @local_methods.keys
+      @local_methods.keys + (@parent&.unlocked_local_methods).to_a
+    end
+
+    def add_local_method(name, &block)
+      raise ArgumentError.new "no method body provided" unless block_given?
+      @local_methods[name.to_sym] = block # if name already exists, its function is overriden
+      name.to_sym
+    end
+
+    def unlocked_local_method(name)
+      name = name.to_sym
+      @local_methods[name] || @parent&.unlocked_local_method(name)
+    end
+
+    def unlocked_local_method?(name)
+      name = name.to_sym
+      @local_methods.filter{|k, v| !@locked_methods.include?(k)}.key?(name) ||
+        !!@parent&.unlocked_local_method?(name)
     end
 
     def unlocked_local_methods
-      @local_methods.filter{|k, v| !@locked_methods.include?(k)}
+      @local_methods.filter{|k, v| !@locked_methods.include?(k)}.keys + (@parent&.unlocked_local_methods).to_a
     end
 
     def lock_method(name)
@@ -126,10 +153,16 @@ class Environment
       n
     end
 
-    def local_method?(name)
-      @local_methods.key?(name.to_sym)
+    # might not be useful
+    def clear_local_method(name)
+      @local_methods.delete(name.to_sym)
+      name.to_sym
     end
-    
+
+    ######################
+    # Local variable stuff
+    ######################
+
     def local_variable(name)
       name = name.to_sym
       @local_variables[name] || @parent&.unlocked_local_variable(name)
@@ -152,15 +185,15 @@ class Environment
       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_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,_v| !@locked_variables.include?(k)}.key?(name) ||
@@ -179,6 +212,10 @@ class Environment
       name.to_sym
     end
 
+    ###########################
+    # Generic traversal methods
+    ###########################
+
     def root?
       parent.nil?
     end
@@ -201,18 +238,6 @@ class Environment
       dir
     end
 
-    def add_local_method(name, &block)
-      raise ArgumentError.new "no method body provided" unless block_given?
-      @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.to_sym)
-      name.to_sym
-    end
-
     def to_s
       @path.path
     end
@@ -221,10 +246,9 @@ 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)
+  elsif which(m.to_s) || ($env.alias?(m) && !$env.aliasing_disabled)
     $env.dispatch(m, *args)
   else
     super

metadata

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