RubyInline 3.12.0 → 3.12.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.12.1 / 2013-02-14
+
+* 2 bug fixes:
+
+  * Fixes for maglev to find headers in the correct location.
+  * Fixes for tests, mostly for maglev.
+
 === 3.12.0 / 2012-12-18
 
 * 1 major enhancement:
@@ -184,273 +191,273 @@
 
 * 2 bug fixes:
 
-	* comment stripper much more sane to fix problems on certain linux distros
-	* fixed a nit with older C compilers.
+  * comment stripper much more sane to fix problems on certain linux distros
+  * fixed a nit with older C compilers.
 
 === 3.6.1 / 2006-10-11
 
 * 1 minor enhancement
 
-	* Hoe'd the Rakefile. :P
+  * Hoe'd the Rakefile. :P
 
 * 2 bug fixes
 
-	* Removed VALUE from @types because it is now in @@type_map.
-	* Tweak added for mingw32.
+  * 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
 
-	* 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.
+  * 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.
+  * 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
 
-	* Switched to install for Makefile.
-	* Lots of minor cleanup.
-	* Added add_to_init to extend init methods. Great hack!
-	* Added 2 demo files used in the rubyconf 2005 presentation.
+  * Switched to install for Makefile.
+  * Lots of minor cleanup.
+  * Added add_to_init to extend init methods. Great hack!
+  * Added 2 demo files used in the rubyconf 2005 presentation.
 
 * 1 bug fix
 
-	* Fixed example in README.txt. OOPS!
+  * Fixed example in README.txt. OOPS!
 
 === 3.4.0 / 2005-07-13
 
 * 2 minor enhancement
 
-	* Changed inline to take the language and a hash of options.
-		* Still backwards compatible, for now, and emits a warning.
-	* Options are available via the builder passed to your block.
+  * Changed inline to take the language and a hash of options.
+    * Still backwards compatible, for now, and emits a warning.
+  * Options are available via the builder passed to your block.
 
 * 2 bug fixes
 
-	* Modified caller discovery, yet again, due to changes in ruby 1.8.3.
-	* More compatible and clean with non-gems systems.
+  * Modified caller discovery, yet again, due to changes in ruby 1.8.3.
+  * More compatible and clean with non-gems systems.
 
 === 3.3.2 / 2005-05-19
 
 * 4 bug fixes
 
-	* Fixed a line number issue when using c_raw w/ multi-line signatures.
-	* Inline can now be invoked multiple times per class.
-	* Filled out rdoc.
-	* Fixed some old tests.
+  * Fixed a line number issue when using c_raw w/ multi-line signatures.
+  * Inline can now be invoked multiple times per class.
+  * Filled out rdoc.
+  * Fixed some old tests.
 
 === 3.3.1 / 2005-05-03
 
 * 3 bug fixes
 
-	* Fixed a bug w/ unit tests involving caching of rootdir.
-	* Added a minor tweak to the file discovery when called through eval.
-	* Moved the packaging code into inline.rb in order to get rubygems wrapped scripts to work again (wrapper was breaking due to __FILE__ != $0).
+  * Fixed a bug w/ unit tests involving caching of rootdir.
+  * Added a minor tweak to the file discovery when called through eval.
+  * Moved the packaging code into inline.rb in order to get rubygems wrapped scripts to work again (wrapper was breaking due to __FILE__ != $0).
 
 === 3.3.0 / 2005-04-22
 
 * 2 minor enhancement
 
-	* Added inline_package, which helps you package inlined code into gems.
-	* inline_package also generates a Rakefile for you if you need it.
-	* inline.rb now (only) loads packaged code when present.
+  * Added inline_package, which helps you package inlined code into gems.
+  * inline_package also generates a Rakefile for you if you need it.
+  * inline.rb now (only) loads packaged code when present.
 
 === 3.2.1 / 2005-04-19
 
 * 2 bug fixes
 
-	* Added double to typemap. Thanks Phil Tomson!
-	* Added a minor hack to get cygwin to work right--lemme know pls.
+  * Added double to typemap. Thanks Phil Tomson!
+  * Added a minor hack to get cygwin to work right--lemme know pls.
 
 === 3.2.0 / 2004-11-27
 
 * 8 minor enhancements
 
-	* Gemified
-	* Added #line preprocessor directives to make debugging inside your ruby file practical.
-	* Added uninstall rule to Makefile
-	* Inline::C now generates classes directly instead of included modules.
-	* Better execeptions are thrown on error.
-	* Incorporated a bunch of changes from Jonathan Paisley:
-		* Generation of inline'd class methods. (c_singleton and c_raw_singleton)
-		* Fixed problems with nested module/classes.
-		* Inline can now extend the same class multiple times.
+  * Gemified
+  * Added #line preprocessor directives to make debugging inside your ruby file practical.
+  * Added uninstall rule to Makefile
+  * Inline::C now generates classes directly instead of included modules.
+  * Better execeptions are thrown on error.
+  * Incorporated a bunch of changes from Jonathan Paisley:
+    * Generation of inline'd class methods. (c_singleton and c_raw_singleton)
+    * Fixed problems with nested module/classes.
+    * Inline can now extend the same class multiple times.
 
 * 2 bug fixes
 
-	* Smarter require/instantiation to accomodate other languages better.
-	* Fixed a logic error where running good code, then bad, then bad again ran the original good code.
+  * Smarter require/instantiation to accomodate other languages better.
+  * Fixed a logic error where running good code, then bad, then bad again ran the original good code.
 
 === 3.1.0 / 2004-09-24
 
 * 2 minor enhancement
 
-	* Extended API of Inline::C with prefix(code).
-	* Documented all public API.
+  * Extended API of Inline::C with prefix(code).
+  * Documented all public API.
 
 * 2 bug fixes
 
-	* Cleaned a lot of code and tests.
-	* Removed nearly all tags.
+  * Cleaned a lot of code and tests.
+  * Removed nearly all tags.
 
 === 3.0.1 / 2004-02-24
 
 * 2 bug fixes
 
-	* I let references to ZenTestUnit slip through the release. Removed.
-	* Converted History.txt to ZenWeb format.
+  * I let references to ZenTestUnit slip through the release. Removed.
+  * Converted History.txt to ZenWeb format.
 
 === 3.0.0 / 2003-12-23
 
 * 3 major enhancements
 
-	* Complete rewrite with new design.
-	* Multiple language support, works with C/C++ out of the box.
-	* Multiple functions per compilation unit, now allowing entire classes to be defined and linked in one unit.
+  * Complete rewrite with new design.
+  * Multiple language support, works with C/C++ out of the box.
+  * Multiple functions per compilation unit, now allowing entire classes to be defined and linked in one unit.
 
 * Notes:
 
-	* I still need to write much better/complete documentation.
+  * I still need to write much better/complete documentation.
 
 === 2.2.0 / 2003-01-25
 
 * 1 minor enhancements
 
-	* Touch all generated files to avoid unnecessary diffs.
+  * Touch all generated files to avoid unnecessary diffs.
 
 * 1 bug fixes
 
-	* Added good profiling example in tutorial/*.
-	* Added profiling strategy in README.txt.
+  * Added good profiling example in tutorial/*.
+  * Added profiling strategy in README.txt.
 
 * Notes:
 
-	* Paired with Doug Beaver <snarly@beaver.net>
+  * Paired with Doug Beaver <snarly@beaver.net>
 
 === 2.1.1 / 2002-12-27
 
 * 2 bug fixes
 
-	* Fixed a bug in inline.rb where it was comparing against inline.rb, not the caller.
-	* Tweaked example.rb to take the number of iterations as an option.
+  * Fixed a bug in inline.rb where it was comparing against inline.rb, not the caller.
+  * Tweaked example.rb to take the number of iterations as an option.
 
 === 2.1.0 / 2002-12-17
 
 * 2 minor enhancements
 
-	* Added inline_c_raw to replace Inline.inline.
-	* Removed module Inline as a whole. This gets rid of some
-	* major version incompatibilities, tons of duplicate code, and
-	* just seems to make things happier.
+  * Added inline_c_raw to replace Inline.inline.
+  * Removed module Inline as a whole. This gets rid of some
+  * major version incompatibilities, tons of duplicate code, and
+  * just seems to make things happier.
 
 * 4 bug fixes
 
-	* Added a fix from Michael Scholz to fix the use of $0 for file test.
-	* Added private and public declarations since we are invading
-	* class Module.
-	* Fixed tests... oops!
-	* Lots of clean up...
+  * Added a fix from Michael Scholz to fix the use of $0 for file test.
+  * Added private and public declarations since we are invading
+  * class Module.
+  * Fixed tests... oops!
+  * Lots of clean up...
 
 * Notes:
 
-	* Reviewed by Doug Beaver <snarly@beaver.net>
+  * Reviewed by Doug Beaver <snarly@beaver.net>
 
 === 2.0.0 / 2002-12-12
 
 * 2 bug fixes
 
-	* Minor fix to get working on MacOS X (.so vs .bundle).
-	* Downgraded typemap to be compatible with 1.6.x.
+  * Minor fix to get working on MacOS X (.so vs .bundle).
+  * Downgraded typemap to be compatible with 1.6.x.
 
 * Notes:
 
-	* Paired w/ Doug Beaver <snarly@beaver.net>
+  * Paired w/ Doug Beaver <snarly@beaver.net>
 
 === 2.0.0 beta / 2002-11-22
 
 * 1 major enhancements
 
-	* Added inline_c, a "compile-time" version of inline. Massively enhanced, this version has a limited form of C function parsing.
+  * Added inline_c, a "compile-time" version of inline. Massively enhanced, this version has a limited form of C function parsing.
 
 * 2 minor enhancements
 
-	* Deprecated Inline#inline for Module#inline_c. To be removed by 2.1.0.
-	* Extended example.rb to include a fully written inlined C function.
+  * Deprecated Inline#inline for Module#inline_c. To be removed by 2.1.0.
+  * Extended example.rb to include a fully written inlined C function.
 
 * 3 bug fixes
 
-	* Updated README.txt and improved some of the documentation.
-	* Added test and clean rules to Makefile.
-	* Removed the copious warnings if running ruby < 1.7.2.
+  * Updated README.txt and improved some of the documentation.
+  * Added test and clean rules to Makefile.
+  * Removed the copious warnings if running ruby < 1.7.2.
 
 * Notes:
 
-	* Paired w/ Doug Beaver <snarly@beaver.net>
+  * Paired w/ Doug Beaver <snarly@beaver.net>
 
 === 1.1.0 / 2002-11-01
 
 * 2 minor enhancements
 
-	* Aliased methods are now inlined as well. 250x faster.
-	* ONLY on ruby 1.7*. Warns on ruby < 1.7.
-	* Added a makefile to automate running of all different benchmarks.
+  * Aliased methods are now inlined as well. 250x faster.
+  * ONLY on ruby 1.7*. Warns on ruby < 1.7.
+  * Added a makefile to automate running of all different benchmarks.
 
 * 1 bug fixes
 
-	* Improved example to include an aliased method testcase.
+  * Improved example to include an aliased method testcase.
 
 === 1.0.7 / 2002-09-22
 
 * 1 minor enhancements
 
-	* Only compiles the generated code if it was different from the previous version.
+  * Only compiles the generated code if it was different from the previous version.
 
 * 1 bug fixes
 
-	* Improved security: Checks group and global write on home directory.
+  * Improved security: Checks group and global write on home directory.
 
 === 1.0.6 / 2002-09-18
 
 * 1 minor enhancements
 
-	* Added a prelude argument for header and datatype declarations.
+  * Added a prelude argument for header and datatype declarations.
 
 * 3 bug fixes
 
-	* Only output stuff if invoked verbose (ie 'ruby -v ./example.rb').
-	* Added some compatibility code for windows.
-	* Declared requirement on POSIX system.
+  * Only output stuff if invoked verbose (ie 'ruby -v ./example.rb').
+  * Added some compatibility code for windows.
+  * Declared requirement on POSIX system.
 
 === 1.0.5 / 2002-09-11
 
 * 2 bug fixes
 
-	* Improved security model for UNIX. Still not sure about windoze.
-	* Fixed History.txt to be accurate, gave example in README.
+  * Improved security model for UNIX. Still not sure about windoze.
+  * Fixed History.txt to be accurate, gave example in README.
 
 === 1.0.4 / 2002-09-10
 
 * 1 major enhancements
 
-	* Released to sourceforge!
+  * Released to sourceforge!
 
 * 1 bug fixes
 
-	* A number of very minor bug fixes from IRC sessions w/ others.
+  * A number of very minor bug fixes from IRC sessions w/ others.
 
 === 1.0.0 / 2002-09-05
 
 * 1 major enhancements
 
-	* Birthday!
+  * Birthday!

data/lib/inline.rb

@@ -65,7 +65,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.12.0'
+  VERSION = '3.12.1'
 
   WINDOZE  = /mswin|mingw/ =~ RUBY_PLATFORM
   RUBINIUS = defined? RUBY_ENGINE
@@ -551,10 +551,10 @@ VALUE #{method}_equals(VALUE value) {
 
         if recompile then
 
-          hdrdir = %w(srcdir archdir rubyhdrdir).map { |name|
+          hdrdir = %w(srcdir includedir archdir rubyhdrdir).map { |name|
             RbConfig::CONFIG[name]
           }.find { |dir|
-            dir and File.exist? File.join(dir, "/ruby.h")
+            dir and File.exist? File.join(dir, "ruby.h")
           } or abort "ERROR: Can't find header dir for ruby. Exiting..."
 
           flags = @flags.join(' ')

data/test/test_inline.rb

@@ -1,6 +1,7 @@
 $TESTING = true
 
-$0 = __FILE__ if $0 =~ /-e|\(eval\)/
+$0 = __FILE__ if $0 =~ /-e|\(eval\)|^$/
+$0 = $0.sub(Dir.pwd, '.')
 
 require 'inline'
 require 'tempfile'
@@ -13,15 +14,9 @@ File.umask(0)
 
 require 'pathname'
 
-$expand_paths     = Pathname.new(__FILE__).absolute?
 $inline_path      = './lib/inline.rb'
 $test_inline_path = './test/test_inline.rb'
 
-if $expand_paths then
-  $inline_path      = File.expand_path $inline_path
-  $test_inline_path = File.expand_path $test_inline_path
-end
-
 class InlineTestCase < MiniTest::Unit::TestCase
   def setup
     super
@@ -36,10 +31,6 @@ class InlineTestCase < MiniTest::Unit::TestCase
       ENV.delete 'INLINEDIR'
     end
   end
-
-  def test_stupid
-    #shuts test unit up
-  end
 end
 
 class TestDir < InlineTestCase
@@ -521,7 +512,7 @@ static VALUE method_name_equals(VALUE self, VALUE _value) {
   def util_generate(src, expected, expand_types=true)
     result = @builder.generate src, expand_types
     result = util_strip_lines result
-    result.gsub!(/\# line \d+/, '# line N')
+
     expected = "# line N \"#{$0}\"\n" + expected
     assert_equal(expected, result)
   end
@@ -533,7 +524,7 @@ static VALUE method_name_equals(VALUE self, VALUE _value) {
   def util_strip_lines(src)
     case src
     when String then
-      src.gsub(/\# line \d+/, '# line N')
+      src.gsub(/\# line \d+/, '# line N').gsub(Dir.pwd, '.')
     when Array then
       src.map do |chunk|
         util_strip_lines chunk
@@ -807,21 +798,22 @@ extern \"C\" {
 
     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')
+    result = util_strip_lines result
 
     assert_equal expected, result
-    assert_equal [expected], @builder.src
+    assert_equal [expected], util_strip_lines(@builder.src)
   end
 
   def test_c_raw
     src = "static VALUE answer_raw(int argc, VALUE *argv, VALUE self) { return INT2NUM(42); }"
+
     result = @builder.c_raw src.dup
+    result = util_strip_lines result
 
-    result.gsub!(/\# line \d+/, '# line N')
     expected = "# line N \"#{$0}\"\n" + src
 
     assert_equal expected, result
-    assert_equal [expected], @builder.src
+    assert_equal [expected], util_strip_lines(@builder.src)
   end
 
   def test_map_c_const
@@ -874,6 +866,8 @@ extern \"C\" {
   end
 
   def test_build_good
+    skip "https://github.com/MagLev/maglev/issues/231" if maglev?
+
     code = util_simple_code(:DumbTest1, "long dumbpi() { return 314; }")
     util_test_build(code) do
       result = DumbTest1.new.dumbpi
@@ -983,6 +977,8 @@ EOR
 
 class TestModule < InlineTestCase
   def test_nested
+    skip "https://github.com/MagLev/maglev/issues/231" if maglev?
+
     Object.class_eval $test_module_code
     fb = Foo::Bar.new
     assert_equal(42, fb.forty_two_instance)
@@ -1003,12 +999,16 @@ class TestModule < InlineTestCase
   end
 
   def test_argument_check_good
+    skip "https://github.com/MagLev/maglev/issues/231" if maglev?
+
     util_arity_check
     fb = Foo::Bar.new
     assert_equal 13, fb.arity6(1, 2, 3, 4, 5, "blah")
   end
 
   def test_argument_check_fewer
+    skip "https://github.com/MagLev/maglev/issues/231" if maglev?
+
     util_arity_check
     fb = Foo::Bar.new
 
@@ -1018,6 +1018,8 @@ class TestModule < InlineTestCase
   end
 
   def test_argument_check_more
+    skip "https://github.com/MagLev/maglev/issues/231" if maglev?
+
     util_arity_check
     fb = Foo::Bar.new
     assert_raises ArgumentError do
@@ -1026,6 +1028,8 @@ class TestModule < InlineTestCase
   end
 
   def test_inline
+    skip "https://github.com/MagLev/maglev/issues/231" if maglev?
+
     self.class.inline(:C) do |builder|
       builder.c "int add(int a, int b) { return a + b; }"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 3
   - 12
-  - 0
-  version: 3.12.0
+  - 1
+  version: 3.12.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-12-18 00:00:00 Z
+date: 2013-02-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ZenTest
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 23
         segments: 
         - 4
-        - 3
-        version: "4.3"
+        - 6
+        version: "4.6"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -91,11 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 3
-        - 4
-        version: "3.4"
+        - 5
+        version: "3.5"
   type: :development
   version_requirements: *id004
 description: |-
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A POSIX environment and a compiler for your language.
 rubyforge_project: rubyinline
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Inline allows you to write foreign code within your ruby code