mysh 0.6.12 → 0.6.18

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,9 +19,9 @@ 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]) }}"
@@ -34,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

@@ -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/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
 

data/lib/mysh/sources/smart_auto_complete.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
 
-#* mysh/sources/smart_auto_complete.rb - An adaptive source for auto-complete.
+# An adaptive source for auto-complete.
 module Mysh
 
-  #* array_source.rb - An array as the source for auto-complete.
+  # An array as the source for auto-complete.
   class SmartSource
 
-    #Create a new file/folder auto-data source. NOP
+    # Create a new file/folder auto-data source. NOP
     def initialize(options)
       @prefix        = options[:prefix]
       @auto_source   = MiniReadline::AutoFileSource.new(options)
@@ -14,7 +14,7 @@ module Mysh
       @active_source = nil
     end
 
-    #Construct a new data list for auto-complete
+    # Construct a new data list for auto-complete
     def rebuild(str)
       if /(?<=\s|^)\$[a-z][a-z0-9_]*\z/ =~ str
         sym = $MATCH[1..-1].to_sym
@@ -26,7 +26,7 @@ module Mysh
       @active_source.rebuild(str)
     end
 
-    #Get the next string for auto-complete
+    # Get the next string for auto-complete
     def next
       @active_source ? @active_source.next : @str
     end

data/lib/mysh/sources/string.rb

@@ -1,18 +1,18 @@
 # coding: utf-8
 
-#* mysh/sources/string.rb -- The mysh string command source.
+# The mysh string command source.
 module Mysh
 
-  #A wrapper for a string with mysh commands.
+  # A wrapper for a string with mysh commands.
   class StringSource
 
-    #Setup the string source.
+    # Setup the string source.
     def initialize(str)
       @eoi = false
       @read_pt = str.lines.each
     end
 
-    #Get the initial line of command input.
+    # Get the initial line of command input.
     def get_command(_str="")
       @read_pt.next
     rescue StopIteration
@@ -20,10 +20,10 @@ module Mysh
       "\n"
     end
 
-    #Set up an alias as these two are identical.
+    # Set up an alias as these two are identical.
     alias :get_command_extra :get_command
 
-    #Have we reached the end of input?
+    # Have we reached the end of input?
     def eoi?
       @eoi
     end

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

data/lib/mysh/system.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 
-#* mysh/system.rb -- Support for executing through the system.
+# Support for executing through the system.
 module Mysh
 
-  #Try to execute as a system program.
+  # Try to execute as a system program.
   def self.try_execute_system(input)
     system(input.raw.preprocess.chomp + "\n") ? :system : :error
   end

data/lib/mysh/user_input.rb

@@ -1,22 +1,20 @@
 # coding: utf-8
 
-require 'mini_readline'
-
 require_relative 'sources/console'
 require_relative 'sources/string'
 
 require_relative 'sources/smart_auto_complete'
 require_relative 'sources/parse'
 
-#* mysh/user_input.rb -- Get some text from the user.
+# Get some text from the user.
 module Mysh
 
-  #Get one command from the user.
+  # Get one command from the user.
   def self.get_command(source)
     get_command_extra(source, source.get_command)
   end
 
-  #Get any continuations of the inputs
+  # Get any continuations of the inputs
   def self.get_command_extra(source, str)
     if str.start_with?("=") && /\\\s*$/ =~ str
       get_command_extra(source, $PREMATCH + "\n" + source.get_command_extra(str))
@@ -25,7 +23,7 @@ module Mysh
     end
   end
 
-  #Get the user input ready.
+  # Get the user input ready.
   def self.input
     @input ||= MiniReadline::Readline.new(eoi_detect:    true,
                                           auto_complete: true,
@@ -33,4 +31,3 @@ module Mysh
   end
 
 end
-

data/lib/mysh/version.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 
 module Mysh
-  #The version string of MY SHell.
-  VERSION = "0.6.12"
+  # The version string of MY SHell.
+  VERSION = "0.6.18".freeze
 
-  #A brief summary of this gem.
-  SUMMARY = "mysh -- a Ruby inspired command line shell."
+  # A brief summary of this gem.
+  DESCRIPTION = "mysh -- a Ruby inspired command line shell.".freeze
 end

data/mysh.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Peter Camilleri"]
   spec.email         = ["peter.c.camilleri@gmail.com"]
 
-  spec.summary       = Mysh::SUMMARY
+  spec.summary       = Mysh::DESCRIPTION
   spec.description   = "mysh -- a Ruby inspired command shell " +
                        "for CLI and application use."
   spec.homepage      = "https://github.com/PeterCamilleri/mysh"
@@ -23,17 +23,17 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency 'minitest', "~> 5.7"
-  spec.add_development_dependency 'minitest_visible', "~> 0.1"
   spec.add_development_dependency 'rdoc', "~> 5.0"
   spec.add_development_dependency 'reek', "~> 5.0.2"
 
   spec.add_runtime_dependency     'mini_readline', "~> 0.9.1"
   spec.add_runtime_dependency     'mini_term', "~> 0.1.0"
-  spec.add_runtime_dependency     'pause_output', "~> 0.1.0"
+  spec.add_runtime_dependency     'pause_output', "~> 0.2.0"
   spec.add_runtime_dependency     'format_output', "~> 0.1.0"
   spec.add_runtime_dependency     'vls', "~> 0.4.1"
   spec.add_runtime_dependency     'in_array', "~> 0.1.8"
+  spec.add_runtime_dependency     'insouciant', "~> 0.1.0"
 end