mysh 0.4.0 → 0.5.0

data/lib/mysh/internal/action.rb

@@ -12,14 +12,15 @@ module Mysh
     attr_reader :description
 
     #Setup an internal action.
-    def initialize(name, description)
+    def initialize(name = "", description = "", &action)
       @name, @description = name, description.in_array
-      @exec_binding = mysh_binding
+
+      define_singleton_method(:process_command, &action) if block_given?
     end
 
     #Parse the string and call the action.
-    def quick_parse_and_call(str)
-      call(Mysh.parse_args(str[1..-1].chomp))
+    def process_quick_command(input)
+      process_command(input.quick)
       :internal
     end
 
@@ -28,23 +29,11 @@ module Mysh
       [@name].concat(@description)
     end
 
-    #Evaluate the string in the my shell context.
-    def mysh_eval(str)
-      @exec_binding.eval(str)
-    end
-
     #Get the name without any argument descriptions.
     def short_name
       name.split[0] || ""
     end
 
-    private
-
-    #Create a binding for mysh to execute expressions in.
-    def mysh_binding
-      binding
-    end
-
   end
 
 end

data/lib/mysh/internal/action_pool.rb

@@ -10,7 +10,7 @@ module Mysh
     attr_reader :pool_name
 
     #Create a new action pool
-    def initialize(pool_name, &default_action)
+    def initialize(pool_name, default_action = nil)
       @pool_name, @pool = pool_name, {}
       @pool.default = default_action
     end

data/lib/mysh/internal/actions/cd.rb

@@ -3,22 +3,15 @@
 #* mysh/internal/actions/cd.rb -- The mysh internal cd command.
 module Mysh
 
-  #* mysh/internal/actions/cd.rb -- The mysh internal cd command.
-  class CdCommand < Action
-
-    #Execute the cd command.
-    def call(args)
-      Dir.chdir(args[0]) unless args.empty?
-      puts Dir.pwd.decorate
-    rescue => err
-      puts "Error: #{err}"
-      puts err.backtrace if MNV[:debug]
-    end
-
-  end
-
   #Add the cd command to the library.
   desc = 'Change directory to the optional <dir> parameter ' +
          'and then display the current working directory.'
-  COMMANDS.add_action(CdCommand.new('cd <dir>', desc))
+
+  action = lambda do |input|
+    args = input.args
+    Dir.chdir(args[0]) unless args.empty?
+    puts Dir.pwd.decorate
+  end
+
+  COMMANDS.add_action(Action.new('cd <dir>', desc, &action))
 end

data/lib/mysh/internal/actions/command_line.rb

@@ -15,12 +15,12 @@ module Mysh
     #Execute a post-boot command line option.
     def post_boot(_args); end
 
-    alias :call :pre_boot
+    alias :process_command :pre_boot
 
     #Get an argument for an option.
     def get_arg(read_point)
       result = read_point.next
-      fail if COMMAND_LINE.exists?(result)
+      fail if COMMAND_LINE.exists?(result) #An arg should not be a command!
       result
     rescue
       fail "Error in #{short_name.inspect}: Invalid argument: #{result.inspect}"
@@ -46,7 +46,7 @@ module Mysh
       puts "", msg, ""
     end
 
-    HELP["usage"].call([])
+    HELP["usage"].process_command(nil)
     exit
   end
 

data/lib/mysh/internal/actions/comment.rb

@@ -3,18 +3,10 @@
 #* mysh/internal/actions/comment.rb -- A mysh internal comment.
 module Mysh
 
-  #* mysh/internal/actions/comment.rb -- A mysh internal comment.
-  class MyshComment < Action
-
-    #Ignore a comment.
-    def call(_args)
-      :internal
-    end
-
-  end
-
   #Add comments to the library.
   desc = 'A mysh comment. No action taken'
-  MYSH_COMMENT = MyshComment.new('#<stuff>', desc)
+  action = lambda {|_input| :internal}
+
+  MYSH_COMMENT = Action.new('#<stuff>', desc, &action)
   COMMANDS.add_action(MYSH_COMMENT)
 end

data/lib/mysh/internal/actions/elapsed.rb

@@ -3,25 +3,18 @@
 #* mysh/internal/actions/elapsed.rb -- The mysh internal elapsed command.
 module Mysh
 
-  #* mysh/internal/actions/elapsed.rb -- The mysh internal elapsed command.
-  class TimedCommand < Action
-
-    #Execute the elapsed command.
-    #<br>Endemic Code Smells
-    #* :reek:DuplicateMethodCall -- needed due to time side effects.
-    def call(str)
-      start_time = Time.now
-      Mysh.try_execute_command(str[1..-1])
-      end_time = Time.now
+  #Add the elapsed commands to the library.
+  desc = 'Execute a command and then display the elapsed time.'
 
-      puts "Elapsed execution time = #{"%.3f" % (end_time - start_time)} seconds."
-      :internal
-    end
+  action = lambda do |input|
+    start_time = Time.now
+    Mysh.try_execute_command(input.quick_body)
+    end_time = Time.now
 
+    puts "Elapsed execution time = #{"%.3f" % (end_time - start_time)} seconds."
+    :internal
   end
 
-  #Add the elapsed commands to the library.
-  desc = 'Execute a command and then display the elapsed time.'
-  TIMED_COMMAND = TimedCommand.new('%<command>', desc)
+  TIMED_COMMAND = Action.new('%<command>', desc, &action)
   COMMANDS.add_action(TIMED_COMMAND)
 end

data/lib/mysh/internal/actions/exit.rb

@@ -3,16 +3,9 @@
 #* mysh/internal/actions/exit.rb -- The mysh internal exit command.
 module Mysh
 
-  #* mysh/internal/actions/exit.rb -- The mysh internal exit command.
-  class ExitCommand < Action
-
-    #Execute the exit command.
-    def call(_args)
-      raise MyshExit
-    end
-
-  end
-
   #Add the exit command to the library.
-  COMMANDS.add_action(ExitCommand.new('exit', 'Exit the current mysh level.'))
+  desc = 'Exit the current mysh level.'
+  action = lambda {|_input| raise MyshExit}
+
+  COMMANDS.add_action(Action.new('exit', desc, &action))
 end

data/lib/mysh/internal/actions/gls.rb

@@ -13,8 +13,8 @@ module Mysh
     end
 
     #Execute the gls command.
-    def call(args)
-      process_args(args)
+    def process_command(input)
+      process_args(input.args)
       gather_gems
       send(@report)
     end

data/lib/mysh/internal/actions/help.rb

@@ -4,18 +4,21 @@
 module Mysh
 
   # Help action pool of topics.
-  HELP = ActionPool.new("HELP") do |args|
+  default = Action.new do |args|
     puts "No help found for #{args[0].inspect}."
   end
 
+  HELP = ActionPool.new("HELP", default)
+
   #* mysh/internal/actions/help.rb -- 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
-    def call(args)
-      HELP[args[0] || ""].call(args)
+    def process_command(input)
+      args = input.args
+      HELP[args[0] || ""].process_command(args)
     end
 
   end

data/lib/mysh/internal/actions/help/sub_help.rb

@@ -13,8 +13,8 @@ module Mysh
     end
 
     #Execute a help command.
-    def call(_args)
-      show_handlebar_file(ACTIONS_PATH + 'help/' + @file_name, self)
+    def process_command(_args)
+      mysh "load #{(ACTIONS_PATH + 'help/' + @file_name).decorate}"
     end
 
   end

data/lib/mysh/internal/actions/history.rb

@@ -13,8 +13,8 @@ module Mysh
     end
 
     #Execute the history command.
-    def call(args)
-      @args, @history = args, Mysh.input.history
+    def process_command(input)
+      @args, @history = input.args, Mysh.input.history
 
       #The history command should not be part of the history.
       @history.pop

data/lib/mysh/internal/actions/load.rb

@@ -3,40 +3,34 @@
 #* mysh/internal/actions/load.rb -- The mysh load command.
 module Mysh
 
-  #* mysh/internal/actions/load.rb -- The mysh load command.
-  class LoadCommand < Action
-
-    #Execute the load command.
-    #<br>Endemic Code Smells
-    #* :reek:TooManyStatements
-    def call(args)
-      file_name = args.shift
-
-      if file_name
-        file_ext, @exec_binding = File.extname(file_name), binding
-
-        if file_ext == '.mysh'
-          Mysh.process_file(file_name)
-          :internal
-        elsif file_ext == '.txt'
-          show_handlebar_file(file_name, self)
-          :internal
-        elsif ["", ".rb"].include?(file_ext)
-          load file_name
-          :internal
-        else
-          fail "Error: Unknown file type: #{file_name.inspect}"
-        end
-
+  #Add the load command to the library.
+  desc = "Load a ruby program, mysh script, " +
+         "or text file into the mysh environment."
+
+  action = lambda do |input|
+    args = input.args
+    file_name = args.shift
+
+    if file_name
+      file_ext = File.extname(file_name)
+
+      if file_ext == '.mysh'
+        Mysh.process_file(file_name)
+        :internal
+      elsif file_ext == '.txt'
+        show_handlebar_file(file_name, BindingWrapper.new(binding))
+        :internal
+      elsif file_ext == '.rb'
+        load file_name
+        :internal
       else
-        fail "Error: A load file must be specified."
+        fail "Error: Unknown file type: #{file_name.inspect}"
       end
 
+    else
+      fail "Error: A load file must be specified."
     end
-
   end
 
-  #Add the load command to the library.
-  desc = 'Load a ruby program, mysh script, or text file into the mysh environment.'
-  COMMANDS.add_action(LoadCommand.new('load file', desc))
+  COMMANDS.add_action(Action.new('load file', desc, &action))
 end

data/lib/mysh/internal/actions/pwd.rb

@@ -3,16 +3,8 @@
 #* mysh/internal/actions/pwd.rb -- The mysh internal pwd command.
 module Mysh
 
-  #* mysh/internal/actions/pwd.rb -- The mysh internal pwd command.
-  class PwdCommand < Action
-
-    #Execute the cd command.
-    def call(_args)
-      puts Dir.pwd.decorate
-    end
-
-  end
-
   desc = 'Display the current working directory.'
-  COMMANDS.add_action(PwdCommand.new('pwd', desc))
+  action = lambda {|_input| puts Dir.pwd.decorate}
+
+  COMMANDS.add_action(Action.new('pwd', desc, &action))
 end

data/lib/mysh/internal/actions/quit.rb

@@ -3,16 +3,8 @@
 #* mysh/internal/actions/quit.rb -- The mysh internal quit command.
 module Mysh
 
-  #* mysh/internal/actions/quit.rb -- The mysh internal quit command.
-  class QuitCommand < Action
-
-    #Execute the quit command.
-    def call(_args)
-      exit
-    end
-
-  end
-
   #Add the quit command to the library.
-  COMMANDS.add_action(QuitCommand.new('quit', 'Quit out of the mysh.'))
+  desc = 'Quit out of the mysh.'
+
+  COMMANDS.add_action(Action.new('quit', desc) {|_input| exit })
 end

data/lib/mysh/internal/actions/say.rb

@@ -3,18 +3,9 @@
 #* mysh/internal/actions/say.rb -- A mysh internal say command.
 module Mysh
 
-  #* mysh/internal/actions/say.rb -- A mysh internal say command.
-  class SayCommand < Action
-
-    #Say something!
-    def call(args)
-      puts args.join(' ')
-      :internal
-    end
-
-  end
-
   #Add says to the library.
   desc = 'Display the text in the command arguments.'
-  COMMANDS.add_action(SayCommand.new('say <stuff>', desc))
+  action = lambda {|input| puts input.cooked_body}
+
+  COMMANDS.add_action(Action.new('say <stuff>', desc, &action))
 end

data/lib/mysh/internal/actions/show.rb

@@ -4,31 +4,28 @@
 module Mysh
 
   #Show items.
-  SHOW = ActionPool.new("SHOW") do |args|
-    puts "No show data found for #{args[0].inspect}. See ?@ for more."
+  default = Action.new do |input|
+    puts "No show data found for #{input.raw.inspect}. See ?@ for more."
   end
 
-  #* mysh/internal/actions/show.rb -- The mysh internal show command.
-  class ShowCommand < Action
-
-    #Execute a help command by routing it to a sub-command.
-    #<br>Endemic Code Smells
-    #* :reek:UtilityFunction :reek:FeatureEnvy
-    def call(args)
-      if args.empty?
-        puts "An item is needed for the show command."
-      else
-        SHOW[args[0]].call(args)
-      end
-    end
+  SHOW = ActionPool.new("SHOW", default)
+
+  #The shared description.
+  desc = "Display information about a part of mysh. See ?@ for more."
 
+  action = lambda do |input|
+    item = input.args[0]
+
+    if item.empty?
+      puts "An item is needed for the show command."
+    else
+      SHOW[item].process_command(input)
+    end
   end
 
-  # The base help command.
-  desc = 'Display information about a part of mysh. See ?@ for more.'
-  COMMANDS.add_action(ShowCommand.new('show <item>', desc))
   #The show command action object.
-  SHOW_COMMAND = ShowCommand.new('@<item>', desc)
+  COMMANDS.add_action(Action.new('show <item>', desc, &action))
+  SHOW_COMMAND = Action.new('@<item>', desc, &action)
   COMMANDS.add_action(SHOW_COMMAND)
 end
 

data/lib/mysh/internal/actions/show/env.rb

@@ -7,7 +7,7 @@ module Mysh
   class EnvInfoCommand < Action
 
     #Execute the ? shell command.
-    def call(_args)
+    def process_command(_args)
       puts "Key mysh environment information.", ""
       puts info.format_mysh_bullets, "",
            path.format_mysh_bullets, ""
@@ -20,15 +20,15 @@ module Mysh
     #* :reek:UtilityFunction
     def info
       [["version",   Mysh::VERSION],
-       ["init file", $mysh_init_file],
+       ["init file", $mysh_init_file.decorate],
        ["user",      ENV['USER']],
-       ["home",      ENV['HOME']],
+       ["home",      (ENV['HOME'] || "").decorate],
        ["name",      $PROGRAM_NAME.decorate],
-       ["os shell",  ENV['SHELL']    || ENV['ComSpec']],
+       ["os shell",  (ENV['SHELL'] || ENV['ComSpec'] || "").decorate],
        ["host",      ENV['HOSTNAME'] || ENV['COMPUTERNAME']],
        ["os",        ENV['OS']],
        ["platform",  MiniReadline::TERM_PLATFORM],
-       ["java?",     MiniReadline::TERM_JAVA != nil],
+       ["java?",     MiniReadline::TERM_JAVA ? true : false],
        ["term",      ENV['TERM']],
        ["disp",      ENV['DISPLAY']],
        ["edit",      ENV['EDITOR']]]