mysh 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a76283a8d651321e0120c508b5402ebc91d9ae
-  data.tar.gz: 52eb191af673c9494000f23f254f24f8b5e906e3
+  metadata.gz: a7a1fe687d859a5bcd1b9d9c5752a37d0204373e
+  data.tar.gz: b141ac7759e49a617717f77c49fe60faeb92540b
 SHA512:
-  metadata.gz: 57b6d2bebfd47526c31af93b646d084041de6e623733376e5937b7c4ce2cc054ba384583a97e0feb79354c9a234947cdc24efb01234c1791f2b88f87780305a1
-  data.tar.gz: 593a900c74fd535984bd7554f90f45e94f3316d905dfd1fec44383f412fe7dc24082866a7dee757a9096a6a6306c7050a778fba22740093fa50466c4a9754ad9
+  metadata.gz: 86c6a1c87904fd42c6cb2267c34d9233934d4180bce918ba427bc8e759f0dc724e196ce1b3d460f050aed7993619c62d8a70c57ff43a0893bf031ce259e025d7
+  data.tar.gz: e584dbab723de2722996b57c10e20883939c5c46799d4f8d724e1424378640005f83ab1779d9f9df345255cd2f58c003f63cd7e4984357e85b442e9e1e172c6c

data/lib/mysh.rb

@@ -9,6 +9,7 @@ require 'English'
 $no_alias_read_line_module = true
 require 'mini_readline'
 
+require_relative 'mysh/smart_source'
 require_relative 'mysh/internal'
 require_relative 'mysh/expression'
 require_relative 'mysh/version'
@@ -29,7 +30,7 @@ module Mysh
     @input = MiniReadline::Readline.new(history: true,
                                         eoi_detect: true,
                                         auto_complete: true,
-                                        auto_source: MiniReadline::AutoFileSource)
+                                        auto_source: SmartSource)
 
     loop do
       input = @input.readline(prompt: 'mysh> ')

data/lib/mysh/commands/help.rb

@@ -10,39 +10,28 @@ module Mysh
 
     #Add the exit command to the library.
     add(self.new('help', 'Display help information for mysh.') do |args|
-      puts "mysh (MY SHell) version: #{Mysh::VERSION}"
+      puts "mysh (MY ruby SHell) version: #{Mysh::VERSION}"
       puts
 
       if args.empty?
         width = 0
-        puts "Internal mysh commands:"
+        puts "1) Internal mysh commands:"
         puts " - executed by mysh directly."
-        puts " - a leading space skips all internal commands."
+        puts " - supports the following set of commands."
         puts
+        puts "Command    Description"
+        puts "=======    ==========="
 
         InternalCommand
           .info
-          .concat(ExecHost.info)
-          .sort do |first, second |
-            width = [width, first[0].length, second[0].length].max
-            first[0] <=> second[0]
-          end
-          .each do |info|
-            puts "#{info[0].ljust(width)}    #{info[1]}"
-          end
-
-        puts
-        puts "Math support:"
-        puts " - the execution environment includes the Math module."
-        puts " - for more info use the help math command."
-
-        puts
-        puts "External commands:"
-        puts " - executed by the system using the standard shell."
-        puts " - use help #{EXT_TAG} for more info on external commands."
+          .sort {|first, second | first[0] <=> second[0] }
+          .each {|info| puts "#{info[0].ljust(10)} #{info[1]}" }
         puts
+        puts IO.read(File.dirname(__FILE__) + '/help.txt')
       elsif args[0] == 'math'
         puts IO.read(File.dirname(__FILE__) + '/help_math.txt')
+      elsif args[0] == 'ruby'
+        puts IO.read(File.dirname(__FILE__) + '/help_ruby.txt')
       else
         args[0] = "" if args[0] == EXT_TAG
         system("help " + args.join)

data/lib/mysh/commands/help.txt

@@ -0,0 +1,14 @@
+2) Ruby Expression support:
+ - any line beginning with an equals "=" sign will be evaluated as a Ruby
+   expression. This allows the mysh command line to serve as a programming,
+   debugging and super-calculator environment.
+ - for more info use the 'help ruby' command.
+
+3) Math support:
+ - the execution environment includes the Math module.
+ - for more info use the 'help math' command.
+
+4) External commands:"
+ - executed by the system using the standard shell.
+ - to force the use of the external shell, add a leading space to the command.
+

data/lib/mysh/commands/help_math.txt

@@ -1,5 +1,9 @@
 mysh Math support summary
 
+ - The Ruby expression execution environment includes the Math module. Thus
+   the following advanced math functions are directly available without having
+   to explicitly reference that module.
+
 Method     Returns Description
 =======    ======= ================================================
 acos(x)    Float   Computes the arc cosine of x. Returns 0..PI.
@@ -25,8 +29,8 @@ hypot(x,y) Float   Returns sqrt(x**2 + y**2), the hypotenuse of a right-angled
 ldexp(f,e) Float   Returns the value of f*(2**e).
 lgamma(x)  Array   Returns a two-element array containing the log of the
                    gamma of x and the sign of gamma of x.
-log(x)     Float   Computes the natural log of c.
-log(x,B)   Float   Computes the base B log of c.
+log(x)     Float   Computes the natural log of x.
+log(x,B)   Float   Computes the base B log of x.
 log10(x)   Float   Returns the base 10 logarithm of x.
 log2(x)    Float   Returns the base 2 logarithm of x.
 sin(x)     Float   Computes the sine of x (expressed in radians).

data/lib/mysh/commands/help_ruby.txt

@@ -0,0 +1,15 @@
+mysh Ruby expression support summary
+
+ - All command lines that begin with an equals "=" sign are evaluated as Ruby
+   expressions.
+ - Expressions ending with a backslash character "\" are continued on the next
+   line. The prompt changes to "mysh\" to indicate that this is going on.
+ - The results are displayed using the pretty-print facility.
+ - Auto-complete always places any file names in quotes so they can be used
+   as string parameters.
+
+A few noteworthy methods exist that facilitate use of Ruby expressions:
+
+reset    Reset the execution environment to the default state.
+result   Returns the result of the previous expression.
+

data/lib/mysh/expression.rb

@@ -11,13 +11,6 @@ module Mysh
 
     include Math
 
-    #Get help info on Ruby host exec.
-    def self.info
-      [["=an_expr", "Display the result of evaluating an expression in ruby."],
-       ["=result",  "Display the result of the previous evaluation."],
-       ["=stuff \\","This expression is continued on the next line."]]
-    end
-
     #The result of the previous expression.
     attr_reader :result
 
@@ -42,7 +35,12 @@ module Mysh
     #Do the actual work of executing an expression.
     def do_execute(str)
       if /\\\s*$/ =~ str
-        do_execute($PREMATCH + "\n" + Mysh.input.readline(prompt: 'mysh\\ '))
+        parms = {
+                 prompt: 'mysh\\ ',
+                 auto_source: MiniReadline::QuotedFileFolderSource
+                }
+
+        do_execute($PREMATCH + "\n" + Mysh.input.readline(parms))
       else
         begin
           pp eval("@result" + str)
@@ -55,4 +53,3 @@ module Mysh
     end
   end
 end
-

data/lib/mysh/smart_source.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+
+#* array_source.rb - An array as the source for auto-complete.
+module Mysh
+
+  #* array_source.rb - An array as the source for auto-complete.
+  class SmartSource
+
+    #Create a new file/folder auto-data source. NOP
+    def initialize(options)
+      @auto_source = MiniReadline::AutoFileSource.new(options)
+      @quote_source = MiniReadline::QuotedFileFolderSource.new(options)
+    end
+
+    #Construct a new data list for auto-complete
+    def rebuild(str)
+      @active_source = str[0] == '=' ? @quote_source : @auto_source
+      @active_source.rebuild(str)
+    end
+
+    #Get the next string for auto-complete
+    def next
+      @active_source.next
+    end
+
+  end
+
+end

data/lib/mysh/version.rb

@@ -2,7 +2,7 @@
 
 module Mysh
   #The version string of MY SHell.
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 
   #A brief summary of this gem.
   SUMMARY = "mysh -- a Ruby inspired command shell"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,9 @@ files:
 - lib/mysh/commands/cd.rb
 - lib/mysh/commands/exit.rb
 - lib/mysh/commands/help.rb
+- lib/mysh/commands/help.txt
 - lib/mysh/commands/help_math.txt
+- lib/mysh/commands/help_ruby.txt
 - lib/mysh/commands/history.rb
 - lib/mysh/expression.rb
 - lib/mysh/internal.rb
@@ -133,6 +135,7 @@ files:
 - lib/mysh/internal/instance.rb
 - lib/mysh/internal/klass.rb
 - lib/mysh/internal/parse.rb
+- lib/mysh/smart_source.rb
 - lib/mysh/version.rb
 - mysh.gemspec
 - rakefile.rb