webri 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68514ee1cc75ddf56d6e2571cf618e6cd9f4f1280ba36ead73b48dc55f1a76d2
-  data.tar.gz: ad21f3ead74402261aef2de10afe02f6d4dc84651e4ee455ec10fb69198470b7
+  metadata.gz: ba0ef2db19e442871c35e15c179f5de35941e87e5ce1a3d4afe0e1df9c6e19c0
+  data.tar.gz: 03b7f263f09d1e02e83cc0a190f47e221c5dc7e5bb1b7487149520fbbb361655
 SHA512:
-  metadata.gz: ea208781efa16baa846c81f5760019dc22b8b291d3f82fda2f7e5f824f4fbb3079c22a5eb65beea5edeb6bc7e9e4c3c833e10a04d4393ad4ab12681aad4cc8d3
-  data.tar.gz: 55408e4193540296a0c9085ed8ba4c29843530ac91497b338cab2989bc19b407ba2b20c8f739b7c7d7698b2949bc140530a844578046af920cf2088e5f203fa3
+  metadata.gz: 863c5f457150c1ac329b767e899afb41e62ea2016095e72d29efb374c080f39cab6888b01cd32132651e1ce8adba108d3deed9efb20a532873debe4c4f8d50c4
+  data.tar.gz: 3cb5a5ff87a108a4e026764add4540af14327161004bee077272f52a64a2296e5056b7bd9706d5dbac8051a68956fa4b266d7c5fa89723dc1d2c806095658c60

data/exe/webri

@@ -7,55 +7,28 @@ require_relative '../lib/webri/version'
 require_relative '../lib/webri'
 require_relative '../lib/scraper'
 
-NAME = <<EOT
-
-Name:
-
-There are four types of names, as determined by prefixes:
-
-- Class or module: starts with a capital letter; e.g., 'Array'.
-- Singleton method: starts with '::'; e.g., '::new'.
-- Instance method: starts with '#' (escaped as '\\#', if your shell requires it);
-  e.g., '#inspect'.
-- Ruby file: starts with 'ruby:'; e.g., 'ruby:syntax_rdoc'.
-
-Name handling:
-
-- If name is a complete name of its type (and not also the start of other such names),
-  webri opens the page for that name.
-- If name is incomplete, but is the start of only one name of its type,
-  webri asks whether to open the page for that name.
-- If name is incomplete, but is the start of multiple names of its type,
-  webri displays those names and lets you choose.
-- If name is not a valid name of its type, webri asks whether show such names.
-- If name is not valid at all (i.e., does not start with any of the prefixes above),
-  webri prints an error message.
-
-EOT
 options = {}
 
 parser = OptionParser.new
 
 parser.version = WebRI::VERSION
 parser.banner = <<-BANNER
-webri is a console application for displaying Ruby online HTML documentation.
-Documentation pages are opened in the default web browser.
+Console application #{WebRI.webri} displays Ruby online HTML documentation
+in the default web browser.
 
-Usage: #{parser.program_name} [options] name
+Usage: #{WebRI.webri} [options] #{WebRI.variable('name')}
 
 BANNER
 
 RELEASES = Scraper.scrapers.keys.inspect
 
 parser.separator("Options:")
-release_description = <<-EOT
 
-EOT
 parser.on('-r', '--release RELEASE',
           "Specify documentation release (one of #{RELEASES}).") do |value|
   options[:release_name] = value
 end
-parser.on('-i', '--info', 'Print information about webri.') do
+parser.on('-i', '--info', "Print information about #{WebRI.webri}.") do
   options[:info] = true
 end
 parser.on('--noreline', 'Do not use Reline (useful for testing).') do |value|
@@ -68,11 +41,11 @@ parser.on('-h', '--help', 'Print this help.') do
   puts parser
   exit
 end
-parser.on('-v', '--version', 'Print the version of webri.') do
+parser.on('-v', '--version', "Print the version of #{WebRI.webri}.") do
   puts WebRI::VERSION
   exit
 end
-parser.separator(NAME)
+parser.separator(WebRI::HELP)
 
 parser.parse!
 

data/lib/webri/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class WebRI
-  VERSION = "2.1.0"
+  VERSION = "2.2.1"
 end

data/lib/webri.rb

@@ -48,7 +48,9 @@ class WebRI
   # Site of the official documentation.
   DOC_SITE = 'https://docs.ruby-lang.org/en/'
 
-  PROMPT = "('?' for help) webri> "
+  def self.prompt
+    "(Type #{WebRI.tokenq('?')} for help, #{WebRI.tokenq('exit')} to exit) #{self.webri}> "
+  end
 
   CLASS = 'class/module'
   SINGLETON = 'singleton method'
@@ -104,7 +106,7 @@ class WebRI
 
   def repl_plain # Read-evaluate-print loop, without Reline.
     while true
-      $stdout.write(PROMPT)
+      $stdout.write(WebRI.prompt)
       $stdout.flush
       response = $stdin.gets.chomp
       exit if response == 'exit'
@@ -132,7 +134,7 @@ class WebRI
       Reline.completion_proc = proc { |word|
         completion_words
       }
-      while line = Reline.readline(PROMPT, true)
+      while line = Reline.readline(WebRI.prompt, true)
         case line.chomp
         when 'exit'
           exit 0
@@ -420,12 +422,14 @@ class WebRI
 
   # Present choices; return choice.
   def get_choice_(choices, required: false)
+    lines = []
     index = nil
     range = (0..choices.size - 1)
     until range.include?(index)
       choices.each_with_index do |choice, i|
         s = "%6d" % i
-        puts "  #{s}:  #{choice}"
+        token = WebRI.token(choice)
+        lines << "  #{s}:  #{token}"
       end
       while true
         message = if required
@@ -433,8 +437,24 @@ class WebRI
                   else
                     'Type a number to choose, or Return to skip:  '
                   end
-        print message
-        $stdout.flush
+        lines << message
+        s = lines.join("\n")
+        require "mkmf"
+
+        pager =
+          ENV["PAGER"] ||
+          if find_executable("less")
+            'less -RFX'
+          else
+            'more'
+          end
+        begin
+          IO.popen(pager, "w") do |io|
+            io.puts s
+          rescue Errno::EPIPE
+            # User exited early.
+          end
+        end
         response = $stdin.gets
         case response
         when /(\d+)/
@@ -443,7 +463,7 @@ class WebRI
         when "\n"
           return nil unless required
         else
-
+          # Continue
         end
       end
     end
@@ -535,30 +555,136 @@ class WebRI
   end
 
   def help(response)
-    if response == '?'
-      puts <<HELP
+    puts WebRI::HELP
+    return
+    puts <<HELP
 Type:
-  - 'exit' to exit webri.
+  - #{WebRI.tokenq('exit')} to exit #{WebRI.webri}.
   - #{CLASS.capitalize} name (full or partial) to see #{CLASS} names:
-      - 'Array' (full name, not the start of other names).
-      - 'Ar' (partial name).
+      - #{WebRI.tokenq('Array')} (full name, not the start of other names).
+      - #{WebRI.tokenq('Ar')} (partial name).
   - #{SINGLETON.capitalize} name (full or partial) to see #{SINGLETON} names:
-      - '::tanh' (full name, not the start of other names).
-      - '::ta' (partial name).
+      - #{WebRI.tokenq('::tanh')} (full name, not the start of other names).
+      - #{WebRI.tokenq('::ta')} (partial name).
   - #{INSTANCE.capitalize} name (full or partial) to see #{INSTANCE} names:
-      - '#query=' (full name, not the start of other names).
-      - '#qu' (partial name).
+      - #{WebRI.tokenq('#query=')} (full name, not the start of other names).
+      - #{WebRI.tokenq('#qu')} (partial name).
   - #{FILE.capitalize}name (full or partial) to see #{FILE} names:
-      - 'ruby:syntax_rdoc' (full name, not the start of other names).
-      - 'ruby:syntax' (partial name).
+      - #{WebRI.tokenq('ruby:syntax_rdoc')} (full name, not the start of other names).
+      - #{WebRI.tokenq('ruby:syntax')} (partial name).
 HELP
-    else
-      p response
-    end
   end
 
   def help_main
 
   end
 
+  ANSI_COLOR = {
+    black: 30,
+    red: 31,
+    green: 32,
+    yellow: 33,
+    blue: 34,
+    magenta: 35,
+    cyan: 36,
+    white: 37,
+    bright_black: 90,
+    bright_red: 91,
+    bright_green: 92,
+    bright_yellow: 93,
+    bright_blue: 94,
+    bright_magenta: 95,
+    bright_cyan: 96,
+    bright_white: 97,
+  }
+
+  def self.ansi_color(s, color)
+    # return s unless $stdout.tty?
+    "\e[#{ANSI_COLOR[color]}m#{s}\e[0m"
+  end
+
+  def self.webri
+    self.ansi_color('webri', :blue)
+  end
+
+  def self.variable(s)
+    self.ansi_color(s, :yellow)
+  end
+
+  def self.string(s)
+    self.ansi_color("'#{s}'", :green)
+  end
+
+  def self.token(s)
+    color = case s
+            when /^[A-Z]/
+              :bright_blue
+            when /^::/
+              :bright_yellow
+            when /^#/
+              :bright_green
+            when /^ruby:/
+              :bright_red
+            else
+              :bright_cyan
+            end
+    self.ansi_color("#{s}", color)
+  end
+
+  def WebRI.tokenq(s)
+    "'" + WebRI.token("#{s}") + "'"
+  end
+
+  def self.file_name(s)
+    self.ansi_color("#{s}", :red)
+  end
+
+  def self.singleton_method_name(s)
+    self.ansi_color("#{s}", :magenta)
+  end
+
+  def self.instance_method_name(s)
+    self.ansi_color("#{s}", :cyan)
+  end
+
+  def self.class_name(s)
+    self.ansi_color("#{s}", :bright_blue)
+  end
+
+  HELP = <<EOT
+
+There are four types of #{WebRI.variable('name')}, as determined by prefixes:
+
+|------------------|----------------|--------------------|
+|       Type       |     Prefix     |      Example       |
+|------------------|----------------|--------------------|
+| Class/module     | Capital letter | #{WebRI.tokenq('Array')}            |
+| Singleton method | #{WebRI.tokenq('::')}           | #{WebRI.tokenq('::new')}            |
+| Instance method  | #{WebRI.tokenq('#')}            | #{WebRI.tokenq('#inspect')}         |
+| Ruby file        | #{WebRI.tokenq('ruby:')}        | #{WebRI.tokenq('ruby:syntax_rdoc')} |
+|------------------|----------------|--------------------|
+
+Note: On the command-line, the instance method prefix should be escaped as #{WebRI.string('\\#')} if your shell requires it.
+
+Name handling:
+
+- If #{WebRI.variable('name')} is exactly a name of its type (but not the beginning of other such names),
+  #{WebRI.webri} opens the page for that name.
+  Examples: #{WebRI.tokenq('Array')}, #{WebRI.tokenq('::trap')}, #{WebRI.tokenq('#xmlschema')}, #{WebRI.tokenq('ruby:syntax_rdoc')}. 
+- If #{WebRI.variable('name')} is the beginning of exactly one name of its type,
+  #{WebRI.webri} asks whether to open the page for that name.
+  Examples: #{WebRI.tokenq('Arra')}, #{WebRI.tokenq('::tra')}, #{WebRI.tokenq('#xmlschem')}, #{WebRI.tokenq('ruby:syntax_')}.
+- If #{WebRI.variable('name')} is the beginning of multiple names of its type,
+  #{WebRI.webri} displays those names and lets you choose.
+  Examples: #{WebRI.tokenq('A')}, #{WebRI.tokenq('::t')}, #{WebRI.tokenq('#')}, #{WebRI.tokenq('ruby:s')}.
+- If #{WebRI.variable('name')} is not a valid name of its type,
+  #{WebRI.webri} asks whether show such names.
+  Examples: #{WebRI.tokenq('Xyzzy')}, #{WebRI.tokenq('::xyzzy')}, #{WebRI.tokenq('#xyzzy')}, #{WebRI.tokenq('ruby:xyzzy')}.
+- If #{WebRI.variable('name')} is not valid at all (i.e., does not start with any of the prefixes above),
+  #{WebRI.webri} prints an error message.
+  Examples: #{WebRI.tokenq('nosuch')}, #{WebRI.tokenq('$foo')}, #{WebRI.tokenq('%Bar')}.
+
+EOT
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webri
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - BurdetteLamar