From 8ce49ee081139791b41fee22e33fe313fa5590aa Mon Sep 17 00:00:00 2001 From: Ryan Fitzgerald Date: Sat, 11 Aug 2012 17:39:25 -0700 Subject: [PATCH] Remove extended_commands, default_commands -> commands --- lib/pry/commands.rb | 6 +----- lib/pry/{default_commands => commands}/amend_line.rb | 0 lib/pry/{default_commands => commands}/bang.rb | 0 lib/pry/{default_commands => commands}/bang_pry.rb | 0 lib/pry/{default_commands => commands}/cat.rb | 0 lib/pry/{default_commands => commands}/cd.rb | 0 lib/pry/{default_commands => commands}/easter_eggs.rb | 0 lib/pry/{default_commands => commands}/edit.rb | 0 lib/pry/{default_commands => commands}/edit_method.rb | 0 lib/pry/{default_commands => commands}/exit.rb | 0 lib/pry/{default_commands => commands}/exit_all.rb | 0 lib/pry/{default_commands => commands}/exit_program.rb | 0 lib/pry/{default_commands => commands}/find_method.rb | 0 lib/pry/{default_commands => commands}/gem_cd.rb | 0 lib/pry/{default_commands => commands}/gem_install.rb | 0 lib/pry/{default_commands => commands}/gem_list.rb | 0 lib/pry/{default_commands => commands}/gist.rb | 0 lib/pry/{default_commands => commands}/help.rb | 1 + lib/pry/{default_commands => commands}/hist.rb | 0 lib/pry/{default_commands => commands}/import_set.rb | 0 lib/pry/{default_commands => commands}/install_command.rb | 0 lib/pry/{default_commands => commands}/jump_to.rb | 0 lib/pry/{default_commands => commands}/ls.rb | 0 lib/pry/{default_commands => commands}/nesting.rb | 0 lib/pry/{default_commands => commands}/play.rb | 0 lib/pry/{default_commands => commands}/pry_backtrace.rb | 0 lib/pry/{default_commands => commands}/pry_version.rb | 0 lib/pry/{default_commands => commands}/raise_up.rb | 0 lib/pry/{default_commands => commands}/reload_method.rb | 0 lib/pry/{default_commands => commands}/reset.rb | 0 lib/pry/{default_commands => commands}/ri.rb | 0 lib/pry/{default_commands => commands}/save_file.rb | 0 lib/pry/{default_commands => commands}/shell_command.rb | 0 lib/pry/{default_commands => commands}/shell_mode.rb | 0 lib/pry/{default_commands => commands}/show_command.rb | 0 lib/pry/{default_commands => commands}/show_doc.rb | 0 lib/pry/{default_commands => commands}/show_input.rb | 0 lib/pry/{default_commands => commands}/show_source.rb | 0 lib/pry/{default_commands => commands}/simple_prompt.rb | 0 lib/pry/{default_commands => commands}/stat.rb | 0 lib/pry/{default_commands => commands}/switch_to.rb | 0 lib/pry/{default_commands => commands}/toggle_color.rb | 0 lib/pry/{default_commands => commands}/whereami.rb | 0 lib/pry/{default_commands => commands}/wtf.rb | 0 lib/pry/extended_commands/experimental.rb | 7 ------- 45 files changed, 2 insertions(+), 12 deletions(-) rename lib/pry/{default_commands => commands}/amend_line.rb (100%) rename lib/pry/{default_commands => commands}/bang.rb (100%) rename lib/pry/{default_commands => commands}/bang_pry.rb (100%) rename lib/pry/{default_commands => commands}/cat.rb (100%) rename lib/pry/{default_commands => commands}/cd.rb (100%) rename lib/pry/{default_commands => commands}/easter_eggs.rb (100%) rename lib/pry/{default_commands => commands}/edit.rb (100%) rename lib/pry/{default_commands => commands}/edit_method.rb (100%) rename lib/pry/{default_commands => commands}/exit.rb (100%) rename lib/pry/{default_commands => commands}/exit_all.rb (100%) rename lib/pry/{default_commands => commands}/exit_program.rb (100%) rename lib/pry/{default_commands => commands}/find_method.rb (100%) rename lib/pry/{default_commands => commands}/gem_cd.rb (100%) rename lib/pry/{default_commands => commands}/gem_install.rb (100%) rename lib/pry/{default_commands => commands}/gem_list.rb (100%) rename lib/pry/{default_commands => commands}/gist.rb (100%) rename lib/pry/{default_commands => commands}/help.rb (99%) rename lib/pry/{default_commands => commands}/hist.rb (100%) rename lib/pry/{default_commands => commands}/import_set.rb (100%) rename lib/pry/{default_commands => commands}/install_command.rb (100%) rename lib/pry/{default_commands => commands}/jump_to.rb (100%) rename lib/pry/{default_commands => commands}/ls.rb (100%) rename lib/pry/{default_commands => commands}/nesting.rb (100%) rename lib/pry/{default_commands => commands}/play.rb (100%) rename lib/pry/{default_commands => commands}/pry_backtrace.rb (100%) rename lib/pry/{default_commands => commands}/pry_version.rb (100%) rename lib/pry/{default_commands => commands}/raise_up.rb (100%) rename lib/pry/{default_commands => commands}/reload_method.rb (100%) rename lib/pry/{default_commands => commands}/reset.rb (100%) rename lib/pry/{default_commands => commands}/ri.rb (100%) rename lib/pry/{default_commands => commands}/save_file.rb (100%) rename lib/pry/{default_commands => commands}/shell_command.rb (100%) rename lib/pry/{default_commands => commands}/shell_mode.rb (100%) rename lib/pry/{default_commands => commands}/show_command.rb (100%) rename lib/pry/{default_commands => commands}/show_doc.rb (100%) rename lib/pry/{default_commands => commands}/show_input.rb (100%) rename lib/pry/{default_commands => commands}/show_source.rb (100%) rename lib/pry/{default_commands => commands}/simple_prompt.rb (100%) rename lib/pry/{default_commands => commands}/stat.rb (100%) rename lib/pry/{default_commands => commands}/switch_to.rb (100%) rename lib/pry/{default_commands => commands}/toggle_color.rb (100%) rename lib/pry/{default_commands => commands}/whereami.rb (100%) rename lib/pry/{default_commands => commands}/wtf.rb (100%) delete mode 100644 lib/pry/extended_commands/experimental.rb diff --git a/lib/pry/commands.rb b/lib/pry/commands.rb index ee53a930..8b2802e0 100644 --- a/lib/pry/commands.rb +++ b/lib/pry/commands.rb @@ -1,10 +1,6 @@ # Default commands used by Pry. Pry::Commands = Pry::CommandSet.new -Dir[File.expand_path('../default_commands/*.rb', __FILE__)].each do |file| - require file -end - -Dir[File.expand_path('../extended_commands/*.rb', __FILE__)].each do |file| +Dir[File.expand_path('../commands/*.rb', __FILE__)].each do |file| require file end diff --git a/lib/pry/default_commands/amend_line.rb b/lib/pry/commands/amend_line.rb similarity index 100% rename from lib/pry/default_commands/amend_line.rb rename to lib/pry/commands/amend_line.rb diff --git a/lib/pry/default_commands/bang.rb b/lib/pry/commands/bang.rb similarity index 100% rename from lib/pry/default_commands/bang.rb rename to lib/pry/commands/bang.rb diff --git a/lib/pry/default_commands/bang_pry.rb b/lib/pry/commands/bang_pry.rb similarity index 100% rename from lib/pry/default_commands/bang_pry.rb rename to lib/pry/commands/bang_pry.rb diff --git a/lib/pry/default_commands/cat.rb b/lib/pry/commands/cat.rb similarity index 100% rename from lib/pry/default_commands/cat.rb rename to lib/pry/commands/cat.rb diff --git a/lib/pry/default_commands/cd.rb b/lib/pry/commands/cd.rb similarity index 100% rename from lib/pry/default_commands/cd.rb rename to lib/pry/commands/cd.rb diff --git a/lib/pry/default_commands/easter_eggs.rb b/lib/pry/commands/easter_eggs.rb similarity index 100% rename from lib/pry/default_commands/easter_eggs.rb rename to lib/pry/commands/easter_eggs.rb diff --git a/lib/pry/default_commands/edit.rb b/lib/pry/commands/edit.rb similarity index 100% rename from lib/pry/default_commands/edit.rb rename to lib/pry/commands/edit.rb diff --git a/lib/pry/default_commands/edit_method.rb b/lib/pry/commands/edit_method.rb similarity index 100% rename from lib/pry/default_commands/edit_method.rb rename to lib/pry/commands/edit_method.rb diff --git a/lib/pry/default_commands/exit.rb b/lib/pry/commands/exit.rb similarity index 100% rename from lib/pry/default_commands/exit.rb rename to lib/pry/commands/exit.rb diff --git a/lib/pry/default_commands/exit_all.rb b/lib/pry/commands/exit_all.rb similarity index 100% rename from lib/pry/default_commands/exit_all.rb rename to lib/pry/commands/exit_all.rb diff --git a/lib/pry/default_commands/exit_program.rb b/lib/pry/commands/exit_program.rb similarity index 100% rename from lib/pry/default_commands/exit_program.rb rename to lib/pry/commands/exit_program.rb diff --git a/lib/pry/default_commands/find_method.rb b/lib/pry/commands/find_method.rb similarity index 100% rename from lib/pry/default_commands/find_method.rb rename to lib/pry/commands/find_method.rb diff --git a/lib/pry/default_commands/gem_cd.rb b/lib/pry/commands/gem_cd.rb similarity index 100% rename from lib/pry/default_commands/gem_cd.rb rename to lib/pry/commands/gem_cd.rb diff --git a/lib/pry/default_commands/gem_install.rb b/lib/pry/commands/gem_install.rb similarity index 100% rename from lib/pry/default_commands/gem_install.rb rename to lib/pry/commands/gem_install.rb diff --git a/lib/pry/default_commands/gem_list.rb b/lib/pry/commands/gem_list.rb similarity index 100% rename from lib/pry/default_commands/gem_list.rb rename to lib/pry/commands/gem_list.rb diff --git a/lib/pry/default_commands/gist.rb b/lib/pry/commands/gist.rb similarity index 100% rename from lib/pry/default_commands/gist.rb rename to lib/pry/commands/gist.rb diff --git a/lib/pry/default_commands/help.rb b/lib/pry/commands/help.rb similarity index 99% rename from lib/pry/default_commands/help.rb rename to lib/pry/commands/help.rb index 97314b27..9608ee8c 100644 --- a/lib/pry/default_commands/help.rb +++ b/lib/pry/commands/help.rb @@ -1,5 +1,6 @@ class Pry Pry::Commands.create_command "help" do |cmd| + group 'Help' description "Show a list of commands. Type `help ` for information about ." banner <<-BANNER diff --git a/lib/pry/default_commands/hist.rb b/lib/pry/commands/hist.rb similarity index 100% rename from lib/pry/default_commands/hist.rb rename to lib/pry/commands/hist.rb diff --git a/lib/pry/default_commands/import_set.rb b/lib/pry/commands/import_set.rb similarity index 100% rename from lib/pry/default_commands/import_set.rb rename to lib/pry/commands/import_set.rb diff --git a/lib/pry/default_commands/install_command.rb b/lib/pry/commands/install_command.rb similarity index 100% rename from lib/pry/default_commands/install_command.rb rename to lib/pry/commands/install_command.rb diff --git a/lib/pry/default_commands/jump_to.rb b/lib/pry/commands/jump_to.rb similarity index 100% rename from lib/pry/default_commands/jump_to.rb rename to lib/pry/commands/jump_to.rb diff --git a/lib/pry/default_commands/ls.rb b/lib/pry/commands/ls.rb similarity index 100% rename from lib/pry/default_commands/ls.rb rename to lib/pry/commands/ls.rb diff --git a/lib/pry/default_commands/nesting.rb b/lib/pry/commands/nesting.rb similarity index 100% rename from lib/pry/default_commands/nesting.rb rename to lib/pry/commands/nesting.rb diff --git a/lib/pry/default_commands/play.rb b/lib/pry/commands/play.rb similarity index 100% rename from lib/pry/default_commands/play.rb rename to lib/pry/commands/play.rb diff --git a/lib/pry/default_commands/pry_backtrace.rb b/lib/pry/commands/pry_backtrace.rb similarity index 100% rename from lib/pry/default_commands/pry_backtrace.rb rename to lib/pry/commands/pry_backtrace.rb diff --git a/lib/pry/default_commands/pry_version.rb b/lib/pry/commands/pry_version.rb similarity index 100% rename from lib/pry/default_commands/pry_version.rb rename to lib/pry/commands/pry_version.rb diff --git a/lib/pry/default_commands/raise_up.rb b/lib/pry/commands/raise_up.rb similarity index 100% rename from lib/pry/default_commands/raise_up.rb rename to lib/pry/commands/raise_up.rb diff --git a/lib/pry/default_commands/reload_method.rb b/lib/pry/commands/reload_method.rb similarity index 100% rename from lib/pry/default_commands/reload_method.rb rename to lib/pry/commands/reload_method.rb diff --git a/lib/pry/default_commands/reset.rb b/lib/pry/commands/reset.rb similarity index 100% rename from lib/pry/default_commands/reset.rb rename to lib/pry/commands/reset.rb diff --git a/lib/pry/default_commands/ri.rb b/lib/pry/commands/ri.rb similarity index 100% rename from lib/pry/default_commands/ri.rb rename to lib/pry/commands/ri.rb diff --git a/lib/pry/default_commands/save_file.rb b/lib/pry/commands/save_file.rb similarity index 100% rename from lib/pry/default_commands/save_file.rb rename to lib/pry/commands/save_file.rb diff --git a/lib/pry/default_commands/shell_command.rb b/lib/pry/commands/shell_command.rb similarity index 100% rename from lib/pry/default_commands/shell_command.rb rename to lib/pry/commands/shell_command.rb diff --git a/lib/pry/default_commands/shell_mode.rb b/lib/pry/commands/shell_mode.rb similarity index 100% rename from lib/pry/default_commands/shell_mode.rb rename to lib/pry/commands/shell_mode.rb diff --git a/lib/pry/default_commands/show_command.rb b/lib/pry/commands/show_command.rb similarity index 100% rename from lib/pry/default_commands/show_command.rb rename to lib/pry/commands/show_command.rb diff --git a/lib/pry/default_commands/show_doc.rb b/lib/pry/commands/show_doc.rb similarity index 100% rename from lib/pry/default_commands/show_doc.rb rename to lib/pry/commands/show_doc.rb diff --git a/lib/pry/default_commands/show_input.rb b/lib/pry/commands/show_input.rb similarity index 100% rename from lib/pry/default_commands/show_input.rb rename to lib/pry/commands/show_input.rb diff --git a/lib/pry/default_commands/show_source.rb b/lib/pry/commands/show_source.rb similarity index 100% rename from lib/pry/default_commands/show_source.rb rename to lib/pry/commands/show_source.rb diff --git a/lib/pry/default_commands/simple_prompt.rb b/lib/pry/commands/simple_prompt.rb similarity index 100% rename from lib/pry/default_commands/simple_prompt.rb rename to lib/pry/commands/simple_prompt.rb diff --git a/lib/pry/default_commands/stat.rb b/lib/pry/commands/stat.rb similarity index 100% rename from lib/pry/default_commands/stat.rb rename to lib/pry/commands/stat.rb diff --git a/lib/pry/default_commands/switch_to.rb b/lib/pry/commands/switch_to.rb similarity index 100% rename from lib/pry/default_commands/switch_to.rb rename to lib/pry/commands/switch_to.rb diff --git a/lib/pry/default_commands/toggle_color.rb b/lib/pry/commands/toggle_color.rb similarity index 100% rename from lib/pry/default_commands/toggle_color.rb rename to lib/pry/commands/toggle_color.rb diff --git a/lib/pry/default_commands/whereami.rb b/lib/pry/commands/whereami.rb similarity index 100% rename from lib/pry/default_commands/whereami.rb rename to lib/pry/commands/whereami.rb diff --git a/lib/pry/default_commands/wtf.rb b/lib/pry/commands/wtf.rb similarity index 100% rename from lib/pry/default_commands/wtf.rb rename to lib/pry/commands/wtf.rb diff --git a/lib/pry/extended_commands/experimental.rb b/lib/pry/extended_commands/experimental.rb deleted file mode 100644 index 25ccbe84..00000000 --- a/lib/pry/extended_commands/experimental.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Pry - module ExtendedCommands - - Experimental = Pry::CommandSet.new do - end - end -end