mkmf-lite 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59f20bb604e0a323f49572cfbc5f31d3b0b365f6
-  data.tar.gz: 45b42cdbbf3f2c1c9ef57456368ee27850304c78
+SHA256:
+  metadata.gz: b09c774e9b8a62f9c17fc3bddb1a3f5031aec85456258ff557dbd7945897a029
+  data.tar.gz: 1f278b056338594d68a3bcc6d3a2b61730fc91acca58826335119c34d9736298
 SHA512:
-  metadata.gz: 3e4129a030a9ee2157fdc4c4c9c7f9df7d3b7e261bb5cdef78219f0d53c2afd801d0e257e5280cfcf4ab21cf92a60e290b2c8806fdacbcbdf65d20338bfee261
-  data.tar.gz: 0234569427bc297f72eb0b3f06efcb8cc3c03979a49489ccf115f1c393f1f2600000562122671baef03767eeac62638b0dbd15e2eb6eaba8286355a4bf9311f0
+  metadata.gz: 05766eb2658383495265b925361943902dacdab84e8fd88c514ec1b4797f0deb3569e9f82462a8f84ddcd42bd90a0840e0c4384d8f1e60a0403fa10d376d3ab5
+  data.tar.gz: b919b4924fd50ac8137c1d76bbb613c3c66f243f9c51c162473377c9b790a66aa263ef86662e87740c59a99fa08d853c3ddb701e41dde438503e972cc445ff14

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.3.0 - 6-Jan-2019
+* Changed license to Apache-2.0.
+* Replaced class variables with methods.
+* Updated cert.
+
 = 0.2.6 - 6-Sep-2015
 * Added an mkmf-lite.rb file for convenience.
 * Assume Rubygems 2.x.

data/README

@@ -44,10 +44,10 @@
   You can ignore these (or, upgrade your Jruby).
 
 == License
-  Artistic 2.0
+  Apache-2.0
 
 == Copyright
-  (C) 2010-2015 Daniel J. Berger
+  (C) 2010-2019 Daniel J. Berger
   All Rights Reserved
 
 == Warranty

data/certs/djberg96_pub.pem

@@ -1,21 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
 cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
 ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
-bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-tGSHgAmcLlkdGgan182qsE/4kKM=
+bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+/3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
 -----END CERTIFICATE-----

data/lib/mkmf/lite.rb

@@ -7,42 +7,40 @@ require 'open3'
 module Mkmf
   module Lite
     # The version of the mkmf-lite library
-    MKMF_LITE_VERSION = '0.2.6'
+    MKMF_LITE_VERSION = '0.3.0'.freeze
 
-    @@cpp_command = RbConfig::CONFIG['CC'] || RbConfig::CONFIG['CPP']
-    @@cpp_srcfile = 'conftest.c'
+    private
 
-    if File::ALT_SEPARATOR && RbConfig::CONFIG['CPP'] =~ /^cl/
-      @@cpp_outfile = '/Feconftest.exe'
-    else
-      @@cpp_outfile = '-o conftest.exe'
+    def cpp_command
+      command = RbConfig::CONFIG['CC'] || RbConfig::CONFIG['CPP'] || File.which('cc') || File.which('gcc') || File.which('cl')
+      raise "Compiler not found" unless command
+      command
     end
 
-    if RbConfig::CONFIG['LIBS']
-      @@cpp_libraries = RbConfig::CONFIG['LIBS'] + RbConfig::CONFIG['LIBRUBYARG']
-    else
-      # 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.
-      @@cpp_libraries = "-lrt -ldl -lcrypt -lm"
+    def cpp_source_file
+      'conftest.c'
     end
 
-    # JRuby, and possibly others
-    unless @@cpp_command
-      case RbConfig::CONFIG['host_os']
-        when /msdos|mswin|win32|windows|mingw|cygwin/i
-          @@cpp_command = File.which('cl') || File.which('gcc')
-        when /sunos|solaris|hpux/i
-          @@cpp_command = File.which('cc') || File.which('gcc')
-        else
-          @@cpp_command = 'gcc'
+    def cpp_out_file
+      if File::ALT_SEPARATOR && RbConfig::CONFIG['CPP'] =~ /^cl/
+        '/Feconftest.exe'
+      else
+        '-o conftest.exe'
       end
     end
 
-    # Ruby installer can't be trusted to set a sane value
-    if RbConfig::CONFIG['host_os'] =~ /mingw/i
-      @@cpp_command = File.which('gcc')
+    # 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.
+    def cpp_libraries
+      if RbConfig::CONFIG['LIBS']
+        RbConfig::CONFIG['LIBS'] + RbConfig::CONFIG['LIBRUBYARG']
+      else
+        '-lrt -ldl -lcrypt -lm'
+      end
     end
 
+    public
+
     # Check for the presence of the given +header+ file. You may optionally
     # provide a list of directories to search.
     #
@@ -166,11 +164,11 @@ module Mkmf
         stdout_orig = $stdout.dup
 
         Dir.chdir(Dir.tmpdir){
-          File.open(@@cpp_srcfile, 'w'){ |fh| fh.write(code) }
+          File.open(cpp_source_file, 'w'){ |fh| fh.write(code) }
 
-          command  = @@cpp_command + ' '
-          command += @@cpp_outfile + ' '
-          command += @@cpp_srcfile
+          command  = cpp_command + ' '
+          command += cpp_out_file + ' '
+          command += cpp_source_file
 
           # Temporarily close these
           $stderr.reopen(File.null)
@@ -191,8 +189,8 @@ module Mkmf
           end
         }
       ensure
-        File.delete(@@cpp_srcfile) if File.exists?(@@cpp_srcfile)
-        File.delete(@@cpp_outfile) if File.exists?(@@cpp_outfile)
+        File.delete(cpp_source_file) if File.exists?(cpp_source_file)
+        File.delete(cpp_out_file) if File.exists?(cpp_out_file)
         $stderr.reopen(stderr_orig)
         $stdout.reopen(stdout_orig)
       end
@@ -214,24 +212,24 @@ module Mkmf
         stdout_orig = $stdout.dup
 
         Dir.chdir(Dir.tmpdir){
-          File.open(@@cpp_srcfile, 'w'){ |fh| fh.write(code) }
+          File.open(cpp_source_file, 'w'){ |fh| fh.write(code) }
 
           if command_options
-            command  = @@cpp_command + ' ' + command_options + ' '
+            command  = cpp_command + ' ' + command_options + ' '
           else
-            command  = @@cpp_command + ' '
+            command  = cpp_command + ' '
           end
 
-          command += @@cpp_outfile + ' '
-          command += @@cpp_srcfile
+          command += cpp_out_file + ' '
+          command += cpp_source_file
 
           $stderr.reopen(File.null)
           $stdout.reopen(File.null)
           boolean = system(command)
         }
       ensure
-        File.delete(@@cpp_srcfile) if File.exists?(@@cpp_srcfile)
-        File.delete(@@cpp_outfile) if File.exists?(@@cpp_outfile)
+        File.delete(cpp_source_file) if File.exists?(cpp_source_file)
+        File.delete(cpp_out_file) if File.exists?(cpp_out_file)
         $stdout.reopen(stdout_orig)
         $stderr.reopen(stderr_orig)
       end

data/mkmf-lite.gemspec

@@ -3,9 +3,9 @@ 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.2.6'
+  spec.version    = '0.3.0'
   spec.author     = 'Daniel J. Berger'
-  spec.license    = 'Artistic 2.0'
+  spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'http://github.com/djberg96/mkmf-lite'
   spec.test_file  = 'test/test_mkmf_lite.rb'
@@ -17,6 +17,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency('ptools')
   spec.add_development_dependency('test-unit', '>= 2.4.0')
 
+  spec.metadata = {
+    'homepage_uri'      => 'https://github.com/djberg96/mkmf-lite',
+    'bug_tracker_uri'   => 'https://github.com/djberg96/mkmf-lite/issues',
+    'changelog_uri'     => 'https://github.com/djberg96/mkmf-lite/blob/master/CHANGES',
+    'documentation_uri' => 'https://github.com/djberg96/mkmf-lite/wiki',
+    'source_code_uri'   => 'https://github.com/djberg96/mkmf-lite',
+    'wiki_uri'          => 'https://github.com/djberg96/mkmf-lite/wiki'
+  }
+
   spec.description = <<-EOF
     The mkmf-lite library is a light version of the the mkmf library
     designed for use as a library. It does not create packages, builds,

data/test/test_mkmf_lite.rb

@@ -21,7 +21,8 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
   end
 
   test "version information" do
-    assert_equal('0.2.6', MKMF_LITE_VERSION)
+    assert_equal('0.3.0', MKMF_LITE_VERSION)
+    assert_true(MKMF_LITE_VERSION.frozen?)
   end
 
   test "have_header basic functionality" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkmf-lite
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
   cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
   ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
-  bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-  tGSHgAmcLlkdGgan182qsE/4kKM=
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+  A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+  u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+  75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+  6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+  iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+  ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+  74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+  058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+  AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+  YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+  /3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+  h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+  6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+  ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+  1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+  DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+  ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+  WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ptools
@@ -90,8 +95,14 @@ files:
 - test/test_mkmf_lite.rb
 homepage: http://github.com/djberg96/mkmf-lite
 licenses:
-- Artistic 2.0
-metadata: {}
+- Apache-2.0
+metadata:
+  homepage_uri: https://github.com/djberg96/mkmf-lite
+  bug_tracker_uri: https://github.com/djberg96/mkmf-lite/issues
+  changelog_uri: https://github.com/djberg96/mkmf-lite/blob/master/CHANGES
+  documentation_uri: https://github.com/djberg96/mkmf-lite/wiki
+  source_code_uri: https://github.com/djberg96/mkmf-lite
+  wiki_uri: https://github.com/djberg96/mkmf-lite/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -108,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A lighter version of mkmf designed for use as a library