mini_readline 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb399d7a4ffc7fcf703330024c6422386ff2c67
-  data.tar.gz: 748e2eacc096c0eadd51b84f79586b411d1abfa6
+  metadata.gz: 8e937dfc43b28cefc768efd3bdbce315d86dbb57
+  data.tar.gz: 3970f861094c4db5807291447aeb70a1e2144a4a
 SHA512:
-  metadata.gz: 63c11cfeaf488a056405e9b8f6b0c07536b6ef3727d7d584b516f2252c1af8272fe35c2f35f9c5b41d7d2c5de13f8b5b7bc09a9329b3e12db23e03c7da2db939
-  data.tar.gz: acc1855c61e90bba831229f9a05bbfc125371075ba48a4bd8baf2a5fbd695c18495ca4244c1ca19d76ea5bda978a72dfcc56aa65df3622bfbab9ab50e05834d3
+  metadata.gz: 7fbccdab691c99d79feed201ccee633a04ac9c609b4d18318bc2425b544c7b8e578baa77b905b2deb6f597f22dde52f30b06a392d5d402e997194576893dde3b
+  data.tar.gz: 8a34bd1a0c44816dab5f6b7e709811be0a6cf19463cd8468c7eb6ff9dbd80c667d8975297982fa3132277860f924a144535f6a68fa020ff3b79ad06745cdd24d

data/README.md

@@ -52,9 +52,10 @@ Go to start      | Home, Pad Home                   | Home, Ctrl-A
 Go to end        | End, Pad End                     | End, Ctrl-E
 Previous History | Up Arrow, Pad Up                 | Up Arrow, Ctrl-R
 Next History     | Down Arrow, Pad Down             | Down Arrow
-Erase Left       | Backspace                        | Backspace, Ctrl-H
+Erase Left       | Backspace, Ctrl-H                | Backspace, Ctrl-H
 Erase Right      | Delete, Ctrl-Backspace           | Delete, Ctrl-Backspace
 Erase All        | Escape                           | Ctrl-L
+Auto-complete    | Tab, Ctrl-I                      | Tab, Ctrl-I
 
 ### Notes
 * The label "Other" is an umbrella that bundles together the Linux, Mac,
@@ -231,10 +232,11 @@ system gem, use this:
 
 ## Testing
 To date this code has been tested under:
-* Windows 7 with MRI ruby 2.1.6p336 (2015-04-13 revision 50298) [i386-mingw32]
-* Windows 7 + Cygwin with ruby 2.2.3p173 (2015-08-18 revision 51636) [i386-cygwin]
+* Windows 7 with ruby 1.9.3p484 (2013-11-22) [i386-mingw32]
+* Windows 7 with ruby 2.1.6p336 (2015-04-13 revision 50298) [i386-mingw32]
+* Windows 7+Cygwin with ruby 2.2.3p173 (2015-08-18 revision 51636) [i386-cygwin]
 
-<br>More testing is clearly called for.
+<br>**More testing is clearly called for.**
 
 ## Contributing
 

data/lib/mini_readline/options.rb

@@ -9,6 +9,9 @@ module MiniReadline
                   :alt_prompt    => "<< ",    #The prompt when scrolled.
                                               #Set to nil to use main prompt.
 
+                  :auto_complete => true,     #Is auto complete enabled?
+                  :auto_source   => nil,      #Filled in by auto_complete.rb
+
                   :history       => false,    #Is the history buffer enabled?
                   :no_blanks     => true,     #No empty lines in history.
                   :no_dups       => true,     #No duplicate lines in history.

data/lib/mini_readline/raw_term/other/map.rb

@@ -51,6 +51,9 @@ module MiniReadline
     MAP["\x1F"]  = [:delete_right]
     MAP["\e[3~"] = [:delete_right]
 
+    #Auto-completion.
+    MAP["\t"]    = [:auto_complete]
+
     #The Enter key
     MAP["\x0D"]  = [:enter]
 

data/lib/mini_readline/raw_term/windows/map.rb

@@ -48,6 +48,9 @@ module MiniReadline
     MAP["\x00S"] = [:delete_right]
     MAP[pfx+"S"] = [:delete_right]
 
+    #Auto-completion.
+    MAP["\t"]    = [:auto_complete]
+
     #The Enter key
     MAP["\x0D"]  = [:enter]
 

data/lib/mini_readline/raw_term/windows/win_32_api.rb

@@ -3,29 +3,22 @@
 #* windows/win_32_api.rb - Support for selected low level Win32 API entry points.
 module MiniReadline
 
-  require 'fiddle'
+  require 'dl'
 
-  #The classic \Win32API gem is deprecated, so we emulate it with fiddle.
+  #The classic \Win32API gem is deprecated, so we emulate it with DL.
   class Win32API
 
-    #Use standard calling conventions
-    STDCALL = 1
-
     #A hash of DLL files used for one or more API entry points.
     DLL = {}
 
-    #Type mappings.
-    TYPES = {"0" => Fiddle::TYPE_VOID,
-             "S" => Fiddle::TYPE_VOIDP,
-             "I" => Fiddle::TYPE_LONG}
+    #Type mappings
+    TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
 
     #Set up an API entry point.
-    def initialize(dllname, func, import)
-      @proto = import.join.tr("VPpNnLlIi", "0SSI").chomp('0').split('')
-
-      handle = DLL[dllname] ||= Fiddle.dlopen(dllname)
-
-      @func = Fiddle::Function.new(handle[func], TYPES.values_at(*@proto), STDCALL)
+    def initialize(dllname, func, import, export = "0", calltype = :stdcall)
+      @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+      handle = DLL[dllname] ||= DL.dlopen(dllname)
+      @func  = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func, calltype)
     end
 
     #Call the Win 32 API entry point with appropriate arguments.
@@ -41,7 +34,8 @@ module MiniReadline
         end
       end
 
-      @func.call(*args).to_i || 0
+      @func.call(args).to_i || 0
     end
+
   end
 end

data/lib/mini_readline/raw_term/windows.rb

@@ -24,14 +24,14 @@ module MiniReadline
 
     #Set up the Windows Raw Terminal.
     def initialize
-      @_getch = Win32API.new("msvcrt", "_getch", [])
-      @_kbhit = Win32API.new("msvcrt", "_kbhit", [])
+      @_getch = Win32API.new("msvcrt", "_getch", [], 'I')
+      @_kbhit = Win32API.new("msvcrt", "_kbhit", [], 'I')
       @_beep  = Win32API.new("user32", "MessageBeep", ['L'])
       @_set_cursor_posn = Win32API.new("kernel32", "SetConsoleCursorPosition",
-                                       ['L','L'])
+                                       ['L','L'], 'L')
       @_get_screen_info = Win32API.new("kernel32", "GetConsoleScreenBufferInfo",
-                                       ['L','P'])
-      @_get_handle = Win32API.new("kernel32", "GetStdHandle", ['L'])
+                                       ['L','P'], 'L')
+      @_get_handle = Win32API.new("kernel32", "GetStdHandle", ['L'], 'L')
     end
 
     #Output a string

data/lib/mini_readline/read_line/edit/auto_complete/auto_manager.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+#* auto_manager.rb - The controller for auto-complete.
+module MiniReadline
+
+  #* auto_manager.rb - The controller for auto-complete.
+  class AutoManager
+
+    #Create a new auto-complete manager.
+    def initialize(&block)
+      @_block = block
+    end
+
+    #Get the next pivot string
+    def next(pivot)
+      unless @cycler && @old_pivot == pivot
+        @cycler = source.rebuild(pivot)
+      end
+
+      if @cycler
+        @old_pivot = @cycler.next
+      else
+        @old_pivot = nil
+      end
+    end
+
+    #Get the data source
+    def source
+      @_source ||= @_block.call
+    end
+  end
+
+end

data/lib/mini_readline/read_line/edit/auto_complete/file_folder_source.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+
+#* file_folder_source.rb - The data source for auto-complete.
+module MiniReadline
+
+  #* file_folder_source.rb - The data source for auto-complete.
+  class FileFolderSource
+
+    #Construct a new data list for auto-complete
+    def rebuild(pivot)
+      list = Dir.glob(pivot + '*')
+
+      unless list.empty?
+        list.cycle
+      else
+        nil
+      end
+    end
+
+  end
+
+end

data/lib/mini_readline/read_line/edit/auto_complete.rb

@@ -0,0 +1,43 @@
+# coding: utf-8
+
+require_relative 'auto_complete/auto_manager'
+require_relative 'auto_complete/file_folder_source'
+
+#* read_line/window/edit/auto_complete.rb - Process :auto_complete
+module MiniReadline
+
+  #Set up the default auto-complete data source.
+  BASE_OPTIONS[:auto_source] = FileFolderSource
+
+  #* read_line/window/edit/auto_complete.rb - Process :auto_complete
+  class Edit
+
+    #The auto-complete command.
+    def auto_complete(_keyboard_args)
+      root, pivot = get_root_pivot
+
+      if (new_pivot = auto_manager.next(pivot))
+        @edit_buffer = root + new_pivot
+        @edit_posn   = length
+      else
+        @term.beep
+      end
+    end
+
+    #Get the key components of the auto-complete process.
+    def get_root_pivot
+      /\S+$/ =~ (str = auto_trim) ? [$`.to_s, $~.to_s] : [str, ""]
+    end
+
+    #Get the base part of the edit buffer.
+    def auto_trim
+      @edit_buffer[0...(@edit_posn)]
+    end
+
+    #Get the auto-complete manager
+    def auto_manager
+      @_auto_manager ||= AutoManager.new { @options[:auto_source].new }
+    end
+  end
+
+end

data/lib/mini_readline/read_line/edit.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require_relative 'edit_window'
+require_relative 'edit/edit_window'
 
 require_relative 'edit/insert_text'
 require_relative 'edit/enter'
@@ -21,6 +21,8 @@ require_relative 'edit/cancel'
 require_relative 'edit/previous_history'
 require_relative 'edit/next_history'
 
+require_relative 'edit/auto_complete'
+
 require_relative 'edit/unmapped'
 
 #* read_line/edit.rb - The line editor.

data/lib/mini_readline/version.rb

@@ -1,4 +1,4 @@
 module MiniReadline
   #The current version of the mini_readline gem.
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_readline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -93,9 +93,15 @@ files:
 - lib/mini_readline/raw_term/windows/win_32_api.rb
 - lib/mini_readline/read_line.rb
 - lib/mini_readline/read_line/edit.rb
+- lib/mini_readline/read_line/edit/auto_complete.rb
+- lib/mini_readline/read_line/edit/auto_complete/auto_manager.rb
+- lib/mini_readline/read_line/edit/auto_complete/file_folder_source.rb
 - lib/mini_readline/read_line/edit/cancel.rb
 - lib/mini_readline/read_line/edit/delete_left.rb
 - lib/mini_readline/read_line/edit/delete_right.rb
+- lib/mini_readline/read_line/edit/edit_window.rb
+- lib/mini_readline/read_line/edit/edit_window/sync_cursor.rb
+- lib/mini_readline/read_line/edit/edit_window/sync_window.rb
 - lib/mini_readline/read_line/edit/enter.rb
 - lib/mini_readline/read_line/edit/go_end.rb
 - lib/mini_readline/read_line/edit/go_home.rb
@@ -107,9 +113,6 @@ files:
 - lib/mini_readline/read_line/edit/unmapped.rb
 - lib/mini_readline/read_line/edit/word_left.rb
 - lib/mini_readline/read_line/edit/word_right.rb
-- lib/mini_readline/read_line/edit_window.rb
-- lib/mini_readline/read_line/edit_window/sync_cursor.rb
-- lib/mini_readline/read_line/edit_window/sync_window.rb
 - lib/mini_readline/read_line/history.rb
 - lib/mini_readline/read_line/no_history.rb
 - lib/mini_readline/version.rb