From 2982f5c6b822142bcf138eec175e492e9c47c765 Mon Sep 17 00:00:00 2001 From: John Mair Date: Mon, 23 May 2011 22:11:50 +1200 Subject: [PATCH] plugins are now enabled when explicitly activated! (even if previously disabled) --- lib/pry/plugins.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/pry/plugins.rb b/lib/pry/plugins.rb index 2fb93c23..70b0fa94 100644 --- a/lib/pry/plugins.rb +++ b/lib/pry/plugins.rb @@ -6,8 +6,7 @@ class Pry PluginNotFound = Class.new(LoadError) class Plugin - attr_accessor :name, :gem_name, :enabled - attr_reader :active + attr_accessor :name, :gem_name, :enabled, :active def initialize(name, gem_name, enabled) @name, @gem_name, @enabled = name, gem_name, enabled @@ -26,13 +25,12 @@ class Pry # Activate the plugin (require the gem). def activate! begin - Pry::Helpers::BaseHelpers.silence_warnings do - require gem_name - end + require gem_name rescue LoadError raise PluginNotFound, "The plugin '#{gem_name}' was not found!" end - @active = true + self.active = true + self.enabled = true end alias active? active