irb 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f07d42a212577323f5b522af715546bf0aa4f50403191e8bfea72c264cd55fd
-  data.tar.gz: 642aee0475b00876e5a9b4c0ad7dc55b4e84ee215c2e7f664aad689a4103660e
+  metadata.gz: 1db19c9463f04b7e54357c0cdd3aaf2dc33e74f2d82f7ec4e6a1b949232c17f1
+  data.tar.gz: e8fb0dd9ae7bb63ec86f043c646530d2614f8cbc04a2ef9a4566b58206eeb139
 SHA512:
-  metadata.gz: b9466d40cc08ee522b64dee832ce98059b21ed0f6d9cbd3b656ebd05c198c8027c342b9c9c708927662768a3351b0c709f0c7ce373ee3ad68207c8b907644c40
-  data.tar.gz: 5e0a8c523e31fb349e934a25079347619f3e901756ef3cdd8375bd7fd2823e1f2d09054acf42945596fcae2181f20693f220ae8fc283b88e9aaed62851922f04
+  metadata.gz: ffecda47f8fd505d5ae6adc071939668d77a248275554048f36300750f219660d7d876155a0767816f67d01abde2f9a308c5755e62a3fbe2a5e919667b27caa7
+  data.tar.gz: 6906dbf9af719531f725f7fb5175166382626fda407712c46e7087414df09115a5768866e9df36eacf4389bca11959e8a5091127a58a629f7d9d009a0d1e470d

data/.document

@@ -0,0 +1,4 @@
+LICENSE.txt
+README.md
+doc
+lib/**/*.rb

data/LICENSE.txt

@@ -4,10 +4,10 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

data/irb.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = [
+    ".document",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
@@ -52,7 +53,6 @@ Gem::Specification.new do |spec|
     "lib/irb/init.rb",
     "lib/irb/input-method.rb",
     "lib/irb/inspector.rb",
-    "lib/irb/lc/.document",
     "lib/irb/lc/error.rb",
     "lib/irb/lc/help-message",
     "lib/irb/lc/ja/encoding_aliases.rb",

data/lib/irb.rb

@@ -21,6 +21,7 @@ require "irb/locale"
 require "irb/color"
 
 require "irb/version"
+require "irb/easter-egg"
 
 # IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby
 # expressions read from the standard input.
@@ -131,7 +132,7 @@ require "irb/version"
 #
 # See IRB::Context#save_history= for more information.
 #
-# The history of _resuls_ of commands evaluated is not stored by default,
+# The history of _results_ of commands evaluated is not stored by default,
 # but can be turned on to be stored with this +.irbrc+ setting:
 #
 #     IRB.conf[:EVAL_HISTORY] = <number>
@@ -736,7 +737,13 @@ module IRB
     end
 
     def output_value # :nodoc:
-      printf @context.return_format, @context.inspect_last_value
+      str = @context.inspect_last_value
+      multiline_p = /\A.*\Z/ !~ str
+      if multiline_p && @context.newline_before_multiline_output?
+        printf @context.return_format, "\n#{str}"
+      else
+        printf @context.return_format, str
+      end
     end
 
     # Outputs the local variables to this current session, including

data/lib/irb/completion.rb

@@ -203,7 +203,7 @@ module IRB
         sep = $2
         message = Regexp.quote($3)
 
-        gv = eval("global_variables", bind).collect{|m| m.to_s}.append("true", "false", "nil")
+        gv = eval("global_variables", bind).collect{|m| m.to_s}.push("true", "false", "nil")
         lv = eval("local_variables", bind).collect{|m| m.to_s}
         iv = eval("instance_variables", bind).collect{|m| m.to_s}
         cv = eval("self.class.constants", bind).collect{|m| m.to_s}
@@ -265,18 +265,14 @@ module IRB
       end
     end
 
-    PerfectMatchedProc = ->(matched) {
+    PerfectMatchedProc = ->(matched, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding) {
       RDocRIDriver ||= RDoc::RI::Driver.new
       if matched =~ /\A(?:::)?RubyVM/ and not ENV['RUBY_YES_I_AM_NOT_A_NORMAL_USER']
-        File.open(File.join(__dir__, 'ruby_logo.aa')) do |f|
-          RDocRIDriver.page do |io|
-            IO.copy_stream(f, io)
-          end
-        end
+        IRB.send(:easter_egg)
         return
       end
-      namespace = retrieve_completion_data(matched, doc_namespace: true)
-      return unless matched
+      namespace = retrieve_completion_data(matched, bind: bind, doc_namespace: true)
+      return unless namespace
       if namespace.is_a?(Array)
         out = RDoc::Markup::Document.new
         namespace.each do |m|

data/lib/irb/context.rb

@@ -133,6 +133,11 @@ module IRB
       if @echo_on_assignment.nil?
         @echo_on_assignment = false
       end
+
+      @newline_before_multiline_output = IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT]
+      if @newline_before_multiline_output.nil?
+        @newline_before_multiline_output = true
+      end
     end
 
     # The top-level workspace, see WorkSpace#main
@@ -253,6 +258,20 @@ module IRB
     #     a = "omg"
     #     #=> omg
     attr_accessor :echo_on_assignment
+    # Whether a newline is put before multiline output.
+    #
+    # Uses IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT] if available,
+    # or defaults to +true+.
+    #
+    #     "abc\ndef"
+    #     #=>
+    #     abc
+    #     def
+    #     IRB.CurrentContext.newline_before_multiline_output = false
+    #     "abc\ndef"
+    #     #=> abc
+    #     def
+    attr_accessor :newline_before_multiline_output
     # Whether verbose messages are displayed or not.
     #
     # A copy of the default <code>IRB.conf[:VERBOSE]</code>
@@ -287,6 +306,7 @@ module IRB
     alias ignore_eof? ignore_eof
     alias echo? echo
     alias echo_on_assignment? echo_on_assignment
+    alias newline_before_multiline_output? newline_before_multiline_output
 
     # Returns whether messages are displayed or not.
     def verbose?

data/lib/irb/ext/save-history.rb

@@ -72,7 +72,7 @@ module IRB
       end
       history_file = IRB.rc_file("_history") unless history_file
       if File.exist?(history_file)
-        open(history_file) do |f|
+        open(history_file, "r:#{IRB.conf[:LC_MESSAGES].encoding}") do |f|
           f.each { |l|
             l = l.chomp
             if self.class == ReidlineInputMethod and history.last&.end_with?("\\")
@@ -107,7 +107,7 @@ module IRB
           raise
         end
 
-        open(history_file, 'w', 0600 ) do |f|
+        open(history_file, "w:#{IRB.conf[:LC_MESSAGES].encoding}", 0600) do |f|
           hist = history.map{ |l| l.split("\n").join("\\\n") }
           f.puts(hist[-num..-1] || hist)
         end

data/lib/irb/init.rb

@@ -296,15 +296,18 @@ module IRB # :nodoc:
   DefaultEncodings = Struct.new(:external, :internal)
   class << IRB
     private
-    def set_encoding(extern, intern = nil)
+    def set_encoding(extern, intern = nil, override: true)
       verbose, $VERBOSE = $VERBOSE, nil
       Encoding.default_external = extern unless extern.nil? || extern.empty?
       Encoding.default_internal = intern unless intern.nil? || intern.empty?
-      @CONF[:ENCODINGS] = IRB::DefaultEncodings.new(extern, intern)
       [$stdin, $stdout, $stderr].each do |io|
         io.set_encoding(extern, intern)
       end
-      @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
+      if override
+        @CONF[:LC_MESSAGES].instance_variable_set(:@override_encoding, extern)
+      else
+        @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
+      end
     ensure
       $VERBOSE = verbose
     end

data/lib/irb/input-method.rb

@@ -133,6 +133,9 @@ module IRB
       include Readline
       # Creates a new input method object using Readline
       def initialize
+        if Readline.respond_to?(:encoding_system_needs)
+          IRB.__send__(:set_encoding, Readline.encoding_system_needs.name, override: false)
+        end
         super
 
         @line_no = 0
@@ -207,6 +210,7 @@ module IRB
     include Reline
     # Creates a new input method object using Readline
     def initialize
+      IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false)
       super
 
       @line_no = 0

data/lib/irb/locale.rb

@@ -24,6 +24,7 @@ module IRB # :nodoc:
     @@loaded = []
 
     def initialize(locale = nil)
+      @override_encoding = nil
       @lang = @territory = @encoding_name = @modifier = nil
       @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C"
       if m = LOCALE_NAME_RE.match(@locale)
@@ -40,12 +41,16 @@ module IRB # :nodoc:
       @encoding ||= (Encoding.find('locale') rescue Encoding::ASCII_8BIT)
     end
 
-    attr_reader :lang, :territory, :encoding, :modifier
+    attr_reader :lang, :territory, :modifier
+
+    def encoding
+      @override_encoding || @encoding
+    end
 
     def String(mes)
       mes = super(mes)
-      if @encoding
-        mes.encode(@encoding, undef: :replace)
+      if encoding
+        mes.encode(encoding, undef: :replace)
       else
         mes
       end

data/lib/irb/ruby-lex.rb

@@ -317,11 +317,13 @@ class RubyLex
 
   def check_newline_depth_difference
     depth_difference = 0
+    open_brace_on_line = 0
     @tokens.each_with_index do |t, index|
       case t[1]
       when :on_ignored_nl, :on_nl, :on_comment
         if index != (@tokens.size - 1)
           depth_difference = 0
+          open_brace_on_line = 0
         end
         next
       when :on_sp
@@ -330,8 +332,9 @@ class RubyLex
       case t[1]
       when :on_lbracket, :on_lbrace, :on_lparen
         depth_difference += 1
+        open_brace_on_line += 1
       when :on_rbracket, :on_rbrace, :on_rparen
-        depth_difference -= 1
+        depth_difference -= 1 if open_brace_on_line > 0
       when :on_kw
         next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
         case t[2]
@@ -365,6 +368,7 @@ class RubyLex
     is_first_printable_of_line = true
     spaces_of_nest = []
     spaces_at_line_head = 0
+    open_brace_on_line = 0
     @tokens.each_with_index do |t, index|
       case t[1]
       when :on_ignored_nl, :on_nl, :on_comment
@@ -372,6 +376,7 @@ class RubyLex
         spaces_at_line_head = 0
         is_first_spaces_of_line = true
         is_first_printable_of_line = true
+        open_brace_on_line = 0
         next
       when :on_sp
         spaces_at_line_head = t[2].count(' ') if is_first_spaces_of_line
@@ -380,7 +385,8 @@ class RubyLex
       end
       case t[1]
       when :on_lbracket, :on_lbrace, :on_lparen
-        spaces_of_nest.push(spaces_at_line_head)
+        spaces_of_nest.push(spaces_at_line_head + open_brace_on_line * 2)
+        open_brace_on_line += 1
       when :on_rbracket, :on_rbrace, :on_rparen
         if is_first_printable_of_line
           corresponding_token_depth = spaces_of_nest.pop
@@ -388,6 +394,7 @@ class RubyLex
           spaces_of_nest.pop
           corresponding_token_depth = nil
         end
+        open_brace_on_line -= 1
       when :on_kw
         next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
         case t[2]

data/lib/irb/version.rb

@@ -11,7 +11,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2019-12-24"
+  @LAST_UPDATE_DATE = "2020-02-14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Keiju ISHITSUKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -60,6 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".document"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -95,7 +96,6 @@ files:
 - lib/irb/init.rb
 - lib/irb/input-method.rb
 - lib/irb/inspector.rb
-- lib/irb/lc/.document
 - lib/irb/lc/error.rb
 - lib/irb/lc/help-message
 - lib/irb/lc/ja/encoding_aliases.rb
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).

data/lib/irb/lc/.document

@@ -1,4 +0,0 @@
-# hide help-message files which contain usage information
-error.rb
-ja/encoding_aliases.rb
-ja/error.rb