diff --git a/Gemfile b/Gemfile index 3ca9e071..8b0f2579 100644 --- a/Gemfile +++ b/Gemfile @@ -8,9 +8,8 @@ gem 'appraisal', '~> 2.5' gem 'bundler-audit' gem 'childprocess' gem 'climate_control' +gem 'debug' gem 'prettier_print' -gem 'pry-byebug', platform: :mri -gem 'pry-nav', platform: :jruby gem 'rake' gem 'rubocop' gem 'syntax_tree' diff --git a/Gemfile.lock b/Gemfile.lock index e7807f2e..16b097bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,19 +18,26 @@ GEM bundler-audit (0.9.2) bundler (>= 1.2.0, < 3) thor (~> 1.0) - byebug (11.1.3) childprocess (4.1.0) climate_control (1.1.1) - coderay (1.1.3) + date (3.4.1) + debug (1.11.0) + irb (~> 1.10) + reline (>= 0.3.8) diff-lcs (1.5.1) + erb (5.1.1) haml (6.3.0) temple (>= 0.8.2) thor tilt + io-console (0.8.1) + irb (1.15.2) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) json (2.7.2) language_server-protocol (3.17.0.3) logger (1.6.1) - method_source (1.0.0) optimist (3.1.0) parallel (1.26.3) parser (3.3.5.0) @@ -38,19 +45,25 @@ GEM racc patience_diff (1.2.0) optimist (~> 3.0) + pp (0.6.3) + prettyprint prettier_print (1.2.1) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) + prettyprint (0.2.0) + psych (5.2.6) + date + stringio racc (1.8.1) rainbow (3.1.1) rake (13.0.6) rbs (3.6.1) logger + rdoc (6.15.0) + erb + psych (>= 4.0.0) + tsort regexp_parser (2.9.2) + reline (0.6.2) + io-console (~> 0.5) rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -64,6 +77,7 @@ GEM rubocop-ast (1.32.3) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) + stringio (3.1.7) syntax_tree (6.2.0) prettier_print (>= 1.2.0) syntax_tree-haml (4.0.3) @@ -77,6 +91,7 @@ GEM temple (0.10.3) thor (1.4.0) tilt (2.4.0) + tsort (0.2.0) unicode-display_width (2.6.0) PLATFORMS @@ -90,9 +105,8 @@ DEPENDENCIES bundler-audit childprocess climate_control + debug prettier_print - pry-byebug - pry-nav rake rubocop super_diff! diff --git a/gemfiles/no_rails_rspec_gte_3_10.gemfile b/gemfiles/no_rails_rspec_gte_3_10.gemfile index 52a923f5..cfdf9f7e 100644 --- a/gemfiles/no_rails_rspec_gte_3_10.gemfile +++ b/gemfiles/no_rails_rspec_gte_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/no_rails_rspec_gte_3_13.gemfile b/gemfiles/no_rails_rspec_gte_3_13.gemfile index 6bee070f..1501f56e 100644 --- a/gemfiles/no_rails_rspec_gte_3_13.gemfile +++ b/gemfiles/no_rails_rspec_gte_3_13.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/no_rails_rspec_lt_3_10.gemfile b/gemfiles/no_rails_rspec_lt_3_10.gemfile index 4e51ff93..e7abc768 100644 --- a/gemfiles/no_rails_rspec_lt_3_10.gemfile +++ b/gemfiles/no_rails_rspec_lt_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_6_0_rspec_gte_3_10.gemfile b/gemfiles/rails_6_0_rspec_gte_3_10.gemfile deleted file mode 100644 index cade20f4..00000000 --- a/gemfiles/rails_6_0_rspec_gte_3_10.gemfile +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", git: "https://github.com/thoughtbot/appraisal" -gem "bundler-audit" -gem "childprocess" -gem "climate_control" -gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby -gem "rake" -gem "rubocop" -gem "syntax_tree" -gem "syntax_tree-haml" -gem "syntax_tree-rbs" -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "net-ftp" -gem "combustion" -gem "rails", "~> 6.0.0" -gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw] -gem "rspec", "3.12.0" -gem "rspec-core", "3.12.0" -gem "rspec-expectations", "3.12.3" -gem "rspec-mocks", "3.12.0" -gem "rspec-support", "3.12.0" -gem "rspec-rails" - -gemspec path: "../" diff --git a/gemfiles/rails_6_0_rspec_gte_3_13.gemfile b/gemfiles/rails_6_0_rspec_gte_3_13.gemfile deleted file mode 100644 index c427d0f5..00000000 --- a/gemfiles/rails_6_0_rspec_gte_3_13.gemfile +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", git: "https://github.com/thoughtbot/appraisal" -gem "bundler-audit" -gem "childprocess" -gem "climate_control" -gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby -gem "rake" -gem "rubocop" -gem "syntax_tree" -gem "syntax_tree-haml" -gem "syntax_tree-rbs" -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "net-ftp" -gem "combustion" -gem "rails", "~> 6.0.0" -gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw] -gem "rspec", "3.13.0" -gem "rspec-core", "3.13.0" -gem "rspec-expectations", "3.13.0" -gem "rspec-mocks", "3.13.0" -gem "rspec-support", "3.13.0" -gem "rspec-rails" - -gemspec path: "../" diff --git a/gemfiles/rails_6_0_rspec_lt_3_10.gemfile b/gemfiles/rails_6_0_rspec_lt_3_10.gemfile deleted file mode 100644 index 8bd99db2..00000000 --- a/gemfiles/rails_6_0_rspec_lt_3_10.gemfile +++ /dev/null @@ -1,26 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", git: "https://github.com/thoughtbot/appraisal" -gem "bundler-audit" -gem "childprocess" -gem "climate_control" -gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby -gem "rake" -gem "rubocop" -gem "syntax_tree" -gem "syntax_tree-haml" -gem "syntax_tree-rbs" -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "net-ftp" -gem "combustion" -gem "rails", "~> 6.0.0" -gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw] -gem "rspec", "~> 3.9.0" -gem "rspec-rails" - -gemspec path: "../" diff --git a/gemfiles/rails_6_1_rspec_gte_3_10.gemfile b/gemfiles/rails_6_1_rspec_gte_3_10.gemfile index 8e9fc6c8..211e4682 100644 --- a/gemfiles/rails_6_1_rspec_gte_3_10.gemfile +++ b/gemfiles/rails_6_1_rspec_gte_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_6_1_rspec_gte_3_13.gemfile b/gemfiles/rails_6_1_rspec_gte_3_13.gemfile index 395259ef..386deaff 100644 --- a/gemfiles/rails_6_1_rspec_gte_3_13.gemfile +++ b/gemfiles/rails_6_1_rspec_gte_3_13.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_6_1_rspec_lt_3_10.gemfile b/gemfiles/rails_6_1_rspec_lt_3_10.gemfile index 4cf39553..f98e7557 100644 --- a/gemfiles/rails_6_1_rspec_lt_3_10.gemfile +++ b/gemfiles/rails_6_1_rspec_lt_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_0_rspec_gte_3_10.gemfile b/gemfiles/rails_7_0_rspec_gte_3_10.gemfile index 8b82ef0e..d0a51f28 100644 --- a/gemfiles/rails_7_0_rspec_gte_3_10.gemfile +++ b/gemfiles/rails_7_0_rspec_gte_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_0_rspec_gte_3_13.gemfile b/gemfiles/rails_7_0_rspec_gte_3_13.gemfile index 1e94e0a6..850fc4a3 100644 --- a/gemfiles/rails_7_0_rspec_gte_3_13.gemfile +++ b/gemfiles/rails_7_0_rspec_gte_3_13.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_0_rspec_lt_3_10.gemfile b/gemfiles/rails_7_0_rspec_lt_3_10.gemfile index dd0e37d2..4f3e886d 100644 --- a/gemfiles/rails_7_0_rspec_lt_3_10.gemfile +++ b/gemfiles/rails_7_0_rspec_lt_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_1_rspec_gte_3_10.gemfile b/gemfiles/rails_7_1_rspec_gte_3_10.gemfile index 7292240f..9287dd7d 100644 --- a/gemfiles/rails_7_1_rspec_gte_3_10.gemfile +++ b/gemfiles/rails_7_1_rspec_gte_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_1_rspec_gte_3_13.gemfile b/gemfiles/rails_7_1_rspec_gte_3_13.gemfile index 0eb008ad..8415b417 100644 --- a/gemfiles/rails_7_1_rspec_gte_3_13.gemfile +++ b/gemfiles/rails_7_1_rspec_gte_3_13.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_1_rspec_lt_3_10.gemfile b/gemfiles/rails_7_1_rspec_lt_3_10.gemfile index c701c1f8..9f6f9a77 100644 --- a/gemfiles/rails_7_1_rspec_lt_3_10.gemfile +++ b/gemfiles/rails_7_1_rspec_lt_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_2_rspec_gte_3_10.gemfile b/gemfiles/rails_7_2_rspec_gte_3_10.gemfile index bc332051..9d15393a 100644 --- a/gemfiles/rails_7_2_rspec_gte_3_10.gemfile +++ b/gemfiles/rails_7_2_rspec_gte_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_2_rspec_gte_3_13.gemfile b/gemfiles/rails_7_2_rspec_gte_3_13.gemfile index a1f052bb..d3aa8e52 100644 --- a/gemfiles/rails_7_2_rspec_gte_3_13.gemfile +++ b/gemfiles/rails_7_2_rspec_gte_3_13.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_7_2_rspec_lt_3_10.gemfile b/gemfiles/rails_7_2_rspec_lt_3_10.gemfile index d1c5418f..5221548d 100644 --- a/gemfiles/rails_7_2_rspec_lt_3_10.gemfile +++ b/gemfiles/rails_7_2_rspec_lt_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_8_0_rspec_gte_3_10.gemfile b/gemfiles/rails_8_0_rspec_gte_3_10.gemfile index 310d11ff..1dda5456 100644 --- a/gemfiles/rails_8_0_rspec_gte_3_10.gemfile +++ b/gemfiles/rails_8_0_rspec_gte_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_8_0_rspec_gte_3_13.gemfile b/gemfiles/rails_8_0_rspec_gte_3_13.gemfile index 9289872d..481a46b1 100644 --- a/gemfiles/rails_8_0_rspec_gte_3_13.gemfile +++ b/gemfiles/rails_8_0_rspec_gte_3_13.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/gemfiles/rails_8_0_rspec_lt_3_10.gemfile b/gemfiles/rails_8_0_rspec_lt_3_10.gemfile index 7db57624..578a2f42 100644 --- a/gemfiles/rails_8_0_rspec_lt_3_10.gemfile +++ b/gemfiles/rails_8_0_rspec_lt_3_10.gemfile @@ -6,9 +6,8 @@ gem "appraisal", "~> 2.5" gem "bundler-audit" gem "childprocess" gem "climate_control" +gem "debug" gem "prettier_print" -gem "pry-byebug", platform: :mri -gem "pry-nav", platform: :jruby gem "rake" gem "rubocop" gem "syntax_tree" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 62398397..4492ad3d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,18 +1,7 @@ # frozen_string_literal: true -if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2') - begin - require 'pry-byebug' - rescue LoadError - end - - begin - require 'pry-nav' - rescue LoadError - end -end - require 'climate_control' +require 'debug' #--- diff --git a/spec/support/integration/test_programs/base.rb b/spec/support/integration/test_programs/base.rb index c806f460..4c64c88f 100644 --- a/spec/support/integration/test_programs/base.rb +++ b/spec/support/integration/test_programs/base.rb @@ -67,9 +67,7 @@ def result_of_command_with_fork def result_of_command_with_spawn CommandRunner.run( Shellwords.join(['rspec', '--options', '/tmp/dummy-rspec-config', tempfile.to_s]), - env: { - 'DISABLE_PRY' => true - } + env: {} ) end diff --git a/support/test_plan.rb b/support/test_plan.rb index ce2fc4ed..a090caa8 100644 --- a/support/test_plan.rb +++ b/support/test_plan.rb @@ -17,7 +17,6 @@ def initialize( @color_enabled = color_enabled @super_diff_configuration = super_diff_configuration - @pry_enabled = true @libraries = [] end @@ -32,17 +31,10 @@ def boot .gemfile_path .to_s require 'bundler/setup' + require 'debug' $LOAD_PATH.unshift(PROJECT_DIRECTORY.join('lib')) - if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2') - begin - require 'pry-byebug' - rescue LoadError - require 'pry-nav' - end - end - if SuperDiff::CurrentBundle.instance.current_appraisal.name.start_with?( 'no_rails_' ) @@ -135,10 +127,6 @@ def color_enabled? @color_enabled end - def pry_enabled? - @pry_enabled - end - def reconnect_activerecord return unless defined?(ActiveRecord::Base) @@ -158,8 +146,6 @@ def run_test_with_libraries(*libraries) super_diff_configuration.merge(color_enabled: color_enabled?) ) - ENV['DISABLE_PRY'] = 'true' unless pry_enabled? - yield if block_given? libraries.each { |library| require library }