mysh 0.6.12 → 0.6.18

data/lib/mysh/internal/{actions/cd.rb → cd.rb}

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-#* mysh/internal/actions/cd.rb -- The mysh internal cd command.
+# The mysh internal cd command.
 module Mysh
 
-  #Add the cd command to the library.
+  # Add the cd command to the library.
   desc = 'Change directory to the optional <dir> parameter ' +
          'or display the current working directory.'
 

data/lib/mysh/internal/{actions/comment.rb → comment.rb}

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-#* mysh/internal/actions/comment.rb -- A mysh internal comment.
+# A mysh internal comment.
 module Mysh
 
-  #Add comments to the library.
+  # Add comments to the library.
   desc = 'A mysh comment. No action taken'
   action = lambda {|_input| :internal}
 

data/lib/mysh/internal/{actions/elapsed.rb → elapsed.rb}

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-#* mysh/internal/actions/elapsed.rb -- The mysh internal elapsed command.
+# The mysh internal elapsed command.
 module Mysh
 
-  #Add the elapsed commands to the library.
+  # Add the elapsed commands to the library.
   desc = 'Execute a command and then display the elapsed time. See ?% for more.'
 
   action = lambda do |input|

data/lib/mysh/internal/{actions/gls.rb → gls.rb}

@@ -1,18 +1,18 @@
 # coding: utf-8
 
-#* mysh/internal/actions/gls.rb -- The mysh gls (gem ls) command.
+# The mysh gls (gem ls) command.
 module Mysh
 
-  #* mysh/internal/actions/gls.rb -- The mysh gls (gem ls) command.
+  # The mysh gls (gem ls) command.
   class GlsCommand < Action
 
-    #Set up this command.
+    # Set up this command.
     def initialize(*args)
       super
       @report = @mask = @specs = nil
     end
 
-    #Execute the gls command.
+    # Execute the gls command.
     def process_command(input)
       process_args(input.args)
       gather_gems
@@ -57,9 +57,8 @@ module Mysh
       report.puts_format_output_bullets
     end
 
-    #Get detailed information on a gem specification.
-    #<br>Endemic Code Smells
-    #* :reek:UtilityFunction
+    # Get detailed information on a gem specification.
+    # Endemic Code Smells   :reek:UtilityFunction
     def info(spec)
       [["name",        spec.name],
        ["version",     spec.version],

data/lib/mysh/internal/{actions/help.rb → help.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-#* mysh/internal/actions/help.rb -- The mysh internal help command.
+# The mysh internal help command.
 module Mysh
 
   # Help action pool of topics.
@@ -21,12 +21,11 @@ module Mysh
 
   HELP = ActionPool.new("HELP", default)
 
-  #* mysh/internal/actions/help.rb -- The mysh internal help command.
+  # The mysh internal help command.
   class HelpCommand < Action
 
-    #Execute a help command by routing it to a sub-command.
-    #<br>Endemic Code Smells
-    #* :reek:UtilityFunction
+    # Execute a help command by routing it to a sub-command.
+    # Endemic Code Smells  :reek:UtilityFunction
     def process_command(input)
       args = input.args
       HELP[args[0] || ""].process_command(args)
@@ -37,12 +36,11 @@ module Mysh
   # The base help command.
   desc = 'Display help information for mysh with an optional topic. See ?? for more.'
   COMMANDS.add_action(HelpCommand.new('help <topic>', desc))
+
   #The help command action object.
   HELP_COMMAND = HelpCommand.new('?<topic>', desc)
   COMMANDS.add_action(HELP_COMMAND)
 end
 
-require_relative 'help/sub_help'
-
-#Load up the extra help actions!
-Dir[Mysh::Action::ACTIONS_PATH + 'help/*.rb'].each {|file| require file }
+# Load in support for help sub-topics
+require_relative 'support/sub_help'

data/lib/mysh/internal/{actions/history.rb → history.rb}

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-#* mysh/internal/actions/history.rb -- The mysh internal history command.
+# The mysh internal history command.
 module Mysh
 
-  #* mysh/internal/actions/history.rb -- The mysh internal history command.
+  # The mysh internal history command.
   class HistoryCommand < Action
 
     #Set up this command.
@@ -12,11 +12,11 @@ module Mysh
       @args = @history = nil
     end
 
-    #Execute the history command.
+    # Execute the history command.
     def process_command(input)
       @args, @history = input.args, Mysh.input.history
 
-      #The history command should not be part of the history.
+      # The history command should not be part of the history.
       @history.pop
 
       pull_index || clear_history || show_history
@@ -24,7 +24,7 @@ module Mysh
 
     private
 
-    #Deal with history index arguments
+    # Deal with history index arguments
     def pull_index
       index = @args[0].to_i
 
@@ -35,7 +35,7 @@ module Mysh
       end
     end
 
-    #Clear the history buffer.
+    # Clear the history buffer.
     def clear_history
       if @args[0] == 'clear'
         @history.clear
@@ -44,7 +44,7 @@ module Mysh
       end
     end
 
-    #Just show the history.
+    # Just show the history.
     def show_history
       pattern = Regexp.new(@args[0] || /./)
 
@@ -55,10 +55,11 @@ module Mysh
 
   end
 
-  #Add the history commands to the library.
+  # Add the history commands to the library.
   desc = 'Display the mysh command history. See ?! for more.'
   COMMANDS.add_action(HistoryCommand.new('history <arg>', desc))
-  #The history command action object.
+
+  # The history command action object.
   HISTORY_COMMAND = HistoryCommand.new('!<arg>', desc)
   COMMANDS.add_action(HISTORY_COMMAND)
 end

data/lib/mysh/internal/load.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+
+# The mysh load command.
+module Mysh
+
+  # Add the load command to the library.
+  desc = "Load ruby programs, mysh scripts, " +
+         "or text files into the mysh environment."
+
+  action = lambda do |input|
+    count = 0
+    args = input.args
+
+    args.each do |file_name|
+      puts file_name if args.length > 1
+      Mysh.load_a_file(file_name)
+      count += 1
+    end
+
+    if count > 0
+      :internal
+    else
+      fail "Error: A load file must be specified."
+    end
+  end
+
+  # Load a single file.
+  def self.load_a_file(file_name)
+    case File.extname(file_name)
+    when '.mysh'
+      Mysh.process_file(file_name)
+      :internal
+    when '.txt'
+      show_handlebar_file(file_name, binding)
+      :internal
+    when '.rb'
+      load file_name
+      :internal
+    else
+      fail "Error: Unknown file type: #{file_name.inspect}"
+    end
+  end
+
+  COMMANDS.add_action(Action.new('load <files>', desc, &action))
+end

data/lib/mysh/internal/{actions/mls.rb → mls.rb}

@@ -2,10 +2,10 @@
 
 require 'vls'
 
-#* mysh/internal/actions/mls.rb -- The mysh module ls command.
+# The mysh module ls command.
 module Mysh
 
-  #Add the mls command to the library.
+  # Add the mls command to the library.
   desc = 'Display modules with version info. See ?mls for more.'
 
   action = lambda do |input|

data/lib/mysh/internal/{actions/pwd.rb → pwd.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-#* mysh/internal/actions/pwd.rb -- The mysh internal pwd command.
+# The mysh internal pwd command.
 module Mysh
 
   desc = 'Display the current working directory.'

data/lib/mysh/internal/{actions/say.rb → say.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-#* mysh/internal/actions/say.rb -- A mysh internal say command.
+# The mysh internal say command.
 module Mysh
 
   #Add says to the library.

data/lib/mysh/internal/{actions/show.rb → show.rb}

@@ -1,19 +1,19 @@
 # coding: utf-8
 
-#* mysh/internal/actions/show.rb -- The mysh internal show command.
+# The mysh internal show command.
 module Mysh
 
   # The working message for long duration processing.
   WORKING = "Working...\r"
 
-  #Show items.
+  # Show items.
   default = Action.new do |input|
     puts "No show data found for #{input.raw.inspect}. See ?@ for more."
   end
 
   SHOW = ActionPool.new("SHOW", default)
 
-  #The shared description.
+  # The shared description.
   desc = "Display information about a part of mysh. See ?@ for more."
 
   action = lambda do |input|
@@ -26,11 +26,12 @@ module Mysh
     end
   end
 
-  #The show command action object.
+  # The show command action object.
   COMMANDS.add_action(Action.new('show <item>', desc, &action))
   SHOW_COMMAND = Action.new('@<item>', desc, &action)
   COMMANDS.add_action(SHOW_COMMAND)
 end
 
-#Load up the extra help actions!
-Dir[Mysh::Action::ACTIONS_PATH + 'show/*.rb'].each {|file| require file }
+# Load up the various show actions!
+path = MYSH_LIB + "mysh/show/*.rb"
+Dir[path].each {|file| require file }

data/lib/mysh/internal/{actions/help → support}/sub_help.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
 
-#* mysh/internal/actions/help/sub_help.rb -- The mysh internal help sub commands.
+# The mysh internal help sub commands.
 module Mysh
 
-  #* mysh/internal/actions/help/sub_help.rb -- The mysh internal help sub commands.
+  # The mysh internal help sub commands.
   class HelpSubCommand < Action
 
-    #Setup a help command.
+    # Setup a help command.
     def initialize(name, description, file_name)
       super(name, description)
       @file_name = file_name
@@ -14,12 +14,13 @@ module Mysh
 
     #Execute a help command.
     def process_command(_args)
-      mysh "load #{(ACTIONS_PATH + 'help/' + @file_name).to_host_spec}"
+      path = MYSH_LIB + "mysh/help/" + @file_name
+      mysh "load #{path.to_host_spec}"
     end
 
   end
 
-  #Add help topics here. Don't sweat the order; they get sorted by name.
+  # Add help topics here. Don't sweat the order; they get sorted by name.
   #        Name        Description                            Help File
   help = [['',        'General help on mysh.',               'help.txt'   ],
           ['set',     'Help on mysh variables.',             'vars.txt'   ],
@@ -34,13 +35,14 @@ module Mysh
           ['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'    ],
-          ['mls',     'Help on mls internal mysh command.',  'mls.txt'    ],
+          ['gls',     'Help on the gls command.',            'gls.txt'    ],
+          ['mls',     'Help on the mls command.',            'mls.txt'    ],
           ['!',       'Help on the history command.',        'history.txt'],
           ['history', 'Help on the history command.',        'history.txt'],
           ['kbd',     'Help on mysh keyboard mapping.',      'kbd.txt'    ],
           ['{{',      'Help on mysh handlebars.',            'hbar.txt'   ],
           ['init',    'Help on mysh initialization.',        'init.txt'   ],
+          ['type',    'Help on the type command.',           'type.txt'   ],
           ['types',   'Help on mysh file types.',            'types.txt'  ],
           ['help',    'This help on the help command.',      'h_o_h.txt'  ],
           ['?',       'This help on the help command.',      'h_o_h.txt'  ]

data/lib/mysh/internal/type.rb

@@ -0,0 +1,38 @@
+# coding: utf-8
+
+# The mysh type command.
+module Mysh
+
+  # Add the type command to the library.
+  desc = 'Display one or more text files with optional support for ' +
+         'embedded handlebars and shell variables. See ?type for more.'
+
+  action = lambda do |input|
+    count = 0
+    cooked = MNV[:type] !~ /\A(raw|false|no|off)\z/i
+    args = input.args
+
+    args.each do |file_name|
+      puts file_name if args.length > 1
+
+      case file_name
+      when "-c"
+        cooked = false
+      when "+c"
+        cooked = true
+      else
+        if cooked
+          show_handlebar_file(file_name, binding)
+        else
+          puts IO.read(file_name)
+        end
+      end
+
+      count += 1
+    end
+
+    fail "A text file must be specified." if count == 0
+  end
+
+  COMMANDS.add_action(Action.new('type <files>', desc, &action))
+end

data/lib/mysh/internal/{actions/vars.rb → vars.rb}

@@ -1,24 +1,24 @@
 # coding: utf-8
 
-#* mysh/internal/actions/vars.rb -- The mysh internal variables commands.
+# The mysh internal variables commands.
 module Mysh
 
-  #* mysh/internal/actions/vars.rb -- The mysh internal variable commands.
+  # The mysh internal variable commands.
   class VarsCommand < Action
 
-    #The mysh variable parsing regex.
+    # The mysh variable parsing regex.
     VAR_EXP = %r{(?<name>   [a-z][a-z0-9_]*){0}
                  (?<equals> =){0}
                  (?<value>  \S.*){0}
                  \$ (\g<name> \s* (\g<equals> \s* \g<value>?)?)?}x
 
-    #Setup an internal action.
+    # Setup an internal action.
     def initialize(name, description)
       @var_name = @equals = @value = nil
       super(name, description)
     end
 
-    #Execute a command against the internal mysh variables.
+    # Execute a command against the internal mysh variables.
     def process_command(input)
       if (match = VAR_EXP.match(input.raw_body))
         @var_name, @equals, @value = match[:name], match[:equals], match[:value]
@@ -30,7 +30,7 @@ module Mysh
       :internal
     end
 
-    #Do the actual work here.
+    # Do the actual work here.
     def do_command
       sym = @var_name.to_sym if @var_name
 
@@ -45,7 +45,7 @@ module Mysh
       end
     end
 
-    #Display all variables neatly.
+    # Display all variables neatly.
     def show_all_values
       puts (MNV.keys - ['$'.to_sym])
              .sort
@@ -55,7 +55,7 @@ module Mysh
 
   end
 
-  #The show command action object.
+  # The set command action object.
   desc = 'Set/query mysh variables. See ?set for more.'
   COMMANDS.add_action(VarsCommand.new('set <$name>=value', desc))
 end

data/lib/mysh/process.rb

@@ -1,24 +1,24 @@
 # coding: utf-8
 
-#* mysh/process.rb -- The mysh command processors.
+# The mysh command processors.
 module Mysh
 
-  #Process from the console.
+  # Process from the console.
   def self.process_console
     process_source(Console.new)
   end
 
-  #Process from a string.
+  # Process from a string.
   def self.process_string(str)
     process_source(StringSource.new(str))
   end
 
-  #Process from a file.
+  # Process from a file.
   def self.process_file(name)
     process_source(StringSource.new(IO.read(name)))
   end
 
-  #Process commands from a source.
+  # Process commands from a source.
   def self.process_source(source)
     until source.eoi? do
       execute_a_command(source)
@@ -26,7 +26,7 @@ module Mysh
   rescue MyshExit
   end
 
-  #Execute a single line of input and handle exceptions.
+  # Execute a single line of input and handle exceptions.
   def self.execute_a_command(source)
     try_execute_command(get_command(source))
 
@@ -38,7 +38,7 @@ module Mysh
     puts err.backtrace if MNV[:debug].extract_boolean || defined?(MiniTest)
   end
 
-  #Try to execute a single line of input. Does not handle exceptions.
+  # Try to execute a single line of input. Does not handle exceptions.
   def self.try_execute_command(str)
     input = InputWrapper.new(str)