etc 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215e8d5d0a7f804a20a00ffd2879002451731866c6b7858d2f57ea24c2d885d9
-  data.tar.gz: 3480e3113f594bd6e268bd014f243e26365f38a1660a2fc7916ead6a77de36be
+  metadata.gz: 5f5196e40206894d4fc74d486106863f351e131e89fa6017807542361a09c617
+  data.tar.gz: 131ade148fb05d021a9956ee282722012abbc0607f87bfa15bd06a0374264a4a
 SHA512:
-  metadata.gz: ffc70bc1b076f3a0a5607f9f6684c977d55f1536e8f497ce4cfa62e2bff87eabce93679733cc3b27b99fef357e1a004dbeff0d2e68ce772337a4f23b8583a619
-  data.tar.gz: 748e259456471c7a82728529999c01e31b75d311e1510306d9e097fb127e195a975cb7d6e0a6e16f5e4a7dc98157aeced29a9882f348aae731f920d8b749e2d2
+  metadata.gz: 210712686ace4800e20dbc1c4f97ead9a352f6d65dc794bb0033f55da286ec730bef1269f5b9479b4f600a87a55a31470f7596b83ddc705aeb5f194618646e37
+  data.tar.gz: aa0cba8840eb405a1b80339d82c44b2c582e97b2cab1db8d7ad05f315ac1a78325c421698b94a53283302702f5ea2a669221bfbf84f0be88bf880fc863ade405

data/README.md

@@ -1,7 +1,5 @@
 # Etc
 
-[![Build Status](https://travis-ci.org/ruby/etc.svg?branch=master)](https://travis-ci.org/ruby/etc)
-
 The Etc module provides access to information typically stored in files in the /etc directory on Unix systems.
 
 The information accessible consists of the information found in the `/etc/passwd` and `/etc/group` files, plus information about he system's temporary directory (/tmp) and configuration directory (/etc).

data/ext/etc/etc.c

@@ -52,10 +52,34 @@ char *getenv();
 #endif
 char *getlogin();
 
-#define RUBY_ETC_VERSION "1.1.0"
+#define RUBY_ETC_VERSION "1.2.0"
+
+#ifdef HAVE_RB_DEPRECATE_CONSTANT
+void rb_deprecate_constant(VALUE mod, const char *name);
+#else
+# define rb_deprecate_constant(mod,name) ((void)(mod),(void)(name))
+#endif
 
 #include "constdefs.h"
 
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+#include "ruby/thread_native.h"
+#else
+/* Implement rb_native_mutex_x using an int */
+typedef int rb_nativethread_lock_t;
+static int rb_native_mutex_trylock(int *mutex) {
+    if (*mutex) {
+    	return 1;
+    }
+    *mutex = 1;
+    return 0;
+}
+static void rb_native_mutex_unlock(int *mutex) {
+    *mutex = 0;
+}
+#define rb_native_mutex_initialize rb_native_mutex_unlock
+#endif
+
 /* call-seq:
  *	getlogin	->  String
  *
@@ -119,6 +143,12 @@ safe_setup_filesystem_str(const char *str)
 #endif
 
 #ifdef HAVE_GETPWENT
+# ifdef __APPLE__
+#   define PW_TIME2VAL(t) INT2NUM((int)(t))
+# else
+#   define PW_TIME2VAL(t) TIMET2NUM(t)
+# endif
+
 static VALUE
 setup_passwd(struct passwd *pwd)
 {
@@ -136,7 +166,7 @@ setup_passwd(struct passwd *pwd)
 			 safe_setup_filesystem_str(pwd->pw_dir),
 			 safe_setup_filesystem_str(pwd->pw_shell),
 #ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
-			 INT2NUM(pwd->pw_change),
+			 PW_TIME2VAL(pwd->pw_change),
 #endif
 #ifdef HAVE_STRUCT_PASSWD_PW_QUOTA
 			 INT2NUM(pwd->pw_quota),
@@ -151,7 +181,7 @@ setup_passwd(struct passwd *pwd)
 			 safe_setup_locale_str(pwd->pw_comment),
 #endif
 #ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
-			 INT2NUM(pwd->pw_expire),
+			 PW_TIME2VAL(pwd->pw_expire),
 #endif
 			 0		/*dummy*/
 	);
@@ -228,12 +258,12 @@ etc_getpwnam(VALUE obj, VALUE nam)
 }
 
 #ifdef HAVE_GETPWENT
-static int passwd_blocking = 0;
+static rb_nativethread_lock_t passwd_blocking;
 static VALUE
 passwd_ensure(VALUE _)
 {
     endpwent();
-    passwd_blocking = (int)Qfalse;
+    rb_native_mutex_unlock(&passwd_blocking);
     return Qnil;
 }
 
@@ -252,10 +282,9 @@ passwd_iterate(VALUE _)
 static void
 each_passwd(void)
 {
-    if (passwd_blocking) {
+    if (rb_native_mutex_trylock(&passwd_blocking)) {
 	rb_raise(rb_eRuntimeError, "parallel passwd iteration");
     }
-    passwd_blocking = (int)Qtrue;
     rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
 }
 #endif
@@ -471,12 +500,12 @@ etc_getgrnam(VALUE obj, VALUE nam)
 }
 
 #ifdef HAVE_GETGRENT
-static int group_blocking = 0;
+static rb_nativethread_lock_t group_blocking;
 static VALUE
 group_ensure(VALUE _)
 {
     endgrent();
-    group_blocking = (int)Qfalse;
+    rb_native_mutex_unlock(&group_blocking);
     return Qnil;
 }
 
@@ -496,10 +525,9 @@ group_iterate(VALUE _)
 static void
 each_group(void)
 {
-    if (group_blocking) {
+    if (rb_native_mutex_trylock(&group_blocking)) {
 	rb_raise(rb_eRuntimeError, "parallel group iteration");
     }
-    group_blocking = (int)Qtrue;
     rb_ensure(group_iterate, 0, group_ensure, 0);
 }
 #endif
@@ -1064,6 +1092,9 @@ Init_etc(void)
 {
     VALUE mEtc;
 
+    #ifdef HAVE_RB_EXT_RACTOR_SAFE
+	RB_EXT_RACTOR_SAFE(true);
+    #endif
     mEtc = rb_define_module("Etc");
     rb_define_const(mEtc, "VERSION", rb_str_new_cstr(RUBY_ETC_VERSION));
     init_constants(mEtc);
@@ -1165,10 +1196,14 @@ Init_etc(void)
     rb_define_const(mEtc, "Passwd", sPasswd);
 #endif
     rb_define_const(rb_cStruct, "Passwd", sPasswd); /* deprecated name */
+    rb_deprecate_constant(rb_cStruct, "Passwd");
     rb_extend_object(sPasswd, rb_mEnumerable);
     rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
-
+#ifdef HAVE_GETPWENT
+    rb_native_mutex_initialize(&passwd_blocking);
+#endif
 #ifdef HAVE_GETGRENT
+    rb_native_mutex_initialize(&group_blocking);
     sGroup = rb_struct_define_under(mEtc, "Group", "name",
 #ifdef HAVE_STRUCT_GROUP_GR_PASSWD
 				    "passwd",
@@ -1200,6 +1235,7 @@ Init_etc(void)
     rb_define_const(mEtc, "Group", sGroup);
 #endif
     rb_define_const(rb_cStruct, "Group", sGroup); /* deprecated name */
+    rb_deprecate_constant(rb_cStruct, "Group");
     rb_extend_object(sGroup, rb_mEnumerable);
     rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
 #endif

data/ext/etc/extconf.rb

@@ -47,6 +47,11 @@ if !File.exist?("#{srcdir}/depend")
   %x[#{RbConfig.ruby} #{srcdir}/mkconstants.rb -o #{srcdir}/constdefs.h]
 end
 
+decl = [
+  "void rb_deprecate_constant(VALUE, const char *);",
+]
+have_func('rb_deprecate_constant(Qnil, "None")', [decl])
+
 $distcleanfiles << "constdefs.h"
 
 create_makefile("etc")

data/test/etc/test_etc.rb

@@ -44,7 +44,7 @@ class TestEtc < Test::Unit::TestCase
     unless s.empty?
       assert_include(s, Etc.getpwuid)
     end
-  end
+  end unless RUBY_PLATFORM.include?("android")
 
   def test_getpwnam
     passwd = {}
@@ -54,7 +54,7 @@ class TestEtc < Test::Unit::TestCase
     passwd.each_value do |s|
       assert_equal(s, Etc.getpwnam(s.name))
     end
-  end
+  end unless RUBY_PLATFORM.include?("android")
 
   def test_passwd_with_low_level_api
     a = []
@@ -169,4 +169,27 @@ class TestEtc < Test::Unit::TestCase
     assert_operator(1, :<=, n)
   end
 
+  def test_ractor
+    return unless Etc.passwd # => skip test if no platform support
+
+    assert_ractor(<<~RUBY, require: 'etc')
+      ractor = Ractor.new do
+        Etc.passwd do |s|
+          Ractor.yield :sync
+          Ractor.yield s.name
+          break :done
+        end
+      end
+      ractor.take # => :sync
+      assert_raise RuntimeError, /parallel/ do
+        Etc.passwd {}
+      end
+      name = ractor.take # => first name
+      ractor.take # => :done
+      name2 = Etc.passwd do |s|
+        break s.name
+      end
+      assert_equal(name2, name)
+    RUBY
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yukihiro Matsumoto
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,13 +80,13 @@ files:
 - ext/etc/etc.c
 - ext/etc/extconf.rb
 - ext/etc/mkconstants.rb
-- stub/etc.rb
 - test/etc/test_etc.rb
 homepage: https://github.com/ruby/etc
 licenses:
+- Ruby
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: Provides access to information typically stored in UNIX /etc directory.
 test_files: []

data/stub/etc.rb

@@ -1 +0,0 @@
-require "#{RUBY_VERSION[/\d+\.\d+/]}/etc.so"