mysh 0.6.12 → 0.6.18

data/lib/mysh/{internal/actions/command_line → command_line}/pre_prompt.rb

@@ -1,43 +1,41 @@
 # coding: utf-8
 
-#* mysh/internal/actions/command_line/prompt.rb -- The mysh pre_prompt command.
+# The mysh pre_prompt command.
 module Mysh
 
-  #* mysh/internal/actions/command_line/pre_prompt.rb -- The mysh pre_prompt command.
+  # The mysh pre_prompt command.
   class PrepromptOption < CommandOption
 
-    #Skip over the argument for pre_boot.
+    # Skip over the argument for pre_boot.
     def pre_boot(read_point)
       get_arg(read_point)
     end
 
-    #Execute the prompt command line option.
-    #<br>Endemic Code Smells
-    #* :reek:UtilityFunction
+    # Execute the prompt command line option.
+    # Endemic Code Smells   :reek:UtilityFunction
     def post_boot(read_point)
       MNV[:pre_prompt] = get_arg(read_point)
     end
 
   end
 
-  #Add the pre prompt command line option to the library.
+  # Add the pre prompt command line option to the library.
   desc = 'Set the mysh pre prompt to "str".'
   COMMAND_LINE.add_action(PrepromptOption.new('--pre-prompt "str"', desc))
   COMMAND_LINE.add_action(PrepromptOption.new('-pr "str"', desc))
 
-  #* mysh/internal/actions/command_line/pre_prompt.rb -- The mysh command no pre_prompt.
+  # The mysh command no pre_prompt.
   class NoPrepromptOption < CommandOption
 
-    #Execute the no pre_prompt command line option.
-    #<br>Endemic Code Smells
-    #* :reek:UtilityFunction
+    # Execute the no pre_prompt command line option.
+    # Endemic Code Smells   :reek:UtilityFunction
     def post_boot(_args)
       MNV[:pre_prompt] = ""
     end
 
   end
 
-  #Add the prompt command line option to the library.
+  # Add the prompt command line option to the library.
   desc = 'Turn off mysh pre prompting.'
   COMMAND_LINE.add_action(NoPrepromptOption.new('--no-pre-prompt', desc))
   COMMAND_LINE.add_action(NoPrepromptOption.new('-npr', desc))

data/lib/mysh/{internal/actions/command_line → command_line}/prompt.rb

@@ -1,41 +1,40 @@
 # coding: utf-8
 
-#* mysh/internal/actions/command_line/prompt.rb -- The mysh prompt command.
+# The mysh prompt command.
 module Mysh
 
-  #* mysh/internal/actions/command_line/prompt.rb -- The mysh prompt command.
+  # The mysh prompt command.
   class PromptOption < CommandOption
 
-    #Skip over the argument for pre_boot.
+    # Skip over the argument for pre_boot.
     def pre_boot(read_point)
       get_arg(read_point)
     end
 
-    #Execute the prompt command line option.
+    # Execute the prompt command line option.
     def post_boot(read_point)
       MNV[:prompt] = get_arg(read_point)
     end
 
   end
 
-  #Add the prompt command line option to the library.
+  # Add the prompt command line option to the library.
   desc = 'Set the mysh prompt to "str".'
   COMMAND_LINE.add_action(PromptOption.new('--prompt "str"', desc))
   COMMAND_LINE.add_action(PromptOption.new('-p "str"', desc))
 
-  #* mysh/internal/actions/command_line/prompt.rb -- The mysh prompt command no prompt.
+  # The mysh prompt command no prompt.
   class NoPromptOption < CommandOption
 
-    #Execute the no prompt command line option.
-    #<br>Endemic Code Smells
-    #* :reek:UtilityFunction
+    # Execute the no prompt command line option.
+    # Endemic Code Smells   :reek:UtilityFunction
     def post_boot(_args)
       MNV[:prompt] = ""
     end
 
   end
 
-  #Add the prompt command line option to the library.
+  # Add the prompt command line option to the library.
   desc = 'Turn off mysh prompting.'
   COMMAND_LINE.add_action(NoPromptOption.new('--no-prompt', desc))
   COMMAND_LINE.add_action(NoPromptOption.new('-np', desc))

data/lib/mysh/command_line/quit.rb

@@ -0,0 +1,19 @@
+# coding: utf-8
+
+# The mysh quit command.
+module Mysh
+
+  # The mysh quit command.
+  class QuitOption < CommandOption
+
+    # Execute the quit command line option.
+    def post_boot(_args)
+      exit
+    end
+
+  end
+
+  # Add the quit command line option to the library.
+  desc = "Exit a nested mysh file or command."
+  COMMAND_LINE.add_action(QuitOption.new('--quit', desc))
+end

data/lib/mysh/{internal/actions/command_line → command_line}/usage.rb

@@ -1,19 +1,19 @@
 # coding: utf-8
 
-#* mysh/internal/actions/command_line/usage.rb -- The mysh help command usage.
+# The mysh help command usage.
 module Mysh
 
-  #* mysh/internal/actions/command_line/usage.rb -- The mysh help command usage.
+  # The mysh help command usage.
   class UsageOption < CommandOption
 
-    #Execute the help command line option. (Punt to error handler with no msg)
+    # Execute the help command line option. (Punt to error handler with no msg)
     def pre_boot(_args)
       raise MyshUsage
     end
 
   end
 
-  #Add the usage command line option to the library.
+  # Add the usage command line option to the library.
   desc = 'Display mysh usage info and exit.'
 
   USAGE = UsageOption.new('--help', desc)

data/lib/mysh/external.rb

@@ -1,11 +1,10 @@
 # coding: utf-8
 
-#* mysh/external.rb -- Support for executing external files.
+# Support for executing external files.
 module Mysh
 
-  #Try to execute an external file.
-  #<br>Endemic Code Smells
-  #* :reek:TooManyStatements
+  # Try to execute an external file.
+  # Endemic Code Smells   :reek:TooManyStatements
   def self.try_execute_external(input)
     args = input.parsed
     file_name = args.shift

data/lib/mysh/globalize.rb

@@ -1,16 +1,15 @@
 # coding: utf-8
 
-#Monkey patches for mysh global entities.
+# Monkey patches for mysh global entities.
 class Object
 
-  #Make the environment variable store accessible everywhere.
+  # Make the environment variable store accessible everywhere.
   MNV = Mysh::MNV
 
   private
 
-  #The mysh equivalent of the system method.
-  #<br>Endemic Code Smells
-  #* :reek:UtilityFunction
+  # The mysh equivalent of the system method.
+  # Endemic Code Smells  :reek:UtilityFunction
   def mysh(str)
     Mysh.try_execute_command(str)
   end
@@ -20,21 +19,13 @@ class Object
     raise MyshExit
   end
 
-  # Run some code with no wuccas.
-  def insouciant
-    yield
-  rescue => err
-    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
+      specs[0].version
     else
       "<Not found in repository>"
     end

data/lib/mysh/handlebars.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require_relative 'handlebars/string'
+require_relative 'handlebars/eval_handlebars'
 
 # Handlebar embedded ruby support.
 class Object
@@ -21,5 +21,3 @@ private
   end
 
 end
-
-

data/lib/mysh/handlebars/{string.rb → eval_handlebars.rb}

@@ -7,14 +7,15 @@ class String
   def eval_handlebars(evaluator=$mysh_exec_binding)
     string, text, buffer = self, "", []
 
+    # Translate the string with embedded code into Ruby code.
     until string.empty?
       text, code, string = string.partition(/{{.*?}}/m)
 
-      if not text.empty?
+      unless text.empty?
         text = text.gsub(/\\[{}]/) {|found| found[1]}
         buffer << "_m_<<#{text.inspect};"
-      elsif buffer.empty?
-        buffer << ""
+      else
+        buffer << "" if buffer.empty?
       end
 
       unless code.empty?
@@ -26,6 +27,7 @@ class String
       end
     end
 
+    # Evaluate the result of the translation.
     if buffer.length > 1
       evaluator.eval("_m_ = '';" + buffer.join + "_m_")
     else

data/lib/mysh/{internal/actions/help → help}/h_o_h.txt

@@ -14,7 +14,7 @@ Brief summaries are also available on the following internal commands:
 
 {{ Mysh::COMMANDS.actions_info
                  .reject{|cmd| cmd[1]["See ?"]}
-                 .map{|cmd| cmd[0].split[0] }
+                 .map{|cmd| cmd[0].gsub(/<.*>/, "").strip }
                  .join(" ")
 }}
 

data/lib/mysh/help/type.txt

@@ -0,0 +1,28 @@
+Help: mysh type command summary:
+
+The type command is used to display one or more text files. The names of these
+files are the arguments to this command as are options that control how those
+files are processed before being displayed.
+
+Files can be handled in one of two modes:
+
+    raw    Files are displayed with no pre-processing
+    cooked Files are displayed after handlebars and shell variables have been
+           processed and the results inserted into the text.
+
+The default behavior of the type command is set by the \$type variable. This
+may take the values:
+
+    raw, off, false, no   = raw mode (the default value)
+    cooked, on, true, yes = cooked mode
+
+Within the type command, options can be used to override the defaults:
+
+    +c  Force cooked mode.
+    -c  Force raw mode.
+
+Note: This command contrasts with the load command which can also be used to
+      display text files. The difference is the the load command always expands
+      handlebars and shell variables.
+
+

data/lib/mysh/{internal/actions/help → help}/vars.txt

@@ -4,7 +4,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:
 
-    set $name=value
+    set \$name=value
 
 Where:
 * name is a word matching the regex: /[a-z][a-z0-9_]*/. Lower case only.
@@ -14,7 +14,7 @@ To erase the value of a variable, use:         set $$name=
 To display the name/value of a variable, use:  set $$name
 To display all variable names/values use:      set
 
-As an escapement, the string $$$$ maps to a single $$.
+As an escapement, the strings $$$$ or \\$ map to a single $$.
 
 Some variables that are used in mysh are:
 
@@ -23,8 +23,8 @@ $$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
 $$name        The name given to this mysh session.
-$$post_prompt The prompt used when a line is continued with a trailing \\
-             character.
+$$post_prompt The prompt used when a line is continued with a trailing \
+             character. By default this just a single \
 $$pre_prompt  A prompt string displayed before the actual command prompt.
              Delete the pre_prompt variable to disable pre-prompting.
 $$prompt      The user prompt.

data/lib/mysh/input_wrapper.rb

@@ -1,62 +1,62 @@
 # coding: utf-8
 
-#* mysh/internal/input_wrapper.rb -- An action compatible wrapper for a input.
+# An action compatible wrapper for a input.
 module Mysh
 
-  #* mysh/internal/input_wrapper.rb -- An action compatible wrapper for a input.
+  # An action compatible wrapper for a input.
   class InputWrapper
 
-    #Build an input wrapper.
+    # Build an input wrapper.
     def initialize(raw)
       @raw = raw.chomp
       @raw_command = @raw_body = nil
     end
 
-    #Access the raw text.
+    # Access the raw text.
     attr_reader :raw
 
-    #Get the first raw character.
+    # Get the first raw character.
     def quick_command
       @raw[0] || ""
     end
 
-    #Get the balance of the raw string.
+    # Get the balance of the raw string.
     def quick_body
       @raw[1..-1] || ""
     end
 
-    #Get the command word if it exists.
+    # Get the command word if it exists.
     def raw_command
       @raw_command ||= @raw.split[0] || ""
     end
 
-    #Get the parameter text.
+    # Get the parameter text.
     def raw_body
       @raw_body ||= @raw[(raw_command.length + 1)..-1] || ""
     end
 
-    #Get the preprocessed argument text.
+    # Get the preprocessed argument text.
     def cooked_body
       raw_body.preprocess
     end
 
-    #Access the massaged text.
+    # Access the massaged text.
     def cooked
       body = cooked_body
       raw_command + (body.empty? ? "" : " " + body)
     end
 
-    #Get the parsed arguments
+    # Get the parsed arguments
     def args
       Mysh.parse_args(cooked_body)
     end
 
-    #Get the parsed command line.
+    # Get the parsed command line.
     def parsed
       [raw_command] + args
     end
 
-    #Set up input for a quick style command.
+    # Set up input for a quick style command.
     def quick
       @raw_command = quick_command
       @raw_body    = quick_body

data/lib/mysh/internal.rb

@@ -1,10 +1,22 @@
 # coding: utf-8
 
-require_relative 'internal/actions/actions_path'
-require_relative 'internal/action'
-require_relative 'internal/action_pool'
-require_relative 'internal/manage'
-require_relative 'internal/to_file_spec'
-
-#Load up the internal actions!
-Dir[Mysh::Action::ACTIONS_PATH + '*.rb'].each {|file| require file }
+module Mysh
+
+  # Set up the command action pool.
+  COMMANDS = ActionPool.new("COMMANDS")
+
+  # 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
+
+end
+
+# Load up the internal actions!
+load_spec = MYSH_LIB + "mysh/internal/*.rb"
+Dir[load_spec].each {|file| require file }