irb 1.12.0 → 1.13.0

data/lib/irb/statement.rb

@@ -16,10 +16,6 @@ module IRB
       raise NotImplementedError
     end
 
-    def evaluable_code
-      raise NotImplementedError
-    end
-
     class EmptyInput < Statement
       def is_assignment?
         false
@@ -37,10 +33,6 @@ module IRB
       def code
         ""
       end
-
-      def evaluable_code
-        code
-      end
     end
 
     class Expression < Statement
@@ -60,18 +52,15 @@ module IRB
       def is_assignment?
         @is_assignment
       end
-
-      def evaluable_code
-        @code
-      end
     end
 
     class Command < Statement
-      def initialize(code, command, arg, command_class)
-        @code = code
-        @command = command
-        @arg = arg
+      attr_reader :command_class, :arg
+
+      def initialize(original_code, command_class, arg)
+        @code = original_code
         @command_class = command_class
+        @arg = arg
       end
 
       def is_assignment?
@@ -86,17 +75,6 @@ module IRB
         require_relative 'command/debug'
         IRB::Command::DebugCommand > @command_class
       end
-
-      def evaluable_code
-        # Hook command-specific transformation to return valid Ruby code
-        if @command_class.respond_to?(:transform_args)
-          arg = @command_class.transform_args(@arg)
-        else
-          arg = @arg
-        end
-
-        [@command, arg].compact.join(' ')
-      end
     end
   end
 end

data/lib/irb/version.rb

@@ -5,7 +5,7 @@
 #
 
 module IRB # :nodoc:
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
   @RELEASE_VERSION = VERSION
-  @LAST_UPDATE_DATE = "2024-03-06"
+  @LAST_UPDATE_DATE = "2024-05-01"
 end

data/lib/irb/workspace.rb

@@ -6,6 +6,8 @@
 
 require "delegate"
 
+require_relative "helper_method"
+
 IRB::TOPLEVEL_BINDING = binding
 module IRB # :nodoc:
   class WorkSpace
@@ -108,8 +110,10 @@ EOF
     # <code>IRB.conf[:__MAIN__]</code>
     attr_reader :main
 
-    def load_commands_to_main
-      main.extend ExtendCommandBundle
+    def load_helper_methods_to_main
+      ancestors = class<<main;ancestors;end
+      main.extend ExtendCommandBundle if !ancestors.include?(ExtendCommandBundle)
+      main.extend HelpersContainer if !ancestors.include?(HelpersContainer)
     end
 
     # Evaluate the given +statements+ within the  context of this workspace.
@@ -170,4 +174,16 @@ EOF
       "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear}\n"
     end
   end
+
+  module HelpersContainer
+    def self.install_helper_methods
+      HelperMethod.helper_methods.each do |name, helper_method_class|
+        define_method name do |*args, **opts, &block|
+          helper_method_class.instance.execute(*args, **opts, &block)
+        end unless method_defined?(name)
+      end
+    end
+
+    install_helper_methods
+  end
 end