RubyInline 3.5.0 → 3.6.0

data/History.txt

@@ -1,3 +1,17 @@
+*** 3.6.0 / 2005-11-30 (omg I suck: actual release: 2006-09-15)
+
++ 6 minor enhancements
+	+ C builder can now be used directly for other foreign language glue.
+	+ Pretty much all (c) functions are plain argument style, not argc/argv.
+	+ Added Nathaniel and Dan's patches for windows support.
+	+ Added VALUE as a default known type.
+	+ Improved testing under $DEBUG.
+	+ Deprecated $INLINE_FLAGS and $INLINE_LIBS are dead.
++ 3 bug fixes
+	+ Fixed a number of issues wrt testing.
+	+ Cleaned up and cached certain calculations.
+	+ Some windows compiler fixes went in, but MS compiler is a PITA still.
+
 *** 3.5.0 / 2005-10-15
 
 + 4 minor enhancements

data/Manifest.txt

@@ -1,12 +1,11 @@
 History.txt
-Makefile
 Manifest.txt
 README.txt
+Rakefile
 demo/fastmath.rb
 demo/hello.rb
 example.rb
 example2.rb
-inline.gemspec
 inline.rb
 inline_package
 test_inline.rb

data/Rakefile

@@ -0,0 +1,118 @@
+# -*- ruby -*- 
+
+require 'rake'
+require 'rake/contrib/sshpublisher'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'rbconfig'
+
+PREFIX = ENV['PREFIX'] || Config::CONFIG['prefix']
+RUBYLIB = Config::CONFIG['sitelibdir']
+
+task :default => :test
+
+task :test do
+  ruby %(-I. -w ./test_inline.rb)
+end
+
+task :examples do
+  %w(example.rb example2.rb tutorial/example1.rb tutorial/example2.rb).each do |e|
+    rm_rf '~/.ruby_inline'
+    ruby "-I. -w #{e}"
+  end
+end
+
+task :bench do
+  verbose(false) do
+    puts "Running native"
+    ruby "-I. ./example.rb 3"
+    puts "Running primer - preloads the compiler and stuff"
+    rm_rf '~/.ruby_inline'
+    ruby "-I. ./example.rb 0"
+    puts "With full builds"
+    (0..2).each do |i|
+      rm_rf '~/.ruby_inline'
+      ruby "-I. ./example.rb #{i}"
+    end
+    puts "Without builds"
+    (0..2).each do |i|
+      ruby "-I. ./example.rb #{i}"
+    end
+  end
+end
+
+desc 'Generate RDoc'
+Rake::RDocTask.new :rdoc do |rd|
+  rd.rdoc_dir = 'doc'
+  rd.rdoc_files.add 'inline.rb', 'inline_package', 'README.txt', 'History.txt'
+  rd.main = 'README.txt'
+  rd.options << '-t RubyInline RDoc'
+end
+
+desc 'Upload RDoc to RubyForge'
+task :upload => :rdoc do
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/config.yml")))
+  user = "#{config["username"]}@rubyforge.org"
+  project = '/var/www/gforge-projects/rubyinline'
+  local_dir = 'doc'
+  pub = Rake::SshDirPublisher.new user, project, local_dir
+  pub.upload
+end
+
+require 'rubygems'
+require './inline.rb'
+
+spec = Gem::Specification.new do |s|
+
+  s.name = 'RubyInline'
+  s.version = Inline::VERSION
+  s.summary = "Multi-language extension coding within ruby."
+
+  paragraphs = File.read("README.txt").split(/\n\n+/)
+  s.description = paragraphs[3]
+  puts s.description
+
+  s.requirements << "A POSIX environment and a compiler for your language."
+  s.files = IO.readlines("Manifest.txt").map {|f| f.chomp }
+
+  s.bindir = "."
+  s.executables = ['inline_package']
+  puts "Executables = #{s.executables.join(", ")}"
+
+  s.require_path = '.' 
+  s.autorequire = 'inline'
+
+  s.has_rdoc = false                            # I SUCK - TODO
+  s.test_suite_file = "test_inline.rb"
+
+  s.author = "Ryan Davis"
+  s.email = "ryand-ruby@zenspider.com"
+  s.homepage = "http://www.zenspider.com/ZSS/Products/RubyInline/"
+  s.rubyforge_project = "rubyinline"
+end
+
+if $0 == __FILE__
+  Gem.manage_gems
+  Gem::Builder.new(spec).build
+end
+
+desc 'Build Gem'
+Rake::GemPackageTask.new spec do |pkg|
+  pkg.need_tar = true
+end
+
+task :install do
+  install 'inline.rb', RUBYLIB, :mode => 0444
+  install 'inline_package', File.join(PREFIX, 'bin'), :mode => 0555
+end
+
+task :uninstall do
+  rm File.join(RUBYLIB, 'inline.rb')
+  rm File.join(PREFIX, 'bin', 'inline_package')
+end
+
+task :clean => [ :clobber_rdoc, :clobber_package ] do
+  rm Dir["*~"]
+  rm_rf %w(~/.ruby_inline) 
+end

data/inline.rb

@@ -51,7 +51,12 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.5.0'
+  VERSION = '3.6.0'
+  
+  WINDOZE  = /win32/ =~ RUBY_PLATFORM
+  DEV_NULL = (WINDOZE ? 'nul' : '/dev/null')
+  RAKE     = (WINDOZE ? 'rake.cmd' : 'rake')
+  GEM      = (WINDOZE ? 'gem.cmd'  : 'gem')
 
   $stderr.puts "RubyInline v #{VERSION}" if $DEBUG
 
@@ -59,8 +64,14 @@ module Inline
 
   def self.rootdir
     env = ENV['INLINEDIR'] || ENV['HOME']
+
+    if env.nil? then
+      $stderr.puts "Define INLINEDIR or HOME in your environment and try again"
+      exit 1
+    end
+
     unless defined? @@rootdir and env == @@rootdir and test ?d, @@rootdir then
-      rootdir = ENV['INLINEDIR'] || ENV['HOME']
+      rootdir = env
       Dir.mkdir rootdir, 0700 unless test ?d, rootdir
       Dir.assert_secure rootdir
       @@rootdir = rootdir
@@ -91,7 +102,7 @@ module Inline
 
     protected unless $TESTING
 
-    MAGIC_ARITY_THRESHOLD = 2
+    MAGIC_ARITY_THRESHOLD = 15
     MAGIC_ARITY = -1
 
     @@type_map = {
@@ -103,6 +114,7 @@ module Inline
       'unsigned int'  => [ 'NUM2UINT', 'UINT2NUM' ],
       'unsigned long' => [ 'NUM2UINT', 'UINT2NUM' ],
       'unsigned'      => [ 'NUM2UINT', 'UINT2NUM' ],
+      'VALUE'         => [ '', '' ],
       # Can't do these converters because they conflict with the above:
       # ID2SYM(x), SYM2ID(x), NUM2DBL(x), FIX2UINT(x)
     }
@@ -135,9 +147,11 @@ module Inline
       # clean and collapse whitespace
       sig.gsub!(/\s+/, ' ')
 
-      types = 'void|VALUE|' + @@type_map.keys.map{|x| Regexp.escape(x)}.join('|')
+      unless defined? @types then
+        @types = 'void|VALUE|' + @@type_map.keys.map{|x| Regexp.escape(x)}.join('|')
+      end
 
-      if /(#{types})\s*(\w+)\s*\(([^)]*)\)/ =~ sig then
+      if /(#{@types})\s*(\w+)\s*\(([^)]*)\)/ =~ sig then
 	return_type, function_name, arg_string = $1, $2, $3
 	args = []
 	arg_string.split(',').each do |arg|
@@ -145,8 +159,7 @@ module Inline
 	  # helps normalize into 'char * varname' form
 	  arg = arg.gsub(/\s*\*\s*/, ' * ').strip
 
-	  # if /(#{types})\s+(\w+)\s*$/ =~ arg
-	  if /(((#{types})\s*\*?)+)\s+(\w+)\s*$/ =~ arg then
+	  if /(((#{@types})\s*\*?)+)\s+(\w+)\s*$/ =~ arg then
 	    args.push([$4, $1])
 	  elsif arg != "void" then
 	    $stderr.puts "WARNING: '#{arg}' not understood"
@@ -154,7 +167,7 @@ module Inline
 	end
 
 	arity = args.size
-	arity = -1 if arity > MAGIC_ARITY_THRESHOLD or raw
+	arity = MAGIC_ARITY if raw
 
 	return {
 	  'return' => return_type,
@@ -168,10 +181,7 @@ module Inline
     end # def parse_signature
 
     def generate(src, options={})
-
-      if not Hash === options then
-        options = {:expand_types=>options}
-      end
+      options = {:expand_types=>options} unless Hash === options
 
       expand_types = options[:expand_types]
       singleton = options[:singleton]
@@ -182,28 +192,21 @@ module Inline
       return_type = signature['return']
       arity = signature['arity']
 
+      raise ArgumentError, "too many arguments" if arity > MAGIC_ARITY_THRESHOLD
+
       if expand_types then
 	prefix = "static VALUE #{function_name}("
 	if arity == MAGIC_ARITY then
 	  prefix += "int argc, VALUE *argv, VALUE self"
 	else
 	  prefix += "VALUE self"
-	  signature['args'].each do |arg, type|
-	    prefix += ", VALUE _#{arg}"
-	  end
+          prefix += signature['args'].map { |arg, type| ", VALUE _#{arg}"}.join
 	end
 	prefix += ") {\n"
-	if arity == MAGIC_ARITY then
-	  count = 0
-	  signature['args'].each do |arg, type|
-	    prefix += "  #{type} #{arg} = #{ruby2c(type)}(argv[#{count}]);\n"
-	    count += 1
-	  end
-	else
-	  signature['args'].each do |arg, type|
-	    prefix += "  #{type} #{arg} = #{ruby2c(type)}(_#{arg});\n"
-	  end
-	end
+        prefix += signature['args'].map { |arg, type|
+          "  #{type} #{arg} = #{ruby2c(type)}(_#{arg});\n"
+        }.join
+
 	# replace the function signature (hopefully) with new sig (prefix)
 	result.sub!(/[^;\/\"\>]+#{function_name}\s*\([^\{]+\{/, "\n" + prefix)
 	result.sub!(/\A\n/, '') # strip off the \n in front in case we added it
@@ -230,7 +233,7 @@ module Inline
               end
 
       file, line = caller[1].split(/:/)
-      result = "# line #{line.to_i + delta} \"#{file}\"\n" + result unless $DEBUG
+      result = "# line #{line.to_i + delta} \"#{file}\"\n" + result unless $DEBUG and not $TESTING
 
       @src << result
       @sig[function_name] = [arity,singleton]
@@ -242,7 +245,7 @@ module Inline
       unless defined? @module_name then
         module_name = @mod.name.gsub('::','__')
         md5 = Digest::MD5.new
-        @sig.keys.sort_by{|x| x.to_s}.each { |m| md5 << m.to_s }
+        @sig.keys.sort_by { |x| x.to_s }.each { |m| md5 << m.to_s }
         @module_name = "Inline_#{module_name}_#{md5.to_s[0,4]}"
       end
       @module_name
@@ -264,11 +267,11 @@ module Inline
       raise ArgumentError, "Class/Module arg is required" unless Module === mod
       # new (but not on some 1.8s) -> inline -> real_caller|eval
       stack = caller
-      meth = stack.shift until meth =~ /in .(inline|test_)/ or stack.empty?
+      meth = stack.shift until meth =~ /in .(inline|test_|setup)/ or stack.empty?
       raise "Couldn't discover caller" if stack.empty?
       real_caller = stack.first
       real_caller = stack[3] if real_caller =~ /\(eval\)/
-      @real_caller = real_caller.split(/:/).first
+      @real_caller = real_caller.split(/:/)[0..-2].join(':')
       @rb_file = File.expand_path(@real_caller)
 
       @mod = mod
@@ -308,7 +311,6 @@ module Inline
     def build
       so_name = self.so_name
       so_exists = File.file? so_name
-
       unless so_exists and File.mtime(rb_file) < File.mtime(so_name)
 	
 	src_name = "#{Inline.directory}/#{module_name}.c"
@@ -323,12 +325,15 @@ module Inline
 	  io.puts "#ifdef __cplusplus"
 	  io.puts "extern \"C\" {"
 	  io.puts "#endif"
+          io.puts "  __declspec(dllexport)" if WINDOZE
 	  io.puts "  void Init_#{module_name}() {"
           io.puts "    VALUE c = rb_cObject;"
+
           # TODO: use rb_class2path
-          @mod.name.split("::").each do |n|
-            io.puts "    c = rb_const_get_at(c,rb_intern(\"#{n}\"));"
-          end
+          io.puts @mod.name.split("::").map { |n|
+            "    c = rb_const_get_at(c,rb_intern(\"#{n}\"));"
+          }.join("\n")
+
 	  @sig.keys.sort.each do |name|
 	    arity, singleton = @sig[name]
             if singleton then
@@ -377,28 +382,40 @@ module Inline
 	  end
 
 	  flags = @flags.join(' ')
-	  flags += " #{$INLINE_FLAGS}" if defined? $INLINE_FLAGS# DEPRECATE
 	  libs  = @libs.join(' ')
-	  libs += " #{$INLINE_LIBS}" if defined? $INLINE_LIBS	# DEPRECATE
 
-	  cmd = "#{Config::CONFIG['LDSHARED']} #{flags} #{Config::CONFIG['CFLAGS']} -I #{hdrdir} -o #{so_name} #{src_name} #{libs}"
+         cmd = "#{Config::CONFIG['LDSHARED']} #{flags} #{Config::CONFIG['CFLAGS']} -I #{hdrdir} -o \"#{so_name}\" \"#{File.expand_path(src_name)}\" #{libs}"
 	  
           case RUBY_PLATFORM
           when /mswin32/ then
-	    cmd += " -link /INCREMENTAL:no /EXPORT:Init_#{module_name}"
+            cmd += " -link /LIBPATH:\"#{Config::CONFIG['libdir']}\" /DEFAULTLIB:\"#{Config::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
           when /i386-cygwin/ then
             cmd += ' -L/usr/local/lib -lruby.dll'
           end
 
-          cmd += " 2> /dev/null" if $TESTING and not $DEBUG
+          cmd += " 2> #{DEV_NULL}" if $TESTING and not $DEBUG
 	  
 	  $stderr.puts "Building #{so_name} with '#{cmd}'" if $DEBUG
-          `#{cmd}`
+          result = `#{cmd}`
+          $stderr.puts "Output:\n#{result}" if $DEBUG
           if $? != 0 then
             bad_src_name = src_name + ".bad"
             File.rename src_name, bad_src_name
             raise CompilationError, "error executing #{cmd}: #{$?}\nRenamed #{src_name} to #{bad_src_name}"
           end
+
+          if WINDOZE then
+            Dir.chdir self.directory do
+              cmd = "mt /manifest lib.so.manifest /outputresource:so.dll;#2"
+              $stderr.puts "Embedding manifest with '#{cmd}'" if $DEBUG
+              result = `#{cmd}`
+              $stderr.puts "Output:\n#{result}" if $DEBUG
+              if $? != 0 then
+                raise CompilationError, "error executing #{cmd}: #{$?}"
+              end
+            end
+          end
+
 	  $stderr.puts "Built successfully" if $DEBUG
 	end
 
@@ -536,14 +553,19 @@ module Inline
     end
 
     def build_gem
-      STDERR.puts "==> Running rake" unless $TESTING
-
-      cmd = "rake package"
-      cmd += "> /dev/null 2> /dev/null" if $TESTING
-      system cmd
+      STDERR.puts "==> Running rake" unless $TESTING or $DEBUG
 
-      STDERR.puts unless $TESTING
-      STDERR.puts "Ok, you now have a gem in ./pkg, enjoy!" unless $TESTING
+      cmd = "#{RAKE} package"
+      cmd += "> #{DEV_NULL} 2> #{DEV_NULL}" if $TESTING unless $DEBUG
+      
+      if system cmd then
+        unless $TESTING then
+          STDERR.puts
+          STDERR.puts "Ok, you now have a gem in ./pkg, enjoy!"
+        end
+      else
+        STDERR.puts "Calling rake to build the gem failed." unless $TESTING
+      end
     end
 
     def gem_libs
@@ -643,7 +665,7 @@ class Dir
       if $TESTING then
 	raise SecurityError, "Directory #{path} is insecure"
       else
-	$stderr.puts "#{path} is insecure (#{sprintf('%o', mode)}), needs 0700 for perms. Exiting."
+	$stderr.puts "#{path} is insecure (#{'%o' % mode}). It may not be group or world writable. Exiting."
 	exit 1
       end
     end

data/test_inline.rb

@@ -1,25 +1,38 @@
-#!/usr/local/bin/ruby -w 
-
 $TESTING = true
 
+$0 = __FILE__ if $0 == "-e" # for autotest style execution
+
 require 'inline'
 require 'tempfile'
+require 'tmpdir'
 require 'test/unit'
 
 File.umask(0)
 
+module Foo
+  class Bar
+    inline do |builder|
+      builder.c <<-EOC
+        int arity6(int u, int v, int w, int x, int y, char * z) { return x + y + strlen(z); }
+      EOC
+    end
+  end
+end
+
 class InlineTestCase < Test::Unit::TestCase
 
   def setup
     super
-    @rootdir = "/tmp/#{$$}"
-    Dir.mkdir @rootdir, 0700
+    @rootdir = File.join(Dir.tmpdir, "test_inline.#{$$}")
+    Dir.mkdir @rootdir, 0700 unless test ?d, @rootdir
     ENV['INLINEDIR'] = @rootdir
   end
 
   def teardown
-    FileUtils.rm_rf @rootdir unless $DEBUG
-    ENV.delete 'INLINEDIR'
+    unless $DEBUG then
+      FileUtils.rm_rf @rootdir 
+      ENV.delete 'INLINEDIR'
+    end
   end
 
   def test_stupid
@@ -29,7 +42,6 @@ class InlineTestCase < Test::Unit::TestCase
 end
 
 class TestDir < InlineTestCase
-
   def setup
     super
     @count = 1
@@ -41,11 +53,11 @@ class TestDir < InlineTestCase
     Dir.mkdir path, perms unless perms.nil?
     if should_pass then
       assert_nothing_raised do
-	Dir.assert_secure path
+        Dir.assert_secure path
       end
     else
       assert_raises(perms.nil? ? Errno::ENOENT : SecurityError) do
-	Dir.assert_secure path
+        Dir.assert_secure path
       end
     end
   end
@@ -60,7 +72,7 @@ class TestDir < InlineTestCase
     # missing
     util_assert_secure nil, false
   end
-end
+end unless Inline::WINDOZE
 
 class TestInline < InlineTestCase
 
@@ -78,6 +90,12 @@ end
 class TestInline
 class TestC < InlineTestCase
 
+  def setup
+    super
+    @builder = Inline::C.new(self.class)
+  end
+
+
   # quick hack to make tests more readable,
   # does nothing I wouldn't otherwise do...
   def inline(lang=:C)
@@ -104,6 +122,7 @@ class TestC < InlineTestCase
     assert_equal 'NUM2UINT', x.ruby2c("unsigned int")
     assert_equal 'NUM2UINT', x.ruby2c("unsigned long")
     assert_equal 'NUM2UINT', x.ruby2c("unsigned")
+    assert_equal '',         x.ruby2c("VALUE")
 
     assert_raises ArgumentError do
       x.ruby2c('blah')
@@ -119,6 +138,7 @@ class TestC < InlineTestCase
     assert_equal 'UINT2NUM',    x.c2ruby("unsigned int")
     assert_equal 'UINT2NUM',    x.c2ruby("unsigned long")
     assert_equal 'UINT2NUM',    x.c2ruby("unsigned")
+    assert_equal '',            x.c2ruby("VALUE")
 
     assert_raises ArgumentError do
       x.c2ruby('blah')
@@ -127,15 +147,14 @@ class TestC < InlineTestCase
 
   def util_module_name(*signatures)
     md5 = Digest::MD5.new
-    builder = Inline::C.new(self.class)
 
     signatures.each do |signature|
-      builder.sig[signature] = [nil, 0]
+      @builder.sig[signature] = [nil, 0]
       md5 << signature.to_s
     end
 
     assert_equal("Inline_TestInline__TestC_#{md5.to_s[0,4]}",
-                 builder.module_name)
+                 @builder.module_name)
   end
 
   def test_module_name_0_methods
@@ -155,12 +174,10 @@ class TestC < InlineTestCase
   end
 
   def util_parse_signature(src, expected, t=nil, a=nil, b=nil)
-    
     result = nil
-    inline do |builder|
-      builder.add_type_converter t, a, b unless t.nil?
-      result = builder.parse_signature(src)
-    end
+
+    @builder.add_type_converter t, a, b unless t.nil?
+    result = @builder.parse_signature(src)
     
     assert_equal(expected, result)
   end
@@ -243,10 +260,7 @@ class TestC < InlineTestCase
   end
 
   def util_generate(src, expected, expand_types=true)
-    result = ''
-    inline do |builder|
-      result = builder.generate src, expand_types
-    end
+    result = @builder.generate src, expand_types
     result.gsub!(/\# line \d+/, '# line N')
     expected = "# line N \"#{$0}\"\n" + expected
     assert_equal(expected, result)
@@ -355,16 +369,15 @@ return INT2FIX(42)}"
     util_generate_raw(src, expected)
   end
 
-  def test_generate_arity_3
-    src = "int func(int x, int y, int z) {blah; return x+y+z;}"
-
-    expected = "static VALUE func(int argc, VALUE *argv, VALUE self) {
-  int x = FIX2INT(argv[0]);
-  int y = FIX2INT(argv[1]);
-  int z = FIX2INT(argv[2]);
-blah; return INT2FIX(x+y+z);}"
+  def test_generate_arity_too_many
+    src = "int too_many(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9, int aA, int aB, int aC, int aD, int aE, int aF, int ugh) {
+  int q = v + w;
+  return q+x+y+z;
+}"
 
-    util_generate(src, expected)
+    assert_raise(ArgumentError) do
+      @builder.generate src, true
+    end
   end
 
   def test_generate_comments
@@ -456,35 +469,28 @@ puts(s); return rb_str_new2(s)}"
   end
 
   def test_c
-    builder = result = nil
-    inline(:C) do |b|
-      builder = b
-      result = builder.c "int add(int a, int b) { return a + b; }"
-    end
+    result = @builder.c "int add(int a, int b) { return a + b; }"
 
     expected = "# line N \"#{$0}\"\nstatic VALUE add(VALUE self, VALUE _a, VALUE _b) {\n  int a = FIX2INT(_a);\n  int b = FIX2INT(_b);\n return INT2FIX(a + b); }"
 
     result.gsub!(/\# line \d+/, '# line N')
 
     assert_equal expected, result
-    assert_equal [expected], builder.src
+    assert_equal [expected], @builder.src
   end
 
   def test_c_raw
     src = "static VALUE answer_raw(int argc, VALUE *argv, VALUE self) { return INT2NUM(42); }"
-    builder = result = nil
-    inline(:C) do |b|
-      builder = b
-      result = builder.c_raw src.dup
-    end
+    result = @builder.c_raw src.dup
 
     result.gsub!(/\# line \d+/, '# line N')
     expected = "# line N \"#{$0}\"\n" + src
 
     assert_equal expected, result
-    assert_equal [expected], builder.src
+    assert_equal [expected], @builder.src
   end
 
+  # TODO: fix ?
   def util_simple_code(klassname, c_src)
     result = "
       require 'inline'
@@ -502,8 +508,7 @@ puts(s); return rb_str_new2(s)}"
   def util_test_build(src)
     tempfile = Tempfile.new("util_test_build")
     tempfile.write src
-    tempfile.flush
-    tempfile.rewind
+    tempfile.close
     rb_file = tempfile.path + ".rb"
     File.rename tempfile.path, rb_file
     begin
@@ -592,6 +597,26 @@ class TestModule < InlineTestCase
     `rm "#{tempfile.path}.rb"`
   end
 
+  def test_argument_check_good
+    fb = Foo::Bar.new
+    assert_equal 13, fb.arity6(1, 2, 3, 4, 5, "blah")
+  end
+
+  def test_argument_check_fewer
+    fb = Foo::Bar.new
+    
+    assert_raise(ArgumentError) do
+      assert_equal 13, fb.arity6(1, 2, 3)
+    end
+  end
+
+  def test_argument_check_more
+    fb = Foo::Bar.new
+    assert_raise ArgumentError do
+      assert_equal 13, fb.arity6(1, 2, 3, 4, 5, "blah", :extra)
+    end
+  end
+
   def test_inline
     self.class.inline(:C) do |builder|
       builder.c "int add(int a, int b) { return a + b; }"
@@ -611,13 +636,14 @@ class TestInlinePackager < InlineTestCase
 
   def setup
     super
+
     @name = "Packager Test"
     @version = "1.0.0"
     @summary = "This is a Packager test gem"
     @packager = Inline::Packager.new @name, @version, @summary
 
     @package_dir = @rootdir + "_package"
-    Dir.mkdir @package_dir, 0700 # unless test ?d, @package_dir
+    Dir.mkdir @package_dir, 0700 unless test ?d, @package_dir
     @orig_dir = Dir.pwd
     Dir.chdir @package_dir
 
@@ -656,7 +682,7 @@ class TestInlinePackager < InlineTestCase
     built_lib = "Inline_Test.#{@ext}"
     dir = "#{@rootdir}/.ruby_inline"
 
-    Dir.mkdir dir, 0700
+    Dir.mkdir dir, 0700 unless test ?d, dir
     Dir.chdir dir do
       FileUtils.touch built_lib
     end
@@ -670,6 +696,7 @@ class TestInlinePackager < InlineTestCase
   end
 
   def test_generate_rakefile_has_rakefile
+    FileUtils.rm 'Rakefile' if test ?f, 'Rakefile' and $DEBUG
     FileUtils.touch 'Rakefile'
     
     @packager.generate_rakefile
@@ -678,23 +705,32 @@ class TestInlinePackager < InlineTestCase
   end
 
   def test_generate_rakefile_no_rakefile
+    FileUtils.rm 'Rakefile' if test ?f, 'Rakefile' and $DEBUG
+    FileUtils.rm_r 'lib' if test ?d, 'lib' and $DEBUG
+
     @packager.generate_rakefile
 
     assert_equal util_generate_rakefile, File.read('Rakefile')
   end
 
   def test_build_gem
+#    test_copy_libs
+    pwd = Dir.pwd
+
     File.open 'Rakefile', 'w' do |fp|
-      fp.puts util_generate_rakefile
+      src = util_generate_rakefile
+      fp.puts src
     end
 
     @packager.build_gem
+
     package_name = "pkg/#{@name}-#{@version}.gem"
-    assert_equal true, File.exists?(package_name)
-    assert_equal true, system("gem check #{package_name}")
+    assert File.exists?(package_name), "File #{package_name} must exist"
+    assert system("#{Inline::GEM} check #{package_name}"), "gem check must pass"
   end
 
   def test_gem_libs
+    system "rm lib/inline/*" if $DEBUG # hacky
     @packager.libs_copied = true
     expected = ["lib/blah.rb", "lib/inline/Inline_Test.#{@ext}"]
 

metadata

@@ -1,10 +1,10 @@
-!ruby/object:Gem::Specification 
-rubygems_version: 0.8.11.1
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.0
 specification_version: 1
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.5.0
-date: 2005-10-16 00:00:00 -07:00
+  version: 3.6.0
+date: 2006-09-15 00:00:00 -07:00
 summary: Multi-language extension coding within ruby.
 require_paths: 
 - .
@@ -25,18 +25,18 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Ryan Davis
 files: 
 - History.txt
-- Makefile
 - Manifest.txt
 - README.txt
+- Rakefile
 - demo/fastmath.rb
 - demo/hello.rb
 - example.rb
 - example2.rb
-- inline.gemspec
 - inline.rb
 - inline_package
 - test_inline.rb

data/Makefile

@@ -1,41 +0,0 @@
-RUBY?=/usr/local/bin/ruby
-RDOC?=rdoc
-RUBYLIB=$(shell $(RUBY) -rrbconfig -e 'include Config; print CONFIG["sitelibdir"]')
-PREFIX?=/usr/local
-
-test:
-	$(RUBY) -I. -w ./test_inline.rb
-
-examples:
-	rm -rf ~/.ruby_inline; $(RUBY) -I. -w ./example.rb
-	rm -rf ~/.ruby_inline; $(RUBY) -I. -w ./example2.rb
-	rm -rf ~/.ruby_inline; $(RUBY) -I. -w ./tutorial/example1.rb
-	rm -rf ~/.ruby_inline; $(RUBY) -I. -w ./tutorial/example2.rb
-
-docs:
-	$(RDOC) --main inline.rb
-
-bench:
-	@echo "Running native"
-	@$(RUBY) -I. ./example.rb 3 2> /dev/null
-	@echo "Running primer - preloads the compiler and stuff"
-	@rm -rf ~/.ruby_inline; $(RUBY) -I. ./example.rb 0 2>&1 > /dev/null
-	@echo "With full builds"
-	@rm -rf ~/.ruby_inline; $(RUBY) -I. ./example.rb 0 2> /dev/null
-	@rm -rf ~/.ruby_inline; $(RUBY) -I. ./example.rb 1 2> /dev/null
-	@rm -rf ~/.ruby_inline; $(RUBY) -I. ./example.rb 2 2> /dev/null
-	@echo "Without builds"
-	@$(RUBY) -I. ./example.rb 0 2> /dev/null
-	@$(RUBY) -I. ./example.rb 1 2> /dev/null
-	@$(RUBY) -I. ./example.rb 2 2> /dev/null
-
-install:
-	install -m 0444 inline.rb $(RUBYLIB)
-	install -m 0555 inline_package $(PREFIX)/bin
-
-uninstall:
-	rm -f $(RUBYLIB)/inline.rb
-	rm -f $(PREFIX)/bin/inline_package
-
-clean:
-	rm -rf *~ doc ~/.ruby_inline

data/inline.gemspec

@@ -1,38 +0,0 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'inline'
-
-spec = Gem::Specification.new do |s|
-
-  s.name = 'RubyInline'
-  s.version = Inline::VERSION
-  s.summary = "Multi-language extension coding within ruby."
-
-  paragraphs = File.read("README.txt").split(/\n\n+/)
-  s.description = paragraphs[3]
-  puts s.description
-
-  s.requirements << "A POSIX environment and a compiler for your language."
-  s.files = IO.readlines("Manifest.txt").map {|f| f.chomp }
-
-  s.bindir = "."
-  s.executables = ['inline_package']
-  puts "Executables = #{s.executables.join(", ")}"
-
-  s.require_path = '.' 
-  s.autorequire = 'inline'
-
-  s.has_rdoc = false                            # I SUCK - TODO
-  s.test_suite_file = "test_inline.rb"
-
-  s.author = "Ryan Davis"
-  s.email = "ryand-ruby@zenspider.com"
-  s.homepage = "http://www.zenspider.com/ZSS/Products/RubyInline/"
-  s.rubyforge_project = "rubyinline"
-end
-
-if $0 == __FILE__
-  Gem.manage_gems
-  Gem::Builder.new(spec).build
-end