From c362f45cfcf48c59a16a277d828ca432f1183a08 Mon Sep 17 00:00:00 2001 From: John Mair Date: Wed, 25 Jan 2012 01:07:50 +1300 Subject: [PATCH] config.plugins.enabled -> config.should_load_plugins --- lib/pry/pry_class.rb | 5 ++--- test/helper.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/pry/pry_class.rb b/lib/pry/pry_class.rb index e4b52f93..c71cda5c 100644 --- a/lib/pry/pry_class.rb +++ b/lib/pry/pry_class.rb @@ -89,7 +89,7 @@ class Pry # note these have to be loaded here rather than in pry_instance as # we only want them loaded once per entire Pry lifetime. load_rc if Pry.config.should_load_rc - load_plugins if Pry.config.plugins.enabled + load_plugins if Pry.config.should_load_plugins load_requires if Pry.config.should_load_requires load_history if Pry.config.history.should_load load_traps if Pry.config.should_trap_interrupts @@ -241,8 +241,7 @@ class Pry config.gist ||= OpenStruct.new config.gist.inspecter = proc(&:pretty_inspect) - config.plugins ||= OpenStruct.new - config.plugins.enabled = true + config.should_load_plugins = true config.requires ||= [] config.should_load_requires = true diff --git a/test/helper.rb b/test/helper.rb index 36833054..9d4564c7 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -26,7 +26,7 @@ class << Pry Pry.color = false Pry.pager = false Pry.config.should_load_rc = false - Pry.config.plugins.enabled = false + Pry.config.should_load_plugins = false Pry.config.history.should_load = false Pry.config.history.should_save = false Pry.config.auto_indent = false