RubyInline 3.9.0 → 3.10.0

data.tar.gz.sig

@@ -1,3 +1,3 @@
-a�0R6׉�����x����#ˬ��ڟ�w�2O&NH9VR"?�㖁��� �r`{��H�a�8����di���\�s
-k+�|�L
-�A8O	w��e'�YSL�aC�Xz=i��?��Ɍh�eA:��ǎɈ�6�Ȼq�d��:�.5 �a^[�iU�+���9���y��o?�4�k���<w-�"4�����n\�g�ӡ��$�A�t1�H��K�(�Ԭ��0XD}u���kAU�G<�31g�
�w��*
+� 1��e����}ӺE'��%��-O�P�v"�,����'Z3�W�q�.y�~�.����-�	Jg�6��U( ��p6p5h�6ek|���5M�����nNT�}G^���y�.��ٌ���
+��b=�9$	%g�8�>)
+r��(8d���ȕ(lv>w<+2M��~k�gtZ�:F����y)���6��%34�����&Ǿ-���;���y�4C��C�
�3�Nޏ�j�g�Q��{�P���|��

data/History.txt

@@ -1,3 +1,15 @@
+=== 3.10.0 / 2011-08-30
+
+* 2 minor enhancements:
+
+  * Added engined/versioned subdir to .ruby_inline to help with multiple-ruby usage. (valodzka)
+  * Extended file/module naming to avoid hash collisions. (apohllo)
+
+* 2 bug fixes:
+
+  * Fixed examples for 1.9 compatibility.
+  * Use RbConfig instead of Config. (apohllo)
+
 === 3.9.0 / 2011-02-18
 
 * 1 minor enhancement:

data/README.txt

@@ -1,9 +1,8 @@
 = Ruby Inline
 
-* http://rubyforge.org/projects/rubyinline/
-* http://rubyinline.rubyforge.org/RubyInline/
-* http://www.zenspider.com/ZSS/Products/RubyInline/
-* mailto:ryand-ruby@zenspider.com
+rdoc :: http://docs.seattlerb.org/RubyInline/
+home :: http://www.zenspider.com/ZSS/Products/RubyInline/
+repo :: https://github.com/seattlerb/rubyinline
 
 == DESCRIPTION:
 
@@ -33,14 +32,14 @@ See hoe for more details.
 
 == FEATURES/PROBLEMS:
 
-+ Quick and easy inlining of your C or C++ code embedded in your ruby script.
-+ Extendable to work with other languages.
-+ Automatic conversion between ruby and C basic types
-	+ char, unsigned, unsigned int, char *, int, long, unsigned long
-+ inline_c_raw exists for when the automatic conversion isn't sufficient.
-+ Only recompiles if the inlined code has changed.
-+ Pretends to be secure.
-+ Only requires standard ruby libraries, nothing extra to download.
+* Quick and easy inlining of your C or C++ code embedded in your ruby script.
+* Extendable to work with other languages.
+* Automatic conversion between ruby and C basic types
+  * char, unsigned, unsigned int, char *, int, long, unsigned long
+* inline_c_raw exists for when the automatic conversion isn't sufficient.
+* Only recompiles if the inlined code has changed.
+* Pretends to be secure.
+* Only requires standard ruby libraries, nothing extra to download.
 
 == SYNOPSYS:
 
@@ -103,21 +102,21 @@ See hoe for more details.
 
 == REQUIREMENTS:
 
-+ Ruby - 1.8.2 has been used on FreeBSD 4.6+ and MacOSX.
-+ 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/ ).
+* Ruby - 1.8.2 has been used on FreeBSD 4.6+ and MacOSX.
+* 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/ ).
 
 == INSTALL:
 
-+ make test  (optional)
-+ make install
+* make test  (optional)
+* make install
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2001-2007 Ryan Davis, Zen Spider Software
+Copyright (c) Ryan Davis, seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -7,6 +7,7 @@ Hoe.add_include_dirs "../../ZenTest/dev/lib"
 Hoe.add_include_dirs "lib"
 
 Hoe.plugin :seattlerb
+Hoe.plugin :isolate
 
 Hoe.spec "RubyInline" do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
@@ -14,7 +15,8 @@ Hoe.spec "RubyInline" do
   clean_globs << File.expand_path("~/.ruby_inline")
   spec_extras[:requirements] =
     "A POSIX environment and a compiler for your language."
-  extra_deps << ['ZenTest', '~> 4.3'] # for ZenTest mapping
+
+  dependency "ZenTest", "~> 4.3" # for ZenTest mapping
 end
 
 task :test => :clean

data/example2.rb

@@ -14,10 +14,9 @@ class MyTest
     builder.add_compile_flags %q(-x c++)
     builder.add_link_flags %q(-lstdc++)
 
+    builder.include "<iostream>"
+
     builder.c "
-// stupid c++ comment
-#include <iostream>
-/* stupid c comment */
 static
 void
 hello(int i) {

data/lib/inline.rb

@@ -65,7 +65,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.9.0'
+  VERSION = '3.10.0'
 
   WINDOZE  = /mswin|mingw/ =~ RUBY_PLATFORM
   RUBINIUS = defined? RUBY_ENGINE
@@ -134,11 +134,14 @@ module Inline
   end
 
   def self.directory
-    directory = File.join(rootdir, ".ruby_inline")
-    unless defined? @@directory and directory == @@directory
-      @@directory = File.join(self.rootdir, ".ruby_inline")
+    unless defined? @@directory then
+      version = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
+
+      @@directory = File.join(self.rootdir, ".ruby_inline", version)
     end
-    Dir.assert_secure directory
+
+    Dir.assert_secure @@directory
+
     @@directory
   end
 
@@ -285,12 +288,14 @@ module Inline
       delta = if result =~ /\A(static.*?\{)/m then
                 $1.split(/\n/).size
               else
-                warn "WAR\NING: Can't find signature in #{result.inspect}\n" unless $TESTING
+                msg = "WAR\NING: Can't find signature in #{result.inspect}\n"
+                warn msg unless $TESTING
                 0
               end
 
       file, line = caller[1].split(/:/)
-      result = "# line #{line.to_i + delta} \"#{file}\"\n" + result unless $DEBUG and not $TESTING
+      result = "# line #{line.to_i + delta} \"#{file}\"\n" + result unless
+        $DEBUG and not $TESTING
 
       @src << result
       @sig[function_name] = [arity,singleton,method_name]
@@ -365,14 +370,14 @@ module Inline
         module_name = @mod.name.gsub('::','__')
         md5 = Digest::MD5.new
         @sig.keys.sort_by { |x| x.to_s }.each { |m| md5 << m.to_s }
-        @module_name = "Inline_#{module_name}_#{md5.to_s[0,4]}"
+        @module_name = "Inline_#{module_name}_#{md5}"
       end
       @module_name
     end
 
     def so_name
       unless defined? @so_name then
-        @so_name = "#{Inline.directory}/#{module_name}.#{Config::CONFIG["DLEXT"]}"
+        @so_name = "#{Inline.directory}/#{module_name}.#{RbConfig::CONFIG["DLEXT"]}"
       end
       @so_name
     end
@@ -523,7 +528,7 @@ VALUE #{method}_equals(VALUE value) {
 
         unless File.directory? Inline.directory then
           warn "NOTE: creating #{Inline.directory} for RubyInline" if $DEBUG
-          Dir.mkdir Inline.directory, 0700
+          FileUtils.mkdir_p Inline.directory, :mode => 0700
         end
 
         src_name = "#{Inline.directory}/#{module_name}.c"
@@ -548,7 +553,7 @@ VALUE #{method}_equals(VALUE value) {
         if recompile then
 
           hdrdir = %w(srcdir archdir rubyhdrdir).map { |name|
-            Config::CONFIG[name]
+            RbConfig::CONFIG[name]
           }.find { |dir|
             dir and File.exist? File.join(dir, "/ruby.h")
           } or abort "ERROR: Can't find header dir for ruby. Exiting..."
@@ -562,15 +567,15 @@ VALUE #{method}_equals(VALUE value) {
                             nil
                           end
 
-          cmd = [ Config::CONFIG['LDSHARED'],
+          cmd = [ RbConfig::CONFIG['LDSHARED'],
                   flags,
-                  Config::CONFIG['DLDFLAGS'],
-                  Config::CONFIG['CCDLFLAGS'],
-                  Config::CONFIG['CFLAGS'],
+                  RbConfig::CONFIG['DLDFLAGS'],
+                  RbConfig::CONFIG['CCDLFLAGS'],
+                  RbConfig::CONFIG['CFLAGS'],
                   '-I', hdrdir,
                   config_hdrdir,
-                  '-I', Config::CONFIG['includedir'],
-                  "-L#{Config::CONFIG['libdir']}",
+                  '-I', RbConfig::CONFIG['includedir'],
+                  "-L#{RbConfig::CONFIG['libdir']}",
                   '-o', so_name.inspect,
                   File.expand_path(src_name).inspect,
                   libs,
@@ -592,7 +597,7 @@ VALUE #{method}_equals(VALUE value) {
 
           # NOTE: manifest embedding is only required when using VC8 ruby
           # build or compiler.
-          # Errors from this point should be ignored if Config::CONFIG['arch']
+          # Errors from this point should be ignored if RbConfig::CONFIG['arch']
           # (RUBY_PLATFORM) matches 'i386-mswin32_80'
           if WINDOZE and RUBY_PLATFORM =~ /_80$/ then
             Dir.chdir Inline.directory do
@@ -621,9 +626,9 @@ VALUE #{method}_equals(VALUE value) {
       # gawd windoze land sucks
       case RUBY_PLATFORM
       when /mswin32/ then
-        " -link /LIBPATH:\"#{Config::CONFIG['libdir']}\" /DEFAULTLIB:\"#{Config::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
+        " -link /LIBPATH:\"#{RbConfig::CONFIG['libdir']}\" /DEFAULTLIB:\"#{RbConfig::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
       when /mingw32/ then
-        " -Wl,--enable-auto-import -L#{Config::CONFIG['libdir']} -lmsvcrt-ruby18"
+        " -Wl,--enable-auto-import -L#{RbConfig::CONFIG['libdir']} -lmsvcrt-ruby18"
       when /i386-cygwin/ then
         ' -L/usr/local/lib -lruby.dll'
       else

data/test/test_inline.rb

@@ -80,7 +80,8 @@ class TestInline < InlineTestCase
   end
 
   def test_directory
-    inlinedir = File.join(@rootdir, ".ruby_inline")
+    version = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
+    inlinedir = File.join(@rootdir, ".ruby_inline", version)
     assert_equal(inlinedir, Inline.directory)
   end
 
@@ -412,8 +413,7 @@ static VALUE method_name_equals(VALUE self, VALUE _value) {
       md5 << signature.to_s
     end
 
-    assert_equal("Inline_TestInline__TestC_#{md5.to_s[0,4]}",
-                 @builder.module_name)
+    assert_equal("Inline_TestInline__TestC_#{md5}", @builder.module_name)
   end
 
   def test_module_name_0_methods
@@ -774,7 +774,7 @@ static VALUE my_method(VALUE self) {
 #ifdef __cplusplus
 extern \"C\" {
 #endif#{windoze}
-  void Init_Inline_TestInline__TestC_eba5() {
+  void Init_Inline_TestInline__TestC_eba5e5454322e22fe2310198ef14e43f() {
     VALUE c = rb_cObject;
     c = rb_const_get(c, rb_intern("TestInline"));
     c = rb_const_get(c, rb_intern("TestC"));
@@ -1033,7 +1033,7 @@ class TestModule < InlineTestCase
        "inline dir should have been created")
     matches = Dir[File.join(Inline.directory, "Inline_TestModule_*.c")]
     assert_equal(1, matches.length, "Source should have been created")
-    library_file = matches.first.gsub(/\.c$/) { "." + Config::CONFIG["DLEXT"] }
+    library_file = matches.first.gsub(/\.c$/) { "." + RbConfig::CONFIG["DLEXT"] }
     assert(test(?f, library_file),
        "Library file should have been created")
   end

data/tutorial/example2.rb

@@ -7,15 +7,15 @@ class Array
   inline do |builder|
     builder.c_raw "
       static VALUE average(int argc, VALUE *argv, VALUE self) {
-        double result;
+        double result = 0;
         long  i, len;
-        VALUE *arr = RARRAY(self)->ptr;
-        len = RARRAY(self)->len;
-        
+        VALUE *arr = RARRAY_PTR(self);
+        len = RARRAY_LEN(self);
+
         for(i=0; i<len; i++) {
           result += NUM2DBL(arr[i]);
         }
-  
+
         return rb_float_new(result/(double)len);
       }
     "
@@ -70,7 +70,7 @@ $stderr.puts ""
 
 #   & time ruby ./example2.rb 5 100000
 #   .....
-#  
+#
 #   real 0m1.403s
 #   user 0m1.120s
 #   sys  0m0.070s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 47
   prerelease: 
   segments: 
   - 3
-  - 9
+  - 10
   - 0
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,8 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-02-18 00:00:00 -08:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ZenTest
@@ -60,14 +59,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 2
-        - 0
-        - 2
-        version: 2.0.2
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,14 +74,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 27
         segments: 
         - 2
-        - 9
-        - 1
-        version: 2.9.1
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id003
 description: |-
@@ -119,8 +116,7 @@ files:
 - tutorial/example1.rb
 - tutorial/example2.rb
 - .gemtest
-has_rdoc: true
-homepage: http://rubyforge.org/projects/rubyinline/
+homepage: http://www.zenspider.com/ZSS/Products/RubyInline/
 licenses: []
 
 post_install_message: 
@@ -150,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A POSIX environment and a compiler for your language.
 rubyforge_project: rubyinline
-rubygems_version: 1.4.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Inline allows you to write foreign code within your ruby code