pry-debugger-jruby 1.0.0-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ff16ce021c8e8175681bf7680c0aaf3265d74e
-  data.tar.gz: 7a8faa1b0040ae47666c530080924cff69541c5e
+  metadata.gz: c487da46079e6318b389b2f3d27685e720d7cfe9
+  data.tar.gz: 2bb4cbd26d84c4ac9a26f1b065ce4af41be66f20
 SHA512:
-  metadata.gz: 4226ab1696b4932d899e25b5886ced67d816c42b4531fff5ea488a23652a02ac083522b212dc8684f055113452d405872f18abf4c3338aa04eb6c341cd821e3f
-  data.tar.gz: 7e13eee633369b8f0ed1745e5a934ee45b5406c6c9f3c9acd055180b4ef46877f4038f1bc8adfbdd17cf68a76a4d5c0a84c255426074cb5f08050cf2efecab45
+  metadata.gz: f6e33901b57631b130cb2efdcacb18866967434f58f13c597795b21f5ae94de5942d7de7ed9cfc9774600f43b5c95927b1c77dd72aeb43aea8ec2df1c8da0912
+  data.tar.gz: 1f49db5d4716dbeb307a98ddb4b048d5ba5fec4d9401c9353b5ed6bf4d68fc43cf82cda6d8c1b8815577d5ebf2635d5e3c8e9339cce1ae0d032da4c5c40913d3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0 (2016-12-02)
+
+* Avoid stepping into pry code
+* Add help text when running without `--debug`
+
 ## 1.0.0 (2016-12-01)
 
 * Revamp documentation for JRuby usage

data/lib/pry-debugger-jruby/base.rb

@@ -1,8 +1,29 @@
-module PryDebuggerJRuby
-  TRACE_IGNORE_FILES = Dir[File.join(File.dirname(__FILE__), '..', '**', '*.rb')].map { |f| File.expand_path(f) }
+require 'rubygems'
+require 'java'
 
+module PryDebuggerJRuby
   extend self
 
+  private
+
+  def list_pry_files
+    spec = Gem::Specification.find_by_name('pry')
+
+    if spec
+      Dir[File.join(spec.gem_dir, '**', '*rb')]
+    else
+      []
+    end
+  end
+
+  def list_debugger_files
+    Dir[File.join(File.dirname(__FILE__), '..', '**', '*.rb')].map { |f| File.expand_path(f) }
+  end
+
+  public
+
+  TRACE_IGNORE_FILES = [*list_debugger_files, *list_pry_files].freeze
+
   # Checks that a binding is in a local file context. Extracted from
   # https://github.com/pry/pry/blob/master/lib/pry/default_commands/context.rb
   def check_file_context(target)
@@ -10,6 +31,23 @@ module PryDebuggerJRuby
     file == Pry.eval_path || (file !~ /(\(.*\))|<.*>/ && file != '' && file != '-e')
   end
 
+  def check_trace_enabled
+    return true if org.jruby.RubyInstanceConfig.FULL_TRACE_ENABLED
+    warn <<-EOS
+You are currently running JRuby without the --debug flag enabled, and without it this command will not work correctly.
+
+To fix it, either:
+
+* add the --debug flag to your ruby/jruby command
+* or add the --debug flag to the JRUBY_OPTS environment variable
+* or enable the jruby.debug.fullTrace option
+
+Do note that having this option on all the time has a performance penalty, so we recommend you only enable it while debugging.
+Safe prying, fellow rubyst!
+EOS
+    false
+  end
+
   # Reference to currently running pry-remote server. Used by the processor.
   attr_accessor :current_remote_server
 end

data/lib/pry-debugger-jruby/commands.rb

@@ -141,6 +141,7 @@ module PryDebuggerJRuby
         elsif args.empty?
           run 'breakpoints'
         else
+          return unless PryDebuggerJRuby.check_trace_enabled
           new_breakpoint
         end
       end
@@ -212,6 +213,8 @@ module PryDebuggerJRuby
 
     helpers do
       def breakout_navigation(action, times = nil)
+        return unless PryDebuggerJRuby.check_trace_enabled
+
         _pry_.binding_stack.clear     # Clear the binding stack
         throw :breakout_nav, {        # Break out of the REPL loop and
           action: action,             #   signal the tracer

data/lib/pry-debugger-jruby/version.rb

@@ -1,3 +1,3 @@
 module PryDebuggerJRuby
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-debugger-jruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: java
 authors:
 - Ivo Anjo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement