mkmf-lite 0.2.2 → 0.2.3

data/CHANGES

@@ -1,3 +1,11 @@
+= 0.2.3 - 25-Apr-2012
+* No longer assumes mingw/gcc on Windows. Now passes all tests with a
+  version of Ruby compiled with MSVC++.
+* Eliminate Config vs RbConfig warnings in 1.9.3.
+* The stdout stream is now temporarily closed in places where it could
+  result in unwanted output.
+* Upgraded test-unit prerequisite to 2.4.0 or later.
+
 = 0.2.2 - 6-Dec-2011
 * Added the check_sizeof method.
 * If CONFIG['COMMON_HEADERS'] is blank then stdio.h and stdlib.h are

data/lib/mkmf/lite.rb

@@ -12,14 +12,19 @@ end
 module Mkmf
   module Lite
     # The version of the mkmf-lite library
-    MKMF_LITE_VERSION = '0.2.2'
+    MKMF_LITE_VERSION = '0.2.3'
 
-    @@cpp_command = Config::CONFIG['CC'] || Config::CONFIG['CPP']
-    @@cpp_outfile = Config::CONFIG['CPPOUTFILE'] || "-o conftest.i"
+    @@cpp_command = RbConfig::CONFIG['CC'] || RbConfig::CONFIG['CPP']
     @@cpp_srcfile = 'conftest.c'
 
-    if Config::CONFIG['LIBS']
-      @@cpp_libraries = Config::CONFIG['LIBS'] + Config::CONFIG['LIBRUBYARG']
+    if File::ALT_SEPARATOR && RbConfig::CONFIG['CPP'] =~ /^cl/
+      @@cpp_outfile = '/Feconftest.exe'
+    else
+      @@cpp_outfile = '-o conftest.exe'
+    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.
@@ -28,7 +33,7 @@ module Mkmf
 
     # JRuby, and possibly others
     unless @@cpp_command
-      case Config::CONFIG['host_os']
+      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
@@ -117,7 +122,7 @@ module Mkmf
     def get_header_string(headers)
       headers = [headers] unless headers.is_a?(Array)
 
-      common_headers = Config::CONFIG['COMMON_HEADERS']
+      common_headers = RbConfig::CONFIG['COMMON_HEADERS']
 
       if common_headers.nil? || common_headers.empty?
         if headers.empty?
@@ -148,6 +153,7 @@ module Mkmf
         result = 0
 
         stderr_orig = $stderr.dup
+        stdout_orig = $stdout.dup
 
         Dir.chdir(Dir.tmpdir){
           File.open(@@cpp_srcfile, 'w'){ |fh| fh.write(code) }
@@ -156,22 +162,29 @@ module Mkmf
           command += @@cpp_outfile + ' '
           command += @@cpp_srcfile
 
+          # Temporarily close these
           $stderr.reopen(File.null)
+          $stdout.reopen(File.null)
 
           if system(command)
-            Open3.popen3("./conftest.i") do |stdin, stdout, stderr|
+            $stdout.reopen(stdout_orig) # We need this back for open3 to work.
+
+            conftest = File::ALT_SEPARATOR ? "conftest.exe" : "./conftest.exe"
+
+            Open3.popen3(conftest) do |stdin, stdout, stderr|
               stdin.close
               stderr.close
               result = stdout.gets.chomp.to_i
             end
           else
-            raise "Failed to compile source code:\n===\n" + code + "==="
+            raise "Failed to compile source code with command '#{command}':\n===\n" + code + "==="
           end
         }
       ensure
         File.delete(@@cpp_srcfile) if File.exists?(@@cpp_srcfile)
         File.delete(@@cpp_outfile) if File.exists?(@@cpp_outfile)
         $stderr.reopen(stderr_orig)
+        $stdout.reopen(stdout_orig)
       end
 
       result
@@ -188,6 +201,7 @@ module Mkmf
       begin
         boolean = false
         stderr_orig = $stderr.dup
+        stdout_orig = $stdout.dup
 
         Dir.chdir(Dir.tmpdir){
           File.open(@@cpp_srcfile, 'w'){ |fh| fh.write(code) }
@@ -197,11 +211,13 @@ module Mkmf
           command += @@cpp_srcfile
 
           $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)
+        $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.2.2'
+  spec.version   = '0.2.3'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = 'shards'
    
   spec.add_dependency('ptools')
-  spec.add_development_dependency('test-unit', '>= 2.1.2')
+  spec.add_development_dependency('test-unit', '>= 2.4.0')
 
   spec.description = <<-EOF
     The mkmf-lite library is a light version of the the mkmf library

data/test/test_mkmf_lite.rb

@@ -4,8 +4,7 @@
 # Tests for the mkmf-lite library.
 ########################################################################
 require 'rubygems'
-gem 'test-unit'
-require 'test/unit'
+require 'test-unit'
 require 'mkmf/lite'
 
 class TC_Mkmf_Lite < Test::Unit::TestCase
@@ -22,7 +21,7 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
   end
 
   test "version information" do
-    assert_equal('0.2.2', MKMF_LITE_VERSION)
+    assert_equal('0.2.3', MKMF_LITE_VERSION)
   end
 
   test "have_header basic functionality" do
@@ -84,7 +83,7 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
 
   test "check_sizeof basic functionality" do
     assert_respond_to(self, :check_sizeof)
-    assert_nothing_raised{ check_sizeof('struct passwd', 'pwd.h') }
+    assert_nothing_raised{ check_sizeof(@st_type, @st_header) }
   end
 
   test "check_sizeof requires at least one argument" do
@@ -102,7 +101,7 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
   end
 
   test "check_sizeof returns an integer value" do
-    size = check_sizeof('struct passwd', 'pwd.h')
+    size = check_sizeof(@st_type, @st_header)
     assert_kind_of(Integer, size)
     assert_true(size > 0)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mkmf-lite
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ptools
@@ -39,12 +39,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
         - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 4
+        - 0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 description: "    The mkmf-lite library is a light version of the the mkmf library\n    designed for use as a library. It does not create packages, builds,\n    or log files of any kind. Instead, it provides mixin methods that you\n    can use in FFI or tests to check for the presence of header files,\n    constants, and so on.\n"
@@ -58,18 +58,18 @@ extra_rdoc_files:
 - README
 - MANIFEST
 files: 
+- test/test_mkmf_lite.rb
+- Rakefile
+- MANIFEST
 - CHANGES
-- lib/mkmf/lite.rb
-- lib/mkmf/templates/check_sizeof.erb
 - lib/mkmf/templates/have_func.erb
-- lib/mkmf/templates/have_func_pointer.erb
+- lib/mkmf/templates/check_sizeof.erb
 - lib/mkmf/templates/have_header.erb
+- lib/mkmf/templates/have_func_pointer.erb
 - lib/mkmf/templates/have_struct_member.erb
-- MANIFEST
-- mkmf-lite.gemspec
-- Rakefile
+- lib/mkmf/lite.rb
 - README
-- test/test_mkmf_lite.rb
+- mkmf-lite.gemspec
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
 - Artistic 2.0
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A lighter version of mkmf designed for use as a library