mysh 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dca3a0e863422640812a8eda3d02fac5c1581eb
-  data.tar.gz: e89463ff2e335de7296fa66f25ce2a5265e20c8b
+  metadata.gz: a9838abe6d0993c89a86b4b5532928914b79e763
+  data.tar.gz: 0c913b3f4a295000f5aa95bc1c2f1752a5e8ecdc
 SHA512:
-  metadata.gz: 70cd3855b98c7f2fec630dbd6d9981e429b6dcd14ce39f2d8920c75b08c85ff03160c33f3788645d10d2949e942af08bbb045851cf7a85490156f02fcba62a30
-  data.tar.gz: be9ac7a4f9ef4fe2a9c222a2484e097c9d200a80e09b2c494c0b315a28c02354b16b777d2e8c4f9f8e28bb22f0302a85a93f9610400a773f55f4f1c4b40fe3ef
+  metadata.gz: 853099d5554d1a06cec3aa83f16e86cd4d001bb2b90dfcbccb26857486753c5f4370306ce513d3892f00206b2116f9a259adbaf5988284e2a250e7ad05047488
+  data.tar.gz: 9b5e6af59deb7716d4f3f11da57753c6f1174b38acf17bce8f35fff7dc628855cddcd200fe1a5e77dc1043e001aa31215176f01739f539bf52c5108af1acc9c7

data/README.md

@@ -347,7 +347,7 @@ In mysh, variables are kept that control the behavior of the shell. This simple
 command is used to set, delete, and display these variables. The basic method
 for setting a variable is:
 
-    $name=value
+    set $name=value
 
 Where:
 * name is a word matching the regex: /[a-z][a-z0-9_]*/. Note: lower case only.
@@ -355,17 +355,14 @@ Where:
 
 To erase the value of a variable, use:
 
-    $name=
+    set $name=
 
 To display the name/value of a variable, use:
 
-    $name
+    set $name
 
-To display all variable names/values use just enter a single $ sign.
-
-As an escapement, the string $$ maps to a single $.
-
-Some variables that are used in mysh are:
+To display all variable names/values use just enter "set". As an escapement,
+the string $$ maps to a single $. Some variables that are used in mysh are:
 
 Variable    | Description
 ------------|--------------------------------------------

data/lib/mysh/process.rb

@@ -21,14 +21,14 @@ module Mysh
   #Process commands from a source.
   def self.process_source(source)
     until source.eoi? do
-      execute_a_command(get_command(source))
+      execute_a_command(source)
     end
-  rescue Interrupt, MyshExit
+  rescue MyshExit
   end
 
   #Execute a single line of input and handle exceptions.
-  def self.execute_a_command(str)
-    try_execute_command(str)
+  def self.execute_a_command(source)
+    try_execute_command(get_command(source))
 
   rescue Interrupt, StandardError, ScriptError => err
     puts "Error #{err.class}: #{err}"

data/lib/mysh/shell_variables/shell_variable_keeper.rb

@@ -16,8 +16,9 @@ module Mysh
       my_id = self.object_id
       fail "Mysh variable looping error." if loop_check[my_id]
       loop_check[my_id] = self
-
       @value.preprocess
+    ensure
+      loop_check.delete(my_id)
     end
 
     #Get the source code of this variable.

data/lib/mysh/sources/console.rb

@@ -15,11 +15,27 @@ module Mysh
     def get_command
       puts MNV[:pre_prompt] if MNV.key?(:pre_prompt)
       get(prompt: MNV[:prompt] + '>')
+    rescue MiniReadlinePLE => err
+      retry unless handle_get_error(err, :prompt)
+      exit
     end
 
     #Get additional lines of continued commands.
     def get_command_extra(str)
       get(prompt: MNV[:post_prompt] + '\\', prefix: str[0])
+    rescue MiniReadlinePLE => err
+      retry unless handle_get_error(err, :post_prompt)
+      exit
+    end
+
+    # Handle a readline error
+    def handle_get_error(err, selector)
+      puts "Error #{err.class}: #{err}"
+      puts err.backtrace if MNV[:debug]
+
+      MNV[selector].empty?
+    ensure
+      MNV[selector] = ""
     end
 
     #Have we reached the end of input?

data/lib/mysh/version.rb

@@ -2,7 +2,7 @@
 
 module Mysh
   #The version string of MY SHell.
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
   #A brief summary of this gem.
   SUMMARY = "mysh -- a Ruby inspired command line shell."

data/mysh.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rdoc', "~> 5.0"
   spec.add_development_dependency 'reek', "~> 4.5"
 
-  spec.add_runtime_dependency     'mini_readline', "~> 0.8"
+  spec.add_runtime_dependency     'mini_readline', "~> 0.8.1"
   spec.add_runtime_dependency     'vls', "~> 0.4.1"
   spec.add_runtime_dependency     'in_array', "~> 0.1.8"
 end

data/tests/my_shell_tests.rb

@@ -235,4 +235,15 @@ class MyShellTester < Minitest::Test
     assert_equal("test\\foo\\bar.rb".to_std_spec, "test/foo/bar.rb")
   end
 
+  def test_recursion_detection
+    MNV[:rec_test_one] = "one"
+    assert_equal("one one", "$rec_test_one $rec_test_one".preprocess)
+
+    MNV[:rec_test_too] = "$rec_test_too".preprocess
+    assert_raises { "$rec_test_too".preprocess }
+
+    MNV[:rec_test_two] = "$rec_test_one $rec_test_one"
+    assert_equal("one one", "$rec_test_two".preprocess)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysh
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: vls
   requirement: !ruby/object:Gem::Requirement