irb 1.1.0.pre.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08f949b006c169864a0af78d57f3a1d3a78c360d1c3b7eb0e0e8cdb578f02d6c'
-  data.tar.gz: 179eb9d08ca51c7b6ecaa807bc07d7eb4b26f5a56ea440f74361fa2d6cbaa7d2
+  metadata.gz: 2ea14a93083cae06cb1b6acb7df716a4b674fe0179df78133a5e9d515f814de5
+  data.tar.gz: e5c48bf9b0407c3bf8c278a999a333bcf6cc514d467292eb578f0a434992d06c
 SHA512:
-  metadata.gz: a8d294bbba94abd593eb1f5f73e1825c4272bf3b24370b6f38f7458a617481af0b28104a873a03cbc8147d3f0b2d70d159c3021f40b56acb19b6ff51f4b352c1
-  data.tar.gz: 0410eaefa871fe48b295f59bc81c04e47afe510444a2ba205a4e93a5092134aacf363b43d2ee167a1e447edc0e9aa0a219ae2edd9cbde2d959ca9efdadcdcde9
+  metadata.gz: 57da5191caf04ded2eebea073a511f721bb66c511c0821fe4055aa582333209e9293380af20680fcebee290d109e30df73d1752cc32893729e8df0a7712c1192
+  data.tar.gz: eab5b941d5db5d0582e32d7dc3fb77955024c3ca852e83816fc4bf8c4c3442910dff2a3cba7c41a9e0e357943371e371646e8c1b23721fd2e1d8e2c3cfa2fa84

data/lib/irb/color.rb

@@ -71,7 +71,7 @@ module IRB # :nodoc:
         $stdout.tty? && supported? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb'))
       end
 
-      def inspect_colorable?(obj, seen: {})
+      def inspect_colorable?(obj, seen: {}.compare_by_identity)
         case obj
         when String, Symbol, Regexp, Integer, Float, FalseClass, TrueClass, NilClass
           true
@@ -138,11 +138,11 @@ module IRB # :nodoc:
       private
 
       def without_circular_ref(obj, seen:, &block)
-        return false if seen.key?(obj.object_id)
-        seen[obj.object_id] = true
+        return false if seen.key?(obj)
+        seen[obj] = true
         block.call
       ensure
-        seen.delete(obj.object_id)
+        seen.delete(obj)
       end
 
       # Ripper::Lexer::Elem#state is supported on Ruby 2.5+

data/lib/irb/context.rb

@@ -82,6 +82,12 @@ module IRB
         case use_multiline?
         when nil
           if STDIN.tty? && IRB.conf[:PROMPT_MODE] != :INF_RUBY && !use_singleline?
+            # Both of multiline mode and singleline mode aren't specified.
+            puts <<~EOM
+              This version of IRB is drastically different from the previous version.
+              If you hit any issues, you can use "irb --legacy" to run the old version.
+              If you want to just erase this message, please use "irb --multiline".
+            EOM
             @io = ReidlineInputMethod.new
           else
             @io = nil

data/lib/irb/init.rb

@@ -161,7 +161,7 @@ module IRB # :nodoc:
         end
       when "--noinspect"
         @CONF[:INSPECT_MODE] = false
-      when "--singleline", "--readline"
+      when "--singleline", "--readline", "--legacy"
         @CONF[:USE_SINGLELINE] = true
       when "--nosingleline", "--noreadline"
         @CONF[:USE_SINGLELINE] = false
@@ -274,11 +274,11 @@ module IRB # :nodoc:
     if home = ENV["HOME"]
       yield proc{|rc| home+"/.irb#{rc}"}
     end
-    home = Dir.pwd
-    yield proc{|rc| home+"/.irb#{rc}"}
-    yield proc{|rc| home+"/irb#{rc.sub(/\A_?/, '.')}"}
-    yield proc{|rc| home+"/_irb#{rc}"}
-    yield proc{|rc| home+"/$irb#{rc}"}
+    current_dir = Dir.pwd
+    yield proc{|rc| current_dir+"/.irb#{rc}"}
+    yield proc{|rc| current_dir+"/irb#{rc.sub(/\A_?/, '.')}"}
+    yield proc{|rc| current_dir+"/_irb#{rc}"}
+    yield proc{|rc| current_dir+"/$irb#{rc}"}
   end
 
   # loading modules

data/lib/irb/ruby-lex.rb

@@ -306,8 +306,8 @@ class RubyLex
         next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
         case t[2]
         when 'do'
-          if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_CMDARG)
-            # method_with_bock do; end
+          if index > 0 and @tokens[index - 1][3].anybits?(Ripper::EXPR_CMDARG | Ripper::EXPR_ENDFN)
+            # method_with_block do; end
             indent += 1
           else
             # while cond do; end # also "until" or "for"
@@ -332,7 +332,7 @@ class RubyLex
     depth_difference = 0
     @tokens.each_with_index do |t, index|
       case t[1]
-      when :on_ignored_nl, :on_nl
+      when :on_ignored_nl, :on_nl, :on_comment
         if index != (@tokens.size - 1)
           depth_difference = 0
         end
@@ -349,8 +349,8 @@ class RubyLex
         next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
         case t[2]
         when 'do'
-          if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_CMDARG)
-            # method_with_bock do; end
+          if index > 0 and @tokens[index - 1][3].anybits?(Ripper::EXPR_CMDARG | Ripper::EXPR_ENDFN)
+            # method_with_block do; end
             depth_difference += 1
           else
             # while cond do; end # also "until" or "for"
@@ -381,7 +381,7 @@ class RubyLex
     @tokens.each_with_index do |t, index|
       corresponding_token_depth = nil
       case t[1]
-      when :on_ignored_nl, :on_nl
+      when :on_ignored_nl, :on_nl, :on_comment
         spaces_at_line_head = 0
         is_first_spaces_of_line = true
         is_first_printable_of_line = true

data/lib/irb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Keiju ISHITSUKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -129,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: