kotovalexarian-likes-github/pry--pry
1
0
Fork 0
mirror of https://github.com/pry/pry.git synced 2022-11-09 12:35:05 -05:00
Code Releases Activity

Move command options Proc under Command namespace

Browse source 
Because it fits better there and is also hidden from the user.

Signed-off-by: Kyrylo Silin <kyrylosilin@gmail.com>
This commit is contained in:
Kyrylo Silin 2012-12-27 13:21:34 +02:00
parent ebccd57013
commit 6f7e483884
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/pry.rb
View file

@ -130,19 +130,6 @@ class Pry
end end
end end
Pry::DEFAULT_COMMAND_OPTIONS = proc do |match|
{
:requires_gem => [],
:keep_retval => false,
:argument_required => false,
:interpolate => true,
:shellwords => true,
:listing => (String === match ? match : match.inspect),
:use_prefix => true,
:takes_block => false
}
end
# Store the current working directory. This allows show-source etc. to work if # Store the current working directory. This allows show-source etc. to work if
# your process has changed directory since boot. [Issue #675] # your process has changed directory since boot. [Issue #675]
INITIAL_PWD = Dir.pwd INITIAL_PWD = Dir.pwd

15
lib/pry/command.rb
View file

@ -37,7 +37,7 @@ class Pry
# Define or get the command's options # Define or get the command's options
def command_options(arg=nil) def command_options(arg=nil)
@command_options ||= Pry::DEFAULT_COMMAND_OPTIONS.call(match) @command_options ||= DEFAULT_OPTIONS.call(match)
@command_options.merge!(arg) if arg @command_options.merge!(arg) if arg
@command_options @command_options
end end
@ -196,6 +196,19 @@ class Pry
end end
end end
DEFAULT_OPTIONS = proc do |match|
{
:requires_gem => [],
:keep_retval => false,
:argument_required => false,
:interpolate => true,
:shellwords => true,
:listing => (String === match ? match : match.inspect),
:use_prefix => true,
:takes_block => false
}
end
# Properties of one execution of a command (passed by {Pry#run_command} as a hash of # Properties of one execution of a command (passed by {Pry#run_command} as a hash of
# context and expanded in `#initialize` # context and expanded in `#initialize`
attr_accessor :output attr_accessor :output

4
lib/pry/command_set.rb
View file

@ -81,7 +81,7 @@ class Pry
# # number-N regex command # # number-N regex command
def block_command(match, description="No description.", options={}, &block) def block_command(match, description="No description.", options={}, &block)
description, options = ["No description.", description] if description.is_a?(Hash) description, options = ["No description.", description] if description.is_a?(Hash)
options = Pry::DEFAULT_COMMAND_OPTIONS.call(match).merge!(options) options = Pry::Command::DEFAULT_OPTIONS.call(match).merge!(options)
commands[match] = Pry::BlockCommand.subclass(match, description, options, helper_module, &block) commands[match] = Pry::BlockCommand.subclass(match, description, options, helper_module, &block)
end end
@ -113,7 +113,7 @@ class Pry
# #
def create_command(match, description="No description.", options={}, &block) def create_command(match, description="No description.", options={}, &block)
description, options = ["No description.", description] if description.is_a?(Hash) description, options = ["No description.", description] if description.is_a?(Hash)
options = Pry::DEFAULT_COMMAND_OPTIONS.call(match).merge!(options) options = Pry::Command::DEFAULT_OPTIONS.call(match).merge!(options)
commands[match] = Pry::ClassCommand.subclass(match, description, options, helper_module, &block) commands[match] = Pry::ClassCommand.subclass(match, description, options, helper_module, &block)
commands[match].class_eval(&block) commands[match].class_eval(&block)