Avoid circular require when being loaded by 'pry'

When pry starts, it auto-requires any plugins, which means that calling require 'pry' inside pry-nav leads to a circular require warning.
nixme · Sep 19, 2016 · a10cd48 · a10cd48
1 parent d33033d
commit a10cd48
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## UNRELEASED
+
+* Fix circular require warning.
+
 ## 0.2.4 (2014-06-25)
 
 * Support Pry 0.10

diff --git a/lib/pry-nav/commands.rb b/lib/pry-nav/commands.rb
@@ -1,4 +1,4 @@
-require 'pry'
+require 'pry' unless defined? Pry
 
 module PryNav
   Commands = Pry::CommandSet.new do

diff --git a/lib/pry-nav/pry_ext.rb b/lib/pry-nav/pry_ext.rb
@@ -1,4 +1,4 @@
-require 'pry'
+require 'pry' unless defined? Pry
 require 'pry-nav/tracer'
 
 class << Pry

diff --git a/lib/pry-nav/pry_remote_ext.rb b/lib/pry-nav/pry_remote_ext.rb
@@ -1,3 +1,4 @@
+require 'pry' unless defined? Pry
 require 'pry-remote'
 
 module PryRemote

diff --git a/lib/pry-nav/tracer.rb b/lib/pry-nav/tracer.rb
@@ -1,4 +1,4 @@
-require 'pry'
+require 'pry' unless defined? Pry
 
 module PryNav
   class Tracer