Create a new command registry for jard

Pry::Commands aka Pry.config.commands is the registry that Pry uses to
store declared commands. Jard implements a lot of custom commands. If it
uses Pry::Commands, any binding.pry triggered later includes Jard's
specific commands. That leads to a forever error loop.

Author: 0x2c7

lib/ruby_jard.rb

@@ -13,6 +13,7 @@
 require 'ruby_jard/keys'
 require 'ruby_jard/key_binding'
 require 'ruby_jard/key_bindings'
+require 'ruby_jard/repl_processor'
 require 'ruby_jard/repl_manager'
 require 'ruby_jard/screen_manager'
 require 'ruby_jard/reflection'

lib/ruby_jard/commands/continue_command.rb

@@ -16,5 +16,5 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::ContinueCommand)
-Pry::Commands.alias_command 'c', 'continue'
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::ContinueCommand)
+RubyJard::PryProxy::Commands.alias_command 'c', 'continue'

lib/ruby_jard/commands/down_command.rb

@@ -19,4 +19,4 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::DownCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::DownCommand)

lib/ruby_jard/commands/exit_command.rb

@@ -16,4 +16,4 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::ExitCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::ExitCommand)

lib/ruby_jard/commands/frame_command.rb

@@ -26,4 +26,4 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::FrameCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::FrameCommand)

lib/ruby_jard/commands/help_command.rb

@@ -93,4 +93,4 @@ def help_text_with_sub_commands(commands)
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::HelpCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::HelpCommand)

lib/ruby_jard/commands/jard_command.rb

@@ -49,4 +49,4 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::JardCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::JardCommand)

lib/ruby_jard/commands/list_command.rb

@@ -16,6 +16,6 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::ListCommand)
-Pry::Commands.alias_command 'l', 'list'
-Pry::Commands.alias_command 'whereami', 'list'
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::ListCommand)
+RubyJard::PryProxy::Commands.alias_command 'l', 'list'
+RubyJard::PryProxy::Commands.alias_command 'whereami', 'list'

lib/ruby_jard/commands/next_command.rb

@@ -20,5 +20,5 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::NextCommand)
-Pry::Commands.alias_command 'n', 'next'
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::NextCommand)
+RubyJard::PryProxy::Commands.alias_command 'n', 'next'

lib/ruby_jard/commands/skip_command.rb

@@ -27,4 +27,4 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::SkipCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::SkipCommand)

lib/ruby_jard/commands/step_command.rb

@@ -20,5 +20,5 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::StepCommand)
-Pry::Commands.alias_command 's', 'step'
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::StepCommand)
+RubyJard::PryProxy::Commands.alias_command 's', 'step'

lib/ruby_jard/commands/step_out_command.rb

@@ -20,5 +20,5 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::StepOutCommand)
-Pry::Commands.alias_command 'so', 'step-out'
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::StepOutCommand)
+RubyJard::PryProxy::Commands.alias_command 'so', 'step-out'

lib/ruby_jard/commands/up_command.rb

@@ -20,4 +20,4 @@ def process
   end
 end
 
-Pry::Commands.add_command(RubyJard::Commands::UpCommand)
+RubyJard::PryProxy::Commands.add_command(RubyJard::Commands::UpCommand)

lib/ruby_jard/pry_proxy.rb

@@ -98,13 +98,15 @@ def pry_jard_prompt
     end
 
     def pry_command_set
-      # TODO: Create a dedicated registry to store Jard commands, and merge with Pry default commands
-      # This approach allows Jard and Binding.pry co-exist even after Jard already started
       set = Pry::CommandSet.new
       set.import_from(
         Pry::Commands,
         *(Pry::Commands.list_commands - PRY_EXCLUDED_COMMANDS)
       )
+      set.import_from(
+        PryProxy::Commands,
+        *PryProxy::Commands.list_commands
+      )
       set
     end
 
@@ -127,3 +129,19 @@ def pry_hooks
 end
 
 RubyJard::PryProxy.init
+
+require 'ruby_jard/commands/base_command'
+require 'ruby_jard/commands/validation_helpers'
+require 'ruby_jard/commands/color_helpers'
+require 'ruby_jard/commands/continue_command'
+require 'ruby_jard/commands/exit_command'
+require 'ruby_jard/commands/up_command'
+require 'ruby_jard/commands/down_command'
+require 'ruby_jard/commands/next_command'
+require 'ruby_jard/commands/step_command'
+require 'ruby_jard/commands/step_out_command'
+require 'ruby_jard/commands/frame_command'
+require 'ruby_jard/commands/list_command'
+require 'ruby_jard/commands/skip_command'
+require 'ruby_jard/commands/jard_command'
+require 'ruby_jard/commands/help_command'

lib/ruby_jard/repl_processor.rb

@@ -1,21 +1,5 @@
 # frozen_string_literal: true
 
-require 'ruby_jard/commands/base_command'
-require 'ruby_jard/commands/validation_helpers'
-require 'ruby_jard/commands/color_helpers'
-require 'ruby_jard/commands/continue_command'
-require 'ruby_jard/commands/exit_command'
-require 'ruby_jard/commands/up_command'
-require 'ruby_jard/commands/down_command'
-require 'ruby_jard/commands/next_command'
-require 'ruby_jard/commands/step_command'
-require 'ruby_jard/commands/step_out_command'
-require 'ruby_jard/commands/frame_command'
-require 'ruby_jard/commands/list_command'
-require 'ruby_jard/commands/skip_command'
-require 'ruby_jard/commands/jard_command'
-require 'ruby_jard/commands/help_command'
-
 module RubyJard
   ##
   # Byebug allows customizing processor with a series of hooks (https://github.com/deivid-rodriguez/byebug/blob/e1fb8209d56922f7bafd128af84e61568b6cd6a7/lib/byebug/processors/command_processor.rb)

lib/ruby_jard/session.rb

@@ -57,7 +57,6 @@ def start
       Byebug::Setting[:autoirb] = false
       Byebug::Setting[:autopry] = false
 
-      require 'ruby_jard/repl_processor'
       Byebug::Context.processor = RubyJard::ReplProcessor
       # Exclude all files in Ruby Jard source code from the stacktrace.
       Byebug::Context.ignored_files = Byebug::Context.all_files + RubyJard.all_files

spec/examples/binding_pry_mixed_example.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'ruby_jard'
+
+class SubCalculator
+  def calculate(d)
+    d1 = d * 2
+    jard
+    d2 = d * 2
+    d1 + d2
+  end
+end
+
+class Calculator
+  def calculate(a, b, c)
+    jard
+    d = a + b
+    binding.pry
+    e = SubCalculator.new.calculate(d)
+    binding.pry
+    e + c
+  end
+end
+
+Calculator.new.calculate(1, 2, 3)

spec/integration/compatibilities/compatibilities_spec.rb

@@ -56,4 +56,28 @@
       test.stop
     end
   end
+
+  context 'when attach into program with mixed binding.pry and jard command' do
+    it 'binding.pry command still works along with Jard' do
+      test = JardIntegrationTest.new(
+        self, work_dir,
+        'compatibility_binding_pry_mixed.expected',
+        "bundle exec ruby #{RSPEC_ROOT}/examples/binding_pry_mixed_example.rb",
+        width: 130, height: 30
+      )
+      test.start
+      test.assert_screen
+
+      test.send_keys('continue', :Enter)
+      test.assert_screen
+
+      test.send_keys('exit', :Enter)
+      test.assert_screen
+
+      test.send_keys('continue', :Enter)
+      test.assert_screen
+    ensure
+      test.stop
+    end
+  end
 end