mysh 0.6.12 → 0.6.13

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 }

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/load.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+
+#* mysh/internal/actions/load.rb -- 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/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
+
+#* mysh/internal/actions/type.rb -- 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/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,9 +1,9 @@
 # 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)}
@@ -19,7 +19,7 @@ module Mysh
     :expression
   end
 
-  #Try to execute the inputing as a quick command.
+  # 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"
@@ -22,6 +22,7 @@ module Mysh
   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]) }}"
@@ -34,4 +35,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/{internal/actions/show → show}/env.rb

@@ -21,7 +21,7 @@ module Mysh
     # Get the info
     # Endemic Code Smells :reek:UtilityFunction
     def info
-      [["about",     Mysh::SUMMARY],
+      [["about",     Mysh::DESCRIPTION],
        ["version",   Mysh::VERSION],
        ["installed", Gem::Specification.find_all_by_name("mysh")
                                        .map{|s| s.version.to_s}

data/lib/mysh/sources/console.rb

@@ -47,8 +47,9 @@ module Mysh
 
     # Get some actual user input!
     def get(parms={})
-      parms[:history] = MNV[:history].extract_boolean
-      parms[:no_move] = MNV[:no_move].extract_boolean
+      parms[:history] = MNV[:history].extract_boolean unless parms.has_key?(:history)
+      parms[:no_dups] = MNV[:no_dups].extract_boolean unless parms.has_key?(:no_dups)
+      parms[:no_move] = MNV[:no_move].extract_boolean unless parms.has_key?(:no_move)
 
       result = (input = Mysh.input).readline(parms)
       input.instance_options[:initial] = ""

data/lib/mysh/string_helpers.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+# Monkey patches for Mysh string data.
+class String
+
+  # Extract Boolean data from this string.
+  def extract_boolean
+    self !~ /\A(false|no|off)?\z/i
+  end
+
+  # Make the file name fit the local system.
+  def to_host_spec
+    self.dress_up_slashes
+        .dress_up_quotes
+  end
+
+  # Dress up slashes and backslashes.
+  def dress_up_slashes
+    MiniTerm.windows? ? self.gsub("/", "\\") : self
+  end
+
+  # Dress up in quotes if needed.
+  def dress_up_quotes
+    self[' '] ? "\"#{self}\"" : self
+  end
+
+  # Make the file name fit the standard notation.
+  def to_std_spec
+    self.gsub("\\", "/")
+  end
+
+  # The mysh string pre-processor stack.
+  def preprocess(evaluator=$mysh_exec_binding)
+    self.eval_variables.eval_handlebars(evaluator)
+  end
+
+end