mkrf 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,16 @@
+= 0.1.2 10/4/06
+* [CLEAN-UP] Removed useless add_source from Generator. We've got a constructor for that. [35]
+* [FIXED] Generator.new defaults to sources in the local directory, so extconfs can (and should) be kept in the same directory as the extension files (PROJ_ROOT/ext) and won't clobber pre-existing Rakefiles. [35]
+* [CLEAN-UP] Goodbye ugly method missing hack! [34]
+* [NEW] Added objs to Generator. Access it as you might ldshared. -John G.
+* [CLEAN-UP] Removed the redundant .so rule from the generated rakefile. -John G.
+* [FIXED] Correct defaults in Availability. [29]
+* [NEW] Using rubylibdir from rbconfig for library path. [29]
+* [NEW] Availability options go straight to availability without generator modification. [29]
+* [NEW] CFLAGS and LDSHARED now accessible through .cflags and .ldshared. [29]
+* [FIXED] Can now modify Availability options from the Generator contructor. This may break some existing extconfs that use the .new('libname','file_pattern_a', 'file_pattern_b') syntax. File patterns now only belong as arg 2 and should be an array or a string.
+* [FIXED] No indenting generated Rakefile code. [26]
+
 = 0.1.1 8/17/06
 * [NEW] Logging! [22]
 * [NEW] Added a description to the extension building task [21]

data/README

@@ -1,37 +1,44 @@
 = mkrf -- making C extensions for Ruby a bit easier
 
-<tt>mkrf</tt> is intended to replace <tt>mkmf</tt>, a library for building
-Makefiles to build C extensions to Ruby. Its major goals are easy code reuse of
-its <tt>Availability</tt> class and simple, well documented, use of the
-<tt>Generator</tt> class for Rakefile generation for extensions.
+<tt>mkrf</tt> is intended to replace <tt>mkmf</tt> which is a library for building
+Makefiles to build C extensions to Ruby. The major differences between the two is
+that +mkrf+ builds you a Rakefile instead of a Makefile, and also that +mkrf+
+provides an object-oriented interface.
+
+Major goals of mkrf are
+* easy code reuse of its <tt>Availability</tt> class and
+* simple, well documented, use of the <tt>Generator</tt> class.
 
 == Basic Usage
 
 <tt>mkrf</tt> works similarly to <tt>mkmf</tt> in that a user writes an
-extension configuration (usually <tt>extconf.rb</tt>) and then runs it, which
-generates a <tt>Rakefile</tt>. 
+extension configuration file (usually named <tt>extconf.rb</tt>) and then runs
+it (<tt>ruby ./extconf.rb</tt>), which generates a <tt>Rakefile</tt> in the
+current directory.
 
 In general, <tt>extconf.rb</tt> should be placed in the root directory of the 
-extension and it expects by default that files to be compiled have a <tt>.c</tt> 
-extension and are in the <tt>lib/</tt> directory.
+extension (ex. <tt>PROJECT_ROOT/ext/<i>name_of_module</i></tt>) and it expects,
+by default, that files to be compiled have a <tt>.c</tt> extension and reside in
+that same directory. If your project contains multiple extension modules, then
+each one would get its own subdirectory under <tt>PROJECT_ROOT/ext/</tt> and
+have its own <tt>extconf.rb</tt> file.
 
-The most basic usage looks like this, with the name of the library to be linked
-as the first argument to <tt>Mkrf::Generator.new</tt>:
+The most basic usage looks like the following, where the name of the extension
+module being built is "libtrivial":
 
   require 'mkrf'
   Mkrf::Generator.new('libtrivial')
 
-Extra arguments may be passed to the generator in a block:
+Extra arguments may be passed to the Rakefile generator in a block:
   
-  Mkrf::Generator.new('libtrivial) do |g|
+  Mkrf::Generator.new('libtrivial') do |g|
     g.logger.level = Logger::WARN
     g.include_library('z')
   end
 
-If the extension does not follow the source in <tt>lib/</tt> / <tt>.c</tt> 
-extension convention, it may be overridden in the constructor:
+Another example:
 
-  Mkrf::Generator.new('libxml', '*.c') do |g|
+  Mkrf::Generator.new('libxml') do |g|
     g.include_library('socket','socket')
     g.include_header('libxml/xmlversion.h', 
                      '/opt/include/libxml2', 

data/Rakefile

@@ -24,7 +24,14 @@ namespace :test do
   
   desc "Run basic tests"
   Rake::TestTask.new("units") { |t|
-    t.pattern = 'test/test_*.rb'
+    t.pattern = 'test/unit/test_*.rb'
+    t.verbose = true
+    t.warning = true
+  }
+  
+  desc "Run integration tests"
+  Rake::TestTask.new("integration") { |t|
+    t.pattern = 'test/integration/test_*.rb'
     t.verbose = true
     t.warning = true
   }
@@ -99,6 +106,8 @@ spec = Gem::Specification.new do |s|
   s.requirements << 'rake'
   s.require_path = 'lib'
   s.autorequire = 'mkrf'
+  
+  s.extra_rdoc_files = [ "README", "MIT-LICENSE", "CHANGELOG" ]
 
   s.files = [ "Rakefile", "README", "CHANGELOG", "MIT-LICENSE" ]
   s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }

data/lib/mkrf/availability.rb

@@ -9,8 +9,9 @@ module Mkrf
   # which need to determine functionality based on what libraries are available
   # on the current system.
   class Availability
-    DEFAULT_LIBS = ["ruby", "dl"]
-    
+    DEFAULT_INCLUDES = [Config::CONFIG['includedir'], Config::CONFIG["archdir"],
+                        Config::CONFIG['sitelibdir'], "."]
+                        
     # These really shouldn't be static like this..
     TEMP_SOURCE_FILE = "temp_source.c"
     TEMP_EXECUTABLE = "temp_executable"
@@ -25,10 +26,12 @@ module Mkrf
     # * <tt>:compiler</tt> -- which compiler to use when determining availability
     # * <tt>:includes</tt> -- directories that should be searched for include files
     def initialize(options = {})
-      @loaded_libs = options[:loaded_libs] || DEFAULT_LIBS
-      @headers = options[:headers] || []
-      @compiler = options[:compiler] || "gcc"
-      @includes = (options[:includes].to_a) || []
+      
+      @loaded_libs = (options[:loaded_libs] || Config::CONFIG["LIBS"].gsub('-l', '').split).to_a
+      # Not sure what COMMON_HEADERS looks like when populated
+      @headers = options[:headers] || [] # Config::CONFIG["COMMON_HEADERS"]
+      @compiler = options[:compiler] || Config::CONFIG["CC"]
+      @includes = (options[:includes] || DEFAULT_INCLUDES).to_a
       @logger = Logger.new('mkrf.log')
     end
     
@@ -104,13 +107,16 @@ module Mkrf
       FileUtils.rm_f TEMP_EXECUTABLE
     end
     
-    def method_missing(method, *args, &b)
-      if match = /^with_([_a-zA-Z]\w*)$/.match(method.to_s)
-        super unless STACKABLE_ATTRIBUTES.include? match[1]
-        with_stackable_attribute(match[1], *args, &b)
-      else
-        super
-      end
+    def with_headers(*args, &b)
+      with_stackable_attribute('headers', *args, &b)
+    end
+    
+    def with_loaded_libs(*args, &b)
+      with_stackable_attribute('loaded_libs', *args, &b)
+    end
+    
+    def with_includes(*args, &b)
+      with_stackable_attribute('includes', *args, &b)
     end
     
     # Returns a string of libraries formatted for compilation
@@ -176,8 +182,6 @@ module Mkrf
       return false
     end
     
-    STACKABLE_ATTRIBUTES = ['loaded_libs', 'headers', 'includes']
-    
     def with_stackable_attribute(attribute, *args)
       args = args.to_a
       instance_variable_set("@#{attribute}", 

data/lib/mkrf/generator.rb

@@ -6,9 +6,15 @@ require 'rake/tasklib'
 module Mkrf
   
   # +Generator+ is concerned with taking configuration for an extension
-  # and writing a +Rakefile+ to the local filesystem to build the extension.
+  # and writing a +Rakefile+ to the local filesystem which will later be
+  # used to build the extension.
+  #
+  # You will typically only create one +Generator+ per <tt>extconf.rb</tt>
+  # file, which in turn will generate a Rakefile for building one extension
+  # module.
   #
   # = Usage
+  #
   # In the most basic usage, +Generator+ simply takes the name of the library
   # to compile:
   #
@@ -18,7 +24,7 @@ module Mkrf
   # Configuration of the build can be passed to the +Generator+ constructor
   # as a block:
   #
-  #   Mkrf::Generator.new('libxml', '*.c') do |g|
+  #   Mkrf::Generator.new('libxml') do |g|
   #     g.include_library('socket','socket')
   #     g.include_header('libxml/xmlversion.h',
   #                      '/opt/include/libxml2',
@@ -31,30 +37,46 @@ module Mkrf
     
     CONFIG = Config::CONFIG
     
-    attr_accessor :additional_code # Any extra code to be added to the Rakefile as a string
+    # Any extra code, given as a string, to be appended to the Rakefile.
+    attr_accessor :additional_code
+    
+    # You may append to these attributes directly in your Generator.new block,
+    # for example: <tt>g.objects << ' ../common/foo.o ../common/bar.so -lmystuff'</tt> or
+    # <tt>g.cflags << ' -ansi -Wall'</tt>
+    #
+    # Note the extra space at the beginning of those strings.
+    attr_accessor :cflags
+
+    # +objects+ is for adding _additional_ object files to the link-edit command -- outside
+    # of the ones that correspond to the source files.
+    attr_accessor :objects
+
+    # Any additional options you'd like appended to your system-specific linker command
+    # (which is used to build the shared library).
+    attr_accessor :ldshared
+
+    
     
-    # Create a new generator which will write a new +Rakefile+ to the local
+    # Create a +Generator+ object which writes a Rakefile to the current directory of the local
     # filesystem.
     #
     # Params:
     # * +extension_name+ -- the name of the extension
-    # * +source_patterns+ -- a pattern describing source files to be compiled, "lib/*.c" by default
-    def initialize(extension_name, *source_patterns)
-      @sources = (source_patterns.empty? ? ["lib/*.c"] : source_patterns)
+    # * +source_patterns+ -- an array of patterns describing source files to be compiled. ["*.c"] is the default.
+    def initialize(extension_name, source_patterns = ["*.c"], availability_options = {})
+      @sources = source_patterns
       @extension_name = extension_name + ".#{CONFIG['DLEXT']}"
-      @available = Mkrf::Availability.new(:includes => [CONFIG['includedir'], CONFIG["archdir"],
-                                                        CONFIG['sitelibdir'], "."] )
+      @available = Mkrf::Availability.new(availability_options)
       @defines = []
       
+      objects = ''
+      ldshared = CONFIG['LDSHARED']
+      cflags = "#{CONFIG['CCDLFLAGS']} #{CONFIG['CFLAGS']} #{CONFIG['ARCH_FLAG']}"
+      
       yield self if block_given?
       write_rakefile
     end
     
-    # Add a new pattern to the list of source patterns
-    def add_source(pattern)
-      @sources << pattern
-    end
-    
     # An array of the source patterns as single quoted strings
     def sources
       @sources.collect {|s| "'#{s}'"}
@@ -62,7 +84,7 @@ module Mkrf
     
     # Add a define to the compile string. Example: 
     #
-    #   Mkrf::Generator.new('my_library.bundle') do |g|    
+    #   Mkrf::Generator.new('my_library') do |g|    
     #     g.add_define(HAVE_PTHREADS)
     #   end
     #
@@ -123,41 +145,40 @@ module Mkrf
     
     def rakefile_contents # :nodoc:
       <<-END_RAKEFILE
-        require 'rake/clean'
-        
-        CLEAN.include('*.o')
-        CLOBBER.include('#{@extension_name}', 'mkrf.log')
-        
-        SRC = FileList[#{sources.join(',')}]
-        OBJ = SRC.ext('o')
-        CC = "gcc"
-
-        LDSHARED = "#{CONFIG['LDSHARED']}"
-        LIBPATH =  '-L"/usr/local/lib"'
-        
-        INCLUDES = "#{@available.includes_compile_string}"
-
-        LIBS = "#{@available.library_compile_string}"
-
-        CFLAGS   = "#{CONFIG['CCDLFLAGS']} #{CONFIG['CFLAGS']} #{CONFIG['ARCH_FLAG']} #{defines_compile_string}"
-        
-        task :default => ['#{@extension_name}']
-
-        rule '.o' => '.c' do |t|
-          sh "\#{CC} \#{CFLAGS} \#{INCLUDES} -c -o \#{t.name} \#{t.source}"
-        end
-
-        rule '.so' => '.o' do |t|
-          sh "\#{LDSHARED} \#{LIBPATH} -o \#{OBJ} \#{LOCAL_LIBS} \#{LIBS}"
-        end
-
-        desc "Build this extension"
-        file '#{@extension_name}' => OBJ do
-          sh "\#{LDSHARED} \#{LIBPATH} -o #{@extension_name} \#{OBJ} \#{LIBS}"
-        end
-        
-        #{additional_code}
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('#{@extension_name}', 'mkrf.log')
+
+SRC = FileList[#{sources.join(',')}]
+OBJ = SRC.ext('o')
+CC = "gcc"
+
+ADDITIONAL_OBJECTS = '#{objects}'
+
+LDSHARED = "#{CONFIG['LDSHARED']} #{ldshared}"
+
+LIBPATH =  '-L"#{CONFIG['rubylibdir']}"'
+
+INCLUDES = "#{@available.includes_compile_string}"
+
+LIBS = "#{@available.library_compile_string}"
+
+CFLAGS = "#{cflags} #{defines_compile_string}"
+
+task :default => ['#{@extension_name}']
+
+rule '.o' => '.c' do |t|
+  sh "\#{CC} \#{CFLAGS} \#{INCLUDES} -c -o \#{t.name} \#{t.source}"
+end
+
+desc "Build this extension"
+file '#{@extension_name}' => OBJ do
+  sh "\#{LDSHARED} \#{LIBPATH} -o #{@extension_name} \#{OBJ} \#{ADDITIONAL_OBJECTS} \#{LIBS}"
+end
+
+#{additional_code}
       END_RAKEFILE
     end
   end
-end
+end

data/lib/mkrf.rb

@@ -1,4 +1,4 @@
 require File.dirname(__FILE__) + '/mkrf/availability'
 require File.dirname(__FILE__) + '/mkrf/generator'
 
-Mkrf::VERSION = "0.1.1"
+Mkrf::VERSION = "0.1.2"

data/test/{test_sample_projects.rb → integration/test_sample_projects.rb}

@@ -1,12 +1,12 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
 
 class TestSampleProjects < Test::Unit::TestCase
-  SAMPLES_DIR = File.dirname(__FILE__) + '/sample_files'
+  SAMPLES_DIR = File.dirname(__FILE__) + '/../sample_files'
   
   SAMPLE_LIBS = {
-    :trivial => '/libtrivial/libtrivial.bundle',
-    :syck => '/syck-0.55/ext/ruby/ext/syck/syck.bundle',
-    :libxml => '/libxml-ruby-0.3.8/ext/xml/libxml_so.bundle'
+    :trivial => "/libtrivial/libtrivial.#{Config::CONFIG['DLEXT']}",
+    :syck =>    "/syck-0.55/ext/ruby/ext/syck/syck.#{Config::CONFIG['DLEXT']}",
+    :libxml =>  "/libxml-ruby-0.3.8/ext/xml/libxml_so.#{Config::CONFIG['DLEXT']}"
   }
   
   # Set to true for full command line output

data/test/mkrf.log

@@ -0,0 +1 @@
+# Logfile created on Mon Sep 04 16:10:06 PDT 2006 by logger.rb/1.5.2.7

data/test/sample_files/libtrivial/Rakefile

@@ -0,0 +1,33 @@
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('libtrivial.bundle', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = "gcc"
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "cc -dynamic -bundle -undefined suppress -flat_namespace "
+
+LIBPATH =  '-L"/usr/local/lib/ruby/1.8"'
+
+INCLUDES = "-I/usr/local/include -I/usr/local/lib/ruby/1.8/i686-darwin8.6.1 -I/usr/local/lib/ruby/site_ruby/1.8 -I."
+
+LIBS = "-lpthread -ldl -lobjc"
+
+CFLAGS = " "
+
+task :default => ['libtrivial.bundle']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c -o #{t.name} #{t.source}"
+end
+
+desc "Build this extension"
+file 'libtrivial.bundle' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o libtrivial.bundle #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS}"
+end
+
+

data/test/sample_files/libtrivial/mkrf.log

@@ -0,0 +1,2 @@
+# Logfile created on Wed Oct 04 18:07:33 PDT 2006 by logger.rb/1.5.2.7
+I, [2006-10-04T18:07:33.115099 #20208]  INFO -- : Rakefile written

data/test/sample_files/libxml-ruby-0.3.8/ext/xml/Rakefile

@@ -0,0 +1,33 @@
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('libxml_so.bundle', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = "gcc"
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "cc -dynamic -bundle -undefined suppress -flat_namespace "
+
+LIBPATH =  '-L"/usr/local/lib/ruby/1.8"'
+
+INCLUDES = "-I/usr/local/include -I/usr/local/lib/ruby/1.8/i686-darwin8.6.1 -I/usr/local/lib/ruby/site_ruby/1.8 -I. -I/usr/local/include/libxml2"
+
+LIBS = "-lpthread -ldl -lobjc -lz -liconv -lxml2 -lxml2"
+
+CFLAGS = " -DHAVE_ZLIB_H -DHAVE_LIBXML_XMLVERSION_H"
+
+task :default => ['libxml_so.bundle']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c -o #{t.name} #{t.source}"
+end
+
+desc "Build this extension"
+file 'libxml_so.bundle' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o libxml_so.bundle #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS}"
+end
+
+

data/test/sample_files/libxml-ruby-0.3.8/ext/xml/mkrf.log

@@ -0,0 +1,21 @@
+# Logfile created on Wed Oct 04 18:07:24 PDT 2006 by logger.rb/1.5.2.7
+I, [2006-10-04T18:07:24.726052 #19953]  INFO -- : Checking for library: socket
+W, [2006-10-04T18:07:24.899729 #19953]  WARN -- : Function not found: socket()
+W, [2006-10-04T18:07:24.899924 #19953]  WARN -- : Library not found: socket
+I, [2006-10-04T18:07:24.900035 #19953]  INFO -- : Checking for library: nsl
+W, [2006-10-04T18:07:25.077383 #19953]  WARN -- : Function not found: gethostbyname()
+W, [2006-10-04T18:07:25.077586 #19953]  WARN -- : Library not found: nsl
+I, [2006-10-04T18:07:25.077742 #19953]  INFO -- : Checking for library: z
+I, [2006-10-04T18:07:25.222610 #19953]  INFO -- : Function found: inflate()
+I, [2006-10-04T18:07:25.222960 #19953]  INFO -- : Library found: z
+I, [2006-10-04T18:07:25.223161 #19953]  INFO -- : Checking for library: iconv
+I, [2006-10-04T18:07:25.356626 #19953]  INFO -- : Function found: iconv_open()
+I, [2006-10-04T18:07:25.356894 #19953]  INFO -- : Library found: iconv
+I, [2006-10-04T18:07:25.357068 #19953]  INFO -- : Checking for library: xml2
+I, [2006-10-04T18:07:25.504460 #19953]  INFO -- : Function found: xmlParseDoc()
+I, [2006-10-04T18:07:25.504701 #19953]  INFO -- : Library found: xml2
+I, [2006-10-04T18:07:25.863306 #19953]  INFO -- : Header found: libxml/xmlversion.h
+I, [2006-10-04T18:07:25.863622 #19953]  INFO -- : Checking for library: xml2
+I, [2006-10-04T18:07:25.863692 #19953]  INFO -- : Library already loaded: xml2
+I, [2006-10-04T18:07:26.006086 #19953]  INFO -- : Function found: docbCreateFileParserCtxt()
+I, [2006-10-04T18:07:26.006870 #19953]  INFO -- : Rakefile written

data/test/sample_files/syck-0.55/ext/ruby/ext/syck/Rakefile

@@ -0,0 +1,33 @@
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('syck.bundle', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = "gcc"
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "cc -dynamic -bundle -undefined suppress -flat_namespace "
+
+LIBPATH =  '-L"/usr/local/lib/ruby/1.8"'
+
+INCLUDES = "-I/usr/local/include -I/usr/local/lib/ruby/1.8/i686-darwin8.6.1 -I/usr/local/lib/ruby/site_ruby/1.8 -I."
+
+LIBS = "-lpthread -ldl -lobjc"
+
+CFLAGS = " -DHAVE_ST_H"
+
+task :default => ['syck.bundle']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c -o #{t.name} #{t.source}"
+end
+
+desc "Build this extension"
+file 'syck.bundle' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o syck.bundle #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS}"
+end
+
+

data/test/sample_files/syck-0.55/ext/ruby/ext/syck/extconf.rb

@@ -6,5 +6,4 @@ end
 
 Mkrf::Generator.new('syck') do |g|
   g.include_header("st.h")
-  g.add_source('*.c')         # We can actually do this in the contructor, but this tests add_source
 end

data/test/sample_files/syck-0.55/ext/ruby/ext/syck/mkrf.log

@@ -0,0 +1,3 @@
+# Logfile created on Wed Oct 04 18:07:30 PDT 2006 by logger.rb/1.5.2.7
+I, [2006-10-04T18:07:30.428737 #20126]  INFO -- : Header found: st.h
+I, [2006-10-04T18:07:30.429626 #20126]  INFO -- : Rakefile written

data/test/{test_availability.rb → unit/test_availability.rb}

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
 
 
 class TestAvailability < Test::Unit::TestCase
   def setup
-    @avail = Mkrf::Availability.new(:includes => File.join(File.dirname(__FILE__), 'fixtures'))
+    @avail = Mkrf::Availability.new(:includes => File.join(File.dirname(__FILE__), '..', 'fixtures'))
   end
   
   def teardown
@@ -46,7 +46,7 @@ class TestAvailability < Test::Unit::TestCase
   
   def test_has_header_should_check_many_paths
     assert !@avail.has_header?('header_down_a_directory.h')
-    assert @avail.has_header?('header_down_a_directory.h', File.join(File.dirname(__FILE__), 'fixtures', 'down_a_directory'))
+    assert @avail.has_header?('header_down_a_directory.h', File.join(File.dirname(__FILE__), '..', 'fixtures', 'down_a_directory'))
   end
   
   def test_include_header
@@ -94,4 +94,26 @@ class TestAvailability < Test::Unit::TestCase
       assert_match log_items, source
     end    
   end
+end
+
+class TestAvailabilityDefaults < Test::Unit::TestCase
+  def setup
+    @avail = Mkrf::Availability.new
+    @config = Config::CONFIG
+  end
+  
+  def test_default_libs_should_be_from_rbconfig
+    assert_equal @config["LIBS"].chomp(" "), @avail.library_compile_string
+  end
+  
+  def test_default_compiler_should_be_from_rbconfig
+    assert_equal @config["CC"], @avail.send(:instance_variable_get, :@compiler)
+  end
+  
+  def test_default_include_dir_should_be_from_rbconfig
+    expected = [Config::CONFIG['includedir'], Config::CONFIG["archdir"],
+                Config::CONFIG['sitelibdir'], "."]
+                
+    assert_equal expected, @avail.send(:instance_variable_get, :@includes)
+  end
 end

data/test/{test_generator.rb → unit/test_generator.rb}

@@ -1,10 +1,12 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
 
 # stubb this out so we don't overwrite our test rakefile
 module Mkrf
   class Generator
     def write_rakefile(file = "Rakefile")
     end
+    
+    attr_reader :available
   end
 end
 
@@ -15,7 +17,7 @@ class TestGenerator < Test::Unit::TestCase
   
   def test_default_sources
     g = Mkrf::Generator.new('testlib')
-    assert_equal ["'lib/*.c'"], g.sources, "Default sources incorrect"
+    assert_equal ["'*.c'"], g.sources, "Default sources incorrect"
   end
   
   def test_additional_code
@@ -48,6 +50,38 @@ class TestGenerator < Test::Unit::TestCase
     assert_match(/WARN/, logs)
   end
   
+  def test_availability_options_accessible_in_initialize
+    generator = Mkrf::Generator.new('testlib', ['lib/*.c'], {:loaded_libs => 'static_ruby'})
+    assert_equal ['static_ruby'], generator.available.loaded_libs
+  end
+  
+  def test_additional_objects
+    obj_string = 'somedir/somefile.o'
+    generator = Mkrf::Generator.new('testlib') do |g|
+      g.objects = obj_string
+    end
+    
+    assert_match obj_string, generator.rakefile_contents
+  end
+  
+  def test_ldshared
+    ldshared = 'this_normally_isnt_here'
+    generator = Mkrf::Generator.new('testlib') do |g|
+      g.ldshared = ldshared
+    end
+    
+    assert_match Regexp.new("LDSHARED = .*#{ldshared}.*"), generator.rakefile_contents
+  end
+  
+  def test_cflags
+    cflags = 'this_normally_isnt_here'
+    generator = Mkrf::Generator.new('testlib') do |g|
+      g.cflags = cflags
+    end
+    
+    assert_match Regexp.new("CFLAGS = .*#{cflags}.*"), generator.rakefile_contents
+  end
+  
   protected
   
   def spec_code

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mkrf
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-08-17 00:00:00 -07:00
+  version: 0.1.2
+date: 2006-10-04 00:00:00 -07:00
 summary: Generate Rakefiles to Build C Extensions to Ruby
 require_paths: 
 - lib
@@ -39,18 +39,22 @@ files:
 - lib/mkrf/generator.rb
 - test/abstract_unit.rb
 - test/fixtures
+- test/integration
+- test/mkrf.log
 - test/sample_files
-- test/test_availability.rb
-- test/test_generator.rb
-- test/test_sample_projects.rb
+- test/unit
 - test/fixtures/down_a_directory
 - test/fixtures/stdmkrf.h
 - test/fixtures/down_a_directory/header_down_a_directory.h
+- test/integration/test_sample_projects.rb
 - test/sample_files/libtrivial
 - test/sample_files/libxml-ruby-0.3.8
 - test/sample_files/syck-0.55
 - test/sample_files/libtrivial/extconf.rb
 - test/sample_files/libtrivial/lib
+- test/sample_files/libtrivial/libtrivial.bundle
+- test/sample_files/libtrivial/mkrf.log
+- test/sample_files/libtrivial/Rakefile
 - test/sample_files/libtrivial/lib/libtrivial.c
 - test/sample_files/libtrivial/lib/libtrivial.o
 - test/sample_files/libxml-ruby-0.3.8/CHANGELOG
@@ -59,47 +63,70 @@ files:
 - test/sample_files/libxml-ruby-0.3.8/README
 - test/sample_files/libxml-ruby-0.3.8/ext/xml
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/cbg.c
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/cbg.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/extconf.rb
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml.rb
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml_so.bundle
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/mkrf.log
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/old_extconf.rb
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/Rakefile
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attr.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attr.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attr.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attribute.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attribute.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attribute.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_document.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_document.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_document.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_dtd.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_dtd.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_dtd.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_input_cbg.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_input_cbg.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_input_cbg.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node_set.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node_set.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node_set.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_ns.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_ns.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_ns.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser_context.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser_context.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser_context.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_sax_parser.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_sax_parser.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_sax_parser.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_schema.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_schema.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_schema.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_tree.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_tree.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_tree.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xinclude.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xinclude.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xinclude.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath_context.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath_context.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath_context.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer_context.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer_context.h
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer_context.o
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/sax_parser_callbacks.inc
 - test/sample_files/syck-0.55/aclocal.m4
 - test/sample_files/syck-0.55/bootstrap
@@ -138,19 +165,32 @@ files:
 - test/sample_files/syck-0.55/ext/ruby/yts
 - test/sample_files/syck-0.55/ext/ruby/ext/syck
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/bytecode.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/bytecode.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/emitter.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/emitter.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/extconf.rb
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/gram.c
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/gram.h
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/gram.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/handler.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/handler.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/implicit.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/implicit.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/MANIFEST
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/mkrf.log
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/node.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/node.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/Rakefile
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/rubyext.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/rubyext.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.bundle
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.c
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.h
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/token.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/token.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/yaml2byte.c
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/yaml2byte.o
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/yamlbyte.h
 - test/sample_files/syck-0.55/ext/ruby/lib/okay
 - test/sample_files/syck-0.55/ext/ruby/lib/okay.rb
@@ -233,12 +273,16 @@ files:
 - test/sample_files/syck-0.55/tests/YTS.c
 - test/sample_files/syck-0.55/tests/YTS.c.erb
 - test/sample_files/syck-0.55/tests/YTS.c.rb
+- test/unit/test_availability.rb
+- test/unit/test_generator.rb
 test_files: []
 
 rdoc_options: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
+- MIT-LICENSE
+- CHANGELOG
 executables: []
 
 extensions: []