diff options
| -rw-r--r-- | lib/pry/cli.rb | 12 | ||||
| -rw-r--r-- | lib/pry/config.rb | 4 | ||||
| -rw-r--r-- | lib/pry/pry_class.rb | 1 | ||||
| -rw-r--r-- | spec/config_spec.rb | 1 |
4 files changed, 1 insertions, 17 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 diff --git a/spec/config_spec.rb b/spec/config_spec.rb index db91f7cb..2722fd19 100644 --- a/spec/config_spec.rb +++ b/spec/config_spec.rb @@ -28,7 +28,6 @@ RSpec.describe Pry::Config do specify { expect(subject.output_prefix).to be_a(String) } specify { expect(subject.requires).to be_an(Array) } specify { expect(subject.should_load_requires).to be(true).or be(false) } - specify { expect(subject.should_load_plugins).to be(true).or be(false) } specify { expect(subject.windows_console_warning).to be(true).or be(false) } specify { expect(subject.control_d_handler).to respond_to(:call) } specify { expect(subject.memory_size).to be_a(Numeric) } |