ffi-compiler2 2.0.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8549789704a6cca51363e043802e3da1509e6db8e8cb04e3371fbd1d353d719
-  data.tar.gz: d59762c7609d6e148c6dda92ceb2067875e5c8b73c9802b68180fbbc6c941aba
+  metadata.gz: 7298668a9fdd9774299a0e8f7db5f707a5ddfe07dec06fa4386a01bcee7db5a5
+  data.tar.gz: ce654d24c586edaa2dc571d7a71548bd15a64576367ae8b0e0a97df44e29454f
 SHA512:
-  metadata.gz: 4938d40f72c31d3d280952c99964091215ee50991292466bca16d7e8dea9e8d525c5399f289cd6d025ccc26aa0745faca437a6b5db96757b93205cbc569e9277
-  data.tar.gz: f70c97cf7e3cd83a06d901393c331e7e52cb8f174f9548807bad3cdd175cd50f00c87b6e9686398ee3531c498baa395f1a09f34f535806f2a8a7081c1d2107e4
+  metadata.gz: bee061257b683286b3caea10927543ca3d554500facb5f6465710652c23dd0ebbc287ac0e4abed006a6cdc27b5c3eeb1645cda97e325468316d508b89bf6f360
+  data.tar.gz: 98550ca8ca4c4ba8bcb8ccc7b979b8365143037d87169f7ca821d74fe4a61c45d2a969ef21f9d1e92da59e3ffcb8302872b25c657e351224c88860ac0a4eafad

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec
+

data/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2020 FFI
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/ffi-compiler.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler2'
-  s.version = '2.0.1'
+  s.version = '2.2.2'
   s.author = 'Dāvis'
   s.email = 'davispuh@gmail.com'
   s.homepage = 'https://gitlab.com/davispuh/ffi-compiler'
   s.summary = 'Ruby FFI Rakefile generator'
   s.description = 'Ruby FFI library'
-  s.files = %w(ffi-compiler.gemspec README.md Rakefile LICENSE) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(ffi-compiler.gemspec Gemfile Rakefile README.md LICENSE) + Dir.glob("{lib,spec}/**/*")
   s.license = 'Apache-2.0'
   s.required_ruby_version = '>= 1.9'
   s.add_dependency 'rake'

data/lib/ffi-compiler/compile_task.rb

@@ -5,12 +5,38 @@ require 'ffi'
 require 'tmpdir'
 require 'rbconfig'
 require_relative 'platform'
+require_relative 'shell'
 
 module FFI
   module Compiler
     DEFAULT_CFLAGS = %w(-fexceptions -O -fno-omit-frame-pointer -fno-strict-aliasing)
     DEFAULT_LDFLAGS = %w(-fexceptions)
 
+    class Flags
+      attr_accessor :raw
+
+        def initialize(flags)
+          @flags = flags
+          @raw = true # For backward compatibility
+        end
+
+        def <<(flag)
+          if @raw
+            @flags += shellsplit(flag.to_s)
+          else
+            @flags << flag
+          end
+        end
+
+        def to_a
+          @flags
+        end
+
+        def to_s
+          shelljoin(@flags)
+        end
+    end
+
     class CompileTask < Rake::TaskLib
       attr_reader :cflags, :cxxflags, :ldflags, :libs, :platform
       attr_accessor :name, :ext_dir, :source_dirs, :exclude
@@ -26,9 +52,9 @@ module FFI
         @libraries = []
         @headers = []
         @functions = []
-        @cflags = DEFAULT_CFLAGS.dup
-        @cxxflags = DEFAULT_CFLAGS.dup
-        @ldflags = DEFAULT_LDFLAGS.dup
+        @cflags = Flags.new(shellsplit(ENV['CFLAGS']) || DEFAULT_CFLAGS.dup)
+        @cxxflags = Flags.new(shellsplit(ENV['CXXFLAGS']) || DEFAULT_CFLAGS.dup)
+        @ldflags = Flags.new(shellsplit(ENV['LDFLAGS']) || DEFAULT_LDFLAGS.dup)
         @libs = []
         @platform = Platform.system
         @exports = []
@@ -93,7 +119,7 @@ module FFI
         else
           so_flags << '-shared'
         end
-        so_flags = so_flags.join(' ')
+        so_flags = shelljoin(so_flags)
 
         out_dir = "#{@platform.arch}-#{@platform.os}"
         if @ext_dir != '.'
@@ -106,13 +132,13 @@ module FFI
         lib_name = File.join(out_dir, Platform.system.map_library_name(@name))
 
         iflags = @include_paths.uniq.map { |p| "-I#{p}" }
-        @defines << @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
-        @defines << @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
+        @defines += @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
+        @defines += @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
 
-        cflags = (@cflags + pic_flags + iflags + @defines).join(' ')
-        cxxflags = (@cxxflags + @cflags + pic_flags + iflags + @defines).join(' ')
-        ld_flags = (@library_paths.map { |path| "-L#{path}" } + @ldflags).join(' ')
-        libs = (@libraries.map { |l| "-l#{l}" } + @libs).join(' ')
+        cflags = shelljoin(@cflags.to_a + pic_flags + iflags + @defines)
+        cxxflags = shelljoin(@cxxflags.to_a + @cflags.to_a + pic_flags + iflags + @defines)
+        ld_flags = shelljoin(@library_paths.map { |path| "-L#{path}" } + @ldflags.to_a)
+        libs = shelljoin(@libraries.map { |l| "-l#{l}" } + @libs)
 
         src_files = []
         obj_files = []
@@ -130,12 +156,12 @@ module FFI
           obj_file = obj_files[index]
           if src =~ /\.c$/
             file obj_file => [ src, File.dirname(obj_file) ] do |t|
-              sh "#{cc} #{cflags} -o #{t.name} -c #{t.prerequisites[0]}"
+              sh "#{cc} #{cflags} -o #{shellescape(t.name)} -c #{shellescape(t.prerequisites[0])}"
             end
 
           else
             file obj_file => [ src, File.dirname(obj_file) ] do |t|
-              sh "#{cxx} #{cxxflags} -o #{t.name} -c #{t.prerequisites[0]}"
+              sh "#{cxx} #{cxxflags} -o #{shellescape(t.name)} -c #{shellescape(t.prerequisites[0])}"
             end
           end
 
@@ -150,14 +176,14 @@ module FFI
 
         desc "Build dynamic library"
         file lib_name => obj_files do |t|
-          sh "#{ld} #{so_flags} -o #{t.name} #{t.prerequisites.join(' ')} #{ld_flags} #{libs}"
+          sh "#{ld} #{so_flags} -o #{shellescape(t.name)} #{shelljoin(t.prerequisites)} #{ld_flags} #{libs}"
         end
         CLEAN.include(lib_name)
 
         @exports.each do |e|
           desc "Export #{e[:rb_file]}"
           file e[:header] => [ e[:rb_file] ] do |t|
-            ruby "-I#{File.join(File.dirname(__FILE__), 'fake_ffi')} -I#{File.dirname(t.prerequisites[0])} #{File.join(File.dirname(__FILE__), 'exporter.rb')} #{t.prerequisites[0]} #{t.name}"
+            ruby "-I#{File.join(File.dirname(__FILE__), 'fake_ffi')} -I#{File.dirname(t.prerequisites[0])} #{File.join(File.dirname(__FILE__), 'exporter.rb')} #{shellescape(t.prerequisites[0])} #{shellescape(t.name)}"
           end
 
           obj_files.each { |o| file o  => [ e[:header] ] }
@@ -221,10 +247,10 @@ module FFI
           File.open(path, 'w') do |f|
             f << src
           end
-          cflags = opts.join(' ')
+          cflags = shelljoin(opts)
           output = File.join(dir, 'ffi-test')
           begin
-            return system "#{cc} #{cflags} -o #{output} -c #{path} > #{path}.log 2>&1"
+            return system "#{cc} #{cflags} -o #{shellescape(output)} -c #{shellescape(path)} > #{shellescape(path)}.log 2>&1"
           rescue
             return false
           end

data/lib/ffi-compiler/shell.rb

@@ -0,0 +1,24 @@
+require 'shellwords'
+require 'rbconfig'
+
+def shellescape(str)
+    return str unless str
+    if FFI::Platform::OS == 'windows'
+        '"' + str.gsub('"', '""') + '"'
+    else
+        str.shellescape
+    end
+end
+
+def shelljoin(args)
+    if FFI::Platform::OS == 'windows'
+        args.reduce { |cmd, arg| cmd + ' "' + arg.gsub('"', '""') + '"' }
+    else
+        args.shelljoin
+    end
+end
+
+def shellsplit(str)
+    return str unless str
+    str.shellsplit
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler2
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Dāvis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -83,6 +84,7 @@ files:
 - lib/ffi-compiler/fake_ffi/ffi.rb
 - lib/ffi-compiler/loader.rb
 - lib/ffi-compiler/platform.rb
+- lib/ffi-compiler/shell.rb
 - lib/ffi-compiler/task.rb
 homepage: https://gitlab.com/davispuh/ffi-compiler
 licenses:
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Ruby FFI Rakefile generator