irb 1.1.0.pre.3 → 1.1.0.pre.4

data/lib/irb/init.rb

@@ -43,7 +43,7 @@ module IRB # :nodoc:
     @CONF[:LOAD_MODULES] = []
     @CONF[:IRB_RC] = nil
 
-    @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
+    @CONF[:USE_SINGLELINE] = false unless defined?(ReadlineInputMethod)
     @CONF[:USE_COLORIZE] = true
     @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
@@ -161,14 +161,14 @@ module IRB # :nodoc:
         end
       when "--noinspect"
         @CONF[:INSPECT_MODE] = false
-      when "--readline"
-        @CONF[:USE_READLINE] = true
-      when "--noreadline"
-        @CONF[:USE_READLINE] = false
-      when "--reidline"
-        @CONF[:USE_REIDLINE] = true
-      when "--noreidline"
-        @CONF[:USE_REIDLINE] = false
+      when "--singleline", "--readline"
+        @CONF[:USE_SINGLELINE] = true
+      when "--nosingleline", "--noreadline"
+        @CONF[:USE_SINGLELINE] = false
+      when "--multiline", "--reidline"
+        @CONF[:USE_MULTILINE] = true
+      when "--nomultiline", "--noreidline"
+        @CONF[:USE_MULTILINE] = false
       when "--echo"
         @CONF[:ECHO] = true
       when "--noecho"

data/lib/irb/lc/help-message

@@ -22,17 +22,19 @@ Usage:  irb.rb [options] [programfile] [arguments]
                     when new workspace was created
   --echo            Show result(default)
   --noecho          Don't show result
-  --inspect	    Use `inspect' for output
-  --noinspect	    Don't use inspect for output
-  --readline        Use Readline extension module
-  --noreadline	    Don't use Readline extension module
+  --inspect         Use `inspect' for output
+  --noinspect       Don't use inspect for output
+  --multiline       Use multiline editor module
+  --nomultiline     Don't use multiline editor module
+  --singleline      Use singleline editor module
+  --nosingleline    Don't use singleline editor module
   --colorize        Use colorization
   --nocolorize      Don't use colorization
   --prompt prompt-mode/--prompt-mode prompt-mode
 		    Switch prompt mode. Pre-defined prompt modes are
 		    `default', `simple', `xmp' and `inf-ruby'
   --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs.
-		    Suppresses --readline.
+                    Suppresses --multiline and --singleline.
   --sample-book-mode/--simple-prompt
                     Simple prompt mode
   --noprompt        No prompt mode

data/lib/irb/lc/ja/help-message

@@ -23,8 +23,10 @@ Usage:  irb.rb [options] [programfile] [arguments]
   --noecho	    実行結果を表示しない.
   --inspect	    結果出力にinspectを用いる.
   --noinspect	    結果出力にinspectを用いない.
-  --readline	    readlineライブラリを利用する.
-  --noreadline	    readlineライブラリを利用しない.
+  --multiline       マルチラインエディタを利用する.
+  --nomultiline     マルチラインエディタを利用しない.
+  --singleline      シングルラインエディタを利用する.
+  --nosingleline    シングルラインエディタを利用しない.
   --colorize	    色付けを利用する.
   --nocolorize	    色付けを利用しない.
   --prompt prompt-mode/--prompt-mode prompt-mode
@@ -32,7 +34,8 @@ Usage:  irb.rb [options] [programfile] [arguments]
 		    ロンプトモードは, default, simple, xmp, inf-rubyが
 		    用意されています.
   --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
-		    に指定がない限り, readlineライブラリは使わなくなる.
+                    に指定がない限り, シングルラインエディタとマルチラ
+                    インエディタは使わなくなる.
   --sample-book-mode/--simple-prompt
 		    非常にシンプルなプロンプトを用いるモードです.
   --noprompt	    プロンプト表示を行なわない.

data/lib/irb/ruby-lex.rb

@@ -71,20 +71,27 @@ class RubyLex
     end
   end
 
+  def ripper_lex_without_warning(code)
+    verbose, $VERBOSE = $VERBOSE, nil
+    tokens = Ripper.lex(code)
+    $VERBOSE = verbose
+    tokens
+  end
+
   def set_auto_indent(context)
     if @io.respond_to?(:auto_indent) and context.auto_indent_mode
       @io.auto_indent do |lines, line_index, byte_pointer, is_newline|
         if is_newline
           md = lines[line_index - 1].match(/(\A +)/)
           prev_spaces = md.nil? ? 0 : md[1].count(' ')
-          @tokens = Ripper.lex(lines[0..line_index].join("\n"))
+          @tokens = ripper_lex_without_warning(lines[0..line_index].join("\n"))
           depth_difference = check_newline_depth_difference
           prev_spaces + depth_difference * 2
         else
           code = line_index.zero? ? '' : lines[0..(line_index - 1)].map{ |l| l + "\n" }.join
           last_line = lines[line_index]&.byteslice(0, byte_pointer)
           code += last_line if last_line
-          @tokens = Ripper.lex(code)
+          @tokens = ripper_lex_without_warning(code)
           corresponding_token_depth = check_corresponding_token_depth
           if corresponding_token_depth
             corresponding_token_depth
@@ -97,7 +104,7 @@ class RubyLex
   end
 
   def check_state(code)
-    @tokens = Ripper.lex(code)
+    @tokens = ripper_lex_without_warning(code)
     ltype = process_literal_type
     indent = process_nesting_level
     continue = process_continue
@@ -160,7 +167,7 @@ class RubyLex
     end
     code = @line + (line.nil? ? '' : line)
     code.gsub!(/\s*\z/, '').concat("\n")
-    @tokens = Ripper.lex(code)
+    @tokens = ripper_lex_without_warning(code)
     @continue = process_continue
     @code_block_open = check_code_block(code)
     @indent = process_nesting_level

data/lib/irb/ruby_logo.aa

@@ -0,0 +1,38 @@
+
+                                             -+smJYYN?mm-
+                                   HB"BBYT            TQg  NggT
+                              9Q+g       Nm,T      8g          NJW
+                          YS+              N2NJ"Sg               N?
+                       BQg                  #(  gT Nggggk          J
+                     5j                     NJ    NJ            NNge
+                  #Q                        #JJ     NgT            N(
+                @j                          bj         mT           J
+              Bj                           @/d           NJ         (
+            #q                            #((              NgT     #J
+           5d                            #(t                  mT   $d
+         #q                             @(@J                    NJB;
+        @(                             5d ? HHH H HQmgggggggmN    qD
+       5d                            #uN  2QdH                   E O
+      5                             5JSd  Nd  NJH               @d j
+     Fd                           @J4d     s     NQH           #d  (
+    #(                          #o6d       Nd       NgH       #d  #d
+    4                         B&Od          v          NgT   #d   F
+   #(                       9JGd            NH            NgUd    F
+   #d                    #GJQ                d             NP     $
+   #J                 #U+#Q                  N            Q #     j
+  j /W             BQ+ BQ                     d             NJ   NJ
+  - NjJH      HBIjTQggPJQgW                   N        W     k   #J
+ #J  b  HYWgggN       j s    Nag               d     NN      b   #d
+ #J  5-              D   s         Ngg         N    d        Nd  F
+ Fd BKH2            #+    s             NNgg    J Q           J  ]
+ F H @  J           N      y                   K(d            P  I
+ F4  E  N?         #d       y                #Q   NJ          E  j
+ F   W   Nd        q         m             Bg       NxW       N(H-
+ F   d    b       @           m          Hd            gW      vKJ
+ NJ  d     K      d            s      Bg                 aT    FDd
+  b #       d    N              m  BQ                      mV  N>
+   e5       Nd  #d              NggggggQWH HHHH              NJ -
+    m7       NW H            N                        HSVO1z=?11-
+      NgTH    bB        kH   WBHWWHBHWmQgg&gggggNNN
+           NNggggggNN
+

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.1.0.pre.3"
+  VERSION = "1.1.0.pre.4"
   @RELEASE_VERSION = VERSION
   @LAST_UPDATE_DATE = "2019-09-01"
 end

data/lib/irb/workspace.rb

@@ -124,21 +124,12 @@ EOF
 
     # error message manipulator
     def filter_backtrace(bt)
+      return nil if bt =~ /irb\/.*\.rb/
+      return nil if bt =~ /irb\.rb/
       case IRB.conf[:CONTEXT_MODE]
-      when 0
-        return nil if bt =~ /\(irb_local_binding\)/
       when 1
-        if(bt =~ %r!/tmp/irb-binding! or
-            bt =~ %r!irb/.*\.rb! or
-            bt =~ /irb\.rb/)
-          return nil
-        end
-      when 2
-        return nil if bt =~ /irb\/.*\.rb/
-        return nil if bt =~ /irb\.rb/
+        return nil if bt =~ %r!/tmp/irb-binding!
       when 3
-        return nil if bt =~ /irb\/.*\.rb/
-        return nil if bt =~ /irb\.rb/
         bt = bt.sub(/:\s*in `irb_binding'/, '')
       end
       bt

data/man/irb.1

@@ -0,0 +1,207 @@
+.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
+.Dd August 11, 2019
+.Dt IRB \&1 "Ruby Programmer's Reference Guide"
+.Os UNIX
+.Sh NAME
+.Nm irb
+.Nd Interactive Ruby Shell
+.Sh SYNOPSIS
+.Nm
+.Op Fl -version
+.Op Fl dfUw
+.Op Fl I Ar directory
+.Op Fl r Ar library
+.Op Fl E Ar external Ns Op : Ns Ar internal
+.Op Fl W Ns Op Ar level
+.Op Fl - Ns Oo no Oc Ns inspect
+.Op Fl - Ns Oo no Oc Ns multiline
+.Op Fl - Ns Oo no Oc Ns singleline
+.Op Fl - Ns Oo no Oc Ns echo
+.Op Fl - Ns Oo no Oc Ns colorize
+.Op Fl - Ns Oo no Oc Ns verbose
+.Op Fl -prompt Ar mode
+.Op Fl -prompt-mode Ar mode
+.Op Fl -inf-ruby-mode
+.Op Fl -simple-prompt
+.Op Fl -noprompt
+.Op Fl -tracer
+.Op Fl -back-trace-limit Ar n
+.Op Fl -
+.Op program_file
+.Op argument ...
+.Pp
+.Sh DESCRIPTION
+.Nm
+is the REPL(read-eval-print loop) environment for Ruby programs.
+.Pp
+.Sh OPTIONS
+.Bl -tag -width "1234567890123" -compact
+.Pp
+.It Fl -version
+Prints the version of
+.Nm .
+.Pp
+.It Fl E Ar external Ns Op : Ns Ar internal
+.It Fl -encoding Ar external Ns Op : Ns Ar internal
+Same as `ruby -E' .
+Specifies the default value(s) for external encodings and internal encoding. Values should be separated with colon (:).
+.Pp
+You can omit the one for internal encodings, then the value
+.Pf ( Li "Encoding.default_internal" ) will be nil.
+.Pp
+.It Fl I Ar path
+Same as `ruby -I' .
+Specifies
+.Li $LOAD_PATH
+directory
+.Pp
+.It Fl U
+Same as `ruby -U' .
+Sets the default value for internal encodings
+.Pf ( Li "Encoding.default_internal" ) to UTF-8.
+.Pp
+.It Fl d
+Same as `ruby -d' .
+Sets
+.Li $DEBUG
+to true.
+.Pp
+.It Fl f
+Suppresses read of
+.Pa ~/.irbrc .
+.Pp
+.It Fl w
+Same as `ruby -w' .
+.Pp
+.Pp
+.It Fl W
+Same as `ruby -W' .
+.Pp
+.It Fl h
+.It Fl -help
+Prints a summary of the options.
+.Pp
+.It Fl r Ar library
+Same as `ruby -r'.
+Causes irb to load the library using require.
+.Pp
+.It Fl -inspect
+Uses `inspect' for output (default except for bc mode)
+.Pp
+.It Fl -noinspect
+Doesn't use inspect for output
+.Pp
+.It Fl -multiline
+Uses multiline editor module.
+.Pp
+.It Fl -nomultiline
+Doesn't use multiline editor module.
+.Pp
+.It Fl -singleline
+Uses singleline editor module.
+.Pp
+.It Fl -nosingleline
+Doesn't use singleline editor module.
+.Pp
+.Pp
+.It Fl -echo
+Show result(default).
+.Pp
+.It Fl -noecho
+Don't show result.
+.Pp
+.Pp
+.It Fl -colorize
+Use colorization.
+.Pp
+.It Fl -nocolorize
+Don't use colorization.
+.Pp
+.Pp
+.It Fl -verbose
+Show details.
+.Pp
+.It Fl -noverbose
+Don't show details.
+.Pp
+.It Fl -prompt Ar mode
+.It Fl -prompt-mode Ar mode
+Switch prompt mode. Pre-defined prompt modes are
+`default', `simple', `xmp' and `inf-ruby'.
+.Pp
+.It Fl -inf-ruby-mode
+Uses prompt appropriate for inf-ruby-mode on emacs.
+Suppresses --multiline and --singleline.
+.Pp
+.It Fl -simple-prompt
+Makes prompts simple.
+.Pp
+.It Fl -noprompt
+No prompt mode.
+.Pp
+.It Fl -tracer
+Displays trace for each execution of commands.
+.Pp
+.It Fl -back-trace-limit Ar n
+Displays backtrace top
+.Ar n
+and tail
+.Ar n Ns .
+The default value is 16.
+.El
+.Pp
+.Sh ENVIRONMENT
+.Bl -tag -compact
+.It Ev IRBRC
+.Pp
+.El
+.Pp
+Also
+.Nm
+depends on same variables as
+.Xr ruby 1 .
+.Pp
+.Sh FILES
+.Bl -tag -compact
+.It Pa ~/.irbrc
+Personal irb initialization.
+.Pp
+.El
+.Pp
+.Sh EXAMPLES
+.Dl % irb
+.Dl irb(main):001:0> Ic 1 + 1
+.Dl 2
+.Dl irb(main):002:0> Ic def t(x)
+.Dl irb(main):003:1> Ic   x + 1
+.Dl irb(main):004:1> Ic end
+.Dl => :t
+.Dl irb(main):005:0> Ic t(3)
+.Dl => 4
+.Dl irb(main):006:0> Ic if t(3) == 4
+.Dl irb(main):007:1> Ic p :ok
+.Dl irb(main):008:1> Ic end
+.Dl :ok
+.Dl => :ok
+.Dl irb(main):009:0> Ic quit
+.Dl %
+.Pp
+.Sh SEE ALSO
+.Xr ruby 1 .
+.Pp
+.Sh REPORTING BUGS
+.Bl -bullet
+.It
+Security vulnerabilities should be reported via an email to
+.Mt security@ruby-lang.org .
+Reported problems will be published after being fixed.
+.Pp
+.It
+Other bugs and feature requests can be reported via the
+Ruby Issue Tracking System
+.Pq Lk https://bugs.ruby-lang.org/ .
+Do not report security vulnerabilities
+via this system because it publishes the vulnerabilities immediately.
+.El
+.Sh AUTHORS
+Written by Keiju ISHITSUKA.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.3
+  version: 1.1.0.pre.4
 platform: ruby
 authors:
 - Keiju ISHITSUKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -60,8 +60,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
+- bin/console
+- bin/setup
+- doc/irb/irb-tools.rd.ja
+- doc/irb/irb.rd.ja
 - exe/irb
 - irb.gemspec
 - lib/irb.rb
@@ -100,13 +106,14 @@ files:
 - lib/irb/notifier.rb
 - lib/irb/output-method.rb
 - lib/irb/ruby-lex.rb
-- lib/irb/ruby-token.rb
+- lib/irb/ruby_logo.aa
 - lib/irb/slex.rb
 - lib/irb/src_encoding.rb
 - lib/irb/version.rb
 - lib/irb/workspace.rb
 - lib/irb/ws-for-case-2.rb
 - lib/irb/xmp.rb
+- man/irb.1
 homepage: https://github.com/ruby/irb
 licenses:
 - BSD-2-Clause
@@ -126,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).