irb 1.1.0.pre.2 → 1.1.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81da8e8b11979aca60cc0806c7a679f8a854a2f9f38d215f714d377aaac579ae
-  data.tar.gz: 05f6c327f9226f5789498c182c5b5c4cfe2ada443f65fc3daa577c76e5dcad8e
+  metadata.gz: 71eba1b800fb1d93376272f2f222979ae70d21f19a129b9c06a148784a2e178b
+  data.tar.gz: 02e1cb9a9d88a5e582467975edf596e848e7076066ada250798c43ccbafdfe0b
 SHA512:
-  metadata.gz: 5ab9d21b32e138399ac7eafee532f15f07b85dadc0acb35eb1cd41814a000cb74c69f98455d90b2f7930d23eb79d708468387dcc5b5efb82ac866720e7227cbe
-  data.tar.gz: 2d2836d6c47a4040c7e8b27442b504e9eced9ffd6c2169f7d50dd5439b6534c6f477d51ffa5f5b14fa02c3cecd0f400b9ea8762d399db0d81532b65b2af3ce62
+  metadata.gz: a4acfeb73e0b972fb9ca65b89e1e74f8c9523c26b3d9021af148214f7991d4eb9d633b58a6dbd7b7da7b1c800efc7dd814ddee9bd31c0680ee6e59c0c7b4e5b4
+  data.tar.gz: c0cf5a8bf14b9d1fc037021cff5cd6ad94834595b4c21f933367111114a241279c7643db6e1e0ac408746c448ff9f9b37acf65923600e1437a4a77aca07d5f49

data/README.md

@@ -31,9 +31,9 @@ $ irb
 irb(main):001:0> 1+2
 #=> 3
 irb(main):002:0> class Foo
-irb(main):003:1>  def foo
-irb(main):004:2>    print 1
-irb(main):005:2>  end
+irb(main):003:1>   def foo
+irb(main):004:2>     print 1
+irb(main):005:2>   end
 irb(main):006:1> end
 #=> nil
 ```

data/irb.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4")
+
   spec.add_dependency "reline", ">= 0.0.1"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/irb.rb

@@ -10,6 +10,7 @@
 #
 #
 require "e2mmap"
+require "ripper"
 
 require "irb/init"
 require "irb/context"
@@ -410,6 +411,35 @@ module IRB
   end
 
   class Irb
+    ASSIGNMENT_NODE_TYPES = [
+      # Local, instance, global, class, constant, instance, and index assignment:
+      #   "foo = bar",
+      #   "@foo = bar",
+      #   "$foo = bar",
+      #   "@@foo = bar",
+      #   "::Foo = bar",
+      #   "a::Foo = bar",
+      #   "Foo = bar"
+      #   "foo.bar = 1"
+      #   "foo[1] = bar"
+      :assign,
+
+      # Operation assignment:
+      #   "foo += bar"
+      #   "foo -= bar"
+      #   "foo ||= bar"
+      #   "foo &&= bar"
+      :opassign,
+
+      # Multiple assignment:
+      #   "foo, bar = 1, 2
+      :massign,
+    ]
+    # Note: instance and index assignment expressions could also be written like:
+    # "foo.bar=(1)" and "foo.[]=(1, bar)", when expressed that way, the former
+    # be parsed as :assign and echo will be suppressed, but the latter is
+    # parsed as a :method_add_arg and the output won't be suppressed
+
     # Creates a new irb session
     def initialize(workspace = nil, input_method = nil, output_method = nil)
       @context = Context.new(self, workspace, input_method, output_method)
@@ -498,7 +528,7 @@ module IRB
           begin
             line.untaint
             @context.evaluate(line, line_no, exception: exc)
-            output_value if @context.echo?
+            output_value if @context.echo? && (@context.echo_on_assignment? || !assignment_expression?(line))
           rescue Interrupt => exc
           rescue SystemExit, SignalException
             raise
@@ -717,6 +747,18 @@ module IRB
       format("#<%s: %s>", self.class, ary.join(", "))
     end
 
+    def assignment_expression?(line)
+      # Try to parse the line and check if the last of possibly multiple
+      # expressions is an assignment type.
+
+      # If the expression is invalid, Ripper.sexp should return nil which will
+      # result in false being returned. Any valid expression should return an
+      # s-expression where the second selement of the top level array is an
+      # array of parsed expressions. The first element of each expression is the
+      # expression's type.
+      ASSIGNMENT_NODE_TYPES.include?(Ripper.sexp(line)&.dig(1,-1,0))
+    end
+
     ATTR_TTY = "\e[%sm"
     def ATTR_TTY.[](*a) self % a.join(";"); end
     ATTR_PLAIN = ""
@@ -805,7 +847,7 @@ class Binding
   #
   # See IRB@IRB+Usage for more information.
   def irb
-    IRB.setup(eval("__FILE__"), argv: [])
+    IRB.setup(source_location[0], argv: [])
     workspace = IRB::WorkSpace.new(self)
     STDOUT.print(workspace.code_around_binding)
     IRB::Irb.new(workspace).run(IRB.conf)

data/lib/irb/completion.rb

@@ -205,7 +205,7 @@ module IRB
         sep = $2
         message = Regexp.quote($3)
 
-        gv = eval("global_variables", bind).collect{|m| m.to_s}
+        gv = eval("global_variables", bind).collect{|m| m.to_s}.append("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}
@@ -237,7 +237,7 @@ module IRB
           candidates.uniq!
         end
         if doc_namespace
-          "#{rec.name}#{sep}#{candidates.find{ |i| i == message }}"
+          "#{rec.class.name}#{sep}#{candidates.find{ |i| i == message }}"
         else
           select_message(receiver, message, candidates, sep)
         end

data/lib/irb/context.rb

@@ -121,6 +121,11 @@ module IRB
       if @echo.nil?
         @echo = true
       end
+
+      @echo_on_assignment = IRB.conf[:ECHO_ON_ASSIGNMENT]
+      if @echo_on_assignment.nil?
+        @echo_on_assignment = false
+      end
     end
 
     # The top-level workspace, see WorkSpace#main
@@ -236,6 +241,15 @@ module IRB
     #     puts "omg"
     #     # omg
     attr_accessor :echo
+    # Whether to echo for assignment expressions
+    #
+    # Uses IRB.conf[:ECHO_ON_ASSIGNMENT] if available, or defaults to +false+.
+    #
+    #     a = "omg"
+    #     IRB.CurrentContext.echo_on_assignment = true
+    #     a = "omg"
+    #     #=> omg
+    attr_accessor :echo_on_assignment
     # Whether verbose messages are displayed or not.
     #
     # A copy of the default <code>IRB.conf[:VERBOSE]</code>
@@ -261,6 +275,7 @@ module IRB
     alias ignore_sigint? ignore_sigint
     alias ignore_eof? ignore_eof
     alias echo? echo
+    alias echo_on_assignment? echo_on_assignment
 
     # Returns whether messages are displayed or not.
     def verbose?

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

@@ -75,7 +75,7 @@ module IRB
         open(history_file) do |f|
           f.each { |l|
             l = l.chomp
-            if history.last&.end_with?("\\")
+            if self.class == ReidlineInputMethod and history.last&.end_with?("\\")
               history.last.delete_suffix!("\\")
               history.last << "\n" << l
             else
@@ -101,19 +101,14 @@ module IRB
             File.chmod(0600, history_file)
           end
         rescue Errno::ENOENT
+        rescue Errno::EPERM
+          return
         rescue
           raise
         end
 
         open(history_file, 'w', 0600 ) do |f|
-          hist = history.to_a.map { |l|
-            split_lines = l.split("\n")
-            if split_lines.size == 1
-              l
-            else
-              split_lines.join("\\\n")
-            end
-          }
+          hist = history.map{ |l| l.split("\n").join("\\\n") }
           f.puts(hist[-num..-1] || hist)
         end
       end

data/lib/irb/extend-command.rb

@@ -46,58 +46,80 @@ module IRB # :nodoc:
     ]
 
     @EXTEND_COMMANDS = [
-      [:irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
-       [:irb_print_working_workspace, OVERRIDE_ALL],
-       [:irb_cwws, OVERRIDE_ALL],
-       [:irb_pwws, OVERRIDE_ALL],
-       [:cwws, NO_OVERRIDE],
-       [:pwws, NO_OVERRIDE],
-       [:irb_current_working_binding, OVERRIDE_ALL],
-       [:irb_print_working_binding, OVERRIDE_ALL],
-       [:irb_cwb, OVERRIDE_ALL],
-       [:irb_pwb, OVERRIDE_ALL],
-    ],
-    [:irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
-     [:irb_chws, OVERRIDE_ALL],
-     [:irb_cws, OVERRIDE_ALL],
-     [:chws, NO_OVERRIDE],
-     [:cws, NO_OVERRIDE],
-     [:irb_change_binding, OVERRIDE_ALL],
-     [:irb_cb, OVERRIDE_ALL],
-     [:cb, NO_OVERRIDE]],
+      [
+        :irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
+        [:irb_print_working_workspace, OVERRIDE_ALL],
+        [:irb_cwws, OVERRIDE_ALL],
+        [:irb_pwws, OVERRIDE_ALL],
+        [:cwws, NO_OVERRIDE],
+        [:pwws, NO_OVERRIDE],
+        [:irb_current_working_binding, OVERRIDE_ALL],
+        [:irb_print_working_binding, OVERRIDE_ALL],
+        [:irb_cwb, OVERRIDE_ALL],
+        [:irb_pwb, OVERRIDE_ALL],
+      ],
+      [
+        :irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
+        [:irb_chws, OVERRIDE_ALL],
+        [:irb_cws, OVERRIDE_ALL],
+        [:chws, NO_OVERRIDE],
+        [:cws, NO_OVERRIDE],
+        [:irb_change_binding, OVERRIDE_ALL],
+        [:irb_cb, OVERRIDE_ALL],
+        [:cb, NO_OVERRIDE],
+      ],
 
-    [:irb_workspaces, :Workspaces, "irb/cmd/pushws",
-     [:workspaces, NO_OVERRIDE],
-     [:irb_bindings, OVERRIDE_ALL],
-     [:bindings, NO_OVERRIDE]],
-    [:irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
-     [:irb_pushws, OVERRIDE_ALL],
-     [:pushws, NO_OVERRIDE],
-     [:irb_push_binding, OVERRIDE_ALL],
-     [:irb_pushb, OVERRIDE_ALL],
-     [:pushb, NO_OVERRIDE]],
-    [:irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
-     [:irb_popws, OVERRIDE_ALL],
-     [:popws, NO_OVERRIDE],
-     [:irb_pop_binding, OVERRIDE_ALL],
-     [:irb_popb, OVERRIDE_ALL],
-     [:popb, NO_OVERRIDE]],
+      [
+        :irb_workspaces, :Workspaces, "irb/cmd/pushws",
+        [:workspaces, NO_OVERRIDE],
+        [:irb_bindings, OVERRIDE_ALL],
+        [:bindings, NO_OVERRIDE],
+      ],
+      [
+        :irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
+        [:irb_pushws, OVERRIDE_ALL],
+        [:pushws, NO_OVERRIDE],
+        [:irb_push_binding, OVERRIDE_ALL],
+        [:irb_pushb, OVERRIDE_ALL],
+        [:pushb, NO_OVERRIDE],
+      ],
+      [
+        :irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
+        [:irb_popws, OVERRIDE_ALL],
+        [:popws, NO_OVERRIDE],
+        [:irb_pop_binding, OVERRIDE_ALL],
+        [:irb_popb, OVERRIDE_ALL],
+        [:popb, NO_OVERRIDE],
+      ],
 
-    [:irb_load, :Load, "irb/cmd/load"],
-    [:irb_require, :Require, "irb/cmd/load"],
-    [:irb_source, :Source, "irb/cmd/load",
-     [:source, NO_OVERRIDE]],
+      [
+        :irb_load, :Load, "irb/cmd/load"],
+      [
+        :irb_require, :Require, "irb/cmd/load"],
+      [
+        :irb_source, :Source, "irb/cmd/load",
+        [:source, NO_OVERRIDE],
+      ],
 
-    [:irb, :IrbCommand, "irb/cmd/subirb"],
-    [:irb_jobs, :Jobs, "irb/cmd/subirb",
-     [:jobs, NO_OVERRIDE]],
-    [:irb_fg, :Foreground, "irb/cmd/subirb",
-     [:fg, NO_OVERRIDE]],
-    [:irb_kill, :Kill, "irb/cmd/subirb",
-     [:kill, OVERRIDE_PRIVATE_ONLY]],
+      [
+        :irb, :IrbCommand, "irb/cmd/subirb"],
+      [
+        :irb_jobs, :Jobs, "irb/cmd/subirb",
+        [:jobs, NO_OVERRIDE],
+      ],
+      [
+        :irb_fg, :Foreground, "irb/cmd/subirb",
+        [:fg, NO_OVERRIDE],
+      ],
+      [
+        :irb_kill, :Kill, "irb/cmd/subirb",
+        [:kill, OVERRIDE_PRIVATE_ONLY],
+      ],
 
-    [:irb_help, :Help, "irb/cmd/help",
-     [:help, NO_OVERRIDE]],
+      [
+        :irb_help, :Help, "irb/cmd/help",
+        [:help, NO_OVERRIDE],
+      ],
 
     ]
 

data/lib/irb/init.rb

@@ -51,6 +51,7 @@ module IRB # :nodoc:
     @CONF[:IGNORE_SIGINT] = true
     @CONF[:IGNORE_EOF] = false
     @CONF[:ECHO] = nil
+    @CONF[:ECHO_ON_ASSIGNMENT] = nil
     @CONF[:VERBOSE] = nil
 
     @CONF[:EVAL_HISTORY] = nil
@@ -83,7 +84,7 @@ module IRB # :nodoc:
       :SIMPLE => {
         :PROMPT_I => ">> ",
         :PROMPT_N => ">> ",
-        :PROMPT_S => nil,
+        :PROMPT_S => "%l> ",
         :PROMPT_C => "?> ",
         :RETURN => "=> %s\n"
       },
@@ -172,6 +173,10 @@ module IRB # :nodoc:
         @CONF[:ECHO] = true
       when "--noecho"
         @CONF[:ECHO] = false
+      when "--echo-on-assignment"
+        @CONF[:ECHO_ON_ASSIGNMENT] = true
+      when "--noecho-on-assignment"
+        @CONF[:ECHO_ON_ASSIGNMENT] = false
       when "--verbose"
         @CONF[:VERBOSE] = true
       when "--noverbose"

data/lib/irb/ruby-lex.rb

@@ -205,7 +205,12 @@ class RubyLex
 
     begin # check if parser error are available
       verbose, $VERBOSE = $VERBOSE, nil
-      RubyVM::InstructionSequence.compile(code)
+      case RUBY_ENGINE
+      when 'jruby'
+        JRuby.compile_ir(code)
+      else
+        RubyVM::InstructionSequence.compile(code)
+      end
     rescue SyntaxError => e
       case e.message
       when /unterminated (?:string|regexp) meets end of file/
@@ -293,7 +298,16 @@ class RubyLex
       when :on_kw
         next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
         case t[2]
-        when 'def', 'do', 'case', 'for', 'begin', 'class', 'module'
+        when 'do'
+          if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_CMDARG)
+            # method_with_bock do; end
+            indent += 1
+          else
+            # while cond do; end # also "until" or "for"
+            # This "do" doesn't increment indent because "while" already
+            # incremented.
+          end
+        when 'def', 'case', 'for', 'begin', 'class', 'module'
           indent += 1
         when 'if', 'unless', 'while', 'until'
           # postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
@@ -327,7 +341,16 @@ class RubyLex
       when :on_kw
         next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
         case t[2]
-        when 'def', 'do', 'case', 'for', 'begin', 'class', 'module'
+        when 'do'
+          if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_CMDARG)
+            # method_with_bock do; end
+            depth_difference += 1
+          else
+            # while cond do; end # also "until" or "for"
+            # This "do" doesn't increment indent because "while" already
+            # incremented.
+          end
+        when 'def', 'case', 'for', 'begin', 'class', 'module'
           depth_difference += 1
         when 'if', 'unless', 'while', 'until'
           # postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL

data/lib/irb/version.rb

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

data/lib/irb/workspace.rb

@@ -9,6 +9,9 @@
 #
 #
 #
+
+require "delegate"
+
 module IRB # :nodoc:
   class WorkSpace
     # Creates a new workspace.
@@ -49,17 +52,21 @@ EOF
           @binding = BINDING_QUEUE.pop
 
         when 3	# binding in function on TOPLEVEL_BINDING(default)
-          @binding = eval("self.class.send(:remove_method, :irb_binding) if defined?(irb_binding); def irb_binding; private; binding; end; irb_binding",
+          @binding = eval("self.class.send(:remove_method, :irb_binding) if defined?(irb_binding); private; def irb_binding; binding; end; irb_binding",
                           TOPLEVEL_BINDING,
                           __FILE__,
                           __LINE__ - 3)
         end
       end
+
       if main.empty?
         @main = eval("self", @binding)
       else
         @main = main[0]
-        IRB.conf[:__MAIN__] = @main
+      end
+      IRB.conf[:__MAIN__] = @main
+
+      unless main.empty?
         case @main
         when Module
           @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
@@ -71,6 +78,28 @@ EOF
           end
         end
       end
+
+      case @main
+      when Object
+        use_delegator = @main.frozen?
+      else
+        use_delegator = true
+      end
+
+      if use_delegator
+        @main = SimpleDelegator.new(@main)
+        IRB.conf[:__MAIN__] = @main
+        @main.singleton_class.class_eval do
+          private
+          define_method(:exit) do |*a, &b|
+            # Do nothing, will be overridden
+          end
+          define_method(:binding, Kernel.instance_method(:binding))
+          define_method(:local_variables, Kernel.instance_method(:local_variables))
+        end
+        @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, *@binding.source_location)
+      end
+
       @binding.local_variable_set(:_, nil)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irb
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.2
+  version: 1.1.0.pre.3
 platform: ruby
 authors:
 - Keiju ISHITSUKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reline
@@ -119,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Interactive Ruby command-line tool for REPL (Read Eval Print Loop).