Fix config.rb to File.expand_path $include path in inputrc (#592)

* Fix config.rb to File.expand_path $include path in inputrc * fix bug of test_include_expand_path on Windows
ruby · Sep 26, 2023 · 4d34e52 · 4d34e52
1 parent c2fc1f7
commit 4d34e52
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/reline/config.rb b/lib/reline/config.rb
@@ -252,7 +252,7 @@ def handle_directive(directive, file, no)
       end
       @skip_section = @if_stack.pop
     when 'include'
-      read(args)
+      read(File.expand_path(args))
     end
   end
 

diff --git a/test/reline/test_config.rb b/test/reline/test_config.rb
@@ -160,6 +160,23 @@ def test_include
     assert_equal :audible, @config.instance_variable_get(:@bell_style)
   end
 
+  def test_include_expand_path
+    home_backup = ENV['HOME']
+    File.open('included_partial', 'wt') do |f|
+      f.write(<<~PARTIAL_LINES)
+        set bell-style on
+      PARTIAL_LINES
+    end
+    ENV['HOME'] = Dir.pwd
+    @config.read_lines(<<~LINES.lines)
+      $include ~/included_partial
+    LINES
+
+    assert_equal :audible, @config.instance_variable_get(:@bell_style)
+  ensure
+    ENV['HOME'] = home_backup
+  end
+
   def test_if
     @config.read_lines(<<~LINES.lines)
       $if Ruby