mkmf-lite 0.2.3 → 0.2.4

data/CHANGES

@@ -1,3 +1,6 @@
+= 0.2.4 - 7-Mar-2013
+* The have_header method now accepts an optional list of directories to search.
+
 = 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++.

data/README

@@ -11,7 +11,7 @@
   require 'mkmf/lite'
 
   class System
-    include Mkmf::Lite
+    extend Mkmf::Lite
 
     HAVE_PW_NAME = have_struct_member('struct passwd', 'pw_name', 'pwd.h')
 

data/lib/mkmf/lite.rb

@@ -12,7 +12,7 @@ end
 module Mkmf
   module Lite
     # The version of the mkmf-lite library
-    MKMF_LITE_VERSION = '0.2.3'
+    MKMF_LITE_VERSION = '0.2.4'
 
     @@cpp_command = RbConfig::CONFIG['CC'] || RbConfig::CONFIG['CPP']
     @@cpp_srcfile = 'conftest.c'
@@ -43,14 +43,24 @@ module Mkmf
       end
     end
 
-    # Check for the presence of the given +header+ file.
+    # Check for the presence of the given +header+ file. You may optionally
+    # provide a list of directories to search.
     #
     # Returns true if found, or false if not found.
     #
-    def have_header(header)
+    def have_header(header, *directories)
       erb = ERB.new(read_template('have_header.erb'))
       code = erb.result(binding)
-      try_to_compile(code)
+
+      if directories.empty?
+        options = nil
+      else
+        options = ""
+        directories.each{ |dir| options += "-I#{dir} " }
+        options.rstrip!
+      end
+
+      try_to_compile(code, options)
     end
 
     # Check for the presence of the given +function+ in the common header
@@ -197,7 +207,7 @@ module Mkmf
     # Note that $stderr is temporarily redirected to the null device because
     # we don't actually care about the reason for failure.
     #
-    def try_to_compile(code)
+    def try_to_compile(code, command_options=nil)
       begin
         boolean = false
         stderr_orig = $stderr.dup
@@ -206,7 +216,12 @@ module Mkmf
         Dir.chdir(Dir.tmpdir){
           File.open(@@cpp_srcfile, 'w'){ |fh| fh.write(code) }
 
-          command  = @@cpp_command + ' '
+          if command_options
+            command  = @@cpp_command + ' ' + command_options + ' '
+          else
+            command  = @@cpp_command + ' '
+          end
+
           command += @@cpp_outfile + ' '
           command += @@cpp_srcfile
 

data/mkmf-lite.gemspec

@@ -3,11 +3,11 @@ 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.3'
+  spec.version   = '0.2.4'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'http://www.rubyforge.org/projects/shards'
+  spec.homepage  = 'http://github.com/djberg96/mkmf-lite'
   spec.test_file = 'test/test_mkmf_lite.rb'
   spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
 

data/test/test_mkmf_lite.rb

@@ -21,7 +21,7 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
   end
 
   test "version information" do
-    assert_equal('0.2.3', MKMF_LITE_VERSION)
+    assert_equal('0.2.4', MKMF_LITE_VERSION)
   end
 
   test "have_header basic functionality" do
@@ -33,9 +33,9 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
     assert_false(have_header('foobar.h'))
   end
 
-  test "have_header requires one argument only" do
-    assert_raise(ArgumentError){ have_header }
-    assert_raise(ArgumentError){ have_header('stdio.h', 'stdlib.h') }
+  test "have_header accepts an array of directories as a second argument" do
+    assert_nothing_raised{ have_header('stdio.h', '/usr/local/include') }
+    assert_nothing_raised{ have_header('stdio.h', '/usr/local/include', '/usr/include') }
   end
 
   test "have_func basic functionality" do

metadata

@@ -1,107 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mkmf-lite
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.2.4
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ptools
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+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"
 email: djberg96@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
-files: 
-- test/test_mkmf_lite.rb
-- Rakefile
-- MANIFEST
+files:
 - CHANGES
-- lib/mkmf/templates/have_func.erb
+- lib/mkmf/lite.rb
 - lib/mkmf/templates/check_sizeof.erb
-- lib/mkmf/templates/have_header.erb
+- lib/mkmf/templates/have_func.erb
 - lib/mkmf/templates/have_func_pointer.erb
+- lib/mkmf/templates/have_header.erb
 - lib/mkmf/templates/have_struct_member.erb
-- lib/mkmf/lite.rb
-- README
+- MANIFEST
 - mkmf-lite.gemspec
-homepage: http://www.rubyforge.org/projects/shards
-licenses: 
+- Rakefile
+- README
+- test/test_mkmf_lite.rb
+homepage: http://github.com/djberg96/mkmf-lite
+licenses:
 - Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shards
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A lighter version of mkmf designed for use as a library
-test_files: 
+test_files:
 - test/test_mkmf_lite.rb