mysh 0.6.11 → 0.6.17

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,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"
@@ -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
-

data/lib/mysh/shell_variables/shell_variable_store.rb

@@ -1,19 +1,18 @@
 # coding: utf-8
 
-#* mysh/shell_variables/shell_variable_store.rb -- Storage for mysh variables.
+# Storage for mysh variables.
 module Mysh
 
-  #The holder of mysh variables.
+  # The holder of mysh variables.
   module MNV
-    #Set up the storage hash.
+    # Set up the storage hash.
     @store = Hash.new { |_hash, _key| Keeper.new }
 
-    #The shared loop checker for programmatic access.
+    # The shared loop checker for programmatic access.
     @loop_check = nil
 
-    #Get the value of a variable.
-    #<br>Endemic Code Smells
-    #* :reek:TooManyStatements
+    # Get the value of a variable.
+    # Endemic Code Smells   :reek:TooManyStatements
     def self.[](index)
       keeper = get_keeper(index)
 
@@ -28,7 +27,7 @@ module Mysh
       end
     end
 
-    #Set the value of a variable.
+    # Set the value of a variable.
     def self.[]=(index, value)
       unless value.empty?
         keeper = get_keeper(index)
@@ -41,32 +40,32 @@ module Mysh
       value
     end
 
-    #Get the value keeper of a variable.
+    # Get the value keeper of a variable.
     def self.get_keeper(index)
       @store[index]
     end
 
-    #Set the value keeper of a variable.
+    # Set the value keeper of a variable.
     def self.set_keeper(index, keeper)
       @store[index] = keeper
     end
 
-    #Delete the value keeper of a variable.
+    # Delete the value keeper of a variable.
     def self.delete_keeper(index)
       @store.delete(index)
     end
 
-    #Get the source code of a variable.
+    # Get the source code of a variable.
     def self.get_source(index)
       @store[index].get_source
     end
 
-    #Does this entry exist?
+    # Does this entry exist?
     def self.key?(index)
       @store.key?(index)
     end
 
-    #Get all the keys
+    # Get all the keys
     def self.keys
       @store.keys
     end

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

@@ -1,17 +1,17 @@
 # coding: utf-8
 
-#* mysh/sources/console.rb -- The mysh console command source.
+# The mysh console command source.
 module Mysh
 
-  #A wrapper for the mysh console terminal.
+  # A wrapper for the mysh console terminal.
   class Console
 
-    #Setup the console wrapper.
+    # Setup the console wrapper.
     def initialize
       @eoi = false
     end
 
-    #Get the initial line of command input.
+    # Get the initial line of command input.
     def get_command
       puts MNV[:pre_prompt] if MNV.key?(:pre_prompt)
       get(prompt: MNV[:prompt])
@@ -20,7 +20,7 @@ module Mysh
       exit
     end
 
-    #Get additional lines of continued commands.
+    # Get additional lines of continued commands.
     def get_command_extra(str)
       get(prompt: MNV[:post_prompt] + '\\', prefix: str[0])
     rescue MiniReadlinePLE => err
@@ -38,15 +38,19 @@ module Mysh
       MNV[selector] = ""
     end
 
-    #Have we reached the end of input?
+    # Have we reached the end of input?
     def eoi?
       @eoi
     end
 
     private
 
-    #Get some actual user input!
+    # Get some actual user input!
     def get(parms={})
+      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] = ""
       result

data/lib/mysh/sources/parse.rb

@@ -1,11 +1,10 @@
 # coding: utf-8
 
-#* mysh/sources/parse.rb -- mysh general parser.
+# mysh general parser.
 module Mysh
 
-  #Parse a string into components.
-  #<br>Endemic Code Smells
-  #* :reek:TooManyStatements
+  # Parse a string into components.
+  # Endemic Code Smells   :reek:TooManyStatements
   def self.parse_args(input)
     result, read_point = [], input.chars.each
 
@@ -24,9 +23,8 @@ module Mysh
 
   private
 
-  #Get a string parameter.
-  #<br>Endemic Code Smells
-  #* :reek:TooManyStatements
+  # Get a string parameter.
+  # Endemic Code Smells   :reek:TooManyStatements
   def self.get_string(read_point)
     result = ""
 
@@ -41,9 +39,8 @@ module Mysh
     [result]
   end
 
-  #Get a parameter.
-  #<br>Endemic Code Smells
-  #* :reek:TooManyStatements
+  # Get a parameter.
+  # Endemic Code Smells   :reek:TooManyStatements
   def self.get_parameter(first_char, read_point)
     result = first_char