mysh 0.4.0 → 0.5.0

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

@@ -7,7 +7,7 @@ module Mysh
   class RubyInfoCommand < Action
 
     #Execute the ? shell command.
-    def call(_args)
+    def process_command(_input)
       puts "Key ruby environment information.", ""
       puts info.format_mysh_bullets, "",
            path.format_mysh_bullets, ""

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

@@ -3,26 +3,20 @@
 #* mysh/internal/actions/type.rb -- The mysh type command.
 module Mysh
 
-  #* mysh/internal/actions/type.rb -- The mysh type command.
-  class TypeCommand < Action
-
-    #Execute the type command.
-    def call(args)
-      file_name = args.shift
+  #Add the type command to the library.
+  desc = 'Display a text file with support for optional embedded ' +
+         'handlebars and mysh variables.'
 
-      @exec_binding = binding
+  action = lambda do |input|
+    args = input.args
+    file_name = args.shift
 
-      if file_name
-        show_handlebar_file(file_name, self)
-      else
-        fail "A text file must be specified."
-      end
+    if file_name
+      show_handlebar_file(file_name, BindingWrapper.new(binding))
+    else
+      fail "A text file must be specified."
     end
-
   end
 
-  #Add the type command to the library.
-  desc = 'Display a text file with support for optional embedded ' +
-         'handlebars and mysh variables.'
-  COMMANDS.add_action(TypeCommand.new('type file', desc))
+  COMMANDS.add_action(Action.new('type file', desc, &action))
 end

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

@@ -19,8 +19,8 @@ module Mysh
     end
 
     #Execute a command against the internal mysh variables.
-    def call(str)
-      match = VAR_EXP.match(str.chomp)
+    def process_command(input)
+      match = VAR_EXP.match(input.raw)
       @name, @equals, @value = match[:name], match[:equals], match[:value]
       do_command
       :internal

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

@@ -5,25 +5,20 @@ require 'vls'
 #* mysh/internal/actions/vls.rb -- The mysh module vls (Version LS) command.
 module Mysh
 
-  #* mysh/internal/actions/vls.rb -- The mysh module vls (Version LS) command.
-  class VlsCommand < Action
+  #Add the vls command to the library.
+  desc = 'Display the loaded modules, matching the optional mask, that ' +
+         'have version info.'
 
-    #Execute the vls command.
-    def call(args)
-      filter  = args[0] || /./
-      results = VersionLS.vls(filter)
+  action = lambda do |input|
+    filter  = input.args[0] || /./
+    results = VersionLS.vls(filter)
 
-      if results.empty?
-        puts "No modules found for filter #{filter.inspect}.", ""
-      else
-        puts results.format_mysh_bullets, ""
-      end
+    if results.empty?
+      puts "No modules found for filter #{filter.inspect}.", ""
+    else
+      puts results.format_mysh_bullets, ""
     end
-
   end
 
-  #Add the vls command to the library.
-  desc = 'Display the loaded modules, matching the optional mask, that ' +
-         'have version info.'
-  COMMANDS.add_action(VlsCommand.new('vls <mask>', desc))
+  COMMANDS.add_action(Action.new('vls <mask>', desc, &action))
 end

data/lib/mysh/internal/manage.rb

@@ -6,29 +6,15 @@ module Mysh
   #Set up the command action pool.
   COMMANDS = ActionPool.new("COMMANDS")
 
-  #Parse a command string for use by commands.
-  def self.parse_command(str)
-    result = parse_args(str.chomp)
-
-    [COMMANDS[result.shift], result]
-  end
-
-  #Execute the action of an internal command.
-  def self.execute(str)
-    unless str[0] == ' '
-      action, args = parse_command(str.chomp)
-
-      if action
-        action.call(args)
+  #Try to execute the string as an internal action.
+  def self.try_execute_internal(input)
+    unless input.quick_command == ' '
+      if (action = COMMANDS[input.raw_command])
+        action.process_command(input)
         :internal
       end
     end
   end
 
-  #Try to execute the string as an internal action.
-  def self.try_execute_internal_command(str)
-    execute(str)
-  end
-
 end
 

data/lib/mysh/process.rb

@@ -23,7 +23,7 @@ module Mysh
     until source.eoi? do
       execute_a_command(get_command(source))
     end
-  rescue MyshExit
+  rescue Interrupt, MyshExit
   end
 
   #Execute a single line of input and handle exceptions.
@@ -32,21 +32,17 @@ module Mysh
 
   rescue Interrupt, StandardError, ScriptError => err
     puts "Error #{err.class}: #{err}"
-    puts err.backtrace if MNV[:debug]
+    puts err.backtrace if MNV[:debug] || defined?(MiniTest)
   end
 
   #Try to execute a single line of input. Does not handle exceptions.
-  def self.try_execute_command(input)
-    unless input.start_with?("$")
-      input = input.preprocess
-    end
-
-    puts "=> #{input}" if MNV[:debug]
+  def self.try_execute_command(str)
+    input = InputWrapper.new(str)
 
-    try_execute_quick_command(input)    ||
-    try_execute_internal_command(input) ||
-    try_execute_external_ruby(input)    ||
-    (system(input) ? :system : :error)
+    try_execute_quick(input)    ||
+    try_execute_internal(input) ||
+    try_execute_external(input) ||
+    try_execute_system(input)
   end
 
 end

data/lib/mysh/quick.rb

@@ -4,19 +4,19 @@
 module Mysh
 
   #A hash of quick command short cuts and their actions.
-  QUICK = Hash.new(lambda {|_str| false})
+  QUICK = Hash.new(lambda {|_input| false })
 
-  QUICK['!'] = lambda {|str| HISTORY_COMMAND.quick_parse_and_call(str) }
-  QUICK['#'] = lambda {|str| MYSH_COMMENT.call(str) }
-  QUICK['$'] = lambda {|str| VARS_COMMAND.call(str) }
-  QUICK['%'] = lambda {|str| TIMED_COMMAND.call(str) }
-  QUICK['='] = lambda {|str| $mysh_exec_host.execute(str) }
-  QUICK['?'] = lambda {|str| HELP_COMMAND.quick_parse_and_call(str) }
-  QUICK['@'] = lambda {|str| SHOW_COMMAND.quick_parse_and_call(str) }
+  QUICK['!'] = lambda {|input| HISTORY_COMMAND.process_quick_command(input)}
+  QUICK['#'] = lambda {|input| MYSH_COMMENT.process_command(input)}
+  QUICK['$'] = lambda {|input| VARS_COMMAND.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)}
 
-  #Try to execute the string as a quick command.
-  def self.try_execute_quick_command(str)
-    QUICK[str[0]].call(str)
+  #Try to execute the inputing as a quick command.
+  def self.try_execute_quick(input)
+    QUICK[input.quick_command].call(input)
   end
 
 end

data/lib/mysh/system.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+
+#* mysh/system.rb -- Support for executing through the system.
+module Mysh
+
+  #Try to execute as a system program.
+  def self.try_execute_system(input)
+    system(input.raw.preprocess + "\n") ? :system : :error
+  end
+
+end

data/lib/mysh/version.rb

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

data/tests/my_shell_tests.rb

@@ -11,13 +11,6 @@ class MyShellTester < Minitest::Test
   #Track mini-test progress.
   include MinitestVisible
 
-  #Evaluate the string in a mysh context.
-  def mysh_eval(str)
-    @mysh_binding ||= binding
-
-    @mysh_binding.eval(str)
-  end
-
   def test_that_module_entities_exists
     assert_equal(String, Mysh::VERSION.class)
 
@@ -26,6 +19,8 @@ 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)
     assert_equal(Mysh::ActionPool, Mysh::HELP.class)
@@ -197,4 +192,27 @@ class MyShellTester < Minitest::Test
     assert_equal("99", MNV[:d])
   end
 
+  def test_the_input_wrapper
+    wrapper = Mysh::InputWrapper.new '@last 45 "is finished" {{ 2+2 }} ever'
+
+    assert_equal('@last 45 "is finished" {{ 2+2 }} ever', wrapper.raw)
+    assert_equal('@last 45 "is finished" 4 ever', wrapper.cooked)
+
+    assert_equal('@last', wrapper.raw_command)
+    assert_equal(' 45 "is finished" {{ 2+2 }} ever', wrapper.raw_body)
+
+    assert_equal('@', wrapper.quick_command)
+    assert_equal('last 45 "is finished" {{ 2+2 }} ever', wrapper.quick_body)
+
+    assert_equal(["@last", "45", "is finished", "4", "ever"], wrapper.parsed)
+    assert_equal(["45", "is finished", "4", "ever"], wrapper.args)
+
+    assert_equal(wrapper, wrapper.quick)
+
+    assert_equal('@', wrapper.raw_command)
+    assert_equal('last 45 "is finished" {{ 2+2 }} ever', wrapper.raw_body)
+    assert_equal(["@", "last", "45", "is finished", "4", "ever"], wrapper.parsed)
+    assert_equal(["last", "45", "is finished", "4", "ever"], wrapper.args)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysh
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,11 +155,12 @@ files:
 - lib/mysh/exceptions.rb
 - lib/mysh/expression.rb
 - lib/mysh/expression/lineage.rb
-- lib/mysh/external_ruby.rb
+- lib/mysh/external.rb
 - lib/mysh/globalize.rb
 - lib/mysh/handlebars.rb
 - lib/mysh/handlebars/string.rb
 - lib/mysh/init.rb
+- lib/mysh/input_wrapper.rb
 - lib/mysh/internal.rb
 - lib/mysh/internal/action.rb
 - lib/mysh/internal/action_pool.rb
@@ -225,6 +226,7 @@ files:
 - lib/mysh/sources/parse.rb
 - lib/mysh/sources/smart_auto_complete.rb
 - lib/mysh/sources/string.rb
+- lib/mysh/system.rb
 - lib/mysh/user_input.rb
 - lib/mysh/version.rb
 - mysh.gemspec