lib/irb/command/load.rb in irb-1.12.0 vs lib/irb/command/load.rb in irb-1.13.0
- old
+ new
@@ -8,10 +8,11 @@
module IRB
# :stopdoc:
module Command
class LoaderCommand < Base
+ include RubyArgsExtractor
include IrbLoader
def raise_cmd_argument_error
raise CommandArgumentError.new("Please specify the file name.")
end
@@ -19,20 +20,31 @@
class Load < LoaderCommand
category "IRB"
description "Load a Ruby file."
- def execute(file_name = nil, priv = nil)
+ def execute(arg)
+ args, kwargs = ruby_args(arg)
+ execute_internal(*args, **kwargs)
+ end
+
+ def execute_internal(file_name = nil, priv = nil)
raise_cmd_argument_error unless file_name
irb_load(file_name, priv)
end
end
class Require < LoaderCommand
category "IRB"
description "Require a Ruby file."
- def execute(file_name = nil)
+
+ def execute(arg)
+ args, kwargs = ruby_args(arg)
+ execute_internal(*args, **kwargs)
+ end
+
+ def execute_internal(file_name = nil)
raise_cmd_argument_error unless file_name
rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?")
return false if $".find{|f| f =~ rex}
@@ -61,10 +73,15 @@
class Source < LoaderCommand
category "IRB"
description "Loads a given file in the current session."
- def execute(file_name = nil)
+ def execute(arg)
+ args, kwargs = ruby_args(arg)
+ execute_internal(*args, **kwargs)
+ end
+
+ def execute_internal(file_name = nil)
raise_cmd_argument_error unless file_name
source_file(file_name)
end
end