summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMatijs van Zuijlen <matijs@matijs.net>2020-03-22 12:51:37 +0100
committerMatijs van Zuijlen <matijs@matijs.net>2020-03-22 12:51:37 +0100
commitef8602bf987a590451344a47eabdfda6135587f1 (patch)
treeb8b57113e33a3f12e39d7122691c5acdebacca10 /lib
parent714bcb5b3abd79587839d070ab6b58ff87a69399 (diff)
downloadpry-ef8602bf987a590451344a47eabdfda6135587f1.tar.gz
Remove should_load_plugins config option
Diffstat (limited to 'lib')
-rw-r--r--lib/pry/cli.rb12
-rw-r--r--lib/pry/config.rb4
-rw-r--r--lib/pry/pry_class.rb1
3 files changed, 1 insertions, 16 deletions
diff --git a/lib/pry/cli.rb b/lib/pry/cli.rb
index 17c0d030..2e2b1ea9 100644
--- a/lib/pry/cli.rb
+++ b/lib/pry/cli.rb
@@ -124,15 +124,6 @@ class Pry
end
end
-# Bring in options defined by plugins
-Pry::Slop.new do
- on "no-plugins" do
- Pry.config.should_load_plugins = false
- end
-end.parse(ARGV.dup)
-
-Pry::CLI.add_plugin_options if Pry.config.should_load_plugins
-
# The default Pry command line options (before plugin options are included)
Pry::CLI.add_options do
banner(
@@ -167,7 +158,6 @@ Pry::CLI.add_options do
end
on :s, "select-plugin=", "Only load specified plugin (and no others)." do |plugin_name|
- Pry.config.should_load_plugins = false
Pry.plugins[plugin_name].activate!
end
@@ -176,7 +166,7 @@ Pry::CLI.add_options do
end
on "no-plugins", "Suppress loading of plugins." do
- Pry.config.should_load_plugins = false
+ warn "The --no-plugins option is deprecated and has no effect"
end
on "plugins", "List installed plugins." do
diff --git a/lib/pry/config.rb b/lib/pry/config.rb
index ac6ebad2..c0261104 100644
--- a/lib/pry/config.rb
+++ b/lib/pry/config.rb
@@ -73,9 +73,6 @@ class Pry
# @return [Boolean] whether the local ./.pryrc should be loaded
attribute :should_load_local_rc
- # @return [Boolean]
- attribute :should_load_plugins
-
# @return [Boolean] whether to load files specified with the -r flag
attribute :should_load_requires
@@ -196,7 +193,6 @@ class Pry
output_prefix: '=> ',
requires: [],
should_load_requires: true,
- should_load_plugins: false,
windows_console_warning: true,
control_d_handler: Pry::ControlDHandler.method(:default),
memory_size: 100,
diff --git a/lib/pry/pry_class.rb b/lib/pry/pry_class.rb
index 80dda807..00dc83bd 100644
--- a/lib/pry/pry_class.rb
+++ b/lib/pry/pry_class.rb
@@ -142,7 +142,6 @@ you can add "Pry.config.windows_console_warning = false" to your pryrc.
return if @session_finalized
@session_finalized = true
- load_plugins if Pry.config.should_load_plugins
load_requires if Pry.config.should_load_requires
load_history if Pry.config.history_load
load_traps if Pry.config.should_trap_interrupts