debug 1.2.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556965976e9db176b06e1997eb167cf5538ccd301ddb497ae629cfda01062fa3
-  data.tar.gz: e709e60ef9b43b44a998362347b2b8d7e3d4cbddb4831cd43156d5ddc67dead8
+  metadata.gz: a6251dbcd2eb75a8b4932a740fe0294da996c7bcaaaa965f42353144786b5c0a
+  data.tar.gz: 328c4949a62eeb5277d8d6882c1a7da565b2c5aaa4c2fc5cf52850ca7e454240
 SHA512:
-  metadata.gz: 9169efb00f3f9cebb0f9f21d2773e29d4c67edd7a4bb0b7330664080a15972cfe43199ae3c43e86424b2a6f94b83ce1fb8be1c208149cdd04f28c12f5d9f2842
-  data.tar.gz: a56d82fb5beb82cd821639ae073d8f902aafbdfc762236ea6eb0b2d391cc1e121e541d16083b6b22ae5a8c73b2c2c2e49e54c39f37ac9d4c03d38210499398c8
+  metadata.gz: 7c8c83768d7d9eca50f18018dc9255a54234ee9c048d9885d54d46399e7bf9910ca87f85a9cd804108ec319ec985095016b00b1ab0d45a787fb55ef96b2a9483
+  data.tar.gz: 24c87a5fbef8a8c1851ffea1b21c53613389d0c8fa46a3a205562aa2c98f6515ad863e97a5ee8857914a0363110ef277bc961b8d04902b0a5f537f133f6f18af

data/Rakefile

@@ -7,14 +7,17 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-require "rake/extensiontask"
-
-task :build => :compile
-
-Rake::ExtensionTask.new("debug") do |ext|
-  ext.lib_dir = "lib/debug"
+begin
+  require "rake/extensiontask"
+  task :build => :compile
+
+  Rake::ExtensionTask.new("debug") do |ext|
+    ext.lib_dir = "lib/debug"
+  end
+rescue LoadError
 end
 
+
 task :default => [:clobber, :compile, 'README.md', :test]
 
 file 'README.md' => ['lib/debug/session.rb', 'lib/debug/config.rb',

data/lib/debug/breakpoint.rb

@@ -437,7 +437,7 @@ module DEBUGGER__
           end
         end
 
-      rescue ArgumentError => e
+      rescue ArgumentError
         raise if retried
         retried = true
 
@@ -458,7 +458,7 @@ module DEBUGGER__
         @override_method = true if @method
         retry
       end
-    rescue Exception => e
+    rescue Exception
       raise unless added
     end
 

data/lib/debug/client.rb

@@ -13,9 +13,37 @@ module DEBUGGER__
   class CommandLineOptionError < Exception; end
 
   class Client
-    def initialize argv
-      return util(argv) if String === argv
+    class << self
+      def util name
+        case name
+        when 'gen-sockpath'
+          puts DEBUGGER__.create_unix_domain_socket_name
+        when 'list-socks'
+          cleanup_unix_domain_sockets
+          puts list_connections
+        else
+          raise "Unknown utility: #{name}"
+        end
+      end
 
+      def cleanup_unix_domain_sockets
+        Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*') do |file|
+          if /(\d+)$/ =~ file
+            begin
+              Process.kill(0, $1.to_i)
+            rescue Errno::ESRCH
+              File.unlink(file)
+            end
+          end
+        end
+      end
+
+      def list_connections
+        Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*')
+      end
+    end
+
+    def initialize argv
       @console = Console.new
 
       case argv.size
@@ -48,34 +76,6 @@ module DEBUGGER__
       @console.readline "(rdbg:remote) "
     end
 
-    def util name
-      case name
-      when 'gen-sockpath'
-        puts DEBUGGER__.create_unix_domain_socket_name
-      when 'list-socks'
-        cleanup_unix_domain_sockets
-        puts list_connections
-      else
-        raise "Unknown utility: #{name}"
-      end
-    end
-
-    def cleanup_unix_domain_sockets
-      Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*') do |file|
-        if /(\d+)$/ =~ file
-          begin
-            Process.kill(0, $1.to_i)
-          rescue Errno::ESRCH
-            File.unlink(file)
-          end
-        end
-      end
-    end
-
-    def list_connections
-      Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*')
-    end
-
     def connect_unix name = nil
       if name
         if File.exist? name
@@ -84,8 +84,9 @@ module DEBUGGER__
           @s = Socket.unix(File.join(DEBUGGER__.unix_domain_socket_dir, name))
         end
       else
-        cleanup_unix_domain_sockets
-        files = list_connections
+        Client.cleanup_unix_domain_sockets
+        files = Client.list_connections
+
         case files.size
         when 0
           $stderr.puts "No debug session is available."

data/lib/debug/config.rb

@@ -313,7 +313,7 @@ module DEBUGGER__
 
         o.on('--util=NAME', 'Utility mode (used by tools)') do |name|
           require_relative 'client'
-          Client.new(name)
+          Client.util(name)
           exit
         end
 
@@ -352,9 +352,26 @@ module DEBUGGER__
   ## Unix domain socket configuration
 
   def self.unix_domain_socket_dir
+    require 'tmpdir'
+
     case
     when path = CONFIG[:sock_dir]
     when path = ENV['XDG_RUNTIME_DIR']
+    when 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
+        d = Dir.mktmpdir
+        File.rename(d, path)
+      end
     when home = ENV['HOME']
       path = File.join(home, '.ruby-debug-sock')
 

data/lib/debug/frame_info.rb

@@ -9,10 +9,10 @@ module DEBUGGER__
                         )
 
   # extend FrameInfo with debug.so
-  if File.exist? File.join(__dir__, 'debug.so')
+  begin
     require_relative 'debug.so'
-  else
-    require_relative 'debug'
+  rescue LoadError
+    require 'debug/debug.so'
   end
 
   class FrameInfo

data/lib/debug/session.rb

@@ -25,6 +25,7 @@ require_relative 'tracer'
 
 # To prevent loading old lib/debug.rb in Ruby 2.6 to 3.0
 $LOADED_FEATURES << 'debug.rb'
+$LOADED_FEATURES << File.expand_path(File.join(__dir__, '..', 'debug.rb'))
 require 'debug' # invalidate the $LOADED_FEATURE cache
 
 require 'json' if ENV['RUBY_DEBUG_TEST_MODE']

data/lib/debug/version.rb

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

metadata

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