tty-prompt 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6826fe5bd7ea9efb4e7e901d1bf2aaa34671bd0d
-  data.tar.gz: 440b8acadbc509ffe2260562c1cf9d8e2b192ce0
+  metadata.gz: 774726386ea09cc8c3fc2abd877e377eb3db3c3d
+  data.tar.gz: 43ac05278ae482148a133e7b4ca1ad304e304189
 SHA512:
-  metadata.gz: b4ba64116ae4982a55d032e60a6cee47d28a165e4ab1286c294e3e3109e602f4e6c174febfbe81507d0676eadbd0771565e73fc65c79bda5b914e1fd02405e67
-  data.tar.gz: 3213c42f59d3c3df70a826ed6d2e69f8328725a7483a9ce57437b1464f1c4ae8a2c99a70cd1c43451c8b55d14bcb3ee02e1b98421145397ee08f9892424669bf
+  metadata.gz: d78bc4524d6e8183692e636d783d4c40c4666af82364084e67d3dae701dd9a2bd0695eeb4eac9925616bd054cf1edcca701307f016c3f9ea7a0756c6a0eedeac
+  data.tar.gz: 6965d2d8df2dcffdfe33539d71da7426a185fca2a1649d665417cca03d4961edb20c45e2cd65c2f74784201b86ec3a4e7135b21de547f73db1e7da410b459f2f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## [v0.13.2] - 2017-08-30
+
+### Changed
+* Change to extract TTY::Prompt::Reader to its own dependency
+
 ## [v0.13.1] - 2017-08-16
 
 ### Added
@@ -213,6 +218,8 @@
 
 * Initial implementation and release
 
+[v0.13.2]: https://github.com/piotrmurach/tty-prompt/compare/v0.13.1...v0.13.2
+[v0.13.1]: https://github.com/piotrmurach/tty-prompt/compare/v0.13.0...v0.13.1
 [v0.13.0]: https://github.com/piotrmurach/tty-prompt/compare/v0.12.0...v0.13.0
 [v0.12.0]: https://github.com/piotrmurach/tty-prompt/compare/v0.11.0...v0.12.0
 [v0.11.0]: https://github.com/piotrmurach/tty-prompt/compare/v0.10.1...v0.11.0

data/Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
+# gem 'tty-reader', path: '../tty-reader'
+# gem 'tty-reader', git: 'https://github.com/piotrmurach/tty-reader'
+
 group :test do
   gem 'benchmark-ips', '~> 2.0.0'
   gem 'simplecov', '~> 0.10.0'

data/lib/tty/prompt/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Prompt
-    VERSION = "0.13.1"
+    VERSION = "0.13.2"
   end # Prompt
 end # TTY

data/lib/tty/prompt.rb

@@ -3,6 +3,7 @@
 require 'forwardable'
 require 'pastel'
 require 'tty-cursor'
+require 'tty-reader'
 
 require_relative 'prompt/answers_collector'
 require_relative 'prompt/confirm_question'
@@ -14,7 +15,6 @@ require_relative 'prompt/multi_list'
 require_relative 'prompt/multiline'
 require_relative 'prompt/mask_question'
 require_relative 'prompt/question'
-require_relative 'prompt/reader'
 require_relative 'prompt/slider'
 require_relative 'prompt/statement'
 require_relative 'prompt/suggestion'
@@ -127,8 +127,8 @@ module TTY
 
       @cursor = TTY::Cursor
       @pastel = Pastel.new(@enabled_color.nil? ? {} : { enabled: @enabled_color })
-      @reader = Reader.new(@input, @output, interrupt: @interrupt,
-                           track_history: @track_history, env: @env)
+      @reader = TTY::Reader.new(@input, @output, interrupt: @interrupt,
+                                track_history: @track_history, env: @env)
     end
 
     # Invoke a question type of prompt

data/tty-prompt.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'necromancer',  '~> 0.4.0'
   spec.add_dependency 'pastel',       '~> 0.7.0'
-  spec.add_dependency 'tty-cursor',   '~> 0.5.0'
-  spec.add_dependency 'wisper',       '~> 2.0.0'
   spec.add_dependency 'timers',       '~> 4.1.2'
+  spec.add_dependency 'tty-cursor',   '~> 0.5.0'
+  spec.add_dependency 'tty-reader',   '~> 0.1.0'
 
   spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-prompt
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: necromancer
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: tty-cursor
+  name: timers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
-  name: wisper
+  name: tty-cursor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: timers
+  name: tty-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,15 +192,6 @@ files:
 - lib/tty/prompt/question/checks.rb
 - lib/tty/prompt/question/modifier.rb
 - lib/tty/prompt/question/validation.rb
-- lib/tty/prompt/reader.rb
-- lib/tty/prompt/reader/codes.rb
-- lib/tty/prompt/reader/console.rb
-- lib/tty/prompt/reader/history.rb
-- lib/tty/prompt/reader/key_event.rb
-- lib/tty/prompt/reader/line.rb
-- lib/tty/prompt/reader/mode.rb
-- lib/tty/prompt/reader/win_api.rb
-- lib/tty/prompt/reader/win_console.rb
 - lib/tty/prompt/result.rb
 - lib/tty/prompt/slider.rb
 - lib/tty/prompt/statement.rb

data/lib/tty/prompt/reader/codes.rb

@@ -1,121 +0,0 @@
-# encoding: utf-8
-
-module TTY
-  class Prompt
-    class Reader
-      module Codes
-        def ctrl_keys
-          {
-            ctrl_a: ?\C-a,
-            ctrl_b: ?\C-b,
-            ctrl_c: ?\C-c,
-            ctrl_d: ?\C-d,
-            ctrl_e: ?\C-e,
-            ctrl_f: ?\C-f,
-            ctrl_g: ?\C-g,
-            ctrl_h: ?\C-h,
-            ctrl_i: ?\C-i,
-            ctrl_j: ?\C-j,
-            ctrl_k: ?\C-k,
-            ctrl_l: ?\C-l,
-            ctrl_m: ?\C-m,
-            ctrl_n: ?\C-n,
-            ctrl_o: ?\C-o,
-            ctrl_p: ?\C-p,
-            ctrl_q: ?\C-q,
-            ctrl_r: ?\C-r,
-            ctrl_s: ?\C-s,
-            ctrl_t: ?\C-t,
-            ctrl_u: ?\C-u,
-            ctrl_v: ?\C-v,
-            ctrl_w: ?\C-w,
-            ctrl_x: ?\C-x,
-            ctrl_y: ?\C-y,
-            ctrl_z: ?\C-z
-          }
-        end
-        module_function :ctrl_keys
-
-        def keys
-          {
-            tab:       "\t",
-            enter:     "\n",
-            return:    "\r",
-            escape:    "\e",
-            space:     " ",
-            backspace: ?\C-?,
-            home:      "\e[1~",
-            insert:    "\e[2~",
-            delete:    "\e[3~",
-            end:       "\e[4~",
-            page_up:   "\e[5~",
-            page_down: "\e[6~",
-
-            up:     "\e[A",
-            down:   "\e[B",
-            right:  "\e[C",
-            left:   "\e[D",
-            clear:  "\e[E",
-
-            f1_xterm: "\eOP",
-            f2_xterm: "\eOQ",
-            f3_xterm: "\eOR",
-            f4_xterm: "\eOS",
-
-            f1:  "\e[11~",
-            f2:  "\e[12~",
-            f3:  "\e[13~",
-            f4:  "\e[14~",
-            f5:  "\e[15~",
-            f6:  "\e[17~",
-            f7:  "\e[18~",
-            f8:  "\e[19~",
-            f9:  "\e[20~",
-            f10: "\e[21~",
-            f11: "\e[23~",
-            f12: "\e[24~"
-          }.merge(ctrl_keys)
-        end
-        module_function :keys
-
-        def win_keys
-          {
-            tab:       "\t",
-            enter:     "\r",
-            return:    "\r",
-            escape:    "\e",
-            space:     " ",
-            backspace: "\b",
-            home:      [224, 71].pack('U*'),
-            end:       [224, 79].pack('U*'),
-            insert:    [224, 82].pack('U*'),
-            delete:    [224, 83].pack('U*'),
-            page_up:   [224, 73].pack('U*'),
-            page_down: [224, 81].pack('U*'),
-
-            up:     [224, 72].pack('U*'),
-            down:   [224, 80].pack('U*'),
-            right:  [224, 77].pack('U*'),
-            left:   [224, 75].pack('U*'),
-            clear:  [224, 83].pack('U*'),
-
-            f1:  "\x00;",
-            f2:  "\x00<",
-            f3:  "\x00",
-            f4:  "\x00=",
-            f5:  "\x00?",
-            f6:  "\x00@",
-            f7:  "\x00A",
-            f8:  "\x00B",
-            f9:  "\x00C",
-            f10: "\x00D",
-            f11: "\x00\x85",
-            f12: "\x00\x86"
-          }.merge(ctrl_keys)
-        end
-        module_function :win_keys
-
-      end # Codes
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/console.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-
-require_relative 'codes'
-require_relative 'mode'
-
-module TTY
-  class Prompt
-    class Reader
-      class Console
-        ESC = "\e".freeze
-        CSI = "\e[".freeze
-
-        # Key codes
-        #
-        # @return [Hash[Symbol]]
-        #
-        # @api public
-        attr_reader :keys
-
-        # Escape codes
-        #
-        # @return [Array[Integer]]
-        #
-        # @api public
-        attr_reader :escape_codes
-
-        def initialize(input)
-          @input = input
-          @mode  = Mode.new(input)
-          @keys  = Codes.keys
-          @escape_codes = [[ESC.ord], CSI.bytes.to_a]
-        end
-
-        # Get a character from console with echo
-        #
-        # @param [Hash[Symbol]] options
-        # @option options [Symbol] :echo
-        #   the echo toggle
-        #
-        # @return [String]
-        #
-        # @api private
-        def get_char(options)
-          mode.raw(options[:raw]) do
-            mode.echo(options[:echo]) { input.getc }
-          end
-        end
-
-        protected
-
-        attr_reader :mode
-
-        attr_reader :input
-      end # Console
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/history.rb

@@ -1,145 +0,0 @@
-# encoding: utf-8
-
-require 'forwardable'
-
-module TTY
-  class Prompt
-    class Reader
-      # A class responsible for storing a history of all lines entered by
-      # user when interacting with shell prompt.
-      #
-      # @api private
-      class History
-        include Enumerable
-        extend Forwardable
-
-        # Default maximum size
-        DEFAULT_SIZE = 32 << 4
-
-        def_delegators :@history, :size, :length, :to_s, :inspect
-
-        # Set and retrieve the maximum size of the buffer
-        attr_accessor :max_size
-
-        attr_reader :index
-
-        attr_accessor :cycle
-
-        attr_accessor :duplicates
-
-        attr_accessor :exclude
-
-        # Create a History buffer
-        #
-        # param [Integer] max_size
-        #   the maximum size for history buffer
-        #
-        # param [Hash[Symbol]] options
-        # @option options [Boolean] :duplicates
-        #   whether or not to store duplicates, true by default
-        #
-        # @api public
-        def initialize(max_size = DEFAULT_SIZE, options = {})
-          @max_size   = max_size
-          @index      = 0
-          @history    = []
-          @duplicates = options.fetch(:duplicates) { true }
-          @exclude    = options.fetch(:exclude) { proc {} }
-          @cycle      = options.fetch(:cycle) { false }
-          yield self if block_given?
-        end
-
-        # Iterates over history lines
-        #
-        # @api public
-        def each
-          if block_given?
-            @history.each { |line| yield line }
-          else
-            @history.to_enum
-          end
-        end
-
-        # Add the last typed line to history buffer
-        #
-        # @param [String] line
-        #
-        # @api public
-        def push(line)
-          @history.delete(line) unless @duplicates
-          return if line.to_s.empty? || @exclude[line]
-
-          @history.shift if size >= max_size
-          @history << line
-          @index = @history.size - 1
-
-          self
-        end
-        alias << push
-
-        # Move the pointer to the next line in the history
-        #
-        # @api public
-        def next
-          return if size.zero?
-          if @index == size - 1
-            @index = 0 if @cycle
-          else
-            @index += 1
-          end
-        end
-
-        def next?
-          size > 0 && !(@index == size - 1 && !@cycle)
-        end
-
-        # Move the pointer to the previous line in the history
-        def previous
-          return if size.zero?
-          if @index.zero?
-            @index = size - 1 if @cycle
-          else
-            @index -= 1
-          end
-        end
-
-        def previous?
-          size > 0 && !(@index < 0 && !@cycle)
-        end
-
-        # Return line at the specified index
-        #
-        # @raise [IndexError] index out of range
-        #
-        # @api public
-        def [](index)
-          if index < 0
-            index += @history.size if index < 0
-          end
-          line = @history[index]
-          if line.nil?
-            raise IndexError, 'invalid index'
-          end
-          line.dup
-        end
-
-        # Get current line
-        #
-        # @api public
-        def get
-          return if size.zero?
-
-          self[@index]
-        end
-
-        # Empty all history lines
-        #
-        # @api public
-        def clear
-          @history.clear
-          @index = 0
-        end
-      end # History
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/key_event.rb

@@ -1,91 +0,0 @@
-# encoding: utf-8
-
-module TTY
-  class Prompt
-    class Reader
-      # Responsible for meta-data information about key pressed
-      #
-      # @api private
-      class Key < Struct.new(:name, :ctrl, :meta, :shift)
-        def initialize(*)
-          super(nil, false, false, false)
-        end
-      end
-
-      # Represents key event emitted during keyboard press
-      #
-      # @api public
-      class KeyEvent < Struct.new(:value, :key)
-        # Create key event from read input codes
-        #
-        # @param [Hash[Symbol]] keys
-        #   the keys and codes mapping
-        # @param [Array[Integer]] codes
-        #
-        # @return [KeyEvent]
-        #
-        # @api public
-        def self.from(keys, char)
-          key = Key.new
-          ctrls = keys.keys.grep(/ctrl/)
-
-          case char
-          when keys[:return] then key.name = :return
-          when keys[:enter]  then key.name = :enter
-          when keys[:tab]    then key.name = :tab
-          when keys[:backspace] then key.name = :backspace
-          when keys[:delete] then key.name = :delete
-          when keys[:space]  then key.name = :space
-          when keys[:escape] then key.name = :escape
-          when proc { |c| c =~ /^[a-z]{1}$/ }
-            key.name = :alpha
-          when proc { |c| c =~ /^[A-Z]{1}$/ }
-            key.name = :alpha
-            key.shift = true
-          when proc { |c| c =~ /^\d+$/ }
-            key.name = :num
-          # arrows
-          when keys[:up]    then key.name = :up
-          when keys[:down]  then key.name = :down
-          when keys[:left]  then key.name = :left
-          when keys[:right] then key.name = :right
-          # editing
-          when keys[:clear] then key.name = :clear
-          when keys[:end]   then key.name = :end
-          when keys[:home]  then key.name = :home
-          when keys[:insert]    then key.name = :insert
-          when keys[:page_up]   then key.name = :page_up
-          when keys[:page_down] then key.name = :page_down
-          when proc { |cs| ctrls.any? { |name| keys[name] == cs } }
-            key.name = keys.key(char)
-            key.ctrl = true
-          # f1 - f12
-          when keys[:f1], keys[:f1_xterm] then key.name = :f1
-          when keys[:f2], keys[:f2_xterm] then key.name = :f2
-          when keys[:f3], keys[:f3_xterm] then key.name = :f3
-          when keys[:f4], keys[:f4_xterm] then key.name = :f4
-          when keys[:f5] then key.name = :f5
-          when keys[:f6] then key.name = :f6
-          when keys[:f7] then key.name = :f7
-          when keys[:f8] then key.name = :f8
-          when keys[:f9] then key.name = :f9
-          when keys[:f10] then key.name = :f10
-          when keys[:f11] then key.name = :f11
-          when keys[:f12] then key.name = :f12
-          end
-
-          new(char, key)
-        end
-
-        # Check if key event can be triggered
-        #
-        # @return [Boolean]
-        #
-        # @api public
-        def trigger?
-          !key.nil? && !key.name.nil?
-        end
-      end # KeyEvent
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/line.rb

@@ -1,162 +0,0 @@
-# encoding: utf-8
-
-require 'forwardable'
-
-module TTY
-  class Prompt
-    class Reader
-      class Line
-        extend Forwardable
-
-        def_delegators :@text, :size, :length, :to_s, :inspect,
-                       :slice!, :empty?
-
-        attr_accessor :text
-
-        attr_accessor :cursor
-
-        def initialize(text = "")
-          @text = text
-          @cursor = [0, @text.length].max
-          yield self if block_given?
-        end
-
-        # Check if cursor reached beginning of the line
-        #
-        # @return [Boolean]
-        #
-        # @api public
-        def start?
-          @cursor == 0
-        end
-
-        # Check if cursor reached end of the line
-        #
-        # @return [Boolean]
-        #
-        # @api public
-        def end?
-          @cursor == @text.length
-        end
-
-        # Move line position to the left by n chars
-        #
-        # @api public
-        def left(n = 1)
-          @cursor = [0, @cursor - n].max
-        end
-
-        # Move line position to the right by n chars
-        #
-        # @api public
-        def right(n = 1)
-          @cursor = [@text.length, @cursor + n].min
-        end
-
-        # Move cursor to beginning position
-        #
-        # @api public
-        def move_to_start
-          @cursor = 0
-        end
-
-        # Move cursor to end position
-        #
-        # @api public
-        def move_to_end
-          @cursor = @text.length # put cursor outside of text
-        end
-
-        # Insert characters inside a line. When the lines exceeds
-        # maximum length, an extra space is added to accomodate index.
-        #
-        # @param [Integer] i
-        #   the index to insert at
-        #
-        # @example
-        #   text = 'aaa'
-        #   line[5]= 'b'
-        #   => 'aaa  b'
-        #
-        # @api public
-        def []=(i, chars)
-          if i.is_a?(Range)
-            @text[i] = chars
-            @cursor += chars.length
-            return
-          end
-
-          if i <= 0
-            before_text = ''
-            after_text = @text.dup
-          elsif i == @text.length - 1
-            before_text = @text.dup
-            after_text = ''
-          elsif i > @text.length - 1
-            before_text = @text.dup
-            after_text = ?\s * (i - @text.length)
-            @cursor += after_text.length
-          else
-            before_text = @text[0..i-1].dup
-            after_text  = @text[i..-1].dup
-          end
-
-          if i > @text.length - 1
-            @text = before_text << after_text << chars
-          else
-            @text = before_text << chars << after_text
-          end
-
-          @cursor = i + chars.length
-        end
-
-        # Read character
-        #
-        # @api public
-        def [](i)
-          @text[i]
-        end
-
-        # Replace current line with new text
-        #
-        # @param [String] text
-        #
-        # @api public
-        def replace(text)
-          @text = text
-          @cursor = @text.length # put cursor outside of text
-        end
-
-        # Insert char(s) at cursor position
-        #
-        # @api public
-        def insert(chars)
-          self[@cursor] = chars
-        end
-
-        # Add char and move cursor
-        #
-        # @api public
-        def <<(char)
-          @text << char
-          @cursor += 1
-        end
-
-        # Remove char from the line at current position
-        #
-        # @api public
-        def delete
-          @text.slice!(@cursor, 1)
-        end
-
-        # Remove char from the line in front of the cursor
-        #
-        # @api public
-        def remove
-          left
-          @text.slice!(@cursor, 1)
-        end
-      end # Line
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/mode.rb

@@ -1,44 +0,0 @@
-# encoding: utf-8
-
-require 'io/console'
-
-module TTY
-  class Prompt
-    class Reader
-      class Mode
-        # Initialize a Terminal
-        #
-        # @api public
-        def initialize(input = $stdin)
-          @input = input
-        end
-
-        # Echo given block
-        #
-        # @param [Boolean] is_on
-        #
-        # @api public
-        def echo(is_on = true, &block)
-          if is_on || !@input.tty?
-            yield
-          else
-            @input.noecho(&block)
-          end
-        end
-
-        # Use raw mode in the given block
-        #
-        # @param [Boolean] is_on
-        #
-        # @api public
-        def raw(is_on = true, &block)
-          if is_on && @input.tty?
-            @input.raw(&block)
-          else
-            yield
-          end
-        end
-      end # Mode
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/win_api.rb

@@ -1,55 +0,0 @@
-# encoding: utf-8
-
-require 'fiddle'
-
-module TTY
-  class Prompt
-    class Reader
-      module WinAPI
-        include Fiddle
-
-        Handle = RUBY_VERSION >= "2.0.0" ? Fiddle::Handle : DL::Handle
-
-        CRT_HANDLE = Handle.new("msvcrt") rescue Handle.new("crtdll")
-
-        # Get a character from the console without echo.
-        #
-        # @return [String]
-        #   return the character read
-        #
-        # @api public
-        def getch
-          @@getch ||= Fiddle::Function.new(CRT_HANDLE["_getch"], [], TYPE_INT)
-          @@getch.call
-        end
-        module_function :getch
-
-        # Gets a character from the console with echo.
-        #
-        # @return [String]
-        #   return the character read
-        #
-        # @api public
-        def getche
-          @@getche ||= Fiddle::Function.new(CRT_HANDLE["_getche"], [], TYPE_INT)
-          @@getche.call
-        end
-        module_function :getche
-
-        # Check the console for recent keystroke. If the function
-        # returns a nonzero value, a keystroke is waiting in the buffer.
-        #
-        # @return [Integer]
-        #   return a nonzero value if a key has been pressed. Otherwirse,
-        #   it returns 0.
-        #
-        # @api public
-        def kbhit
-          @@kbhit ||= Fiddle::Function.new(CRT_HANDLE["_kbhit"], [], TYPE_INT)
-          @@kbhit.call
-        end
-        module_function :kbhit
-      end # WinAPI
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader/win_console.rb

@@ -1,91 +0,0 @@
-# encoding: utf-8
-
-require_relative 'codes'
-
-module TTY
-  class Prompt
-    class Reader
-      class WinConsole
-        ESC     = "\e".freeze
-        NUL_HEX = "\x00".freeze
-        EXT_HEX = "\xE0".freeze
-
-        # Key codes
-        #
-        # @return [Hash[Symbol]]
-        #
-        # @api public
-        attr_reader :keys
-
-        # Escape codes
-        #
-        # @return [Array[Integer]]
-        #
-        # @api public
-        attr_reader :escape_codes
-
-        def initialize(input)
-          require_relative 'win_api'
-          @input = input
-          @keys = Codes.win_keys
-          @escape_codes = [[NUL_HEX.ord], [ESC.ord], EXT_HEX.bytes.to_a]
-        end
-
-        # Get a character from console blocking for input
-        #
-        # @param [Hash[Symbol]] options
-        # @option options [Symbol] :echo
-        #   the echo mode toggle
-        # @option options [Symbol] :raw
-        #   the raw mode toggle
-        #
-        # @return [String]
-        #
-        # @api private
-        def get_char(options)
-          if options[:raw] && options[:echo]
-            if options[:nonblock]
-              get_char_echo_non_blocking
-            else
-              get_char_echo_blocking
-            end
-          elsif options[:raw] && !options[:echo]
-            options[:nonblock] ? get_char_non_blocking : get_char_blocking
-          elsif !options[:raw] && !options[:echo]
-            options[:nonblock] ? get_char_non_blocking : get_char_blocking
-          else
-            @input.getc
-          end
-        end
-
-        # Get the char for last key pressed, or if no keypress return nil
-        #
-        # @api private
-        def get_char_non_blocking
-          input_ready? ? get_char_blocking : nil
-        end
-
-        def get_char_echo_non_blocking
-          input_ready? ? get_char_echo_blocking : nil
-        end
-
-        def get_char_blocking
-          WinAPI.getch.chr
-        end
-
-        def get_char_echo_blocking
-          WinAPI.getche.chr
-        end
-
-        # Check if IO has user input
-        #
-        # @return [Boolean]
-        #
-        # @api private
-        def input_ready?
-          !WinAPI.kbhit.zero?
-        end
-      end # Console
-    end # Reader
-  end # Prompt
-end # TTY

data/lib/tty/prompt/reader.rb

@@ -1,350 +0,0 @@
-# encoding: utf-8
-
-require 'wisper'
-require 'rbconfig'
-
-require_relative 'reader/history'
-require_relative 'reader/line'
-require_relative 'reader/key_event'
-require_relative 'reader/console'
-require_relative 'reader/win_console'
-
-module TTY
-  # A class responsible for shell prompt interactions.
-  class Prompt
-    # A class responsible for reading character input from STDIN
-    #
-    # Used internally to provide key and line reading functionality
-    #
-    # @api private
-    class Reader
-      include Wisper::Publisher
-
-      # Raised when the user hits the interrupt key(Control-C)
-      #
-      # @api public
-      InputInterrupt = Class.new(StandardError)
-
-      attr_reader :input
-
-      attr_reader :output
-
-      attr_reader :env
-
-      attr_reader :track_history
-      alias track_history? track_history
-
-      attr_reader :console
-
-      # Key codes
-      CARRIAGE_RETURN = 13
-      NEWLINE         = 10
-      BACKSPACE       = 127
-      DELETE          = 8
-
-      # Initialize a Reader
-      #
-      # @param [IO] input
-      #   the input stream
-      # @param [IO] output
-      #   the output stream
-      # @param [Hash] options
-      # @option options [Symbol] :interrupt
-      #   handling of Ctrl+C key out of :signal, :exit, :noop
-      # @option options [Boolean] :track_history
-      #   disable line history tracking, true by default
-      #
-      # @api public
-      def initialize(input = $stdin, output = $stdout, options = {})
-        @input     = input
-        @output    = output
-        @interrupt = options.fetch(:interrupt) { :error }
-        @env       = options.fetch(:env) { ENV }
-        @track_history = options.fetch(:track_history) { true }
-        @console   = select_console(input)
-        @history   = History.new do |h|
-          h.duplicates = false
-          h.exclude = proc { |line| line.strip == '' }
-        end
-        @stop = false # gathering input
-
-        subscribe(self)
-      end
-
-      # Select appropriate console
-      #
-      # @api private
-      def select_console(input)
-        if windows? && !env['TTY_TEST']
-          WinConsole.new(input)
-        else
-          Console.new(input)
-        end
-      end
-
-      # Get input in unbuffered mode.
-      #
-      # @example
-      #   unbufferred do
-      #     ...
-      #   end
-      #
-      # @api public
-      def unbufferred(&block)
-        bufferring = output.sync
-        # Immediately flush output
-        output.sync = true
-        block[] if block_given?
-      ensure
-        output.sync = bufferring
-      end
-
-      # Read a keypress  including invisible multibyte codes
-      # and return a character as a string.
-      # Nothing is echoed to the console. This call will block for a
-      # single keypress, but will not wait for Enter to be pressed.
-      #
-      # @param [Hash[Symbol]] options
-      # @option options [Boolean] echo
-      #   whether to echo chars back or not, defaults to false
-      # @option options [Boolean] raw
-      #   whenther raw mode enabled, defaults to true
-      #
-      # @return [String]
-      #
-      # @api public
-      def read_keypress(options = {})
-        opts  = { echo: false, raw: true }.merge(options)
-        codes = unbufferred { get_codes(opts) }
-        char  = codes ? codes.pack('U*') : nil
-
-        trigger_key_event(char) if char
-        char
-      end
-      alias read_char read_keypress
-
-      # Get input code points
-      #
-      # @param [Hash[Symbol]] options
-      # @param [Array[Integer]] codes
-      #
-      # @return [Array[Integer]]
-      #
-      # @api private
-      def get_codes(options = {}, codes = [])
-        opts = { echo: true, raw: false }.merge(options)
-        char = console.get_char(opts)
-        handle_interrupt if char == console.keys[:ctrl_c]
-        return if char.nil?
-        codes << char.ord
-
-        condition = proc { |escape|
-          (codes - escape).empty? ||
-          (escape - codes).empty? &&
-          !(64..126).include?(codes.last)
-        }
-
-        while console.escape_codes.any?(&condition)
-          get_codes(options, codes)
-        end
-        codes
-      end
-
-      # Get a single line from STDIN. Each key pressed is echoed
-      # back to the shell. The input terminates when enter or
-      # return key is pressed.
-      #
-      # @param [String] prompt
-      #   the prompt to display before input
-      #
-      # @param [Boolean] echo
-      #   if true echo back characters, output nothing otherwise
-      #
-      # @return [String]
-      #
-      # @api public
-      def read_line(*args)
-        options = args.last.respond_to?(:to_hash) ? args.pop : {}
-        prompt = args.empty? ? '' : args.pop
-        opts = { echo: true, raw: true }.merge(options)
-        line = Line.new('')
-        ctrls = console.keys.keys.grep(/ctrl/)
-        clear_line = "\e[2K\e[1G"
-
-        while (codes = unbufferred { get_codes(opts) }) && (code = codes[0])
-          char = codes.pack('U*')
-          trigger_key_event(char)
-
-          if console.keys[:backspace] == char || BACKSPACE == code
-            next if line.start?
-            line.left
-            line.delete
-          elsif console.keys[:delete] == char || DELETE == code
-            line.delete
-          elsif [console.keys[:ctrl_d],
-                 console.keys[:ctrl_z]].include?(char)
-            break
-          elsif ctrls.include?(console.keys.key(char))
-            # skip
-          elsif console.keys[:up] == char
-            next unless history_previous?
-            line.replace(history_previous)
-          elsif console.keys[:down] == char
-            line.replace(history_next? ? history_next : '')
-          elsif console.keys[:left] == char
-            line.left
-          elsif console.keys[:right] == char
-            line.right
-          else
-            if opts[:raw] && code == CARRIAGE_RETURN
-              char = "\n"
-              line.move_to_end
-            end
-            line.insert(char)
-          end
-
-          if opts[:raw] && opts[:echo]
-            output.print(clear_line)
-            output.print(prompt + line.to_s)
-            if char == "\n"
-              line.move_to_start
-            elsif !line.end?
-              output.print("\e[#{line.size - line.cursor}D")
-            end
-          end
-
-          break if (code == CARRIAGE_RETURN || code == NEWLINE)
-
-          if (console.keys[:backspace] == char || BACKSPACE == code) && opts[:echo]
-            if opts[:raw]
-              output.print("\e[1X") unless line.start?
-            else
-              output.print(?\s + (line.start? ? '' :  ?\b))
-            end
-          end
-        end
-        add_to_history(line.to_s.rstrip) if track_history?
-        line.to_s
-      end
-
-      # Read multiple lines and return them in an array.
-      # Skip empty lines in the returned lines array.
-      # The input gathering is terminated by Ctrl+d or Ctrl+z.
-      #
-      # @param [String] prompt
-      #   the prompt displayed before the input
-      #
-      # @yield [String] line
-      #
-      # @return [Array[String]]
-      #
-      # @api public
-      def read_multiline(prompt = '')
-        @stop = false
-        lines = []
-        loop do
-          line = read_line(prompt)
-          break if !line || line == ''
-          next  if line !~ /\S/ && !@stop
-          if block_given?
-            yield(line) unless line.to_s.empty?
-          else
-            lines << line unless line.to_s.empty?
-          end
-          break if @stop
-        end
-        lines
-      end
-      alias read_lines read_multiline
-
-      # Expose event broadcasting
-      #
-      # @api public
-      def trigger(event, *args)
-        publish(event, *args)
-      end
-
-      # Capture Ctrl+d and Ctrl+z key events
-      #
-      # @api private
-      def keyctrl_d(*)
-        @stop = true
-      end
-      alias keyctrl_z keyctrl_d
-
-      def add_to_history(line)
-        @history.push(line)
-      end
-
-      def history_next?
-        @history.next?
-      end
-
-      def history_next
-        @history.next
-        @history.get
-      end
-
-      def history_previous?
-        @history.previous?
-      end
-
-      def history_previous
-        line = @history.get
-        @history.previous
-        line
-      end
-
-      # Inspect class name and public attributes
-      # @return [String]
-      #
-      # @api public
-      def inspect
-        "#<#{self.class}: @input=#{input}, @output=#{output}>"
-      end
-
-      private
-
-      # Publish event
-      #
-      # @param [String] char
-      #   the key pressed
-      #
-      # @return [nil]
-      #
-      # @api private
-      def trigger_key_event(char)
-        event = KeyEvent.from(console.keys, char)
-        trigger(:"key#{event.key.name}", event) if event.trigger?
-        trigger(:keypress, event)
-      end
-
-      # Handle input interrupt based on provided value
-      #
-      # @api private
-      def handle_interrupt
-        case @interrupt
-        when :signal
-          Process.kill('SIGINT', Process.pid)
-        when :exit
-          exit(130)
-        when Proc
-          @interrupt.call
-        when :noop
-          return
-        else
-          raise InputInterrupt
-        end
-      end
-
-      # Check if Windowz mode
-      #
-      # @return [Boolean]
-      #
-      # @api public
-      def windows?
-        ::File::ALT_SEPARATOR == '\\'
-      end
-    end # Reader
-  end # Prompt
-end # TTY