etc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470f56643e5fb28930ac3d0d1cb4200778c74610c06d958a2c5264eed49fd6ed
-  data.tar.gz: 311937e0471e67df04429ca390b9dd7240e7cb1bef91ca4f06232be0966f8d4f
+  metadata.gz: 8218a130776bcf7e69fb68b5b8a244800979432037ecf2af6b8c95749fcbda19
+  data.tar.gz: 5339f70535a1a31ae93cbf0fe4e700e65dd623150c849c0b41efa930c1c23ade
 SHA512:
-  metadata.gz: 6afef3a83d16491cf6ae5baf9cd0dc496681cb06a58647e9b7389ff149dbaa548a372642657615392ca1b087aaaa94ef3e72a3f75bb25e12a9172e29752a272a
-  data.tar.gz: ee873bfdd434c3e5f501890dcd0707dbed08f6deb68ffb918d2b5c3823612db8e1e3b34286f8b32a032a62ed5089fef9a07e0a07832e9fc37d1c725c8b30a2d0
+  metadata.gz: 1c305c2f6b5544442ca1881d0ebb8f05afa69001f96cf80e72155d6d9a18ce369f24db2e2a9be6e34bc96df1c2a700c0f0eec850f403ab66db1587a3bed2b2c6
+  data.tar.gz: 00bd1808f923eda5d2a6b45a4eb8b68597d13e9107bd5ff9d7ca704f642cf43df0b92004d5bb366da045e694de709374f75e772ace077503c745571611f23cc6

data/README.md

@@ -26,7 +26,7 @@ Or install it yourself as:
 
 ## Usage
 
-```
+```ruby
 require 'etc'
 
 login = Etc.getlogin

data/Rakefile

@@ -7,12 +7,7 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/test_*.rb']
 end
 
-file("constdefs.h") do
-  `ruby ext/etc/mkconstants.rb -o ext/etc/constdefs.h`
-end
-
 require "rake/extensiontask"
 Rake::ExtensionTask.new("etc")
-task :compile => "constdefs.h".to_sym
 
 task :default => :test

data/etc.gemspec

@@ -1,10 +1,8 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
   spec.name          = "etc"
-  spec.version       = "1.0.0"
-  spec.date          = '2017-12-13'
+  spec.version       = "1.0.1"
   spec.authors       = ["Yukihiro Matsumoto"]
   spec.email         = ["matz@ruby-lang.org"]
 

data/ext/etc/extconf.rb

@@ -41,6 +41,10 @@ have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
 have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
 have_struct_member('struct group', 'gr_passwd', 'grp.h')
 
+srcdir = File.expand_path("..", __FILE__)
+if !File.exists?("#{srcdir}/constdefs.h")
+  %x[#{RbConfig.ruby} #{srcdir}/mkconstants.rb -o #{srcdir}/constdefs.h]
+end
 $distcleanfiles << "constdefs.h"
 
 create_makefile("etc")

data/ext/etc/mkconstants.rb

@@ -66,7 +66,15 @@ def each_name(pat)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+erb_new = lambda do |src, safe, trim|
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    ERB.new(src, trim_mode: trim)
+  else
+    ERB.new(src, safe, trim)
+  end
+end
+
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % each_const {|name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -80,7 +88,7 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % each_const {|name, default_value|
 #if defined(<%=name%>)
 %   if comment = COMMENTS[name]
@@ -91,13 +99,13 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % }
 EOS
 
-header_result = ERB.new(<<'EOS', nil, '%').result(binding)
+header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 <%= gen_const_decls %>
 EOS
 
-result = ERB.new(<<'EOS', nil, '%').result(binding)
+result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 #ifdef HAVE_LONG_LONG

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yukihiro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provides access to information typically stored in UNIX /etc directory.