mkmf-lite 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2bb0ebe67ed8844ab179b66b5818a0affe93ce2d762bca7a43b920161b7dfdb
-  data.tar.gz: 7d972aa186c36a84b613409ebc15c9223a21a2520f9565483976ae8d875bff0b
+  metadata.gz: 72c07ed9aa3d8aef12735ec24829df062a4e0461251cbc756f1b45e4e7db0c84
+  data.tar.gz: '04393aeb022d6686e32406dc15f0370ca128ca65508ef11d07c477c1049a3728'
 SHA512:
-  metadata.gz: 6a5064c3121ff5d770339e482f0d1a6b42113c2f405ce1265886e122e9754eb58c1152028deb0662bf9c46ed25b8c7204c946cbf6c162346c522cc65431ac301
-  data.tar.gz: 00e32c33cfb6d7125ddb1c66151d1b775693a0705b07bf1e525ba5428574e9b4cca146ea52c02123ff485fb098aac4c919e2b24b69c7913971e4544ba0f4edf5
+  metadata.gz: 69323d948af2a1c02bdb3b2189b083f66a19438c6ecfa142414b25f46465aa2c5e1860c3993d6dbac69eb337de939ef80defce1caa65267c25db6a9a5f1b9148
+  data.tar.gz: cd7610faf9fcc1638980e4938b87fa73a9beb6376e291c51ba4fdc79e616a01e4db2493211d55ccf07d1f58c94b077e15c573a403bc363f42c657b4005f347b9

data/CHANGES.md

@@ -1,4 +1,15 @@
-## 0.5.2 - 24-Mar-2022
+## 0.7.0 - 13-Sep-2024
+* Append typical library switches to the compiler command. There was a private
+  method already in the code but I wasn't using it.
+* Append DEFS if present in your RbConfig options. This was mainly to ensure
+  that FILE_OFFSET_BITS is passed, if present, but there could be other
+  macros in theory.
+
+## 0.6.0 - 26-Sep-2023
+* Added the memoist gem and memoized the results of all public methods since
+  the odds of them changing between calls is basically zero.
+
+## 0.5.2 - 24-Mar-2023
 * Lots of rubocop updates and minor cleanup, including the addition of
   rubocop and rubocop-rspec as deve dependencies.
 * Deprecation warning fixes (actually bug fixes for Ruby 3.2).

data/README.md

@@ -1,3 +1,5 @@
+[![Ruby](https://github.com/djberg96/mkmf-lite/actions/workflows/ruby.yml/badge.svg)](https://github.com/djberg96/mkmf-lite/actions/workflows/ruby.yml)
+
 ## Summary
 A light version of mkmf designed for use within programs.
 
@@ -41,18 +43,18 @@ used in conjunction with FFI. Also, the source code is quite readable.
 It does not package C extensions, nor generate a log file or a Makefile. It
 does, however, require that you have a C compiler somewhere on your system.
 
-## Known Issues
-You may see this warning from JRuby 1.4.x and earlier:
-
-warning: Useless use of a variable in void context.
+As of version 0.6.0 it memoizes the results of any checks that you make
+since they wouldn't ever change without requiring a reboot/restart of your
+server, container, etc, anyway.
 
-You can ignore these (or, upgrade your Jruby).
+## Known Issues
+Very old versions of JRuby will emit a warning. You should upgrade.
 
 ## License
 Apache-2.0
 
 ## Copyright
-(C) 2010-2020 Daniel J. Berger
+(C) 2010-2023 Daniel J. Berger
 All Rights Reserved
 
 ## Warranty

data/Rakefile

@@ -26,4 +26,9 @@ RuboCop::RakeTask.new
 desc "Run the test suite"
 RSpec::Core::RakeTask.new(:spec)
 
+# Clean up afterwards
+Rake::Task[:spec].enhance do
+  Rake::Task[:clean].invoke
+end
+
 task :default => :spec

data/lib/mkmf/lite.rb

@@ -5,17 +5,25 @@ require 'rbconfig'
 require 'tmpdir'
 require 'open3'
 require 'ptools'
+require 'fileutils'
+require 'memoist'
 
 # The Mkmf module serves as a namespace only.
 module Mkmf
   # The Lite module scopes the Mkmf module to differentiate it from the
   # Mkmf module in the standard library.
   module Lite
+    extend Memoist
+
     # The version of the mkmf-lite library
-    MKMF_LITE_VERSION = '0.5.2'
+    MKMF_LITE_VERSION = '0.7.0'
 
     private
 
+    def cpp_defs
+      RbConfig::CONFIG['DEFS']
+    end
+
     # rubocop:disable Layout/LineLength
     def cpp_command
       command = RbConfig::CONFIG['CC'] || RbConfig::CONFIG['CPP'] || File.which('cc') || File.which('gcc') || File.which('cl')
@@ -24,6 +32,8 @@ module Mkmf
     end
     # rubocop:enable Layout/LineLength
 
+    memoize :cpp_command
+
     def cpp_source_file
       'conftest.c'
     end
@@ -36,16 +46,20 @@ module Mkmf
       end
     end
 
-    # TODO: We should adjust this based on OS. For now we're using
-    # arguments I think you'll typically see set on Linux and BSD.
+    memoize :cpp_out_file
+
     def cpp_libraries
-      if RbConfig::CONFIG['LIBS']
-        RbConfig::CONFIG['LIBS'] + RbConfig::CONFIG['LIBRUBYARG']
+      return if File::ALT_SEPARATOR && RbConfig::CONFIG['CPP'] =~ /^cl/
+
+      if cpp_command =~ /clang/i
+        '-Lrt -Ldl -Lcrypt -Lm'
       else
         '-lrt -ldl -lcrypt -lm'
       end
     end
 
+    memoize :cpp_libraries
+
     public
 
     # Check for the presence of the given +header+ file. You may optionally
@@ -68,6 +82,8 @@ module Mkmf
       try_to_compile(code, options)
     end
 
+    memoize :have_header
+
     # Check for the presence of the given +function+ in the common header
     # files, or within any +headers+ that you provide.
     #
@@ -87,6 +103,8 @@ module Mkmf
       try_to_compile(ptr_code) || try_to_compile(std_code)
     end
 
+    memoize :have_func
+
     # Checks whether or not the struct of type +struct_type+ contains the
     # +struct_member+. If it does not, or the struct type cannot be found,
     # then false is returned.
@@ -102,6 +120,8 @@ module Mkmf
       try_to_compile(code)
     end
 
+    memoize :have_struct_member
+
     # Returns the value of the given +constant+ (which could also be a macro)
     # using +headers+, or common headers if no headers are specified.
     #
@@ -116,6 +136,8 @@ module Mkmf
       try_to_execute(code)
     end
 
+    memoize :check_valueof
+
     # Returns the sizeof +type+ using +headers+, or common headers if no
     # headers are specified.
     #
@@ -137,6 +159,8 @@ module Mkmf
       try_to_execute(code)
     end
 
+    memoize :check_sizeof
+
     private
 
     # Take an array of header file names (or convert it to an array if it's a
@@ -185,7 +209,7 @@ module Mkmf
         Dir.chdir(Dir.tmpdir) do
           File.write(cpp_source_file, code)
 
-          command  = "#{cpp_command} "
+          command  = "#{cpp_command} #{cpp_libraries} #{cpp_defs} "
           command += "#{cpp_out_file} "
           command += cpp_source_file
 
@@ -208,8 +232,8 @@ module Mkmf
           end
         end
       ensure
-        File.delete(cpp_source_file) if File.exist?(cpp_source_file)
-        File.delete(cpp_out_file) if File.exist?(cpp_out_file)
+        FileUtils.rm_f(cpp_source_file)
+        FileUtils.rm_f(cpp_out_file)
         $stderr.reopen(stderr_orig)
         $stdout.reopen(stdout_orig)
       end
@@ -234,9 +258,9 @@ module Mkmf
           File.write(cpp_source_file, code)
 
           if command_options
-            command  = "#{cpp_command} #{command_options} "
+            command  = "#{cpp_command} #{command_options} #{cpp_libraries} #{cpp_defs} "
           else
-            command  = "#{cpp_command} "
+            command  = "#{cpp_command} #{cpp_libraries} #{cpp_defs} "
           end
 
           command += "#{cpp_out_file} "
@@ -247,8 +271,8 @@ module Mkmf
           boolean = system(command)
         end
       ensure
-        File.delete(cpp_source_file) if File.exist?(cpp_source_file)
-        File.delete(cpp_out_file) if File.exist?(cpp_out_file)
+        FileUtils.rm_f(cpp_source_file)
+        FileUtils.rm_f(cpp_out_file)
         $stdout.reopen(stdout_orig)
         $stderr.reopen(stderr_orig)
       end

data/mkmf-lite.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 Gem::Specification.new do |spec|
   spec.name       = 'mkmf-lite'
   spec.summary    = 'A lighter version of mkmf designed for use as a library'
-  spec.version    = '0.5.2'
+  spec.version    = '0.7.0'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.cert_chain = ['certs/djberg96_pub.pem']
 
   spec.add_dependency('ptools', '~> 1.4')
+  spec.add_dependency('memoist', '~> 0.16.2')
+
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec', '~> 3.9')
   spec.add_development_dependency('rubocop')

data/spec/mkmf_lite_spec.rb

@@ -8,6 +8,7 @@
 require 'rubygems'
 require 'rspec'
 require 'mkmf/lite'
+require 'fileutils'
 
 RSpec.describe Mkmf::Lite do
   subject { Class.new{ |obj| obj.extend Mkmf::Lite } }
@@ -19,7 +20,7 @@ RSpec.describe Mkmf::Lite do
 
   describe 'constants' do
     example 'version information' do
-      expect(described_class::MKMF_LITE_VERSION).to eq('0.5.2')
+      expect(described_class::MKMF_LITE_VERSION).to eq('0.7.0')
       expect(described_class::MKMF_LITE_VERSION).to be_frozen
     end
   end
@@ -81,7 +82,7 @@ RSpec.describe Mkmf::Lite do
     end
 
     example 'have_struct_member accepts a maximum of three arguments' do
-      expect{ subject.have_struct_member('struct passwd', 'pw_name', 'pwd.h', true) }.to raise_error(ArgumentError)
+      expect{ subject.have_struct_member('struct passwd', 'pw_name', 'pwd.h', 1) }.to raise_error(ArgumentError)
     end
   end
 
@@ -106,7 +107,7 @@ RSpec.describe Mkmf::Lite do
 
     example 'check_valueof returns an integer value' do
       value = subject.check_valueof(constant)
-      expect(value).to be_kind_of(Integer)
+      expect(value).to be_a(Integer)
       expect(value).to eq(-1)
     end
   end
@@ -132,7 +133,7 @@ RSpec.describe Mkmf::Lite do
 
     example 'check_sizeof returns an integer value' do
       size = subject.check_sizeof(st_type, st_header)
-      expect(size).to be_kind_of(Integer)
+      expect(size).to be_a(Integer)
       expect(size).to be > 0
     end
   end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: mkmf-lite
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ptools
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: memoist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +160,7 @@ metadata:
   source_code_uri: https://github.com/djberg96/mkmf-lite
   wiki_uri: https://github.com/djberg96/mkmf-lite/wiki
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.5.11
+signing_key: 
 specification_version: 4
 summary: A lighter version of mkmf designed for use as a library
 test_files: