pry-debugger-jruby 1.0.0-java → 2.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81ff16ce021c8e8175681bf7680c0aaf3265d74e
-  data.tar.gz: 7a8faa1b0040ae47666c530080924cff69541c5e
+SHA256:
+  metadata.gz: f66248f5198a5529ad65de81da42c927c0e39ac15efc25dc6b3fd78b4d4cc467
+  data.tar.gz: d29533cdc8958e271b006007127f05ecb54ff99b0e8dfbc3ccb775b22f31141e
 SHA512:
-  metadata.gz: 4226ab1696b4932d899e25b5886ced67d816c42b4531fff5ea488a23652a02ac083522b212dc8684f055113452d405872f18abf4c3338aa04eb6c341cd821e3f
-  data.tar.gz: 7e13eee633369b8f0ed1745e5a934ee45b5406c6c9f3c9acd055180b4ef46877f4038f1bc8adfbdd17cf68a76a4d5c0a84c255426074cb5f08050cf2efecab45
+  metadata.gz: 2a8cc5d89f81a8c6dc02449d9f95d3035932bf364327a1d418691c6ffa28d3209e7ed9f3bf33269bcdd871bfdf466aa3c0a67f86fbaf7bfd7918fe862de7d329
+  data.tar.gz: 1f4725014906da70199b946c3d53eb8836782be94b16318344dd7d42e6e709650ae2df39981b8d0d9bab063f8824516bf654676c7b8684475ed815d1c061e4be

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gems.locked
 InstalledFiles
 _yardoc
 coverage

data/.ruby-version

@@ -1 +1 @@
-jruby-9.1.5.0
+jruby-9.2.13.0

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 2.0.0 (2020-11-11)
+
+* Allow syntax highlighting when printing breakpoints
+* Improve documentation for next and breakpoints commands
+* Add support for Pry 0.13, drop support for older Pry versions
+
+## 1.2.2 (2020-08-18)
+
+* Bump dependencies: `pry`, `ruby-debug-base` ([@stergiom](https://gitlab.com/stergiom))
+
+## 1.2.1 (2018-06-06)
+
+* Moved gem to gitlab
+
+## 1.2.0 (2017-12-03)
+
+* Fix breaking using `Class#method` syntax
+* Allow pry-debugger-jruby to be used with pry 0.11
+
+## 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/README.md

@@ -1,10 +1,14 @@
 # pry-debugger-jruby
 
+[![Gem Version](https://badge.fury.io/rb/pry-debugger-jruby.svg)](https://badge.fury.io/rb/pry-debugger-jruby)
+
 _JRuby 9k-compatible pry debugging!_
 
+Requires JRuby >= 9.1.3.0.
+
 Using MRI? I strongly recommend [`pry-byebug`](https://github.com/deivid-rodriguez/pry-byebug) instead!
 
-Adds `step`, `next`, `finish`, and `continue` commands and `breakpoints` to [Pry](http://pry.github.com).
+Adds `step`, `next`, `finish`, and `continue` commands and breakpoints (`break`/`breakpoints`) to [Pry](http://pry.github.com).
 
 To use, run JRuby with the `--debug` flag, and then invoke `pry` normally:
 
@@ -21,7 +25,7 @@ You can also add the `--debug` flag to your `JRUBY_OPTS` environment variable, s
 
 * `step`: Step execution into the next line or method. Takes an optional numeric argument to step multiple times.
 
-* `next`: Step over to the next line within the same frame. Also takes an optional numeric argument to step multiple lines.
+* `next`: Step over to the next line within the same frame. Takes an optional numeric argument to step multiple times. Differs from `step` in that it always stays within the same frame (e.g. does not go into other method calls).
 
 * `finish`: Execute until current stack frame returns.
 
@@ -31,11 +35,11 @@ You can also add the `--debug` flag to your `JRUBY_OPTS` environment variable, s
 
 You can set and adjust breakpoints directly from a Pry session using the following commands:
 
-* `break`: Set a new breakpoint from a line number in the current file, a file and line number, or a method. Pass an optional expression to create a conditional breakpoint. Edit existing breakpoints via various flags.
+* `break`: Set a new breakpoint from a line number in the current file, a file and line number, or a method. Pass an optional expression to create a conditional breakpoint. Edit existing breakpoints via various flags. Type `break --help` from a Pry session to see all available options.
 
     Examples:
 
-    ```ruby
+```ruby
 break SomeClass#run            Break at the start of `SomeClass#run`.
 break Foo#bar if baz?          Break at `Foo#bar` only if `baz?`.
 break app/models/user.rb:15    Break at line 15 in user.rb.
@@ -49,9 +53,7 @@ break --disable-all            Disable all breakpoints.
 
 break                          List all breakpoints. (Same as `breakpoints`)
 break --show 2                 Show details about breakpoint #2.
-    ```
-
-    Type `break --help` from a Pry session to see all available options.
+```
 
 * `breakpoints`: List all defined breakpoints. Pass `-v` or `--verbose` to see the source code around each breakpoint.
 
@@ -70,6 +72,8 @@ gem 'pry-debugger-jruby'
 Then add `binding.remote_pry` where you want to pause:
 
 ```ruby
+require 'pry-remote'
+
 class UsersController < ApplicationController
   def index
     binding.remote_pry
@@ -99,13 +103,13 @@ end
 
 ## Contributors
 
-`pry-debugger-jruby` is maintained by [@ivoanjo](https://github.com/ivoanjo/) and is based off the awesome previous work from the [`pry-debugger`](https://github.com/nixme/pry-debugger) creators:
+`pry-debugger-jruby` is maintained by [Ivo Anjo](https://ivoanjo.me) and is based off the awesome previous work from the [`pry-debugger`](https://github.com/nixme/pry-debugger) creators:
 
-* Gopal Patel (@nixme)
-* John Mair (@banister)
-* Nicolas Viennot (@nviennot)
-* Benjamin R. Haskell (@benizi)
-* Joshua Hou (@jshou)
+* [Gopal Patel](https://github.com/nixme)
+* [John Mair](https://github.com/banister)
+* [Nicolas Viennot](https://github.com/nviennot)
+* [Benjamin R. Haskell](https://github.com/benizi)
+* [Joshua Hou](https://github.com/jshou)
 * ...and others who helped with [`pry-nav`](https://github.com/nixme/pry-nav)
 
 Patches and bug reports are welcome. Just send in a pull request or issue :)

data/bin/pry

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+load(bundle_binstub) if File.file?(bundle_binstub)
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")

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

@@ -31,6 +31,8 @@ module PryDebuggerJRuby
 
         Step over within the same frame. By default, moves forward a single
         line.
+        Differs from `step` in that it always stays within the same frame
+        (e.g. does not go into other method calls).
 
         Examples:
 
@@ -118,7 +120,7 @@ module PryDebuggerJRuby
       end
 
       def process
-        Pry.processor.pry = _pry_
+        Pry.processor.pry = pry_instance
 
         {
           delete:        :delete,
@@ -141,6 +143,7 @@ module PryDebuggerJRuby
         elsif args.empty?
           run 'breakpoints'
         else
+          return unless PryDebuggerJRuby.check_trace_enabled
           new_breakpoint
         end
       end
@@ -161,7 +164,9 @@ module PryDebuggerJRuby
             [$1, $2]
           else               # Method or class name
             self.args = [place]
-            method_object.source_location
+            location = method_object.source_location
+            location[1] += 1
+            location
           end
 
         print_full_breakpoint Breakpoints.add(file, line.to_i, condition)
@@ -173,7 +178,7 @@ module PryDebuggerJRuby
       description 'List defined breakpoints.'
 
       banner <<-BANNER
-        Usage:   breakpoints [OPTIONS]
+        Usage:   breakpoints [--verbose]
         Aliases: breaks
 
         List registered breakpoints and their current status.
@@ -192,8 +197,8 @@ module PryDebuggerJRuby
             header = "#{' ' * (max_width - 1)}#  Enabled  At "
 
             output.puts
-            output.puts text.bold(header)
-            output.puts text.bold('-' * header.size)
+            output.puts Pry::Helpers::Text.bold(header)
+            output.puts Pry::Helpers::Text.bold('-' * header.size)
             Breakpoints.each do |breakpoint|
               output.printf "%#{max_width}d  ", breakpoint.id
               output.print  breakpoint.enabled? ? 'Yes      ' : 'No       '
@@ -204,7 +209,7 @@ module PryDebuggerJRuby
             output.puts
           end
         else
-          output.puts text.bold('No breakpoints defined.')
+          output.puts Pry::Helpers::Text.bold('No breakpoints defined.')
         end
       end
     end
@@ -212,11 +217,13 @@ module PryDebuggerJRuby
 
     helpers do
       def breakout_navigation(action, times = nil)
-        _pry_.binding_stack.clear     # Clear the binding stack
+        return unless PryDebuggerJRuby.check_trace_enabled
+
+        pry_instance.binding_stack.clear     # Clear the binding stack
         throw :breakout_nav, {        # Break out of the REPL loop and
           action: action,             #   signal the tracer
           times:  times,
-          pry:    _pry_,
+          pry:    pry_instance,
         }
       end
 
@@ -231,17 +238,17 @@ module PryDebuggerJRuby
       # at that point.
       def print_full_breakpoint(breakpoint)
         line = breakpoint.pos
-        output.print text.bold("Breakpoint #{breakpoint.id}: ")
+        output.print Pry::Helpers::Text.bold("Breakpoint #{breakpoint.id}: ")
         output.print "#{breakpoint.source} @ line #{line} "
         output.print breakpoint.enabled? ? '(Enabled)' : '(Disabled)'
         output.puts  ' :'
         if (expr = breakpoint.expr)
-          output.puts "#{text.bold('Condition:')} #{expr}"
+          output.puts "#{Pry::Helpers::Text.bold('Condition:')} #{expr}"
         end
         output.puts
         output.puts(
           Pry::Code.from_file(breakpoint.source)
-            .around(line, 3).with_line_numbers.with_marker(line).to_s
+            .around(line, 3).with_line_numbers.with_marker(line).highlighted
         )
         output.puts
       end

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

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

data/pry-debugger-jruby.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |spec|
   spec.version       = PryDebuggerJRuby::VERSION
   spec.platform      = 'java'
   spec.author        = 'Ivo Anjo'
-  spec.email         = 'ivo.anjo@ist.utl.pt'
+  spec.email         = 'ivo@ivoanjo.me'
   spec.license       = 'MIT'
-  spec.homepage      = 'https://github.com/ivoanjo/pry-debugger-jruby'
+  spec.homepage      = 'https://gitlab.com/ivoanjo/pry-debugger-jruby'
   spec.summary       = 'JRuby 9k-compatible pry debugging!'
-  spec.description   = "Add a JRuby-compatible debugger to 'pry'. Adds 'step', 'next', and 'continue' commands to control execution."
+  spec.description   = "Add a JRuby-compatible debugger to 'pry'. Adds 'step', 'next', 'continue', `break` and `breakpoints` commands to control execution."
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_runtime_dependency 'pry', '>= 0.10', '< 0.11'
-  spec.add_runtime_dependency 'ruby-debug-base', '~> 0.10.4'
+  spec.add_dependency 'pry', '>= 0.13', '< 0.14'
+  spec.add_dependency 'ruby-debug-base', '>= 0.10.4', '< 0.12'
 
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'pry-remote', '~> 0.1.6'
-  spec.add_development_dependency 'rake', '~> 11.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

metadata

@@ -1,49 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: pry-debugger-jruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: java
 authors:
 - Ivo Anjo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
   name: pry
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   name: ruby-debug-base
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  name: bundler
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -51,8 +71,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.6
   name: pry-remote
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -63,17 +83,18 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '13.0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
-description: Add a JRuby-compatible debugger to 'pry'. Adds 'step', 'next', and 'continue' commands to control execution.
-email: ivo.anjo@ist.utl.pt
+        version: '13.0'
+description: Add a JRuby-compatible debugger to 'pry'. Adds 'step', 'next', 'continue',
+  `break` and `breakpoints` commands to control execution.
+email: ivo@ivoanjo.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,10 +102,11 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/pry
+- gems.rb
 - lib/pry-debugger-jruby.rb
 - lib/pry-debugger-jruby/base.rb
 - lib/pry-debugger-jruby/breakpoints.rb
@@ -95,7 +117,7 @@ files:
 - lib/pry-debugger-jruby/pry_remote_ext.rb
 - lib/pry-debugger-jruby/version.rb
 - pry-debugger-jruby.gemspec
-homepage: https://github.com/ivoanjo/pry-debugger-jruby
+homepage: https://gitlab.com/ivoanjo/pry-debugger-jruby
 licenses:
 - MIT
 metadata: {}
@@ -114,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.6
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: JRuby 9k-compatible pry debugging!