kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fallback if Pathname#relative_path_from fails

Browse source 
It can fail due to different prefixes, e.g., drive letters or UNC
paths on DOSish platform.
This commit is contained in:
Nobuyoshi Nakada 2020-04-05 11:49:11 +09:00
parent df275179bd
commit ec03d13742
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tool/ruby_vm/helpers/dumper.rb
View file

@ -25,7 +25,8 @@ class RubyVM::Dumper
end end
def new_erb spec def new_erb spec
path = Pathname.new(__FILE__).relative_path_from(Pathname.pwd).dirname path = Pathname.new(__FILE__)
path = (path.relative_path_from(Pathname.pwd) rescue path).dirname
path += '../views' path += '../views'
path += spec path += spec
src = path.read mode: 'rt:utf-8:utf-8' src = path.read mode: 'rt:utf-8:utf-8'

3
tool/ruby_vm/helpers/scanner.rb
View file

@ -20,7 +20,8 @@ class RubyVM::Scanner
attr_reader :__LINE__ attr_reader :__LINE__
def initialize path def initialize path
src = Pathname.new(__FILE__).relative_path_from(Pathname.pwd).dirname src = Pathname.new(__FILE__)
src = (src.relative_path_from(Pathname.pwd) rescue src).dirname
src += path src += path
@__LINE__ = 1 @__LINE__ = 1
@__FILE__ = src.to_path @__FILE__ = src.to_path