mysh 0.6.9 → 0.6.16

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

@@ -8,14 +8,12 @@ module Mysh
 
     # Execute the @env shell command.
     def process_command(_args)
-      print WORKING unless @ran_once
+      print WORKING
       Gem.refresh
 
       puts "Key mysh environment information.", "",
            info.format_output_bullets, "",
            path.format_output_bullets, ""
-
-      @ran_once = true
     end
 
     private
@@ -23,12 +21,12 @@ 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}
                                        .join(", ")],
-       ["latest",    insouciant {Gem.latest_version_for("mysh").to_s}],
+       ["latest",    insouciant {latest_version_for("mysh").to_s}],
        ["init file", $mysh_init_file.to_host_spec],
        ["user",      ENV['USER']],
        ["home",      (ENV['HOME'] || "").to_host_spec],

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

@@ -8,7 +8,7 @@ module Mysh
 
     #Execute the @gem shell command.
     def process_command(input)
-      print WORKING unless @ran_once
+      print WORKING
       Gem.refresh
 
       args = input.cooked_body.split(" ")[1..-1]
@@ -19,7 +19,6 @@ module Mysh
         specific(args)
       end
 
-      @ran_once = true
     end
 
     private
@@ -61,7 +60,7 @@ module Mysh
 
     # Get gem info on the specified gems
     def specific(args)
-      details = []
+      fetcher, details = Gem::SpecFetcher.new, []
 
       args.each do |gem_name|
         version_list = Gem::Specification.find_all_by_name(gem_name)
@@ -69,7 +68,7 @@ module Mysh
                                          .join(", ")
         details << [gem_name, version_list]
 
-        latest = insouciant {latest_version_for(gem_name).to_s}
+        latest = insouciant {latest_version_for(gem_name, fetcher).to_s}
         details << ["latest", latest]
         details << [" ", " "]
       end
@@ -78,18 +77,6 @@ module Mysh
            details.format_output_bullets
     end
 
-    # Get the latest version for the named gem. Patched code.
-    def latest_version_for(name)
-      dependency = Gem::Dependency.new(name)
-      fetcher = Gem::SpecFetcher.fetcher
-      if specs = fetcher.spec_for_dependency(dependency)[0][-1]
-        spec = specs[0]
-        spec && spec.version
-      else
-        "<Not found in repository>"
-      end
-    end
-
   end
 
   desc = 'Get information about the current gem support or ' +

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

@@ -8,13 +8,11 @@ module Mysh
 
     #Execute the @term shell command.
     def process_command(_args)
-      print WORKING unless @ran_once
+      print WORKING
       Gem.refresh
 
       puts "Key term information.", "",
            info.format_output_bullets, ""
-
-      @ran_once = true
     end
 
     private
@@ -22,18 +20,20 @@ module Mysh
     # Get the info
     # Endemic Code Smells :reek:UtilityFunction
     def info
+      fetcher = Gem::SpecFetcher.new
+
       [["about",     MiniReadline::DESCRIPTION],
        ["version",   MiniReadline::VERSION],
        ["installed", Gem::Specification.find_all_by_name("mini_readline")
                                        .map{|s| s.version.to_s}
                                        .join(", ")],
-       ["latest",    insouciant {Gem.latest_version_for("mini_readline").to_s}],
+       ["latest",    insouciant {latest_version_for("mini_readline", fetcher).to_s}],
        ["about",     MiniTerm::DESCRIPTION],
        ["version",   MiniTerm::VERSION],
        ["installed", Gem::Specification.find_all_by_name("mini_term")
                                        .map{|s| s.version.to_s}
                                        .join(", ")],
-       ["latest",    insouciant {Gem.latest_version_for("mini_term").to_s}],
+       ["latest",    insouciant {latest_version_for("mini_term", fetcher).to_s}],
        ["platform",  MiniTerm::TERM_PLATFORM.inspect],
        ["term type", MiniTerm::TERM_TYPE.inspect],
        ["columns",   MiniTerm.width.to_s],
@@ -45,8 +45,6 @@ module Mysh
       ]
     end
 
-
-
   end
 
   desc = 'Get information about the console. See ?term for more.'

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
 

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,13 +23,11 @@ module Mysh
     end
   end
 
-  #Get the user input ready.
+  # Get the user input ready.
   def self.input
-    @input ||= MiniReadline::Readline.new(history:       true,
-                                          eoi_detect:    true,
+    @input ||= MiniReadline::Readline.new(eoi_detect:    true,
                                           auto_complete: true,
                                           auto_source:   SmartSource)
   end
 
 end
-