[前][次][番号順一覧][スレッド一覧]

ruby-changes:68391

From: aycabta <ko1@a...>
Date: Mon, 11 Oct 2021 21:34:44 +0900 (JST)
Subject: [ruby-changes:68391] e212d051d0 (master): [ruby/reline] Rescue LoadError to require 'fiddle'

https://git.ruby-lang.org/ruby.git/commit/?id=e212d051d0

From e212d051d0358734f78b5c402dddd9b631a12fe1 Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@g...>
Date: Mon, 11 Oct 2021 21:24:19 +0900
Subject: [ruby/reline] Rescue LoadError to require 'fiddle'

https://github.com/ruby/reline/commit/fe504bb6b9
---
 lib/reline/terminfo.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/reline/terminfo.rb b/lib/reline/terminfo.rb
index 3f32a5aab0..b4d1d735f8 100644
--- a/lib/reline/terminfo.rb
+++ b/lib/reline/terminfo.rb
@@ -1,5 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/lib/reline/terminfo.rb#L1
-require 'fiddle'
-require 'fiddle/import'
+begin
+  require 'fiddle'
+  require 'fiddle/import'
+rescue LoadError
+  module Reline::Terminfo
+    def self.curses_dl
+      false
+    end
+  end
+end
 
 module Reline::Terminfo
   extend Fiddle::Importer
@@ -50,7 +58,7 @@ module Reline::Terminfo https://github.com/ruby/ruby/blob/trunk/lib/reline/terminfo.rb#L58
     @curses_dl = nil if @curses_dl == false
     @curses_dl
   end
-end
+end if not Reline.const_defined?(:Terminfo) or not Reline::Terminfo.respond_to?(:curses_dl)
 
 module Reline::Terminfo
   dlload curses_dl
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]