RubyInline 3.6.0 → 3.6.1

data/History.txt

@@ -1,3 +1,12 @@
+*** 3.6.1 / 2006-10-11
+
++ 1 minor enhancement
+	+ Hoe'd the Rakefile. :P
++ 2 bug fixes
+	+ Removed VALUE from @types because it is now in @@type_map.
+	+ Tweak added for mingw32.
+
+
 *** 3.6.0 / 2005-11-30 (omg I suck: actual release: 2006-09-15)
 
 + 6 minor enhancements

data/README.txt

@@ -39,6 +39,7 @@ compiler (read: windows)!
           while (i >= 2) { result *= i--; }
           return result;
         }"
+    end
   end
   t = MyTest.new()
   factorial_5 = t.factorial(5)

data/Rakefile

@@ -1,19 +1,22 @@
 # -*- ruby -*- 
 
-require 'rake'
-require 'rake/contrib/sshpublisher'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'rbconfig'
+require 'rubygems'
+require 'hoe'
+
+require './inline.rb'
 
-PREFIX = ENV['PREFIX'] || Config::CONFIG['prefix']
-RUBYLIB = Config::CONFIG['sitelibdir']
+Hoe.new("RubyInline", Inline::VERSION) do |p|
+  p.rubyforge_name = "rubyinline"
+  p.summary = "Multi-language extension coding within ruby."
+  p.description = p.paragraphs_of("README.txt", 3).join
+  p.clean_globs << File.expand_path("~/.ruby_inline")
 
-task :default => :test
+  p.spec_extras[:requirements] = "A POSIX environment and a compiler for your language."
+  p.spec_extras[:require_paths] = ["."]
 
-task :test do
-  ruby %(-I. -w ./test_inline.rb)
+  p.lib_files = %w(inline.rb)
+  p.test_files = %w(test_inline.rb)
+  p.bin_files = %w(inline_package)
 end
 
 task :examples do
@@ -41,78 +44,3 @@ task :bench do
     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,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
   
   WINDOZE  = /win32/ =~ RUBY_PLATFORM
   DEV_NULL = (WINDOZE ? 'nul' : '/dev/null')
@@ -148,7 +148,7 @@ module Inline
       sig.gsub!(/\s+/, ' ')
 
       unless defined? @types then
-        @types = 'void|VALUE|' + @@type_map.keys.map{|x| Regexp.escape(x)}.join('|')
+        @types = 'void|' + @@type_map.keys.map{|x| Regexp.escape(x)}.join('|')
       end
 
       if /(#{@types})\s*(\w+)\s*\(([^)]*)\)/ =~ sig then
@@ -386,9 +386,12 @@ module Inline
 
          cmd = "#{Config::CONFIG['LDSHARED']} #{flags} #{Config::CONFIG['CFLAGS']} -I #{hdrdir} -o \"#{so_name}\" \"#{File.expand_path(src_name)}\" #{libs}"
 	  
+          # gawd windoze land sucks
           case RUBY_PLATFORM
           when /mswin32/ then
             cmd += " -link /LIBPATH:\"#{Config::CONFIG['libdir']}\" /DEFAULTLIB:\"#{Config::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
+          when /mingw32/ then
+            cmd += " -Wl,--enable-auto-import -L#{Config::CONFIG['libdir']} -lmsvcrt-ruby18"
           when /i386-cygwin/ then
             cmd += ' -L/usr/local/lib -lruby.dll'
           end
@@ -452,7 +455,7 @@ module Inline
     # Registers C type-casts +r2c+ and +c2r+ for +type+.
     
     def add_type_converter(type, r2c, c2r)
-      $stderr.puts "WARNING: overridding #{type}" if @@type_map.has_key? type
+      $stderr.puts "WARNING: overridding #{type} on #{caller[0]}" if @@type_map.has_key? type
       @@type_map[type] = [r2c, c2r]
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.6.0
-date: 2006-09-15 00:00:00 -07:00
+  version: 3.6.1
+date: 2006-10-11 00:00:00 -07:00
 summary: Multi-language extension coding within ruby.
 require_paths: 
 - .
@@ -12,10 +12,10 @@ email: ryand-ruby@zenspider.com
 homepage: http://www.zenspider.com/ZSS/Products/RubyInline/
 rubyforge_project: rubyinline
 description: Ruby Inline is an analog to Perl's Inline::C. Out of the box, it allows you to embed C/++ external module code in your ruby script directly. By writing simple builder classes, you can teach how to cope with new languages (fortran, perl, whatever). The code is compiled and run on the fly when needed.
-autorequire: inline
+autorequire: 
 default_executable: 
-bindir: .
-has_rdoc: false
+bindir: bin
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -42,17 +42,25 @@ files:
 - test_inline.rb
 - tutorial/example1.rb
 - tutorial/example2.rb
-test_files: 
-- test_inline.rb
+test_files: []
+
 rdoc_options: []
 
 extra_rdoc_files: []
 
-executables: 
-- inline_package
+executables: []
+
 extensions: []
 
 requirements: 
 - A POSIX environment and a compiler for your language.
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+    version: