readline-ext 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f52b39a9287ece2a0c2b5e2c53bfab5445616011f7f36dc5abf0d23c9bfa25
-  data.tar.gz: 2550a9aab2ac93fe25a1af0764bd04285bb6820dc9e157cabacb3f4daea488b3
+  metadata.gz: aee9c6dfd2619ad2f975738c3cd0f8f142996637ca21d788acb5e8d695c3c2e9
+  data.tar.gz: 1228d841d7bf7c1b606f766fb6c37a3cb2d60ea4fdbd7bfeea85ba8782fd9b3c
 SHA512:
-  metadata.gz: '0118bb153949cdc9450007bd945cd3dd39aa0681cf043a361c647e560425969fa7e3457d2b394a78707f5152b7c0d5d690be14f183a944a9342f6f5534574d23'
-  data.tar.gz: 23f6db65adddff7053d9331b90712a7439ba2b4e77a54984965055355d32c1918f4e92a2f24eeb5f4dd4df1cde9e7af3cd2773392cc747854230a758317b6778
+  metadata.gz: 625852ad1adfe1a8e61f5d243754bf112764cb4a37a7975d5871d1f267856c083f3fd5bccbe9ab077d3928b02bf004c6bfda6a35ee22275a9710919ddb6c744b
+  data.tar.gz: 95f3ae47e17404fbd40041f3d3396a4b9aa86d44e56e7796c73631fc4379f8190e2e5e202a8b14cf1ed18c4cf3eaff8b0f8a435691946570a8e2bdeea061092c

data/.github/workflows/test.yml

@@ -1,17 +1,24 @@
-name: build
+name: test
 
 on: [push, pull_request]
 
 jobs:
-  build:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      min_version: 2.6
+      engine: cruby
+
+  test:
+    needs: ruby-versions
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ 3.1, '3.0', 2.7, 2.6, head ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install libedit
       run: sudo apt-get install -q libedit-dev libedit2
       if: startsWith(matrix.os, 'ubuntu')

data/Gemfile

@@ -7,4 +7,5 @@ group :development do
   gem "rake"
   gem "rake-compiler"
   gem "test-unit"
+  gem "test-unit-ruby-core"
 end

data/ext/readline/extconf.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: false
 require "mkmf"
 
+have_func("rb_io_descriptor")
+
 readline = Struct.new(:headers, :extra_check).new(["stdio.h"])
 
 def readline.have_header(header)

data/ext/readline/readline.c

@@ -15,6 +15,8 @@
 
 ************************************************/
 
+#define READLINE_VERSION "0.2.0"
+
 #ifdef RUBY_EXTCONF_H
 #include RUBY_EXTCONF_H
 #endif
@@ -44,6 +46,15 @@
 #include <sys/stat.h>
 #endif
 
+#ifndef HAVE_RB_IO_DESCRIPTOR
+int io_descriptor_fallback(VALUE io) {
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    return fptr->fd;
+}
+#define rb_io_descriptor io_descriptor_fallback
+#endif
+
 static VALUE mReadline;
 
 #define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper"
@@ -371,30 +382,36 @@ clear_rl_outstream(void)
     readline_outstream = Qfalse;
 }
 
+VALUE io_descriptor(VALUE io) {
+    return RB_INT2NUM(rb_io_descriptor(io));
+}
+
 static void
 prepare_readline(void)
 {
     static int initialized = 0;
+    int state;
+
     if (!initialized) {
         rl_initialize();
         initialized = 1;
     }
 
     if (readline_instream) {
-        rb_io_t *ifp;
-        rb_io_check_initialized(ifp = RFILE(rb_io_taint_check(readline_instream))->fptr);
-        if (ifp->fd < 0) {
+        rb_protect(io_descriptor, readline_instream, &state);
+
+        if (state) {
             clear_rl_instream();
-            rb_raise(rb_eIOError, "closed readline input");
+            rb_jump_tag(state);
         }
     }
 
     if (readline_outstream) {
-        rb_io_t *ofp;
-        rb_io_check_initialized(ofp = RFILE(rb_io_taint_check(readline_outstream))->fptr);
-        if (ofp->fd < 0) {
+        rb_protect(io_descriptor, readline_outstream, &state);
+
+        if (state) {
             clear_rl_outstream();
-            rb_raise(rb_eIOError, "closed readline output");
+            rb_jump_tag(state);
         }
     }
 }
@@ -551,7 +568,6 @@ readline_readline(int argc, VALUE *argv, VALUE self)
 static VALUE
 readline_s_set_input(VALUE self, VALUE input)
 {
-    rb_io_t *ifp;
     int fd;
     FILE *f;
 
@@ -560,9 +576,9 @@ readline_s_set_input(VALUE self, VALUE input)
     }
     else {
         Check_Type(input, T_FILE);
-        GetOpenFile(input, ifp);
+        fd = rb_io_descriptor(input);
         clear_rl_instream();
-        fd = rb_cloexec_dup(ifp->fd);
+        fd = rb_cloexec_dup(fd);
         if (fd == -1)
             rb_sys_fail("dup");
         f = fdopen(fd, "r");
@@ -587,7 +603,6 @@ readline_s_set_input(VALUE self, VALUE input)
 static VALUE
 readline_s_set_output(VALUE self, VALUE output)
 {
-    rb_io_t *ofp;
     int fd;
     FILE *f;
 
@@ -596,9 +611,9 @@ readline_s_set_output(VALUE self, VALUE output)
     }
     else {
         Check_Type(output, T_FILE);
-        GetOpenFile(output, ofp);
+        fd = rb_io_descriptor(output);
         clear_rl_outstream();
-        fd = rb_cloexec_dup(ofp->fd);
+        fd = rb_cloexec_dup(fd);
         if (fd == -1)
             rb_sys_fail("dup");
         f = fdopen(fd, "w");
@@ -2119,6 +2134,8 @@ Init_readline(void)
     /* Version string of GNU Readline or libedit. */
     rb_define_const(mReadline, "VERSION", version);
 
+    rb_define_const(mReadline, "GEM_VERSION", rb_str_new_cstr(READLINE_VERSION));
+
     rl_attempted_completion_function = readline_attempted_completion_function;
 #if defined(HAVE_RL_PRE_INPUT_HOOK)
     rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;

data/readline-ext.gemspec

@@ -1,6 +1,16 @@
+source_version = ["", "ext/readline/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}readline.c")) {|f|
+      f.gets("\n#define READLINE_VERSION ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+
 Gem::Specification.new do |spec|
   spec.name          = "readline-ext"
-  spec.version       = "0.1.5"
+  spec.version       = source_version
   spec.authors       = ["Yukihiro Matsumoto"]
   spec.email         = ["matz@ruby-lang.org"]
 
@@ -14,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z 2>#{IO::NULL}`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readline-ext
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Yukihiro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies: []
 description: Provides an interface for GNU Readline and Edit Line (libedit).
 email:
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Provides an interface for GNU Readline and Edit Line (libedit).