RubyInline 3.6.7 → 3.7.0

data/History.txt

@@ -1,3 +1,19 @@
+=== 3.7.0 / 2008-06-09
+
+* 1 major enhancements:
+
+  * Removed inline_package in favor of hoe's packaging.
+
+* 2 minor enhancements:
+
+  * Switched from warn/exit to abort to fix buffering for error messages.
+  * Improved some error messages.
+
+* 2 bug fixes:
+
+  * Fixes for rubinius.
+  * Fixes for 1.9.
+
 === 3.6.7 / 2008-03-20
 
 * 3 minor enhancements:

data/Manifest.txt

@@ -2,7 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/inline_package
 demo/fastmath.rb
 demo/hello.rb
 example.rb

data/README.txt

@@ -7,14 +7,29 @@
 
 == 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.
+Inline allows you to write foreign code within your ruby code. It
+automatically determines if the code in question has changed and
+builds it only when necessary. The extensions are then automatically
+loaded into the class/module that defines it.
 
-Using the package_inline tool Inline allows you to package up your
-inlined object code for distribution to systems without a compiler.
+You can even write extra builders that will allow you to write inlined
+code in any language. Use Inline::C as a template and look at
+Module#inline for the required API.
+
+== PACKAGING:
+
+To package your binaries into a gem, use hoe's INLINE and
+FORCE_PLATFORM env vars.
+
+Example:
+
+  rake package INLINE=1
+
+or:
+
+  rake package INLINE=1 FORCE_PLATFORM=mswin32
+
+See hoe for more details.
 
 == FEATURES/PROBLEMS:
 
@@ -26,7 +41,6 @@ inlined object code for distribution to systems without a compiler.
 + Only recompiles if the inlined code has changed.
 + Pretends to be secure.
 + Only requires standard ruby libraries, nothing extra to download.
-+ Can generate a basic Rakefile and package up built extensions for distribution.
 
 == SYNOPSYS:
 
@@ -62,13 +76,6 @@ inlined object code for distribution to systems without a compiler.
   t = MyTest.new()
   t.hello(3)
 
-== SYNOPSYS (packaging):
-
-  rm -rf ~/.ruby_inline
-  make test
-  inline_package packagename 1.0.0
-  ls lib/inline
-
 == (PSEUDO)BENCHMARKS:
 
   > make bench
@@ -100,7 +107,6 @@ inlined object code for distribution to systems without a compiler.
 + POSIX compliant system (ie pretty much any UNIX, or Cygwin on MS platforms).
 + A C/C++ compiler (the same one that compiled your ruby interpreter).
 + test::unit for running tests ( http://testunit.talbott.ws/ ).
-+ rubygems & rake if you'd like - these are used by inline_package.
 
 == INSTALL:
 

data/Rakefile

@@ -13,6 +13,8 @@ Hoe.new("RubyInline", Inline::VERSION) do |inline|
     "A POSIX environment and a compiler for your language."
 end
 
+task :test => :clean
+
 desc "run all examples"
 task :examples do
   %w(example.rb example2.rb

data/lib/inline.rb

@@ -4,7 +4,7 @@
 # Ruby Inline is a framework for writing ruby extensions in foreign
 # languages.
 #
-# = SYNOPSIS
+# == SYNOPSIS
 #
 #   require 'inline'
 #   class MyClass
@@ -20,24 +20,37 @@
 #     end
 #   end
 #
-# = DESCRIPTION
+# == DESCRIPTION
 #
 # Inline allows you to write foreign code within your ruby code. It
 # automatically determines if the code in question has changed and
 # builds it only when necessary. The extensions are then automatically
 # loaded into the class/module that defines it.
 #
-# Using the package_inline tool Inline now allows you to package up
-# your inlined object code for distribution to systems without a
-# compiler (read: windows)!
-#
 # You can even write extra builders that will allow you to write
 # inlined code in any language. Use Inline::C as a template and look
 # at Module#inline for the required API.
+#
+# == PACKAGING
+#
+# To package your binaries into a gem, use hoe's INLINE and
+# FORCE_PLATFORM env vars.
+#
+# Example:
+#
+#   rake package INLINE=1
+#
+# or:
+#
+#   rake package INLINE=1 FORCE_PLATFORM=mswin32
+#
+# See hoe for more details.
+#
 
 require "rbconfig"
 require "digest/md5"
 require 'fileutils'
+require 'rubygems'
 
 $TESTING = false unless defined? $TESTING
 
@@ -50,12 +63,20 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.6.7'
+  VERSION = '3.7.0'
 
   WINDOZE  = /win(32|64)/ =~ RUBY_PLATFORM
+  RUBINIUS = defined? RUBY_ENGINE
   DEV_NULL = (WINDOZE ? 'nul'      : '/dev/null')
-  RAKE     = (WINDOZE ? 'rake.bat' : 'rake')
   GEM      = (WINDOZE ? 'gem.bat'  : 'gem')
+  RAKE     = if WINDOZE then
+               'rake.bat'
+             elsif RUBINIUS then
+               File.join(Gem.bindir, 'rake')
+             else
+               "#{Gem.ruby} -S rake"
+             end
+
 
   warn "RubyInline v #{VERSION}" if $DEBUG
 
@@ -69,8 +90,7 @@ module Inline
     env = ENV['HOMEDRIVE'] + ENV['HOMEPATH'] if env.nil? and WINDOZE
 
     if env.nil? then
-      warn "Define INLINEDIR or HOME in your environment and try again"
-      exit 1
+      abort "Define INLINEDIR or HOME in your environment and try again"
     end
 
     unless defined? @@rootdir and env == @@rootdir and test ?d, @@rootdir then
@@ -348,8 +368,9 @@ module Inline
           io.puts "    VALUE c = rb_cObject;"
 
           # TODO: use rb_class2path
+          # io.puts "    VALUE c = rb_path2class(#{@mod.name.inspect});"
           io.puts @mod.name.split("::").map { |n|
-            "    c = rb_const_get_at(c,rb_intern(\"#{n}\"));"
+            "    c = rb_const_get(c,rb_intern(\"#{n}\"));"
           }.join("\n")
 
           @sig.keys.sort.each do |name|
@@ -387,7 +408,7 @@ module Inline
         if recompile then
 
           hdrdir = %w(srcdir archdir rubyhdrdir).map { |name|
-            dir = Config::CONFIG[name]
+            Config::CONFIG[name]
           }.find { |dir|
             dir and File.exist? File.join(dir, "/ruby.h")
           } or abort "ERROR: Can't find header dir for ruby. Exiting..."
@@ -425,7 +446,7 @@ module Inline
           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}"
+            raise CompilationError, "error executing #{cmd.inspect}: #{$?}\nRenamed #{src_name} to #{bad_src_name}"
           end
 
           # NOTE: manifest embedding is only required when using VC8 ruby
@@ -590,82 +611,6 @@ module Inline
     end
 
   end # class Inline::C
-  class Packager
-    attr_accessor :name, :version, :summary, :libs_copied, :inline_dir
-
-    def initialize(name, version, summary = '')
-      @name = name
-      @version = version
-      @summary = summary
-      @libs_copied = false
-      @ext = Config::CONFIG['DLEXT']
-
-      # TODO (maybe) put libs in platform dir
-      @inline_dir = File.join "lib", "inline"
-    end
-
-    def package
-      copy_libs
-      generate_rakefile
-      build_gem
-    end
-
-    def copy_libs
-      unless @libs_copied then
-        FileUtils.mkdir_p @inline_dir
-        built_libs = Dir.glob File.join(Inline.directory, "*.#{@ext}")
-        FileUtils.cp built_libs, @inline_dir
-        @libs_copied = true
-      end
-    end
-
-    def generate_rakefile
-      if File.exists? 'Rakefile' then
-        unless $TESTING then
-          STDERR.puts "Hrm, you already have a Rakefile, so I didn't touch it."
-          STDERR.puts "You might have to add the following files to your gemspec's files list:"
-          STDERR.puts "\t#{gem_libs.join "\n\t"}"
-        end
-        return
-      end
-
-      rakefile = eval RAKEFILE_TEMPLATE
-
-      STDERR.puts "==> Generating Rakefile" unless $TESTING
-      File.open 'Rakefile', 'w' do |fp|
-        fp.puts rakefile
-      end
-    end
-
-    def build_gem
-      STDERR.puts "==> Running rake" unless $TESTING or $DEBUG
-
-      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
-      unless defined? @gem_libs then
-        @gem_libs = Dir.glob File.join(@inline_dir, "*.#{@ext}")
-        files = Dir.glob(File.join('lib', '*')).select { |f| test ?f, f }
-
-        @gem_libs.push(*files)
-        @gem_libs.sort!
-      end
-      @gem_libs
-    end
-
-    RAKEFILE_TEMPLATE = '%[require "rake"\nrequire "rake/gempackagetask"\n\nsummary = #{summary.inspect}\n\nif summary.empty? then\n  STDERR.puts "*************************************"\n  STDERR.puts "*** Summary not filled in, SHAME! ***"\n  STDERR.puts "*************************************"\nend\n\nspec = Gem::Specification.new do |s|\n  s.name = #{name.inspect}\n  s.version = #{version.inspect}\n  s.summary = summary\n\n  s.has_rdoc = false\n  s.files = #{gem_libs.inspect}\n  s.add_dependency "RubyInline", ">= 3.3.0"\n  s.require_path = "lib"\nend\n\ndesc "Builds a gem with #{name} in it"\nRake::GemPackageTask.new spec do |pkg|\n  pkg.need_zip = false\n  pkg.need_tar = false\nend\n]'
-  end # class Packager
 end # module Inline
 
 class Module

data/test/test_inline.rb

@@ -1,6 +1,6 @@
 $TESTING = true
 
-$0 = __FILE__ if $0 == "-e" # for autotest style execution
+$0 = __FILE__ if $0 =~ /-e|\(eval\)/
 
 require 'inline'
 require 'tempfile'
@@ -10,18 +10,7 @@ require 'fileutils' unless defined?(::FileUtils)
 
 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 = File.join(Dir.tmpdir, "test_inline.#{$$}")
@@ -40,7 +29,6 @@ class InlineTestCase < Test::Unit::TestCase
   def test_stupid
     #shuts test unit up
   end
-
 end
 
 class TestDir < InlineTestCase
@@ -54,9 +42,7 @@ class TestDir < InlineTestCase
     @count += 1
     Dir.mkdir path, perms unless perms.nil?
     if should_pass then
-      assert_nothing_raised do
-        Dir.assert_secure path
-      end
+      Dir.assert_secure path
     else
       assert_raises(SecurityError) do
         Dir.assert_secure path
@@ -377,7 +363,7 @@ return INT2FIX(42)}"
   return q+x+y+z;
 }"
 
-    assert_raise(ArgumentError) do
+    assert_raises ArgumentError do
       @builder.generate src, true
     end
   end
@@ -591,6 +577,12 @@ puts(s); return rb_str_new2(s)}"
 end # class TestC
 end # class TestInline
 
+module Foo
+  class Bar
+    # inline stuff will go here...
+  end
+end
+
 $test_module_code = <<-EOR
 module Foo
   class Bar
@@ -627,7 +619,6 @@ end
 EOR
 
 class TestModule < InlineTestCase
-
   def test_nested
     Object.class_eval $test_module_code
     fb = Foo::Bar.new
@@ -638,33 +629,36 @@ class TestModule < InlineTestCase
     tempfile.write($test_module_code2)
     tempfile.flush
     tempfile.rewind
-    
+
     FileUtils.cp tempfile.path, "#{tempfile.path}.rb"
-    
+
     require "#{tempfile.path}.rb"
     assert_equal(12, fb.twelve_instance)
     assert_equal(12, Foo::Bar.twelve_class)
-    
+
     FileUtils.rm "#{tempfile.path}.rb"
   end
 
   def test_argument_check_good
+    util_arity_check
     fb = Foo::Bar.new
     assert_equal 13, fb.arity6(1, 2, 3, 4, 5, "blah")
   end
 
   def test_argument_check_fewer
+    util_arity_check
     fb = Foo::Bar.new
 
-    assert_raise(ArgumentError) do
-      assert_equal 13, fb.arity6(1, 2, 3)
+    assert_raises ArgumentError do
+      fb.arity6(1, 2, 3)
     end
   end
 
   def test_argument_check_more
+    util_arity_check
     fb = Foo::Bar.new
-    assert_raise ArgumentError do
-      assert_equal 13, fb.arity6(1, 2, 3, 4, 5, "blah", :extra)
+    assert_raises ArgumentError do
+      fb.arity6(1, 2, 3, 4, 5, "blah", :extra)
     end
   end
 
@@ -681,113 +675,14 @@ class TestModule < InlineTestCase
        "Library file should have been created")
   end
 
-end
-
-class TestInlinePackager < InlineTestCase
+  def util_arity_check
+    methods = Foo::Bar.public_instance_methods.map { |s| s.to_s }
 
-  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
-    @orig_dir = Dir.pwd
-    Dir.chdir @package_dir
-
-    @ext = Config::CONFIG['DLEXT']
-  end
-
-  def teardown
-    super
-    Dir.chdir @orig_dir
-    FileUtils.rm_rf @package_dir unless $DEBUG
-  end
-
-  def util_generate_rakefile
-    summary = @summary
-    name = @name
-    version = @version
-    gem_libs = []
-
-    eval Inline::Packager::RAKEFILE_TEMPLATE
-  end
-
-  def test_initialize
-    assert_equal "lib/inline", @packager.inline_dir
-    assert_equal false, @packager.libs_copied
-  end
-
-  def test_package
-    assert_nothing_raised do
-      @packager.package
-    end
-  end
-
-  def test_copy_libs
-    assert_equal false, @packager.libs_copied
-
-    built_lib = "Inline_Test.#{@ext}"
-    dir = "#{@rootdir}/.ruby_inline"
-
-    Dir.mkdir dir, 0700 unless test ?d, dir
-    Dir.chdir dir do
-      FileUtils.touch built_lib
-    end
-
-    @packager.copy_libs
-
-    assert_equal true, File.directory?("#{@package_dir}/lib/inline")
-    assert_equal true, File.exists?("#{@package_dir}/lib/inline/#{built_lib}")
-
-    assert_equal true, @packager.libs_copied
-  end
-
-  def test_generate_rakefile_has_rakefile
-    FileUtils.rm 'Rakefile' if test ?f, 'Rakefile' and $DEBUG
-    FileUtils.touch 'Rakefile'
-
-    @packager.generate_rakefile
-
-    assert_equal "", File.read('Rakefile')
-  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|
-      src = util_generate_rakefile
-      fp.puts src
+    unless methods.include? "arity6" then
+      Foo::Bar.inline do |builder|
+        builder.include "<string.h>"
+        builder.c "int arity6(int u, int v, int w, int x, int y, char * z) { return x + y + strlen(z); }"
+      end
     end
-
-    @packager.build_gem
-
-    package_name = "pkg/#{@name}-#{@version}.gem"
-    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}"]
-
-    FileUtils.mkdir_p "lib/inline"
-    FileUtils.touch(expected)
-
-    assert_equal expected, @packager.gem_libs
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.6.7
+  version: 3.7.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-20 00:00:00 -07:00
+date: 2008-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,13 +19,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.5.3
     version: 
-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.  Using the package_inline tool Inline allows you to package up your inlined object code for distribution to systems without a compiler.
+description: Inline allows you to write foreign code within your ruby code. It automatically determines if the code in question has changed and builds it only when necessary. The extensions are then automatically loaded into the class/module that defines it.  You can even write extra builders that will allow you to write inlined code in any language. Use Inline::C as a template and look at Module#inline for the required API.
 email: 
 - ryand-ruby@zenspider.com
-executables: 
-- inline_package
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -37,7 +37,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/inline_package
 - demo/fastmath.rb
 - demo/hello.rb
 - example.rb
@@ -69,9 +68,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A POSIX environment and a compiler for your language.
 rubyforge_project: rubyinline
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: Ruby Inline is an analog to Perl's Inline::C
+summary: Inline allows you to write foreign code within your ruby code
 test_files: 
 - test/test_inline.rb

data/bin/inline_package

@@ -1,15 +0,0 @@
-#!/usr/local/bin/ruby -w
-
-require 'inline'
-
-name = ARGV.shift
-version = ARGV.shift
-summary = ARGV.shift || ""
-
-if version.nil? then # TODO better usage
-  STDERR.puts "Usage: #{$0} NAME VERSION [SUMMARY]"
-  exit 1
-end
-
-packager = Inline::Packager.new name, version, summary
-packager.package