pryx 0.7.2 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76fdf9e7d782f22dc0456d28a788c919e2d4747bbbd5e291e82de79e7b9d97ad
-  data.tar.gz: 14ecbce0582117218559250839b4d7c8a90266c73a940108ca209a28ed9219e9
+  metadata.gz: d7421b2883be187afe07d771287fdf53908136c62cc795a6b4fd6f9030c71d9f
+  data.tar.gz: ac5aba055317fc12c5bfdf3b0574e5bcffa484547ed5998930779d3e6741046f
 SHA512:
-  metadata.gz: e89e4c497c13332305da1dbd0da59412befb4ce394a7f9847b9b1b8fc94a2fbae705813b51e304d7f800d6319babb68acb399196b52e6c0ac1d6f5aa0373242c
-  data.tar.gz: 6943f56b628aad6ec753eb8a2a61aaff4de87e765a5cc52e26a1764e43db7fc38df00c2672de28a50b57cbdd55f30cf75005ab65776d88496400b5323bc7e9c3
+  metadata.gz: 20417e730575de7f13b4b9a42423300167982385566cf8e987f9e33273bcd45a906968640f71cf4fcc810e52ce71b367bab7393757e5201f9e3f2cb435ee7a61
+  data.tar.gz: 39e37f2c2a21d2f24c9518e4ffdd9734e2d8fe703c6c99070fb3ebca629ae39b1d7064a5ced9070dc896c4f707ae706779675c67436ee1d3d86e262669c5d147

data/README.md

@@ -132,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/bin/pryx

@@ -8,6 +8,7 @@ $0 = 'pry'
 
 require 'pry'
 require 'pryx'
+require 'pryx/ap_hack'
 
 # Process command line options and run Pry
 opts = Pry::CLI.parse_options

data/bin/pryx_rails

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# (C) John Mair (banisterfiend)
+# MIT license
+
+$0 = 'pry'
+
+$LOAD_PATH.unshift('.')
+require 'config/environment'
+
+require 'pry'
+require 'pryx'
+require 'pryx/ap_hack'
+
+# Process command line options and run Pry
+opts = Pry::CLI.parse_options
+Pry::CLI.start(opts)

data/lib/pryx/ap_hack.rb

@@ -6,10 +6,8 @@ require 'awesome_print'
 
 if defined? AwesomePrint
   if defined? Pry
-    require 'pry'
     AwesomePrint.pry!
   else
-    require 'irb'
     AwesomePrint.irb!
   end
 end

data/lib/pryx/common_plugins.rb

@@ -1,9 +1,12 @@
 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: 下面两行代码顺序不要换。
+# WARN: 下面两行 require 代码顺序不要换。
 require 'pryx/ap_hack'
-require 'pryx/break_hack'
+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(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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pryx
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.2
 platform: ruby
 authors:
 - Billy.Zheng(zw963)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -30,14 +30,14 @@ 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: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,7 @@ executables:
 - irbx
 - pry!
 - pryx
+- pryx_rails
 extensions: []
 extra_rdoc_files: []
 files:
@@ -235,7 +236,7 @@ files:
 - bin/irbx
 - bin/pry!
 - bin/pryx
-- lib/break/pry/extensions.rb
+- bin/pryx_rails
 - lib/pry-byebug.rb
 - lib/pry-byebug/WARN
 - lib/pry-byebug/base.rb
@@ -252,7 +253,6 @@ files:
 - 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/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