Remove extended_commands, default_commands -> commands

45 files changed, 2 insertions, 12 deletions

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
index e0d51e7a..e0d51e7a 100644
--- a/lib/pry/default_commands/amend_line.rb
+++ b/lib/pry/commands/amend_line.rb
diff --git a/lib/pry/default_commands/bang.rb b/lib/pry/commands/bang.rb
index df02294d..df02294d 100644
--- a/lib/pry/default_commands/bang.rb
+++ b/lib/pry/commands/bang.rb
diff --git a/lib/pry/default_commands/bang_pry.rb b/lib/pry/commands/bang_pry.rb
index c9cd7ba0..c9cd7ba0 100644
--- a/lib/pry/default_commands/bang_pry.rb
+++ b/lib/pry/commands/bang_pry.rb
diff --git a/lib/pry/default_commands/cat.rb b/lib/pry/commands/cat.rb
index c4e9b8f7..c4e9b8f7 100644
--- a/lib/pry/default_commands/cat.rb
+++ b/lib/pry/commands/cat.rb
diff --git a/lib/pry/default_commands/cd.rb b/lib/pry/commands/cd.rb
index bd1c708e..bd1c708e 100644
--- a/lib/pry/default_commands/cd.rb
+++ b/lib/pry/commands/cd.rb
diff --git a/lib/pry/default_commands/easter_eggs.rb b/lib/pry/commands/easter_eggs.rb
index bc83feef..bc83feef 100644
--- a/lib/pry/default_commands/easter_eggs.rb
+++ b/lib/pry/commands/easter_eggs.rb
diff --git a/lib/pry/default_commands/edit.rb b/lib/pry/commands/edit.rb
index c9187228..c9187228 100644
--- a/lib/pry/default_commands/edit.rb
+++ b/lib/pry/commands/edit.rb
diff --git a/lib/pry/default_commands/edit_method.rb b/lib/pry/commands/edit_method.rb
index eeb42253..eeb42253 100644
--- a/lib/pry/default_commands/edit_method.rb
+++ b/lib/pry/commands/edit_method.rb
diff --git a/lib/pry/default_commands/exit.rb b/lib/pry/commands/exit.rb
index 15416081..15416081 100644
--- a/lib/pry/default_commands/exit.rb
+++ b/lib/pry/commands/exit.rb
diff --git a/lib/pry/default_commands/exit_all.rb b/lib/pry/commands/exit_all.rb
index 972281cd..972281cd 100644
--- a/lib/pry/default_commands/exit_all.rb
+++ b/lib/pry/commands/exit_all.rb
diff --git a/lib/pry/default_commands/exit_program.rb b/lib/pry/commands/exit_program.rb
index 561b059b..561b059b 100644
--- a/lib/pry/default_commands/exit_program.rb
+++ b/lib/pry/commands/exit_program.rb
diff --git a/lib/pry/default_commands/find_method.rb b/lib/pry/commands/find_method.rb
index 3fb85a3c..3fb85a3c 100644
--- a/lib/pry/default_commands/find_method.rb
+++ b/lib/pry/commands/find_method.rb
diff --git a/lib/pry/default_commands/gem_cd.rb b/lib/pry/commands/gem_cd.rb
index 7cfb4fc0..7cfb4fc0 100644
--- a/lib/pry/default_commands/gem_cd.rb
+++ b/lib/pry/commands/gem_cd.rb
diff --git a/lib/pry/default_commands/gem_install.rb b/lib/pry/commands/gem_install.rb
index 54a7e6cb..54a7e6cb 100644
--- a/lib/pry/default_commands/gem_install.rb
+++ b/lib/pry/commands/gem_install.rb
diff --git a/lib/pry/default_commands/gem_list.rb b/lib/pry/commands/gem_list.rb
index 6e88f2cd..6e88f2cd 100644
--- a/lib/pry/default_commands/gem_list.rb
+++ b/lib/pry/commands/gem_list.rb
diff --git a/lib/pry/default_commands/gist.rb b/lib/pry/commands/gist.rb
index 073b9bdf..073b9bdf 100644
--- a/lib/pry/default_commands/gist.rb
+++ b/lib/pry/commands/gist.rb
diff --git a/lib/pry/default_commands/help.rb b/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 <foo>` for information about <foo>."
 
     banner <<-BANNER
diff --git a/lib/pry/default_commands/hist.rb b/lib/pry/commands/hist.rb
index 9c3c5d48..9c3c5d48 100644
--- a/lib/pry/default_commands/hist.rb
+++ b/lib/pry/commands/hist.rb
diff --git a/lib/pry/default_commands/import_set.rb b/lib/pry/commands/import_set.rb
index ab40d4db..ab40d4db 100644
--- a/lib/pry/default_commands/import_set.rb
+++ b/lib/pry/commands/import_set.rb
diff --git a/lib/pry/default_commands/install_command.rb b/lib/pry/commands/install_command.rb
index 6ad4d878..6ad4d878 100644
--- a/lib/pry/default_commands/install_command.rb
+++ b/lib/pry/commands/install_command.rb
diff --git a/lib/pry/default_commands/jump_to.rb b/lib/pry/commands/jump_to.rb
index 052c2df1..052c2df1 100644
--- a/lib/pry/default_commands/jump_to.rb
+++ b/lib/pry/commands/jump_to.rb
diff --git a/lib/pry/default_commands/ls.rb b/lib/pry/commands/ls.rb
index 8e84fafd..8e84fafd 100644
--- a/lib/pry/default_commands/ls.rb
+++ b/lib/pry/commands/ls.rb
diff --git a/lib/pry/default_commands/nesting.rb b/lib/pry/commands/nesting.rb
index d7cb144f..d7cb144f 100644
--- a/lib/pry/default_commands/nesting.rb
+++ b/lib/pry/commands/nesting.rb
diff --git a/lib/pry/default_commands/play.rb b/lib/pry/commands/play.rb
index ee02eb11..ee02eb11 100644
--- a/lib/pry/default_commands/play.rb
+++ b/lib/pry/commands/play.rb
diff --git a/lib/pry/default_commands/pry_backtrace.rb b/lib/pry/commands/pry_backtrace.rb
index 447a310c..447a310c 100644
--- a/lib/pry/default_commands/pry_backtrace.rb
+++ b/lib/pry/commands/pry_backtrace.rb
diff --git a/lib/pry/default_commands/pry_version.rb b/lib/pry/commands/pry_version.rb
index 35cf6500..35cf6500 100644
--- a/lib/pry/default_commands/pry_version.rb
+++ b/lib/pry/commands/pry_version.rb
diff --git a/lib/pry/default_commands/raise_up.rb b/lib/pry/commands/raise_up.rb
index 922f6b61..922f6b61 100644
--- a/lib/pry/default_commands/raise_up.rb
+++ b/lib/pry/commands/raise_up.rb
diff --git a/lib/pry/default_commands/reload_method.rb b/lib/pry/commands/reload_method.rb
index 07821ad4..07821ad4 100644
--- a/lib/pry/default_commands/reload_method.rb
+++ b/lib/pry/commands/reload_method.rb
diff --git a/lib/pry/default_commands/reset.rb b/lib/pry/commands/reset.rb
index 7fe481c8..7fe481c8 100644
--- a/lib/pry/default_commands/reset.rb
+++ b/lib/pry/commands/reset.rb
diff --git a/lib/pry/default_commands/ri.rb b/lib/pry/commands/ri.rb
index e689e09f..e689e09f 100644
--- a/lib/pry/default_commands/ri.rb
+++ b/lib/pry/commands/ri.rb
diff --git a/lib/pry/default_commands/save_file.rb b/lib/pry/commands/save_file.rb
index f0f33baf..f0f33baf 100644
--- a/lib/pry/default_commands/save_file.rb
+++ b/lib/pry/commands/save_file.rb
diff --git a/lib/pry/default_commands/shell_command.rb b/lib/pry/commands/shell_command.rb
index 2977ff71..2977ff71 100644
--- a/lib/pry/default_commands/shell_command.rb
+++ b/lib/pry/commands/shell_command.rb
diff --git a/lib/pry/default_commands/shell_mode.rb b/lib/pry/commands/shell_mode.rb
index ae923592..ae923592 100644
--- a/lib/pry/default_commands/shell_mode.rb
+++ b/lib/pry/commands/shell_mode.rb
diff --git a/lib/pry/default_commands/show_command.rb b/lib/pry/commands/show_command.rb
index e0bdecb1..e0bdecb1 100644
--- a/lib/pry/default_commands/show_command.rb
+++ b/lib/pry/commands/show_command.rb
diff --git a/lib/pry/default_commands/show_doc.rb b/lib/pry/commands/show_doc.rb
index 27db66e1..27db66e1 100644
--- a/lib/pry/default_commands/show_doc.rb
+++ b/lib/pry/commands/show_doc.rb
diff --git a/lib/pry/default_commands/show_input.rb b/lib/pry/commands/show_input.rb
index 5e6ba0f7..5e6ba0f7 100644
--- a/lib/pry/default_commands/show_input.rb
+++ b/lib/pry/commands/show_input.rb
diff --git a/lib/pry/default_commands/show_source.rb b/lib/pry/commands/show_source.rb
index e38cfca3..e38cfca3 100644
--- a/lib/pry/default_commands/show_source.rb
+++ b/lib/pry/commands/show_source.rb
diff --git a/lib/pry/default_commands/simple_prompt.rb b/lib/pry/commands/simple_prompt.rb
index 7c8163d7..7c8163d7 100644
--- a/lib/pry/default_commands/simple_prompt.rb
+++ b/lib/pry/commands/simple_prompt.rb
diff --git a/lib/pry/default_commands/stat.rb b/lib/pry/commands/stat.rb
index 8870cb0c..8870cb0c 100644
--- a/lib/pry/default_commands/stat.rb
+++ b/lib/pry/commands/stat.rb
diff --git a/lib/pry/default_commands/switch_to.rb b/lib/pry/commands/switch_to.rb
index da426d73..da426d73 100644
--- a/lib/pry/default_commands/switch_to.rb
+++ b/lib/pry/commands/switch_to.rb
diff --git a/lib/pry/default_commands/toggle_color.rb b/lib/pry/commands/toggle_color.rb
index b1e5750c..b1e5750c 100644
--- a/lib/pry/default_commands/toggle_color.rb
+++ b/lib/pry/commands/toggle_color.rb
diff --git a/lib/pry/default_commands/whereami.rb b/lib/pry/commands/whereami.rb
index 121e642b..121e642b 100644
--- a/lib/pry/default_commands/whereami.rb
+++ b/lib/pry/commands/whereami.rb
diff --git a/lib/pry/default_commands/wtf.rb b/lib/pry/commands/wtf.rb
index f56d34b8..f56d34b8 100644
--- a/lib/pry/default_commands/wtf.rb
+++ b/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