RubyInline 3.12.6 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba7b8737df8454f2428459aa7066082c3966cd52213ae62126489327ce614b9
-  data.tar.gz: 77476279cc150dbfec24b72cfbee747af92f13489e6c46d44436deb06e095fa7
+  metadata.gz: 14e2dd1d335589d1f389ba716c031d8778d02d0b2c74e35ad981168dd7d0999d
+  data.tar.gz: 5b39db47e57df1e9494db491e778e121f0556b8827270ea6cbd63899c03f8f52
 SHA512:
-  metadata.gz: eb1b824084189a44908e5896fba9acb9637c26c31a5944f0c3bd9fa986aae2986e30c05f4a1886672d8dc9a46b619a8b566d5051f8504a48365ddc96d85473fd
-  data.tar.gz: 1c9184d49d7ecf30af622fa8a6b317ca84707524f810b6ee9eb675ceb68d419814116f85eb096ffca523634e7d9f4287e538de584eb2786684b1c05f298bcb0c
+  metadata.gz: 9cce3379d5f7876f9ed3f8736eb3ef90beeea58730fc9303c532efebaf629ea097481e06084a61ddb379319e599ca002385c458a8a183464a1f6199014f8c6b6
+  data.tar.gz: 1650103a7b18af47316fd0983baa3877a36776e71732ac1ffa71cf715fa86415a9bd1ad7584efc74378a2db52c287e6243cedae4cbf025224aaf09136381f67c

data/History.txt

@@ -1,3 +1,25 @@
+=== 3.14.0 / 2023-06-28
+
+* 3 minor enhancements:
+
+  * Changed File.write_with_backup to write the content and return renamed path.
+  * Dropped #inline ancient options processing code. 2005, yo.
+  * Preemptively require language extension if not defined yet.
+
+* 1 bug fix:
+
+  * Declare Init_* to be (void) to prevent some compilers from complaining.
+
+=== 3.13.0 / 2023-01-31
+
+* 1 minor enhancement:
+
+  * Error out if current ruby isn't configured for ENABLE_SHARED.
+
+* 1 bug fix:
+
+  * Clean up examples. C++ warns about ANYARGS deprecation. Gonna have to sit with it for now.
+
 === 3.12.6 / 2022-05-23
 
 * 1 bug fix:

data/Rakefile

@@ -16,6 +16,8 @@ Hoe.spec "RubyInline" do
   spec_extras[:requirements] =
     "A POSIX environment and a compiler for your language."
 
+  license "MIT"
+
   dependency "ZenTest", "~> 4.3" # for ZenTest mapping
 end
 
@@ -23,16 +25,17 @@ task :test => :clean
 
 desc "run all examples"
 task :examples do
-  %w(example.rb example2.rb
+  %w(example.rb
+     example2.rb
      tutorial/example1.rb
      tutorial/example2.rb).each do |e|
     rm_rf '~/.ruby_inline'
-    ruby "-Ilib -w #{e}"
+    ruby "-Ilib -I#{Hoe.include_dirs.first} -w #{e}"
   end
 end
 
 desc "run simple benchmarks"
-task :bench do
+task :bench => [:clean, :isolate] do
   verbose(false) do
     ruby "-Ilib ./example.rb"
     ruby "-Ilib ./example.rb 1000000 12" # 12 is the bignum cutoff for factorial

data/example.rb

@@ -55,31 +55,31 @@ end
 puts "# of iterations = #{max}, n = #{n}"
 Benchmark::bm(20) do |x|
   x.report("null_time") do
-    for i in 0..max do
+    max.times do
       # do nothing
     end
   end
 
   x.report("c") do
-    for i in 0..max do
+    max.times do
       validate(t.factorial_c(n), m)
     end
   end
 
   x.report("c-raw") do
-    for i in 0..max do
+    max.times do
       validate(t.factorial_c_raw(n), m)
     end
   end
 
   x.report("c-alias") do
-    for i in 0..max do
+    max.times do
       validate(t.factorial_alias(n), m)
     end
   end
 
   x.report("pure ruby") do
-    for i in 0..max do
+    max.times do
       validate(t.factorial(n), m)
     end
   end

data/example2.rb

@@ -10,11 +10,13 @@ require 'inline'
 class MyTest
 
   inline do |builder|
+    builder.include_ruby_last
 
     builder.add_compile_flags %q(-x c++)
     builder.add_link_flags %q(-lstdc++)
 
     builder.include "<iostream>"
+    builder.include '"ruby/version.h"'
 
     builder.c "
 static

data/lib/inline.rb

@@ -65,7 +65,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = "3.12.6"
+  VERSION = "3.14.0"
 
   WINDOZE  = /mswin|mingw/ =~ RUBY_PLATFORM
   DEV_NULL = (WINDOZE ? 'nul'      : '/dev/null')
@@ -74,12 +74,12 @@ module Inline
 
   warn "RubyInline v #{VERSION}" if $DEBUG
 
-  def self.register cls
+  def self.register cls # for hoe/inline
     registered_inline_classes << cls
     registered_inline_classes.uniq!
   end
 
-  def self.registered_inline_classes
+  def self.registered_inline_classes # for hoe/inline
     @@registered_inline_classes ||= []
   end
 
@@ -326,7 +326,7 @@ module Inline
       ext << "extern \"C\" {"
       ext << "#endif"
       ext << "  __declspec(dllexport)" if WINDOZE
-      ext << "  void Init_#{module_name}() {"
+      ext << "  void Init_#{module_name}(void) {"
       ext << "    VALUE c = rb_cObject;"
 
       # TODO: use rb_class2path
@@ -449,7 +449,7 @@ module Inline
         @struct_name
 
       c <<-C
-VALUE #{method}() {
+VALUE #{method}(void) {
   #{@struct_name} *pointer;
 
   Data_Get_Struct(self, #{@struct_name}, pointer);
@@ -535,14 +535,11 @@ VALUE #{method}_equals(VALUE value) {
         end
 
         src_name = "#{Inline.directory}/#{module_name}.c"
-        old_src_name = "#{src_name}.old"
-        should_compare = File.write_with_backup(src_name) do |io|
-          io.puts generate_ext
-        end
+        old_src_name = File.write_with_backup src_name, generate_ext
 
         # recompile only if the files are different
         recompile = true
-        if so_exists and should_compare and
+        if so_exists and old_src_name and
             FileUtils.compare_file(old_src_name, src_name) then
           recompile = false
 
@@ -554,6 +551,9 @@ VALUE #{method}_equals(VALUE value) {
         end
 
         if recompile then
+          unless RbConfig::CONFIG["ENABLE_SHARED"] == "yes" then
+            raise "this ruby isn't configured for dynamic linking"
+          end
 
           hdrdir = %w(srcdir includedir archdir rubyhdrdir).map { |name|
             RbConfig::CONFIG[name]
@@ -562,6 +562,9 @@ VALUE #{method}_equals(VALUE value) {
           } or abort "ERROR: Can't find header dir for ruby. Exiting..."
 
           flags = @flags.join(' ')
+
+          @libs << RbConfig::CONFIG['LIBRUBYARG_SHARED']
+
           libs  = @libs.join(' ')
 
           config_hdrdir = if RbConfig::CONFIG['rubyarchhdrdir'] then
@@ -828,22 +831,9 @@ class Module
   def inline(lang = :C, options={})
     Inline.register self
 
-    case options
-    when TrueClass, FalseClass then
-      warn "WAR\NING: 2nd argument to inline is now a hash, changing to {:testing=>#{options}}" unless options
-      options = { :testing => options  }
-    when Hash
-      options[:testing] ||= false
-    else
-      raise ArgumentError, "BLAH"
-    end
+    require "inline/#{lang}" unless Inline.const_defined? lang
 
-    builder_class = begin
-                      Inline.const_get(lang)
-                    rescue NameError
-                      require "inline/#{lang}"
-                      Inline.const_get(lang)
-                    end
+    builder_class = Inline.const_get lang
 
     builder = builder_class.new self
 
@@ -863,25 +853,24 @@ class File
   ##
   # Equivalent to +File::open+ with an associated block, but moves
   # any existing file with the same name to the side first.
+  # Returns renamed path or false if none.
 
-  def self.write_with_backup(path) # returns true if file already existed
-
-    # move previous version to the side if it exists
+  def self.write_with_backup(path, content)
     renamed = false
+
     if File.file? path then
+      renamed = "#{path}.old"
+
       begin
-        File.rename path, path + ".old"
-        renamed = true
-      rescue SystemCallError
+        File.rename path, renamed
+      rescue SystemCallError # in case of race condition
         # do nothing
       end
     end
 
-    File.open(path, "w") do |io|
-      yield(io)
-    end
+    File.write path, content
 
-    return renamed
+    renamed
   end
 end # class File
 
@@ -895,7 +884,7 @@ class Dir
 
   def self.assert_secure(path)
     mode = File.stat(path).mode
-    unless ((mode % 01000) & 0022) == 0 then
+    unless mode % 01000 & 0022 == 0 then
       if $TESTING then
         raise SecurityError, "Directory #{path} is insecure"
       else

data/test/test_inline.rb

@@ -769,7 +769,7 @@ static VALUE my_method(VALUE self) {
 #ifdef __cplusplus
 extern \"C\" {
 #endif#{windoze}
-  void Init_Inline_TestInline__TestC_3ab8c09639e499394bb1f0a0194a839f() {
+  void Init_Inline_TestInline__TestC_3ab8c09639e499394bb1f0a0194a839f(void) {
     VALUE c = rb_cObject;
     c = rb_const_get(c, rb_intern("TestInline"));
     c = rb_const_get(c, rb_intern("TestC"));

data/tutorial/example1.rb

@@ -3,7 +3,7 @@
 # We started out with some code that averaged a ton of numbers in a
 # bunch of arrays. Once we finally lost our patience with the average
 # running time of the code, we decided to profile and optimize it
-# using RubyInline. 
+# using RubyInline.
 
 class Array
 
@@ -20,7 +20,7 @@ max_size = (ARGV.shift || 100_000).to_i
 a = (1..max_size).to_a
 
 1.upto(max_loop) do
-  avg = a.average
+  a.average
   $stderr.print "."
 end
 $stderr.puts ""
@@ -34,7 +34,7 @@ $stderr.puts ""
 
 #   & time ruby ./example1.rb 5 100000
 #   .....
-#  
+#
 #   real 0m4.580s
 #   user 0m3.310s
 #   sys  0m0.090s

data/tutorial/example2.rb

@@ -27,7 +27,7 @@ max_size = (ARGV.shift || 100_000).to_i
 a = (1..max_size).to_a
 
 1.upto(max_loop) do
-  avg = a.average
+  a.average
   $stderr.print "."
 end
 $stderr.puts ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: RubyInline
 version: !ruby/object:Gem::Version
-  version: 3.12.6
+  version: 3.14.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
-  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
-  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
-  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
-  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
-  YsuyUzsMz6GQA4khyaMgKNSD
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ZenTest
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.0'
 description: |-
   Inline allows you to write foreign code within your ruby code. It
   automatically determines if the code in question has changed and
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - A POSIX environment and a compiler for your language.
-rubygems_version: 3.3.12
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Inline allows you to write foreign code within your ruby code