pryx 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce341aed30736e74c9555f58904c279e3df2c8e9b34927b5a3ea0a203d56f48a
-  data.tar.gz: b910b99fd34921918bac6baccf2153518f0ca9c46d00245e4af507f80121df1e
+  metadata.gz: f103fdc3949130cba0098bf43e28c8de891a98a45ba2cc47a39e3acceae96ba4
+  data.tar.gz: f923206b67cba8f0c8c6932a6f4ebcbb69348ecca558b1a255eac233de74ebab
 SHA512:
-  metadata.gz: 39b07122fe28eb18ef6b69ce6719fa59a75eb0d5aad2d6407de9684298dd9b80396a3d547294d043e8566043168ee4f14d61c22674d94efb1443f4ec9325e9a8
-  data.tar.gz: 335180f0b216cc9997118bf6e692b5bfb95f8a70d5cc5b1c28049f3955d96dd2696072e516a06fd963e8bb35b4fae4a006879adcf2903b929f193733ee94e791
+  metadata.gz: 9f315016c8cebcefc7cb0c3de0c24ca16018c42f0dbdf63595138ada13152cc5ccfdc0ce80349265ed0a4e45d949c0ac421780fd5e0dc347983eceaf0bade22a
+  data.tar.gz: df142f61ddb4d41660c1f895a1ba5c4371be097166b991c71016f3a1b54ef77f16824716c88aa02763dcfda770cfb41e9c33f16afe8b0b54929da4a5f8c7d7a8

data/README.md

@@ -98,7 +98,8 @@ Following is pry command available only after start a Pry session:
 5.  Add `pry-aa_ancestors` command for print the class hierarchy, see [pry-aa_ancestors](https://github.com/tbpgr/pry-aa_ancestors)
 6.  Add `up/down/frame/stack` command, see [pry-stack_explorer](https://github.com/pry/pry-stack_explorer)
 7.  Add `yes` or `y` command, see [pry-yes](https://github.com/christofferh/pry-yes)
-8.  Add `pry-disam`, Check following screenshot for a example:
+8.  Add `reload!` command , see [pry-reload](https://github.com/runa/pry-reload)
+9.  Add `pry-disam`, Check following screenshot for a example:
 
 ![pry-disasm](images/disasm.png)
 
@@ -131,11 +132,12 @@ pryx is same as pry, but, with plugins and libraries correct configured.
 
 irbx is same things for irb.
 
-pry! just a alias to `pry-remote` command, when `Kernel#pry!` was intercepted in a background process, 
-you can run `pry!` directly in terminal connect to it.
+`pry!` just a alias to `binding.pry`, but, if process is running on background, it a alias to `binding.remote_pry('0.0.0.0', 9876)`, 
+you can specify host or port manually, like this: `pry!(host: '192.168.1.100')`. 
+in another terminal, you can run `pry!` directly to connect to it use IP + port.
 
-if your's pry-remote server started background on another host, or on a container, you man need
-specify hostname and port, e.g. connnect to 192.168.1.100, with port 9876
+e.g. assume your's pry-remote server started background on another host(192.168.1.100), port 9876
+It maybe in container, you can connect remote pry like this:
 
 ```sh
 $: pry! -s 192.168.1.100 -p 9876

data/lib/pryx/common_plugins.rb

@@ -1,9 +1,25 @@
 require 'binding_of_caller'
 require 'clipboard'
 
-# ap_hack 可以确保，当使用 irb! 时，looksee ls1 输出显示正确，同时不用关闭 irb :USE_COLORIZE 设置。
+# HACK: for ap 可以确保，当使用 irb! 时，looksee ls1 输出显示正确，同时不用关闭 irb :USE_COLORIZE 设置。
 # See https://github.com/oggy/looksee/issues/57
 # 但是，ap_hack 必须放到 break_hack 前面，调换顺序，上面的 hack 失效。
-# WARN: 下面两行代码顺序不要换。
-require 'pryx/ap_hack'
-require 'pryx/break_hack'
+# WARN: 下面两行 require 代码顺序不要换。
+require 'awesome_print'
+
+# AwesomePrint.defaults = {
+#   index: false
+# }
+
+if defined? AwesomePrint
+  if defined? Pry
+    AwesomePrint.pry!
+  else
+    AwesomePrint.irb!
+  end
+end
+
+require 'break'
+Pry.commands.alias_command 'n', 'next'
+Pry.commands.alias_command 's', 'step'
+Pry.commands.alias_command 'w', 'watch' # watch is pry builtin

data/lib/pryx/pry_hack.rb

@@ -1,7 +1,7 @@
 # 注意如果开启 pry-stack_explorer, 就不要使用 debugger, 因为进入新的上下文后, pry-stack_explorer 将失效.
 
 class Binding
-  def _pry(host=nil, port=nil, options={})
+  def _pry(host: nil, port: nil, options: {})
     if host
       require 'pry-remote'
     else
@@ -14,7 +14,7 @@ class Binding
     if host
       notify_send('loading remote pry ...')
       # remote_pry(host, port, options) if Pry.initial_session?
-      remote_pry(host, port, options)
+      self.remote_pry(host, port, options)
     else
       warn 'loading pry ...'
       self.pry
@@ -24,12 +24,14 @@ end
 
 module Kernel
   # 运行 pry! 会被拦截, 且只会被拦截一次.
-  def pry!(remote: nil, port: 9876)
-    return unless ENV['Pry_was_started'].nil?
+  def pry!(host: nil, port: 9876)
+    if Pryx::Background.foreground? and host.nil?
+      return unless ENV['Pry_was_started'].nil?
 
-    ENV['Pry_was_started'] = 'true'
+      ENV['Pry_was_started'] = 'true'
+    end
 
-    pry3(2, remote: remote, port: port)
+    pry3(2, host: host, port: port)
 
     # 这里如果有代码, 将会让 pry! 进入这个方法, 因此保持为空.
   end
@@ -41,13 +43,13 @@ module Kernel
 
   # 和 pry! 的差别就是，pry? 使用 pry-state 插件输出当前 context 的很多变量内容。
   # 注意：不需要总是开启 pry-state，因为有时候会输出太多内容，造成刷屏。
-  def pry?(remote: nil, port: 9876)
+  def pry?(host: nil, port: 9876)
     return unless ENV['Pry_was_started'].nil?
 
     require 'pry-state'
     ENV['Pry_was_started'] = 'true'
 
-    pry3(2, remote: remote, port: port)
+    pry3(2, host: host, port: port)
 
     # 这里如果有代码, 将会让 pry! 进入这个方法, 因此保持为空.
   end
@@ -59,21 +61,21 @@ module Kernel
   # 1. 单独运行 pry2， 永远不会被拦截,
   # 2. 如果之前运行过 pry1, 此时 pry2 将被拦截, 且只会被拦截一次.
 
-  def pry2(caller=1, remote: nil, port: 9876)
+  def pry2(host: nil, port: 9876)
     if ENV['Pry2_should_start'] == 'true'
       ENV['Pry2_should_start'] = nil
-      pry3(2, remote: remote, port: port)
+      pry3(2, host: host, port: port)
     end
   end
 
   # 等价于默认的 binding.pry, 会反复被拦截。
   # 起成 pry3 这个名字，也是为了方便直接使用。
-  def pry3(caller=1, remote: nil, port: 9876)
-    remote = '0.0.0.0' if Pryx::Background.background?
+  def pry3(caller=1, host: nil, port: 9876)
+    host = '0.0.0.0' if Pryx::Background.background?
 
     require 'binding_of_caller'
 
-    binding.of_caller(caller)._pry(remote, port)
+    binding.of_caller(caller)._pry(host: host, port: port)
   end
 
   def notify_send(msg)

data/lib/pryx/pry_plugins.rb

@@ -4,7 +4,6 @@ require 'pry-power_assert'
 require 'pry-doc'
 
 require 'pry-yes'
-Pry.commands.alias_command 'y', 'yes'
 
 require 'pry-hier'
 
@@ -18,6 +17,8 @@ Pry::Commands.alias_command 'aa', 'aa_ancestors'
 require 'pry-stack_explorer'
 require 'pryx/pry-stack_explorer_hack'
 
+require 'pry-reload'
+
 Pry::Commands.block_command 'cc', 'Continue, but stop in pry! breakpoint' do
   Pry.instance_variable_set(:@initial_session, true)
   ENV['Pry_was_started'] = nil

data/lib/pryx/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pryx
-  VERSION = [0, 7, 0]
+  VERSION = [0, 8, 1]
 
   class << VERSION
     include Comparable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pryx
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Billy.Zheng(zw963)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.40.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: looksee
+  name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: clipboard
+  name: looksee
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: pry-aa_ancestors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: pry-power_assert
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry-hier
   requirement: !ruby/object:Gem::Requirement
@@ -123,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: pry-aa_ancestors
+  name: pry-power_assert
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
+  name: pry-reload
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '0.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ritual
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +235,6 @@ files:
 - bin/irbx
 - bin/pry!
 - bin/pryx
-- lib/break/pry/extensions.rb
 - lib/pry-byebug.rb
 - lib/pry-byebug/WARN
 - lib/pry-byebug/base.rb
@@ -236,9 +249,7 @@ files:
 - lib/pry-state/printer.rb
 - lib/pry-yes.rb
 - lib/pryx.rb
-- lib/pryx/ap_hack.rb
 - lib/pryx/background.rb
-- lib/pryx/break_hack.rb
 - lib/pryx/common_plugins.rb
 - lib/pryx/drip.wav
 - lib/pryx/irb_hack.rb

data/lib/break/pry/extensions.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Break::Pry
-  module PryExtensions
-    attr_accessor :__break_session__
-
-    def initialize(options={})
-      super(options)
-
-      @__break_session__ = options[:__break_session__]
-    end
-  end
-end
-
-Pry.prepend Break::Pry::PryExtensions
-
-begin
-  require 'pry-remote'
-
-  module Break::Pry
-    class << self
-      attr_accessor :current_remote_server
-    end
-
-    module PryRemoteServerExtensions
-      def initialize(*)
-        Break::Pry.current_remote_server&.teardown
-
-        super
-      end
-
-      def run
-        return if Break::Pry.current_remote_server
-
-        Break::Pry.current_remote_server = self
-
-        setup
-
-        Pry.start @object, @options.merge(input: client.input_proxy, output: client.output)
-      end
-
-      def teardown
-        super
-      ensure
-        Break::Pry.current_remote_server = nil
-      end
-    end
-  end
-
-# Hack for break works with pry_remote.
-# More details, see: https://github.com/gsamokovarov/break/issues/9
-
-# PryRemote::Server.prepend Break::Pry::PryRemoteServerExtensions
-rescue LoadError
-  # Do nothing if we cannot require pry-remote.
-end

data/lib/pryx/ap_hack.rb

@@ -1,15 +0,0 @@
-require 'awesome_print'
-
-# AwesomePrint.defaults = {
-#   index: false
-# }
-
-if defined? AwesomePrint
-  if defined? Pry
-    require 'pry'
-    AwesomePrint.pry!
-  else
-    require 'irb'
-    AwesomePrint.irb!
-  end
-end

data/lib/pryx/break_hack.rb

@@ -1,6 +0,0 @@
-require 'break'
-load "#{__dir__}/../break/pry/extensions.rb"
-
-Pry.commands.alias_command 'n', 'next'
-Pry.commands.alias_command 's', 'step'
-Pry.commands.alias_command 'w', 'watch' # watch is pry builtin