From badd1054a7f2f3f82722083f0c06a90d52081a9e Mon Sep 17 00:00:00 2001 From: ViugiNick Date: Mon, 26 Mar 2018 13:39:32 +0300 Subject: [PATCH 1/2] require thread_alias in caller (#141) --- bin/rdebug-ide | 8 -------- lib/ruby-debug-ide/command.rb | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/bin/rdebug-ide b/bin/rdebug-ide index 698564e..a72dfd1 100755 --- a/bin/rdebug-ide +++ b/bin/rdebug-ide @@ -131,14 +131,6 @@ else Debugger::PROG_SCRIPT = $0 end -if RUBY_VERSION < "1.9" - lib_path = File.expand_path(File.dirname(__FILE__) + "/../lib/") - $: << lib_path unless $:.include? lib_path - require 'ruby-debug-ide/thread_alias.rb' -else - require_relative '../lib/ruby-debug-ide/thread_alias' -end - if options.dispatcher_port != -1 ENV['IDE_PROCESS_DISPATCHER'] = options.dispatcher_port.to_s if RUBY_VERSION < "1.9" diff --git a/lib/ruby-debug-ide/command.rb b/lib/ruby-debug-ide/command.rb index 55f96f7..ecbd2ba 100644 --- a/lib/ruby-debug-ide/command.rb +++ b/lib/ruby-debug-ide/command.rb @@ -4,6 +4,7 @@ require 'debase' end +require 'ruby-debug-ide/thread_alias' require 'ruby-debug-ide/helper' require 'delegate' From d171ee2d1522a6ce73afb2600b4aa917ce6304ff Mon Sep 17 00:00:00 2001 From: Valentin Fondaratov Date: Tue, 27 Mar 2018 20:11:38 +0300 Subject: [PATCH 2/2] bump version to beta4 [ci skip] --- lib/ruby-debug-ide/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ruby-debug-ide/version.rb b/lib/ruby-debug-ide/version.rb index 36552ae..8524da7 100755 --- a/lib/ruby-debug-ide/version.rb +++ b/lib/ruby-debug-ide/version.rb @@ -1,3 +1,3 @@ module Debugger - IDE_VERSION='0.7.0.beta3' + IDE_VERSION='0.7.0.beta4' end