tebako-runtime 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb768706b6e2fda16611bed89a6f4cd6e52296c969cfda886f51dbb9edd516e8
-  data.tar.gz: 1311d0ad02355fe08c374b51acca120db90f398f7942aa37c2909829a77a45b3
+  metadata.gz: '097d5286d2407698d42ea62673f8ecb003f02ec6977d980ea399f7b50fbb97e5'
+  data.tar.gz: a7983b403f626a3f6b92a0f8d893fccadf4933c03cf13b2ebb306f221be20cae
 SHA512:
-  metadata.gz: 3626130726d12b47ff32fb397d8650887305608854813b838b9744dcf18a91945cc97ba7c741b9c158126e5e85fe5a8f8a8741d8b783e0cf83a3c1709051cb77
-  data.tar.gz: 6f9500c6b5639d506091831cbe60d0a2dcefa71b6820a5a92caaf51bc03d2be46e31c1869f6841f0c0dbfe5536a8a810a14a6b1af6a1276c8d17c44573bf3767
+  metadata.gz: aba554f750356e8445d4cc0f4dc4d41b5af24058ebda5a7d6c1ac7ddadd82a5032903b6411023a61369def5e904b02ac71b2395a64f8e08624cb8eb5ec4ecbec
+  data.tar.gz: 6f9ff5b865e68681dec9dc25cf7211c7e0c733e126c734be496a00bf168bfd00c4625df26fccfd367ce68895148e2a0e6a96a4d08be7a8a526b1c08d722456b1

data/Rakefile

@@ -35,14 +35,17 @@ require "fileutils"
 namespace :build do
   desc "Download cacert.pem"
   task :download_cacert do
-    url = URI("https://curl.se/ca/cacert.pem")
-    FileUtils.mkdir_p("lib/cert")
-    Net::HTTP.start(url.host, url.port, use_ssl: url.scheme == "https") do |http|
-      request = Net::HTTP::Get.new url
-      http.request request do |response|
-        open "lib/cert/cacert.pem.mozilla", "w" do |io|
-          response.read_body do |chunk|
-            io.write chunk
+    unless File.exist?("lib/cert/cacert.pem.mozilla")
+
+      url = URI("https://curl.se/ca/cacert.pem")
+      FileUtils.mkdir_p("lib/cert")
+      Net::HTTP.start(url.host, url.port, use_ssl: url.scheme == "https") do |http|
+        request = Net::HTTP::Get.new url
+        http.request request do |response|
+          open "lib/cert/cacert.pem.mozilla", "w" do |io|
+            response.read_body do |chunk|
+              io.write chunk
+            end
           end
         end
       end
@@ -52,7 +55,9 @@ end
 
 task build: "build:download_cacert"
 
-task default: ["build:download_cacert", :spec]
+task spec: "build:download_cacert"
+
+task default: :spec
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new

data/lib/tebako-runtime/memfs.rb

@@ -35,7 +35,7 @@ require_relative "string"
 # Module TebakoRuntime
 # Methods to extract files from memfs to temporary folder
 module TebakoRuntime
-  COMPILER_MEMFS = RUBY_PLATFORM =~ /msys|mingw|cygwin/ ? "A:/__tebako_memfs__" : "/__tebako_memfs__"
+  COMPILER_MEMFS = RUBY_PLATFORM =~ /mswin|mingw/ ? "A:/__tebako_memfs__" : "/__tebako_memfs__"
   COMPILER_MEMFS_LIB_CACHE = Pathname.new(Dir.mktmpdir("tebako-runtime-"))
 
   class << self

data/lib/tebako-runtime/pass-through/ffi-platform-stub.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+module FFI
+  module Platform
+    ARCH = case RbConfig::CONFIG["host_cpu"].downcase
+           when /amd64|x86_64|x64/
+             "x86_64"
+           when /i\d86|x86|i86pc/
+             "i386"
+           when /ppc64|powerpc64/
+             "powerpc64"
+           when /ppc|powerpc/
+             "powerpc"
+           when /sparcv9|sparc64/
+             "sparcv9"
+           when /arm64|aarch64/ # MacOS calls it "arm64", other operating systems "aarch64"
+             "aarch64"
+           when /^arm/
+             if OS == "darwin" # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
+               "aarch64"
+             else
+               "arm"
+             end
+           else
+             RbConfig::CONFIG["host_cpu"].downcase
+           end
+
+    OS =
+      case RbConfig::CONFIG["host_os"].downcase
+      when /linux/
+        "linux"
+      when /darwin/
+        "darwin"
+      when /freebsd/
+        "freebsd"
+      when /netbsd/
+        "netbsd"
+      when /openbsd/
+        "openbsd"
+      when /dragonfly/
+        "dragonflybsd"
+      when /sunos|solaris/
+        "solaris"
+      when /mingw|mswin/
+        "windows"
+      else
+        RbConfig::CONFIG["host_os"].downcase
+      end
+
+    LIBPREFIX = case OS
+                when /windows|msys/
+                  ""
+                when /cygwin/
+                  "cyg"
+                else
+                  "lib"
+                end
+
+    LIBSUFFIX = case OS
+                when /darwin/
+                  "dylib"
+                when /windows|cygwin|msys/
+                  "dll"
+                else
+                  # Punt and just assume a sane unix (i.e. anything but AIX)
+                  # when /linux|bsd|solaris/
+                  # "so"
+                  "so"
+                end
+
+    PASS_THROUGH = true
+
+    def self.mac?
+      RUBY_PLATFORM =~ /darwin/
+    end
+  end
+end

data/lib/tebako-runtime/pre/excavate.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# For some reason on Windows an attempt to require "seven_zip_ruby" from excavate fails
+# I cannot debug it effectively because of https://github.com/tamatebako/tebako/issues/119
+
+require "seven_zip_ruby"

data/lib/tebako-runtime/pre/seven-zip.rb

@@ -32,10 +32,11 @@ require_relative "../../tebako-runtime"
 module TebakoRuntime
   sevenz_lib = RUBY_PLATFORM.downcase.match(/mswin|mingw/) ? "7z*.dll" : "7z.so"
   sevenz_path = File.join(full_gem_path("seven-zip"), "lib", "seven_zip_ruby", sevenz_lib)
+  sevenz_paths = Dir.glob(sevenz_path)
   sevenz_new_folder = COMPILER_MEMFS_LIB_CACHE / "seven_zip_ruby"
   FileUtils.mkdir_p(sevenz_new_folder)
-  Dir.glob(sevenz_path).each do |file|
+  sevenz_paths.each do |file|
     FileUtils.cp(file, sevenz_new_folder)
   end
-  $LOAD_PATH.unshift(COMPILER_MEMFS_LIB_CACHE)
+  $LOAD_PATH.unshift(COMPILER_MEMFS_LIB_CACHE.to_s)
 end

data/lib/tebako-runtime/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module TebakoRuntime
-  VERSION = "0.4.2"
+  VERSION = "0.5.1"
 end

data/lib/tebako-runtime.rb

@@ -37,6 +37,7 @@ require_relative "tebako-runtime/memfs"
 # - an option to implement adapter 'AFTER'
 module TebakoRuntime
   PRE_REQUIRE_MAP = {
+    "excavate" => "tebako-runtime/pre/excavate",
     "seven_zip_ruby" => "tebako-runtime/pre/seven-zip"
   }.freeze
 
@@ -65,6 +66,31 @@ module TebakoRuntime
     puts "Tebako runtime: skipped [#{name}]" if log_enabled && !res_inner
     log_enabled
   end
+
+  def self.process_all(name)
+    f1 = process(name, PRE_REQUIRE_MAP, "pre")
+    res = original_require name
+    f2 = process(name, POST_REQUIRE_MAP, "post")
+
+    puts "Tebako runtime: req [#{name}]" unless f1 || f2
+    res
+  end
+
+  # Very special deploy-time patching
+  # It targets ffi-compiler/ffi-compiler2 that use some functions of
+  # deployed ffi to process other gems
+  # THis approach is not compatible with tebako on Windows because ffi
+  # is deployed with (implib) reference to target tebako package that is
+  # not available at deploy time
+  def self.process_pass_through(name)
+    if name == "ffi" && RUBY_PLATFORM =~ /mswin|mingw/
+      puts "Replacing ffi ffi-platform-stub" if log_enabled
+      res = original_require "tebako-runtime/pass-through/ffi-platform-stub"
+    else
+      res = original_require name
+    end
+    res
+  end
 end
 
 # Some would call it 'monkey patching' but in reality we are adding
@@ -72,11 +98,10 @@ end
 module Kernel
   alias original_require require
   def require(name)
-    f1 = TebakoRuntime.process(name, TebakoRuntime::PRE_REQUIRE_MAP, "pre")
-    res = original_require name
-    f2 = TebakoRuntime.process(name, TebakoRuntime::POST_REQUIRE_MAP, "post")
-
-    puts "Tebako runtime: req [#{name}]" unless f1 || f2
-    res
+    if ENV["TEBAKO_PASS_THROUGH"]
+      TebakoRuntime.process_pass_through name
+    else
+      TebakoRuntime.process_all name
+    end
   end
 end

data/tebako-runtime.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -160,6 +160,8 @@ files:
 - lib/tebako-runtime/adapters/net-http.rb
 - lib/tebako-runtime/adapters/sassc.rb
 - lib/tebako-runtime/memfs.rb
+- lib/tebako-runtime/pass-through/ffi-platform-stub.rb
+- lib/tebako-runtime/pre/excavate.rb
 - lib/tebako-runtime/pre/seven-zip.rb
 - lib/tebako-runtime/string.rb
 - lib/tebako-runtime/version.rb
@@ -185,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Run-time support of tebako executable packager