mysh 0.6.9 → 0.6.16

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/{init.rb → load_init_file.rb}

@@ -1,12 +1,12 @@
 # coding: utf-8
 
-#* mysh/init.rb -- The mysh init file loader.
+# The mysh initial file loader.
 module Mysh
 
-  #Set the init file used to startup mysh to none so far.
+  # Set the initial file used to startup mysh to none so far.
   $mysh_init_file = nil
 
-  #Perform init phase processing.
+  # Perform initial phase processing.
   def self.mysh_load_init
 
     unless $mysh_init_file

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)
 

data/lib/mysh/quick.rb

@@ -1,19 +1,25 @@
 # coding: utf-8
 
-#* mysh/internal/quick.rb -- The mysh internal quick commands.
+# The mysh internal quick commands.
 module Mysh
 
-  #A hash of quick command short cuts and their actions.
+  # A hash of quick command short cuts and their actions.
   QUICK = Hash.new(lambda {|_input| false })
 
   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)}
 
-  #Try to execute the inputing as a quick command.
+  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)
   end

data/lib/mysh/shell_variables.rb

@@ -4,13 +4,13 @@ require_relative 'shell_variables/shell_variable_store'
 require_relative 'shell_variables/shell_variable_keeper'
 require_relative 'shell_variables/evaluate'
 
-#* mysh/shell_variables.rb -- Adds support for mysh scripting variables.
+# Adds support for mysh scripting variables.
 module Mysh
 
-  #Set up some essential entries.
+  # Set up some essential entries.
   MNV['$'.to_sym] = "$"
 
-  #Set up some default values.
+  # Set up some default values.
   MNV[:debug]       = "false"
   MNV[:prompt]      = "mysh>"
   MNV[:post_prompt] = "$prompt"
@@ -19,7 +19,10 @@ module Mysh
   MNV[:page_width]  = "{{ MiniTerm.width }}"
   MNV[:page_height] = "{{ MiniTerm.height }}"
   MNV[:page_pause]  = "on"
-  MNV[:page_msg]    = "Press a key, a space, or q:"
+
+  MNV[:history]     = "on"
+  MNV[:no_dups]     = "on"
+  MNV[:no_move]     = "on"
 
   MNV[:d] = "{{ Time.now.strftime(MNV[:date_fmt]) }}"
   MNV[:h] = "{{ ENV['HOME'].to_host_spec }}"
@@ -31,4 +34,6 @@ module Mysh
 
   MNV[:date_fmt] = "%Y-%m-%d"
   MNV[:time_fmt] = "%H:%M"
+
+  MNV[:type] = "raw"
 end

data/lib/mysh/shell_variables/evaluate.rb

@@ -1,18 +1,9 @@
 # coding: utf-8
 
-#Monkey patches for Mysh variables
+# Monkey patches for Mysh variables
 class String
 
-  #Extract common mysh data from this string.
-  def extract_boolean
-    if self =~ /\A(false|no|off)\z/i
-      false
-    else
-      self
-    end
-  end
-
-  #Evaluate any variable substitutions in the input.
+  # Evaluate any variable substitutions in the string.
   def eval_variables
     self.gsub(/((?<!\\)\$\$)|((?<!\\)\$[a-z][a-z0-9_]*)/) do |str|
       sym = str[1..-1].to_sym

data/lib/mysh/shell_variables/shell_variable_keeper.rb

@@ -1,17 +1,17 @@
 # coding: utf-8
 
-#* mysh/shell_variables/shell_variable_keeper.rb -- The keeper of mysh values.
+# The keeper of mysh values.
 module Mysh
 
-  #The keeper of mysh variable values.
+  # The keeper of mysh variable values.
   class Keeper
 
-    #Set up this variable
+    # Set up this variable
     def initialize(value="")
       @value = value
     end
 
-    #Get the value of this variable.
+    # Get the value of this variable.
     def get_value(loop_check={})
       my_id = self.object_id
       fail "Mysh variable looping error." if loop_check[my_id]
@@ -21,12 +21,12 @@ module Mysh
       loop_check.delete(my_id)
     end
 
-    #Get the source code of this variable.
+    # Get the source code of this variable.
     def get_source
       @value
     end
 
-    #Set the value of this variable.
+    # Set the value of this variable.
     def set_value(value)
       @value = value
     end
@@ -34,4 +34,3 @@ module Mysh
   end
 
 end
-