highline 2.0.0.pre.develop.9 → 2.0.0.pre.develop.11

data/lib/highline/template_renderer.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'forwardable'
+require "forwardable"
 
 class HighLine
   # Renders an erb template taking a {Question} and a {HighLine} instance
@@ -42,9 +42,9 @@ class HighLine
     # is not available.
     # @return [String] error message.
     def method_missing(method, *args)
-      "Method #{method} with args #{args.inspect} " +
-      "is not available on #{self.inspect}. " +
-      "Try #{methods(false).sort.inspect}"
+      "Method #{method} with args #{args.inspect} " \
+        "is not available on #{inspect}. " \
+        "Try #{methods(false).sort.inspect}"
     end
 
     # @return [Question, Menu] {#source} attribute.
@@ -59,4 +59,4 @@ class HighLine
       HighLine.const_get(name)
     end
   end
-end
+end

data/lib/highline/terminal.rb

@@ -16,24 +16,17 @@ class HighLine
   # input and output to.
   # The specialized Terminals all decend from this HighLine::Terminal class
   class Terminal
-
     # Probe for and return a suitable Terminal instance
     # @param input [IO] input stream
     # @param output [IO] output stream
     def self.get_terminal(input, output)
-      terminal = nil
-
       # First of all, probe for io/console
       begin
         require "io/console"
         require "highline/terminal/io_console"
         terminal = HighLine::Terminal::IOConsole.new(input, output)
       rescue LoadError
-      end
-
-      # Fall back to UnixStty
-      unless terminal
-        require 'highline/terminal/unix_stty'
+        require "highline/terminal/unix_stty"
         terminal = HighLine::Terminal::UnixStty.new(input, output)
       end
 
@@ -57,8 +50,7 @@ class HighLine
 
     # An initialization callback.
     # It is called by {.get_terminal}.
-    def initialize_system_extensions
-    end
+    def initialize_system_extensions; end
 
     # @return [Array<Integer, Integer>] two value terminal
     #   size like [columns, lines]
@@ -67,8 +59,7 @@ class HighLine
     end
 
     # Enter Raw No Echo mode.
-    def raw_no_echo_mode
-    end
+    def raw_no_echo_mode; end
 
     # Yieds a block to be executed in Raw No Echo mode and
     # then restore the terminal state.
@@ -80,40 +71,38 @@ class HighLine
     end
 
     # Restore terminal to its default mode
-    def restore_mode
-    end
+    def restore_mode; end
 
     # Get one character from the terminal
     # @return [String] one character
-    def get_character
-    end
+    def get_character; end # rubocop:disable Naming/AccessorMethodName
 
     # Get one line from the terminal and format accordling.
     # Use readline if question has readline mode set.
     # @param question [HighLine::Question]
     # @param highline [HighLine]
     # @param options [Hash]
-    def get_line(question, highline, options={})
+    def get_line(question, highline)
       raw_answer =
-      if question.readline
-        get_line_with_readline(question, highline, options={})
-      else
-        get_line_default(highline)
-      end
+        if question.readline
+          get_line_with_readline(question, highline)
+        else
+          get_line_default(highline)
+        end
 
       question.format_answer(raw_answer)
     end
 
     # Get one line using #readline_read
     # @param (see #get_line)
-    def get_line_with_readline(question, highline, options={})
-      require "readline"    # load only if needed
+    def get_line_with_readline(question, highline)
+      require "readline" # load only if needed
 
       question_string = highline.render_statement(question)
 
       raw_answer = readline_read(question_string, question)
 
-      if !raw_answer and highline.track_eof?
+      if !raw_answer && highline.track_eof?
         raise EOFError, "The input stream is exhausted."
       end
 
@@ -140,7 +129,7 @@ class HighLine
         Readline.readline(prompt, true)
       end
 
-      $VERBOSE    = old_verbose
+      $VERBOSE = old_verbose
 
       raw_answer
     end
@@ -148,8 +137,8 @@ class HighLine
     # Get one line from terminal using default #gets method.
     # @param highline (see #get_line)
     def get_line_default(highline)
-      raise EOFError, "The input stream is exhausted." if highline.track_eof? and
-                                                            highline.input.eof?
+      raise EOFError, "The input stream is exhausted." if highline.track_eof? &&
+                                                          highline.input.eof?
       highline.input.gets
     end
 
@@ -157,12 +146,12 @@ class HighLine
 
     # Running on JRuby?
     def jruby?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     end
 
     # Running on Rubinius?
     def rubinius?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
     end
 
     # Running on Windows?
@@ -190,7 +179,11 @@ class HighLine
 
     # Saves terminal state using shell stty command.
     def save_stty
-      @stty_save = `stty -g`.chomp rescue nil
+      @stty_save = begin
+                     `stty -g`.chomp
+                   rescue StandardError
+                     nil
+                   end
     end
 
     # Restores terminal state using shell stty command.

data/lib/highline/terminal/io_console.rb

@@ -21,9 +21,9 @@ class HighLine
       end
 
       # (see Terminal#get_character)
-      def get_character
+      def get_character # rubocop:disable Naming/AccessorMethodName
         input.getch # from ruby io/console
       end
     end
   end
-end
+end

data/lib/highline/terminal/ncurses.rb

@@ -3,9 +3,10 @@
 class HighLine
   class Terminal
     # NCurses HighLine::Terminal
-    # @note Code migrated +UNTESTED+ from the old code base to the new terminal api.
+    # @note Code migrated +UNTESTED+ from the old code base to the new
+    # terminal api.
     class NCurses < Terminal
-      require 'ffi-ncurses'
+      require "ffi-ncurses"
 
       # (see Terminal#raw_no_echo_mode)
       def raw_no_echo_mode
@@ -34,4 +35,4 @@ class HighLine
       end
     end
   end
-end
+end

data/lib/highline/terminal/unix_stty.rb

@@ -5,25 +5,28 @@ class HighLine
     # HighLine::Terminal option that uses external "stty" program
     # to control terminal options.
     class UnixStty < Terminal
-
       # A Unix savvy method using stty to fetch the console columns, and rows.
       # ... stty does not work in JRuby
       # @return (see Terminal#terminal_size)
       def terminal_size
         begin
           require "io/console"
-          winsize = IO.console.winsize.reverse rescue nil
+          winsize = begin
+                      IO.console.winsize.reverse
+                    rescue NoMethodError
+                      nil
+                    end
           return winsize if winsize
         rescue LoadError
         end
 
-        if /solaris/ =~ RUBY_PLATFORM and
-          `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/
-          [$2, $1].map { |x| x.to_i }
+        if /solaris/ =~ RUBY_PLATFORM &&
+           `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/
+          [Regexp.last_match(2), Regexp.last_match(1)].map(&:to_i)
         elsif `stty size` =~ /^(\d+)\s(\d+)$/
-          [$2.to_i, $1.to_i]
+          [Regexp.last_match(2).to_i, Regexp.last_match(1).to_i]
         else
-          [ 80, 24 ]
+          [80, 24]
         end
       end
 
@@ -40,9 +43,9 @@ class HighLine
       end
 
       # (see Terminal#get_character)
-      def get_character( input = STDIN )
+      def get_character(input = STDIN)
         input.getc
       end
     end
   end
-end
+end

data/lib/highline/version.rb

@@ -2,5 +2,5 @@
 
 class HighLine
   # The version of the installed library.
-  VERSION = "2.0.0-develop.9".freeze
+  VERSION = "2.0.0-develop.11".freeze
 end

data/lib/highline/wrapper.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
 
-class HighLine
+require "English"
 
+class HighLine
   # A simple Wrapper module that is aware of ANSI escape codes.
   # It compensates for the ANSI escape codes so it works on the
   # actual (visual) line length.
   module Wrapper
-
     #
     # Wrap a sequence of _lines_ at _wrap_at_ characters per line.  Existing
     # newlines will not be affected by this process, but additional newlines
@@ -18,24 +18,25 @@ class HighLine
       return text unless wrap_at
       wrap_at = Integer(wrap_at)
 
-      wrapped = [ ]
+      wrapped = []
       text.each_line do |line|
         # take into account color escape sequences when wrapping
-        wrap_at = wrap_at + (line.length - actual_length(line))
+        wrap_at += (line.length - actual_length(line))
         while line =~ /([^\n]{#{wrap_at + 1},})/
-          search  = $1.dup
-          replace = $1.dup
-          if index = replace.rindex(" ", wrap_at)
+          search  = Regexp.last_match(1).dup
+          replace = Regexp.last_match(1).dup
+          index = replace.rindex(" ", wrap_at)
+          if index
             replace[index, 1] = "\n"
             replace.sub!(/\n[ \t]+/, "\n")
             line.sub!(search, replace)
           else
-            line[$~.begin(1) + wrap_at, 0] = "\n"
+            line[$LAST_MATCH_INFO.begin(1) + wrap_at, 0] = "\n"
           end
         end
         wrapped << line
       end
-      return wrapped.join
+      wrapped.join
     end
 
     #
@@ -45,8 +46,8 @@ class HighLine
     # @param string_with_escapes [String] any ANSI colored String
     # @return [Integer] length based on the visual size of the String
     #   (without the escape codes)
-    def self.actual_length( string_with_escapes )
+    def self.actual_length(string_with_escapes)
       string_with_escapes.to_s.gsub(/\e\[\d{1,2}m/, "").length
     end
   end
-end
+end

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.develop.9
+  version: 2.0.0.pre.develop.11
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: code_statistics
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,27 +124,6 @@ files:
 - site/highline.css
 - site/images/logo.png
 - site/index.html
-- test/acceptance/acceptance.rb
-- test/acceptance/acceptance_test.rb
-- test/acceptance/at_color_output_using_erb_templates.rb
-- test/acceptance/at_echo_false.rb
-- test/acceptance/at_readline.rb
-- test/io_console_compatible.rb
-- test/string_methods.rb
-- test/test_answer_converter.rb
-- test/test_color_scheme.rb
-- test/test_helper.rb
-- test/test_highline.rb
-- test/test_import.rb
-- test/test_list.rb
-- test/test_menu.rb
-- test/test_paginator.rb
-- test/test_question_asker.rb
-- test/test_simulator.rb
-- test/test_string_extension.rb
-- test/test_string_highline.rb
-- test/test_style.rb
-- test/test_wrapper.rb
 homepage: https://github.com/JEG2/highline
 licenses:
 - Ruby
@@ -136,25 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: highline
-rubygems_version: 2.6.11
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: HighLine is a high-level command-line IO library.
-test_files:
-- test/io_console_compatible.rb
-- test/string_methods.rb
-- test/test_answer_converter.rb
-- test/test_color_scheme.rb
-- test/test_helper.rb
-- test/test_highline.rb
-- test/test_import.rb
-- test/test_list.rb
-- test/test_menu.rb
-- test/test_paginator.rb
-- test/test_question_asker.rb
-- test/test_simulator.rb
-- test/test_string_extension.rb
-- test/test_string_highline.rb
-- test/test_style.rb
-- test/test_wrapper.rb
+test_files: []

data/test/acceptance/acceptance.rb

@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-current_dir = File.dirname(File.expand_path(__FILE__))
-
-# All acceptance test files begins with 'at_'
-acceptance_test_files = Dir["#{current_dir}/at_*"]
-
-# Load each acceptance test file making
-# all tests to be run
-acceptance_test_files.each { |file| load file }
-
-# Print a report
-
-report = <<EOF
-
-===
-Well done!
-
-Below you have a report with all the answers you gave.
-It has also some environment information to help us debugging.
-
-If any of the tests have not passed on your environment,
-please copy/past the text bellow and send to us.
-
-If you are familiar with GitHub you can report the failing test
-as a GitHub issue at https://github.com/JEG2/highline/issues.
-If possible, always check if your issue is already reported
-by someone else. If so, just report that you are also affected
-on the same alredy open issued.
-
-If you are more confortable with e-mail, you could send it to
-james@grayproductions.net
-
-=== HighLine Acceptance Tests Report
-Date: #{Time.now.utc}
-HighLine::VERSION: #{HighLine::VERSION}
-Terminal: #{$terminal.terminal.class}
-RUBY_DESCRIPTION: #{RUBY_DESCRIPTION rescue 'not available'}
-Readline::VERSION: #{Readline::VERSION rescue 'not availabe'}
-ENV['SHELL']: #{ENV['SHELL']}
-ENV['TERM']: #{ENV['TERM']}
-ENV['TERM_PROGRAM']: #{ENV['TERM_PROGRAM']}
-
-Answers:
-#{HighLine::AcceptanceTest.answers_for_report}
-EOF
-
-puts report
-
-timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-filename  = "highlinetests-#{timestamp}.log"
-
-File.open "#{filename}", 'w+' do |f|
-  f.puts report
-end
-
-puts
-puts "You can also see the above information in"
-puts "a timestamped file named #{filename}"
-puts "at the current directory."
-puts