mysh 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc2ce1a31750c110022b543778cb28e70b4f2456
-  data.tar.gz: e5f15032fa38956e7f06be1f8cc92ce5de7feba9
+  metadata.gz: 1aaea546a90b6d110dd8910757083c385a7e72d5
+  data.tar.gz: 4f82d70adf3479acf12ee7a670c6d3a247326777
 SHA512:
-  metadata.gz: 4484f3c07c6ac22a7ccba4b29dd87116926f0731d4b9c54bd54ecefcefcea8676c8fe111d7f7c98be1331ed7ea17798af7d3566ef064d94d879fae89619001fa
-  data.tar.gz: 7c4a82903c595abd907bd02285051bbb0805481fa54b65f3993359fea6c24376d6f58646f3400ddc9aab36c636fde249d9265c94960339c365954bdad01f9f42
+  metadata.gz: 5b6d81b4a6cce7307a7b1262ad4125afb1cc1c0083a2c128543ff43211bd3be70bf4c3372f43a01b1225b4668d077b3b29cac51c29741313c0ae757510398e3a
+  data.tar.gz: 1aff82db1052b83caf85b0e09f006eebebf80a0b0782da66660b09586fabe1527bdd72f4760c47eaa2a4387a5f16447acc6ce588f364101d3a692736c628bad1

data/README.md

@@ -26,7 +26,7 @@ See the original article at:
 (http://www.blackbytes.info/2016/07/writing-a-shell-in-ruby/)
 
 Oh, and one other little thing. A survey of the mysh reveals that it currently
-contains 2291 lines of code. It seems that there has been some growth beyond
+contains 2188 lines of code. It seems that there has been some growth beyond
 the 25 lines in the original article.
 
 ## Installation
@@ -907,7 +907,7 @@ on the optional parms.
 ###### "string".preprocess(context=mysh_default_context)
 Process the string for embedded variables and handlebars. By default,
 any embedded ruby  is evaluated in the mysh global expression binding. However,
-another BindingWrapper instance may be passed to access an alternative binding.
+another binding may be passed to access an alternative execution environment.
 
 ###### "string".to_host_spec
 Given a string with a file spec, to_host_spec adjusts that string so that it is

data/lib/mysh.rb

@@ -1,17 +1,16 @@
 # coding: utf-8
 
-# mysh -- MY SHell -- a Ruby/Rails inspired command line shell.
+# mysh -- MY SHell -- a Ruby inspired command line shell.
 
+require 'pp'
 require 'English'
 require 'in_array'
 require 'pause_output'
 require 'format_output'
 
 require_relative 'mysh/exceptions'
-require_relative 'mysh/binding_wrapper'
 require_relative 'mysh/input_wrapper'
 require_relative 'mysh/user_input'
-require_relative 'mysh/expression'
 require_relative 'mysh/internal'
 require_relative 'mysh/quick'
 require_relative 'mysh/external'
@@ -22,7 +21,7 @@ require_relative 'mysh/pre_processor'
 require_relative 'mysh/process'
 require_relative 'mysh/globalize'
 require_relative 'mysh/init'
-
+require_relative 'mysh/expression'
 require_relative 'mysh/version'
 
 #The Mysh (MY SHell) module. A container for mysh and its functionality.
@@ -43,3 +42,5 @@ end
 if __FILE__ == $0
   Mysh.run(ARGV)  #Run a shell if this file is run directly.
 end
+
+$VERBOSE = nil

data/lib/mysh/expression.rb

@@ -1,66 +1,46 @@
 # coding: utf-8
 
-require 'pp'
 require_relative 'expression/lineage'
 
-#* mysh/expression.rb -- The mysh ruby expression processor.
-#<br>Endemic Code Smells
-#* :reek:ModuleInitialize -- False positive
+# Endemic Code Smells  :reek:ModuleInitialize -- False positive
 module Mysh
 
-  #Set up some popular constants
+  # Set up some popular constants
   E = Math::E
   PI = Math::PI
 
-  #Reset the state of the execution hosting environment.
-  #<br>Endemic Code Smells
-  # :reek:TooManyStatements -- False positive
+  $mysh_exec_result  = nil
+
+  # Reset the state of the execution hosting environment.
+  # Endemic Code Smells  :reek:TooManyStatements -- False positive
   def self.reset_host
     exec_class = Class.new do
 
       include Math
 
-      #Set up a new execution environment
+      # Set up a new execution environment
       def initialize
-        $mysh_exec_result  = nil
-        $mysh_exec_binding = mysh_binding
-      end
-
-      #Do the actual work of executing an expression.
-      #<br>Note:
-      #* The expression string always begins with an '=' character.
-      def execute(expression)
-        pp $mysh_exec_binding.eval("$mysh_exec_result" + expression)
-        :expression
+        $mysh_exec_binding = binding
       end
 
-      #Return a simple message for less convoluted error messages.
+      # Return a simple message for less convoluted error messages.
       def inspect
         "exec_host"
       end
 
-      #Evaluate the string in the my shell context.
-      def mysh_eval(str)
-        $mysh_exec_binding.eval(str)
-      end
-
       private
 
-      #Get the previous result
+      # Get the previous result
       def result
          $mysh_exec_result
       end
 
-      #Reset the state of the execution host.
+      # Reset the state of the execution host.
       def reset
         Mysh.reset_host
         nil
       end
 
-      #Create a binding for mysh to execute expressions in.
-      def mysh_binding
-        binding
-      end
     end
 
     $mysh_exec_host = exec_class.new

data/lib/mysh/external.rb

@@ -22,7 +22,7 @@ module Mysh
         Mysh.process_file(file_name)
         :mysh_script
       elsif ext == '.txt'
-        show_handlebar_file(file_name, BindingWrapper.new(binding))
+        show_handlebar_file(file_name, binding)
         :internal
       end
     end

data/lib/mysh/globalize.rb

@@ -27,4 +27,17 @@ class Object
     err.to_s
   end
 
+  # Get the latest version for the named gem. Patched code.
+  def latest_version_for(name, fetcher=nil)
+    dependency = Gem::Dependency.new(name)
+    fetcher  ||= Gem::SpecFetcher.new
+
+    if specs = fetcher.spec_for_dependency(dependency)[0][-1]
+      spec = specs[0]
+      spec && spec.version
+    else
+      "<Not found in repository>"
+    end
+  end
+
 end

data/lib/mysh/handlebars.rb

@@ -2,21 +2,20 @@
 
 require_relative 'handlebars/string'
 
-#* user_input/handlebars.rb -- Handlebar embedded ruby support.
+# Handlebar embedded ruby support.
 class Object
 
-  #Show a file with embedded ruby handlebars.
-  #<br>Note:
-  #The message receiver is the evaluation host for the handlebar code.
-  def show_handlebar_file(name, evaluator = $mysh_exec_host)
+private
+
+  # Show a file with embedded ruby handlebars.
+  # Note: The message receiver is the evaluation host for the handlebar code.
+  def show_handlebar_file(name, evaluator = $mysh_exec_binding)
     puts eval_handlebar_file(name, evaluator)
   end
 
-  #Expand a file with embedded ruby handlebars.
-  #<br>Note:
-  #The message receiver is the evaluation host for the handlebar code.
-  #<br>Endemic Code Smells
-  #* :reek:UtilityFunction
+  # Expand a file with embedded ruby handlebars.
+  # Note: The message receiver is the evaluation host for the handlebar code.
+  # Endemic Code Smells   :reek:UtilityFunction
   def eval_handlebar_file(name, evaluator)
     IO.read(name).preprocess(evaluator)
   end

data/lib/mysh/handlebars/string.rb

@@ -1,22 +1,36 @@
 # coding: utf-8
 
-#Monkey patches for Mysh handlebars
+# Monkey patches for Mysh handlebars
 class String
 
-  #Evaluate any variable substitutions in the input.
-  def eval_handlebars(evaluator=$mysh_exec_host)
-    gsub(/{{.*?}}/m) do |match|
-      code   = match[2...-2]
-      silent = code.end_with?("#")
-      result = evaluator.mysh_eval(code)
+  # Evaluate any variable substitutions in the input.
+  def eval_handlebars(evaluator=$mysh_exec_binding)
+    string, text, buffer = self, "", []
 
-      (result unless silent).to_s
+    until string.empty?
+      text, code, string = string.partition(/{{.*?}}/m)
+
+      if not text.empty?
+        text = text.gsub(/\\[{}]/) {|found| found[1]}
+        buffer << "_m_<<#{text.inspect};"
+      elsif buffer.empty?
+        buffer << ""
+      end
+
+      unless code.empty?
+        if code[-3] == "#"
+          buffer << "#{code[2...-3]};"
+        else
+          buffer << "_m_<<(#{code[2...-2]}).to_s;"
+        end
+      end
     end
-  end
 
-  #Process quoted brace characters
-  def eval_quoted_braces
-    gsub(/\\[\{\}]/) {|found| found[1]}
+    if buffer.length > 1
+      evaluator.eval("_m_ = '';" + buffer.join + "_m_")
+    else
+      text
+    end
   end
 
 end

data/lib/mysh/internal/actions/help/hbar.txt

@@ -30,6 +30,17 @@ those cases, simply end the expression with a '#' character. For example:
     mysh>echo \{\{ "not embedded" #\}\} \{\{ "embedded" \}\}
       embedded
 
+A common use for not embedded code snippets is to act as the control
+structures. For example:
+
+    \{\{ 3.times do |i| #\}\} The count is: \{\{ i+1 \}\}
+    \{\{ end #\}\}
+
+Yields the following output:
+
+    {{ 3.times do |i| #}} The count is: {{ i+1 }}
+    {{ end #}}
+
 Finally, it may be that it is desired to embed braces into a text file or
 the command line. In that case precede the brace with a backslash character
 like: \\{  or \\}

data/lib/mysh/internal/actions/load.rb

@@ -18,7 +18,7 @@ module Mysh
         Mysh.process_file(file_name)
         :internal
       elsif file_ext == '.txt'
-        show_handlebar_file(file_name, BindingWrapper.new(binding))
+        show_handlebar_file(file_name, binding)
         :internal
       elsif file_ext == '.rb'
         load file_name

data/lib/mysh/internal/actions/show/env.rb

@@ -8,14 +8,12 @@ module Mysh
 
     # Execute the @env shell command.
     def process_command(_args)
-      print WORKING unless @ran_once
+      print WORKING
       Gem.refresh
 
       puts "Key mysh environment information.", "",
            info.format_output_bullets, "",
            path.format_output_bullets, ""
-
-      @ran_once = true
     end
 
     private
@@ -28,7 +26,7 @@ module Mysh
        ["installed", Gem::Specification.find_all_by_name("mysh")
                                        .map{|s| s.version.to_s}
                                        .join(", ")],
-       ["latest",    insouciant {Gem.latest_version_for("mysh").to_s}],
+       ["latest",    insouciant {latest_version_for("mysh").to_s}],
        ["init file", $mysh_init_file.to_host_spec],
        ["user",      ENV['USER']],
        ["home",      (ENV['HOME'] || "").to_host_spec],

data/lib/mysh/internal/actions/show/gem.rb

@@ -8,7 +8,7 @@ module Mysh
 
     #Execute the @gem shell command.
     def process_command(input)
-      print WORKING unless @ran_once
+      print WORKING
       Gem.refresh
 
       args = input.cooked_body.split(" ")[1..-1]
@@ -19,7 +19,6 @@ module Mysh
         specific(args)
       end
 
-      @ran_once = true
     end
 
     private
@@ -61,7 +60,7 @@ module Mysh
 
     # Get gem info on the specified gems
     def specific(args)
-      details = []
+      fetcher, details = Gem::SpecFetcher.new, []
 
       args.each do |gem_name|
         version_list = Gem::Specification.find_all_by_name(gem_name)
@@ -69,7 +68,7 @@ module Mysh
                                          .join(", ")
         details << [gem_name, version_list]
 
-        latest = insouciant {latest_version_for(gem_name).to_s}
+        latest = insouciant {latest_version_for(gem_name, fetcher).to_s}
         details << ["latest", latest]
         details << [" ", " "]
       end
@@ -78,18 +77,6 @@ module Mysh
            details.format_output_bullets
     end
 
-    # Get the latest version for the named gem. Patched code.
-    def latest_version_for(name)
-      dependency = Gem::Dependency.new(name)
-      fetcher = Gem::SpecFetcher.fetcher
-      if specs = fetcher.spec_for_dependency(dependency)[0][-1]
-        spec = specs[0]
-        spec && spec.version
-      else
-        "<Not found in repository>"
-      end
-    end
-
   end
 
   desc = 'Get information about the current gem support or ' +

data/lib/mysh/internal/actions/show/term.rb

@@ -8,13 +8,11 @@ module Mysh
 
     #Execute the @term shell command.
     def process_command(_args)
-      print WORKING unless @ran_once
+      print WORKING
       Gem.refresh
 
       puts "Key term information.", "",
            info.format_output_bullets, ""
-
-      @ran_once = true
     end
 
     private
@@ -22,18 +20,20 @@ module Mysh
     # Get the info
     # Endemic Code Smells :reek:UtilityFunction
     def info
+      fetcher = Gem::SpecFetcher.new
+
       [["about",     MiniReadline::DESCRIPTION],
        ["version",   MiniReadline::VERSION],
        ["installed", Gem::Specification.find_all_by_name("mini_readline")
                                        .map{|s| s.version.to_s}
                                        .join(", ")],
-       ["latest",    insouciant {Gem.latest_version_for("mini_readline").to_s}],
+       ["latest",    insouciant {latest_version_for("mini_readline", fetcher).to_s}],
        ["about",     MiniTerm::DESCRIPTION],
        ["version",   MiniTerm::VERSION],
        ["installed", Gem::Specification.find_all_by_name("mini_term")
                                        .map{|s| s.version.to_s}
                                        .join(", ")],
-       ["latest",    insouciant {Gem.latest_version_for("mini_term").to_s}],
+       ["latest",    insouciant {latest_version_for("mini_term", fetcher).to_s}],
        ["platform",  MiniTerm::TERM_PLATFORM.inspect],
        ["term type", MiniTerm::TERM_TYPE.inspect],
        ["columns",   MiniTerm.width.to_s],
@@ -45,8 +45,6 @@ module Mysh
       ]
     end
 
-
-
   end
 
   desc = 'Get information about the console. See ?term for more.'

data/lib/mysh/internal/actions/type.rb

@@ -12,7 +12,7 @@ module Mysh
     file_name = args.shift
 
     if file_name
-      show_handlebar_file(file_name, BindingWrapper.new(binding))
+      show_handlebar_file(file_name, binding)
     else
       fail "A text file must be specified."
     end

data/lib/mysh/pre_processor.rb

@@ -4,8 +4,8 @@
 class String
 
   #The mysh string pre-processor stack.
-  def preprocess(evaluator=$mysh_exec_host)
-    self.eval_variables.eval_handlebars(evaluator).eval_quoted_braces
+  def preprocess(evaluator=$mysh_exec_binding)
+    self.eval_variables.eval_handlebars(evaluator)
   end
 
 end

data/lib/mysh/quick.rb

@@ -9,10 +9,16 @@ module Mysh
   QUICK['!'] = lambda {|input| HISTORY_COMMAND.process_quick_command(input)}
   QUICK['#'] = lambda {|input| MYSH_COMMENT.process_command(input)}
   QUICK['%'] = lambda {|input| TIMED_COMMAND.process_command(input)}
-  QUICK['='] = lambda {|input| $mysh_exec_host.execute(input.raw.preprocess)}
   QUICK['?'] = lambda {|input| HELP_COMMAND.process_quick_command(input)}
   QUICK['@'] = lambda {|input| SHOW_COMMAND.process_quick_command(input)}
 
+  QUICK['='] = lambda do |input|
+    cmd = "$mysh_exec_result=(" + input.raw[1..-1].preprocess + ")"
+    puts cmd if MNV[:debug].extract_boolean
+    pp $mysh_exec_binding.eval(cmd)
+    :expression
+  end
+
   #Try to execute the inputing as a quick command.
   def self.try_execute_quick(input)
     QUICK[input.quick_command].call(input)

data/lib/mysh/version.rb

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

data/samples/show.txt

@@ -9,3 +9,5 @@ Args = {{ args.inspect }}
     ["Squares", Array.new(count){|i| (i+1)**2} ],
     ["Cubes",   Array.new(count){|i| (i+1)**3} ]].format_output_bullets }}
 
+{{ 10.times do |i| #}} Let's count: {{ i+1 }}
+{{          end #}}

data/tests/my_shell_tests.rb

@@ -19,7 +19,6 @@ class MyShellTester < Minitest::Test
     assert_equal(Class,  Mysh::ActionPool.class)
     assert_equal(Module, Mysh::MNV.class)
     assert_equal(Class,  Mysh::Keeper.class)
-    assert_equal(Class,  Mysh::BindingWrapper.class)
     assert_equal(Class,  Mysh::InputWrapper.class)
 
     assert_equal(Mysh::ActionPool, Mysh::COMMANDS.class)
@@ -44,13 +43,13 @@ class MyShellTester < Minitest::Test
 
   def test_handlebars
     assert_equal("ABC 123 DEF",
-                 "ABC {{ (1..3).to_a.join }} DEF".eval_handlebars)
+                 "ABC {{ (1..3).to_a.join }} DEF".preprocess)
 
-    assert_equal("ABC", "{{ 'ABC'  }}".eval_handlebars)
-    assert_equal("",    "{{ 'ABC' #}}".eval_handlebars)
+    assert_equal("ABC", "{{ 'ABC'  }}".preprocess)
+    assert_equal("",    "{{ 'ABC' #}}".preprocess)
 
-    assert_equal("{{ 'ABC' }}", "\\{\\{ 'ABC' \\}\\}".eval_quoted_braces)
-    assert_equal("{{A}}", "{{ '{'+'{A}'+'}' }}".eval_handlebars.eval_quoted_braces)
+    assert_equal("{{ 'ABC' }}", "\\{\\{ 'ABC' \\}\\}".preprocess)
+    assert_equal("{{A}}", "{{ '{'+'{A}'+'}' }}".preprocess)
   end
 
   def test_command_parsing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysh
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.11
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -193,7 +193,6 @@ files:
 - README.md
 - bin/mysh
 - lib/mysh.rb
-- lib/mysh/binding_wrapper.rb
 - lib/mysh/exceptions.rb
 - lib/mysh/expression.rb
 - lib/mysh/expression/lineage.rb

data/lib/mysh/binding_wrapper.rb

@@ -1,21 +0,0 @@
-# coding: utf-8
-
-#* mysh/internal/binding_wrapper.rb -- An action compatible wrapper for a binding.
-module Mysh
-
-  #* mysh/internal/binding_wrapper.rb -- An action compatible wrapper for a binding.
-  class BindingWrapper
-
-    #Setup a binding wrapper
-    def initialize(binding)
-      @exec_binding = binding
-    end
-
-    #Evaluate the string in the wrapped context.
-    def mysh_eval(str)
-      @exec_binding.eval(str)
-    end
-
-  end
-
-end