mysh 0.3.0 → 0.4.0

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

@@ -8,12 +8,11 @@ module Mysh
 
     #Execute the exit command.
     def call(_args)
-      raise MiniReadlineEOI
+      raise MyshExit
     end
 
   end
 
   #Add the exit command to the library.
-  COMMANDS.add_action(ExitCommand.new('exit', 'Exit mysh.'))
-  COMMANDS.add_action(ExitCommand.new('quit', 'Exit mysh.'))
+  COMMANDS.add_action(ExitCommand.new('exit', 'Exit the current mysh level.'))
 end

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

@@ -39,7 +39,7 @@ module Mysh
     def gather_gems
       @specs = Gem.loaded_specs
                   .values
-                  .select {|spec| !(spec.name.partition(@mask)[1]).empty?}
+                  .select {|spec| spec.name[@mask]}
                   .sort   {|first, second| first.name <=> second.name}
     end
 

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

@@ -5,15 +5,12 @@ results of this evaluation are displayed.
 
 Notes:
 
-Lines ending with a \\ are continued on the next line. The prompt changes to
-mysh\\ to indicate that this is going on. The command is NOT actually processed
-until a line with NO trailing \\ is entered.
-
-The results of the expression are displayed using the pretty-print facility
-except for nil (shows as blank).
-
-Auto-complete always places any file names in quotes so they can be used as
-string parameters.
+* Lines ending with a \ are continued on the next line. The prompt changes to
+  mysh\ to indicate that this is going on. The command is NOT actually
+  processed until a line with NO trailing \ is entered.
+* The results of the expression are displayed using the pretty-print facility.
+* Auto-complete always places any file names in quotes so they can be used as
+  string parameters.
 
 A few special methods exist:
 

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

@@ -15,6 +15,12 @@ Form  Form     Description
   !   history  Display the mysh command history, or if an index is specified,
                retrieve the command with that index value.
 
+  #            A comment.
+
+  $            A mysh variable statement. See ?$ for more info.
+
+  %            Execute a command and then report the elapsed time.
+
   =            All command lines that begin with = are evaluated as Ruby
                expressions. The results of this evaluation are displayed.
 

data/lib/mysh/internal/actions/help/sub_help.rb

@@ -28,6 +28,7 @@ module Mysh
           ['env',     'Help on the show env command.',       'env.txt'    ],
           ['ruby',    'Help on the show ruby command.',      'ruby.txt'   ],
           ['math',    'Help on math functions.',             'math.txt'   ],
+          ['usage',   'Help on mysh usage.',                 'usage.txt'  ],
           ['=',       'Help on ruby expressions.',           'expr.txt'   ],
           ['quick',   'Help on quick commands.',             'quick.txt'  ],
           ['gls',     'Help on gls internal mysh command.',  'gls.txt'    ],

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

@@ -0,0 +1,8 @@
+Help: mysh usage info for version: {{ Mysh::VERSION }}
+
+Usage: mysh <args>
+
+Where args are one or more of the following command options:
+
+{{ Mysh::COMMAND_LINE.actions_info.format_mysh_bullets }}
+

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

@@ -19,7 +19,7 @@ As an escapement, the string $$$$ maps to a single $$.
 Some variables that are used in mysh are:
 
 $$d           The current date.
-$$date_fmt    The format for the date: "%Y-%m-%d"
+$$date_fmt    The format for the date: "%Y-%m-%d". ie: 2017-01-09
 $$debug       Does the shell display additional debugging info (true/false)
 $$h           The home folder's path
 $$post_prompt The prompt used when a line is continued with a trailing \\
@@ -28,7 +28,7 @@ $$pre_prompt  A prompt string displayed before the actual command prompt.
              Delete the pre_prompt variable to disable pre-prompting.
 $$prompt      The user prompt.
 $$t           The current time.
-$$time_fmt    The format for the time: "%H:%M"
+$$time_fmt    The format for the time: "%H:%M". ie: 20:11
 $$u           The current user.
 $$w           The current working directory's path.
 

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

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+#* mysh/internal/actions/load.rb -- The mysh load command.
+module Mysh
+
+  #* mysh/internal/actions/load.rb -- The mysh load command.
+  class LoadCommand < Action
+
+    #Execute the load command.
+    #<br>Endemic Code Smells
+    #* :reek:TooManyStatements
+    def call(args)
+      file_name = args.shift
+
+      if file_name
+        file_ext, @exec_binding = File.extname(file_name), binding
+
+        if file_ext == '.mysh'
+          Mysh.process_file(file_name)
+          :internal
+        elsif file_ext == '.txt'
+          show_handlebar_file(file_name, self)
+          :internal
+        elsif ["", ".rb"].include?(file_ext)
+          load file_name
+          :internal
+        else
+          fail "Error: Unknown file type: #{file_name.inspect}"
+        end
+
+      else
+        fail "Error: A load file must be specified."
+      end
+
+    end
+
+  end
+
+  #Add the load command to the library.
+  desc = 'Load a ruby program, mysh script, or text file into the mysh environment.'
+  COMMANDS.add_action(LoadCommand.new('load file', desc))
+end

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

@@ -0,0 +1,18 @@
+# coding: utf-8
+
+#* mysh/internal/actions/quit.rb -- The mysh internal quit command.
+module Mysh
+
+  #* mysh/internal/actions/quit.rb -- The mysh internal quit command.
+  class QuitCommand < Action
+
+    #Execute the quit command.
+    def call(_args)
+      exit
+    end
+
+  end
+
+  #Add the quit command to the library.
+  COMMANDS.add_action(QuitCommand.new('quit', 'Quit out of the mysh.'))
+end

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

@@ -0,0 +1,20 @@
+# coding: utf-8
+
+#* mysh/internal/actions/say.rb -- A mysh internal say command.
+module Mysh
+
+  #* mysh/internal/actions/say.rb -- A mysh internal say command.
+  class SayCommand < Action
+
+    #Say something!
+    def call(args)
+      puts args.join(' ')
+      :internal
+    end
+
+  end
+
+  #Add says to the library.
+  desc = 'Display the text in the command arguments.'
+  COMMANDS.add_action(SayCommand.new('say <stuff>', desc))
+end

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

@@ -19,17 +19,19 @@ module Mysh
     #<br>Endemic Code Smells
     #* :reek:UtilityFunction
     def info
-      [["user",     ENV['USER']],
-       ["home",     ENV['HOME']],
-       ["name",     $PROGRAM_NAME.decorate],
-       ["shell",    ENV['SHELL']    || ENV['ComSpec']],
-       ["host",     ENV['HOSTNAME'] || ENV['COMPUTERNAME']],
-       ["os",       ENV['OS']],
-       ["platform", MiniReadline::TERM_PLATFORM],
-       ["java",     MiniReadline::TERM_JAVA != nil],
-       ["term",     ENV['TERM']],
-       ["disp",     ENV['DISPLAY']],
-       ["edit",     ENV['EDITOR']]]
+      [["version",   Mysh::VERSION],
+       ["init file", $mysh_init_file],
+       ["user",      ENV['USER']],
+       ["home",      ENV['HOME']],
+       ["name",      $PROGRAM_NAME.decorate],
+       ["os shell",  ENV['SHELL']    || ENV['ComSpec']],
+       ["host",      ENV['HOSTNAME'] || ENV['COMPUTERNAME']],
+       ["os",        ENV['OS']],
+       ["platform",  MiniReadline::TERM_PLATFORM],
+       ["java?",     MiniReadline::TERM_JAVA != nil],
+       ["term",      ENV['TERM']],
+       ["disp",      ENV['DISPLAY']],
+       ["edit",      ENV['EDITOR']]]
     end
 
     #Get the path.

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

@@ -15,13 +15,14 @@ module Mysh
       if file_name
         show_handlebar_file(file_name, self)
       else
-        puts "Error: A text file must be specified."
+        fail "A text file must be specified."
       end
     end
 
   end
 
   #Add the type command to the library.
-  desc = 'Display a text file with optional embedded handlebars.'
-  COMMANDS.add_action(TypeCommand.new('type', desc))
+  desc = 'Display a text file with support for optional embedded ' +
+         'handlebars and mysh variables.'
+  COMMANDS.add_action(TypeCommand.new('type file', desc))
 end

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

@@ -23,7 +23,7 @@ module Mysh
       match = VAR_EXP.match(str.chomp)
       @name, @equals, @value = match[:name], match[:equals], match[:value]
       do_command
-      true
+      :internal
     end
 
     #Do the actual work here.
@@ -43,10 +43,10 @@ module Mysh
 
     #Display all variables neatly.
     def show_all_values
-      puts MNV.keys
-              .sort
-              .map {|sym| ["$" + sym.to_s, MNV.get_source(sym)]}
-              .format_mysh_bullets
+      puts (MNV.keys - ['$'.to_sym])
+             .sort
+             .map {|sym| ["$" + sym.to_s, MNV.get_source(sym)]}
+             .format_mysh_bullets
     end
 
   end

data/lib/mysh/internal/manage.rb

@@ -8,7 +8,7 @@ module Mysh
 
   #Parse a command string for use by commands.
   def self.parse_command(str)
-    result = Mysh.parse_args(str.chomp)
+    result = parse_args(str.chomp)
 
     [COMMANDS[result.shift], result]
   end

data/lib/mysh/process.rb

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+#* mysh/process.rb -- The mysh command processors.
+module Mysh
+
+  #Process from the console.
+  def self.process_console
+    process_source(Console.new)
+  end
+
+  #Process from a string.
+  def self.process_string(str)
+    process_source(StringSource.new(str))
+  end
+
+  #Process from a file.
+  def self.process_file(name)
+    process_source(StringSource.new(IO.read(name)))
+  end
+
+  #Process commands from a source.
+  def self.process_source(source)
+    until source.eoi? do
+      execute_a_command(get_command(source))
+    end
+  rescue MyshExit
+  end
+
+  #Execute a single line of input and handle exceptions.
+  def self.execute_a_command(str)
+    try_execute_command(str)
+
+  rescue Interrupt, StandardError, ScriptError => err
+    puts "Error #{err.class}: #{err}"
+    puts err.backtrace if MNV[:debug]
+  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]
+
+    try_execute_quick_command(input)    ||
+    try_execute_internal_command(input) ||
+    try_execute_external_ruby(input)    ||
+    (system(input) ? :system : :error)
+  end
+
+end

data/lib/mysh/quick.rb

@@ -7,10 +7,12 @@ module Mysh
   QUICK = Hash.new(lambda {|_str| 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 {|str| VARS_COMMAND.call(str) }
 
   #Try to execute the string as a quick command.
   def self.try_execute_quick_command(str)

data/lib/mysh/shell_variables.rb

@@ -2,7 +2,6 @@
 
 require_relative 'shell_variables/shell_variable_store'
 require_relative 'shell_variables/shell_variable_keeper'
-require_relative 'shell_variables/globalize'
 require_relative 'shell_variables/evaluate'
 
 #* mysh/shell_variables.rb -- Adds support for mysh scripting variables.

data/lib/mysh/sources/console.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+
+#* mysh/sources/console.rb -- The mysh console command source.
+module Mysh
+
+  #A wrapper for the mysh console terminal.
+  class Console
+
+    #Setup the console wrapper.
+    def initialize
+      @eoi = false
+    end
+
+    #Get the initial line of command input.
+    def get_command
+      puts MNV[:pre_prompt] if MNV.key?(:pre_prompt)
+      get(prompt: MNV[:prompt] + '>')
+    end
+
+    #Get additional lines of continued commands.
+    def get_command_extra(str)
+      get(prompt: MNV[:post_prompt] + '\\', prefix: str[0])
+    end
+
+    #Have we reached the end of input?
+    def eoi?
+      @eoi
+    end
+
+    private
+
+    #Get some actual user input!
+    def get(parms={})
+      result = (input = Mysh.input).readline(parms)
+      input.instance_options[:initial] = ""
+      result
+    rescue MiniReadlineEOI
+      @eoi = true
+      "\n"
+    end
+
+  end
+
+end

data/lib/mysh/{user_input → sources}/parse.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-#* mysh/user_input/parse.rb -- mysh general parser.
+#* mysh/sources/parse.rb -- mysh general parser.
 module Mysh
 
   #Parse a string into components.

data/lib/mysh/{user_input/smart_source.rb → sources/smart_auto_complete.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-#* mysh/user_input/smart_source.rb - An adaptive source for auto-complete.
+#* mysh/sources/smart_auto_complete.rb - An adaptive source for auto-complete.
 module Mysh
 
   #* array_source.rb - An array as the source for auto-complete.

data/lib/mysh/sources/string.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+#* mysh/sources/string.rb -- The mysh string command source.
+module Mysh
+
+  #A wrapper for a string with mysh commands.
+  class StringSource
+
+    #Setup the string source.
+    def initialize(str)
+      @eoi = false
+      @read_pt = str.lines.each
+    end
+
+    #Get the initial line of command input.
+    def get_command(_str="")
+      @read_pt.next
+    rescue StopIteration
+      @eoi = true
+      "\n"
+    end
+
+    #Set up an alias as these two are identical.
+    alias :get_command_extra :get_command
+
+    #Have we reached the end of input?
+    def eoi?
+      @eoi
+    end
+
+  end
+
+end