Skip to content

Commit 2028a4c

Browse files
author
John Firebaugh
committed
Rename lib subdirectory so as not to conflict with ruby-debug
The namespaces still conflict, but now at least you can have both ruby-debug and ruby-debug-ide on the load path without blowing up, as long as you require only one of them. For example, if you have both ruby-debug and ruby-debug-ide in your Gemfile with :require => false. Plus it's just good practice to name the lib subdirectory the same as the gem. And now we no longer need to conditionally use require_relative.
1 parent 55cfde3 commit 2028a4c

24 files changed

+11
-30
lines changed

lib/ruby-debug-ide.rb

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@
33
require "socket"
44
require 'thread'
55
require 'ruby-debug-base'
6-
if RUBY_VERSION < "1.9"
7-
require 'ruby-debug/version'
8-
require 'ruby-debug/xml_printer'
9-
require 'ruby-debug/ide_processor'
10-
require 'ruby-debug/event_processor'
11-
else
12-
require_relative 'ruby-debug/version'
13-
require_relative 'ruby-debug/xml_printer'
14-
require_relative 'ruby-debug/ide_processor'
15-
require_relative 'ruby-debug/event_processor'
16-
end
6+
7+
require 'ruby-debug-ide/version'
8+
require 'ruby-debug-ide/xml_printer'
9+
require 'ruby-debug-ide/ide_processor'
10+
require 'ruby-debug-ide/event_processor'
1711

1812
module Debugger
1913

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
if RUBY_VERSION < "1.9"
2-
require 'ruby-debug/helper'
3-
else
4-
require_relative 'helper'
5-
end
6-
1+
require 'ruby-debug-ide/helper'
72

83
module Debugger
94

File renamed without changes.

0 commit comments

Comments
 (0)