debug 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adddd814397fedb45de84db6ccb2dc49c3aefae141e73b156e3b87c29a3edf60
-  data.tar.gz: 0b0cb92d077f04ed9f7bfa1f79f56f35dc4dc9054f27ea3608d23c5f0d462274
+  metadata.gz: 948301b2d85d9acb8758ae20e63a60d0253dc1d1e1bf5c2ddc276abb39d12993
+  data.tar.gz: 2e6b7c89ee568710d52d3fcaff1ff5eb44db71c4e296e039a6f21f4e5de9b9ee
 SHA512:
-  metadata.gz: 3e60eb57c1ec6c164d6956e777f8ac52e15ba84c13b97443650ac67f2b503397cfc57d9f0b897f331946e7200067227d61e7b81f459c5b42e44098dbbe9161ef
-  data.tar.gz: 3a377c3da4482103142fbece04cb896522f952aa3d43f316f50dd699f35f0c24db100df3e706e6d86cbc752021800bbfdff6131a95023d497741d68c396e5ed7
+  metadata.gz: dd5237c7fc194760f33cdd97c007fe1c879ed4140342821972d2385a612bd5fd4c8faffd2a3763adea1378931be13e65d46e2a23f5997412ac96c6e7c802e0d2
+  data.tar.gz: 396eab432e765065288f49cda52ce8a4449ee6c97465bde2ef70ec8ca39678b80831748b551d6aa6e4417c1c6512b8b0f8caf4371516a9178181582b9bf9542c

data/lib/debug/client.rb

@@ -91,9 +91,7 @@ module DEBUGGER__
         @console.readline "(rdbg:remote\##{@pid}) "
       else
         @console.readline "(rdbg:remote) "
-      end.tap{|line|
-        p readline: line
-      }
+      end
     end
 
     def connect_unix name = nil

data/lib/debug/config.rb

@@ -371,38 +371,54 @@ module DEBUGGER__
 
   ## Unix domain socket configuration
 
-  def self.unix_domain_socket_dir
+  def self.check_dir_authority path
+    fs = File.stat(path)
+
+    unless (dir_uid = fs.uid) == (uid = Process.uid)
+      raise "#{path} uid is #{dir_uid}, but Process.uid is #{uid}"
+    end
+    unless (dir_mode = fs.mode) == 040700 # 4: dir, 7:rwx
+      raise "#{path}'s mode is #{dir_mode.to_s(8)} (should be 040700)"
+    end
+
+    path
+  end
+
+  def self.unix_domain_socket_tmpdir
     require 'tmpdir'
 
-    case
-    when path = CONFIG[:sock_dir]
-    when path = ENV['XDG_RUNTIME_DIR']
-    when tmpdir = Dir.tmpdir
+    if tmpdir = Dir.tmpdir
       path = File.join(tmpdir, "ruby-debug-sock-#{Process.uid}")
 
-      if File.exist?(path)
-        fs = File.stat(path)
-        unless (dir_uid = fs.uid) == (uid = Process.uid)
-          raise "#{path} uid is #{dir_uid}, but Process.uid is #{uid}"
-        end
-        unless (dir_mode = fs.mode) == 040700 # 4: dir, 7:rwx
-          raise "#{path}'s mode is #{dir_mode.to_s(8)} (should be 040700)"
-        end
-      else
+      unless File.exist?(path)
         d = Dir.mktmpdir
         File.rename(d, path)
       end
-    when home = ENV['HOME']
+
+      check_dir_authority(path)
+    end
+  end
+
+  def self.unix_domain_socket_homedir
+    if home = ENV['HOME']
       path = File.join(home, '.ruby-debug-sock')
 
-      case
-      when !File.exist?(path)
+      unless File.exist?(path)
         Dir.mkdir(path, 0700)
-      when !File.directory?(path)
-        raise "#{path} is not a directory."
       end
+
+      check_dir_authority(path)
+    end
+  end
+
+  def self.unix_domain_socket_dir
+    case
+    when path = CONFIG[:sock_dir]
+    when path = ENV['XDG_RUNTIME_DIR']
+    when path = unix_domain_socket_tmpdir
+    when path = unix_domain_socket_homedir
     else
-      raise 'specify RUBY_DEBUG_SOCK_DIR environment variable for UNIX domain socket directory.'
+      raise 'specify RUBY_DEBUG_SOCK_DIR environment variable.'
     end
 
     path

data/lib/debug/local.rb

@@ -86,6 +86,24 @@ module DEBUGGER__
         trap(:INT, prev_handler)
       end
     end
+
+    def after_fork_parent
+      parent_pid = Process.pid
+
+      at_exit{
+        SESSION.intercept_trap_sigint_end
+        trap(:SIGINT, :IGNORE)
+
+        if Process.pid == parent_pid
+          # only check child process from its parent
+          begin
+            # wait for all child processes to keep terminal
+            loop{ Process.waitpid }
+          rescue Errno::ESRCH, Errno::ECHILD
+          end
+        end
+      }
+    end
   end
 end
 

data/lib/debug/prelude.rb

@@ -40,7 +40,7 @@ module Kernel
     end
   end
 
-  alias b debugger if ENV['RUBY_DEBUG_B']
+  alias bb debugger if ENV['RUBY_DEBUG_BB']
 end
 
 class Binding

data/lib/debug/server.rb

@@ -306,6 +306,10 @@ module DEBUGGER__
         s.puts "quit"
       end
     end
+
+    def after_fork_parent
+      # do nothing
+    end
   end
 
   class UI_TcpServer < UI_ServerBase
@@ -454,14 +458,27 @@ module DEBUGGER__
       ::DEBUGGER__.warn "Debugger can attach via UNIX domain socket (#{@sock_path})"
       vscode_setup if CONFIG[:open_frontend] == 'vscode'
 
-      Socket.unix_server_loop @sock_path do |sock, client|
-        @sock_for_fork = sock
-        @client_addr = client
+      begin
+        Socket.unix_server_loop @sock_path do |sock, client|
+          @sock_for_fork = sock
+          @client_addr = client
 
-        yield sock
-      ensure
-        sock.close
-        @sock_for_fork = nil
+          yield sock
+        ensure
+          sock.close
+          @sock_for_fork = nil
+        end
+      rescue Errno::ECONNREFUSED => _e
+        ::DEBUGGER__.warn "#{_e.message} (socket path: #{@sock_path})"
+
+        if @sock_path.start_with? Config.unix_domain_socket_tmpdir
+          # try on homedir
+          @sock_path = Config.create_unix_domain_socket_name(unix_domain_socket_homedir)
+          ::DEBUGGER__.warn "retry with #{@sock_path}"
+          retry
+        else
+          raise
+        end
       end
     end
   end

data/lib/debug/session.rb

@@ -1635,20 +1635,7 @@ module DEBUGGER__
     end
 
     def after_fork_parent
-      parent_pid = Process.pid
-      at_exit{
-        @intercept_trap_sigint = false
-        trap(:SIGINT, :IGNORE)
-
-        if Process.pid == parent_pid
-          # only check child process from its parent
-          begin
-            # wait for all child processes to keep terminal
-            loop{ Process.waitpid }
-          rescue Errno::ESRCH, Errno::ECHILD
-          end
-        end
-      }
+      @ui.after_fork_parent
     end
   end
 
@@ -1774,8 +1761,8 @@ module DEBUGGER__
     def sync &b
       info "sync"
 
+      lock
       begin
-        lock
         b.call if b
       ensure
         unlock
@@ -2012,8 +1999,8 @@ module DEBUGGER__
 
         parent_hook = -> child_pid {
           DEBUGGER__.warn "Detaching after fork from parent process #{Process.pid}"
-          SESSION.deactivate
           SESSION.after_fork_parent
+          SESSION.deactivate
         }
         child_hook = -> {
           DEBUGGER__.warn "Attaching after process #{parent_pid} fork to child process #{Process.pid}"
@@ -2112,6 +2099,8 @@ module Kernel
     loc = caller_locations(up_level, 1).first; ::DEBUGGER__.add_line_breakpoint loc.path, loc.lineno + 1, oneshot: true, command: cmds
     self
   end
+
+  alias bb debugger if ENV['RUBY_DEBUG_BB']
 end
 
 class Binding

data/lib/debug/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DEBUGGER__
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debug
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Debugging functionality for Ruby