tebako 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22aea474f49445f022530cf4cc3c16c2bce29da88bb1c3bc0c4d0a64838676a8
-  data.tar.gz: 3f3efc915bcde108bdd14b6f21946cf6c2e20edc7d48e2703db54f9ea9ed5dfb
+  metadata.gz: 2b277eb25391af787dab395176c4c8de0ce0946c4051761777819c6ba8dfc85b
+  data.tar.gz: fd68af8da0fd9900620627cb769a693953a91936a45f4c1049e233ad2ce250be
 SHA512:
-  metadata.gz: 78be29f984b8505a537327970820f91151411dde2fd0bbb6d760741cd373e61324d1b225ca2e1792f22f53b32a52ad0b3bcfa8c23ec7ede3df221c6435d8cb45
-  data.tar.gz: 13f0505477b14079016a48c83f44da433dcabf1858ea99ae2e8ab3892d7231493d5d46f02defdf57908ad5b652c6b8713d5ef0129b25ae979798bc549e3442f7
+  metadata.gz: b93340ce7093fc7c43f1c7948b1392e73980b76ce88e9b0489d20de33f4262965dadba78fa8805597928088d9a0763074017d37f0cf538735ab4baed03503206
+  data.tar.gz: 798727d58f68b36d7ce2f5ce642223680c1a0f76f4f78851da95531c2cdce891eb59badbe782289631bbe9ee301e43c73c685a616582f2a07fd6319809d5606d

data/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -177,7 +177,7 @@ elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   else(${RUBY_VER} VERSION_LESS "3.1.0")
     set(OPENSSL_VER "3")
   endif(${RUBY_VER} VERSION_LESS "3.1.0")
-  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
+  set(BUILD_OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
 endif()
 
 if(IS_DARWIN)
@@ -243,15 +243,7 @@ if(IS_MSYS)
 endif(IS_MSYS)
 
 def_ext_prj_g(INCBIN "348e36b")
-def_ext_prj_g(DWARFS_WR "v0.4.0")
-
-if (DEFINED ENV{BUNDLER_VER})
- set(BUNDLER_VER $ENV{BUNDLER_VER})
- set(BUNDLER_ANNOTATION "environment")
-else()
-  set(BUNDLER_VER "2.3.22")
-  set(BUNDLER_ANNOTATION "default")
-endif()
+def_ext_prj_g(DWARFS_WR "v0.4.3")
 
 find_library(_LIBNCURSES "libncurses.a")
 if(${_LIBNCURSES} STREQUAL "_LIBNCURSES-NOTFOUND")
@@ -268,7 +260,6 @@ endif(${RUBY_VER} VERSION_LESS "3.2.0")
 
 message("Configuration summary:")
 message(STATUS "ruby: v${RUBY_VER} at ${RUBY_SOURCE_DIR}")
-message(STATUS "bundler version: ${BUNDLER_VER} (${BUNDLER_ANNOTATION})")
 if(WITH_OPENSSL_BUILD)
   message(STATUS "openssl: building @${OPENSSL_TAG} at ${OPENSSL_SOURCE_DIR}")
 endif(WITH_OPENSSL_BUILD)
@@ -437,9 +428,9 @@ endif()
 set(C_FLAGS_DEST cppflags)
 
 if(IS_DARWIN)
-  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BUILD_BREW_PREFIX}/opt/zlib/include -I${BUILD_BREW_PREFIX}/include")
-  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib  -L${BUILD_BREW_PREFIX}/lib")
-  set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
+  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BREW_PREFIX}/opt/zlib/include -I${BREW_PREFIX}/include")
+  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BREW_PREFIX}/opt/zlib/lib  -L${BREW_PREFIX}/lib")
+  set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
   set(C_FLAGS_DEST cflags)
 else(IS_DARWIN)
   string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -static-libgcc")
@@ -511,7 +502,7 @@ else (${SETUP_MODE})
   list(LENGTH GEMS     GLENGTH)
 
   add_custom_target(clean_filesystem
-      COMMAND ruby ${EXE}/tebako-packager deploy ${RUBY_STASH_DIR} ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR} ${TBD} ${TGD}
+      COMMAND ruby ${EXE}/tebako-packager deploy ${RUBY_STASH_DIR} ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR} ${GFLENGTH}
       DEPENDS ${RUBY_PRJ}
   )
   if(GSLENGTH GREATER 0)
@@ -527,8 +518,6 @@ else (${SETUP_MODE})
         add_custom_target(source_filesystem
            COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${DATA_PRE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
            COMMAND ${CMAKE_COMMAND} -E make_directory ${TGD}
-           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                       ${TBD}/gem${CMD_SUFFIX} install bundler -v '${BUNDLER_VER}' --source 'https://rubygems.org/' --no-document --install-dir ${TGD}
            COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                        ${TBD}/bundle${CMD_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
            COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E  env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
@@ -572,9 +561,6 @@ else (${SETUP_MODE})
                    ${CMAKE_COMMAND} -E false )
        COMMAND ${CMAKE_COMMAND} -E make_directory ${TLD}
        COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${TLD} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
-       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/gem${CMD_SUFFIX} install bundler -v '${BUNDLER_VER}'
-                                              --source 'https://rubygems.org/' --no-document --install-dir ${TGD}
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                            ${TBD}/bundle${CMD_SUFFIX} config build.ffi --disable-system-libffi
        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1

data/README.adoc

@@ -33,18 +33,18 @@ In the future:
 
 The Tebako packager is tested on the following platforms:
 
-* Linux: Ubuntu 20.04; Alpine 3.16
-* macOS: macOS 11.0 (Monterey)
+* Linux: Ubuntu 20.04; Alpine 3.17
+* macOS: macOS 11 (Big Sur), 12 (Monterey), 13 (Ventura)
 * Windows: TBD
 
 == Supported Ruby versions
 
 The Tebako packager supports the following versions of Ruby for packaging:
 
-* 2.7.7
+* 2.7.8
 * 3.0.6
 * 3.1.4
-* 3.2.2
+* 3.2.3
 
 Support of specific version including minor release requires some effort, sometimes extensive
 but our goal is to be able to package all maintained Ruby releases.
@@ -53,7 +53,7 @@ but our goal is to be able to package all maintained Ruby releases.
 
 === Ubuntu
 
-==== GNU C/C++ 9+ or Clang C/C++ 11+
+==== GNU C/C++ 10+ or Clang C/C++ 12+
 
 ==== CMake version 3.20+
 
@@ -120,7 +120,7 @@ export TZ=Etc/UTC
 apt-get update
 apt-get install -y software-properties-common
 add-apt-repository -y ppa:ubuntu-toolchain-r/test
-apt-get install -y gcc-9 g++-9
+apt-get install -y gcc-10 g++-10
 
 apt-get install -y curl git ruby ruby-dev pkg-config bison flex make autoconf
 curl https://apt.kitware.com/kitware-archive.sh | bash
@@ -164,7 +164,7 @@ cmmands below.
 ----
 tebako press     \
   [-p|--prefix=<tebako-root-folder>] \
-  [-R|--Ruby=<2.7.7|3.0.6|3.1.4|3.2.2>]   \
+  [-R|--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]   \
   -r|--root=<project-root-folder>     \
   -e|--entry-point=<entry-point>      \
   [-o|--output=<packaged file name>] \
@@ -176,7 +176,7 @@ Where:
 * `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
 folder)
 
-* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.0.6)
+* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.4)
 
 * `<project-root>`, a folder at the host source file system where project files
 are located
@@ -214,7 +214,7 @@ invocation of press command.
 ----
 tebako setup     \
   [-p |--prefix=<tebako-root-folder>] \
-  [-R |--Ruby=<2.7.7|3.0.6|3.1.4|3.2.2>]
+  [-R |--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]
 ----
 
 Where:
@@ -257,7 +257,7 @@ Normally you do not need to do it since tebako packager optimizes artifacts life
 ----
 tebako clean_ruby
   [-p|--prefix=<tebako-root-folder>]
-  [-R|--Ruby=<2.7.7|3.0.6|3.1.4|3.2.2>]
+  [-R|--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]
 ----
 
 Where:

data/common.env

@@ -1,6 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.4.0
-BUNDLER_VER=2.3.22
+DWARFS_WR_TAG=v0.4.3
 RUBY_VER=3.1.4

data/exe/tebako-packager

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # 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
 #
@@ -78,13 +78,15 @@ begin
     #       ARGV[2] -- DATA_SRC_DIR
     #       ARGV[3] -- DATA_PRE_DIR
     #       ARGV[4] -- DATA_BIN_DIR
-    #       ARGV[5] -- TARGET_BIN_DIR (TBD)
-    #       ARGV[6] -- TARGET_GEM_DIR (TGD)
-    unless ARGV.length == 7
+    #       ARGV[5] -- GFLENGTH
+    unless ARGV.length == 6
       raise Tebako::Error,
-            "tebako-packager deploy command expects 7 arguments, #{ARGV.length} has been provided."
+            "tebako-packager deploy command expects 6 arguments, #{ARGV.length} has been provided."
     end
-    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
+    Tebako::Packager.init(ARGV[1], ARGV[2], ARGV[3], ARGV[4])
+    # Assume that "<TARGET_BIN_DIR (TBD)>" is <DATA_SRC_DIR>/bin"
+    # That shall match CMakeLists.txt settings
+    Tebako::Packager.deploy(ARGV[2], "#{ARGV[2]}/bin", ARGV[5])
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/lib/tebako/cli_helpers.rb

@@ -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
 #
@@ -59,10 +59,11 @@ module Tebako
     end
 
     RUBY_VERSIONS = {
-      "2.7.7" => "e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90",
+      "2.7.8" => "c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0",
       "3.0.6" => "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e",
       "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6",
-      "3.2.2" => "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc"
+      "3.2.3" => "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba",
+      "3.3.0" => "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d"
     }.freeze
 
     DEFAULT_RUBY_VERSION = "3.1.4"
@@ -130,6 +131,7 @@ module Tebako
 
     def prefix
       @prefix ||= if options["prefix"].nil?
+                    puts "No prefix specified, using ~/.tebako"
                     File.expand_path("~/.tebako")
                   elsif options["prefix"] == "PWD"
                     Dir.pwd

data/lib/tebako/packager/pass2.rb

@@ -140,7 +140,7 @@ module Tebako
         # rubocop:enable Metrics/MethodLength
 
         def mlibs_subst(ostype, deps_lib_dir, ruby_ver)
-          yjit_libs = PatchHelpers.ruby32?(ruby_ver) ? "$(YJIT_LIBS) " : ""
+          yjit_libs = PatchHelpers.ruby32only?(ruby_ver) ? "$(YJIT_LIBS) " : ""
           {
             "MAINLIBS = #{yjit_libs}@MAINLIBS@" =>
               "# -- Start of tebako patch -- \n" \

data/lib/tebako/packager/patch_helpers.rb

@@ -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
 #
@@ -34,6 +34,16 @@ module Tebako
     # Ruby patching helpers (pass2)
     module PatchHelpers
       class << self
+        def patch_file(fname, mapping)
+          raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
+
+          puts "   ... patching #{fname}"
+          restore_and_save(fname)
+          contents = File.read(fname)
+          mapping.each { |pattern, subst| contents.sub!(pattern, subst) }
+          File.open(fname, "w") { |file| file << contents }
+        end
+
         def get_prefix_macos(package)
           out, st = Open3.capture2("brew --prefix #{package}")
           raise Tebako::Error, "brew --prefix #{package} failed with code #{st.exitstatus}" unless st.exitstatus.zero?
@@ -51,6 +61,28 @@ module Tebako
           out
         end
 
+        def recreate(dirname)
+          FileUtils.rm_rf(dirname, noop: nil, verbose: nil, secure: true)
+          FileUtils.mkdir(dirname)
+        end
+
+        def restore_and_save(fname)
+          raise Tebako::Error, "Could not save #{fname} because it does not exist." unless File.exist?(fname)
+
+          old_fname = "#{fname}.old"
+          if File.exist?(old_fname)
+            FileUtils.rm_f(fname)
+            File.rename(old_fname, fname)
+          end
+          FileUtils.cp(fname, old_fname)
+        end
+
+        def restore_and_save_files(files, ruby_source_dir)
+          files.each do |fname|
+            restore_and_save "#{ruby_source_dir}/#{fname}"
+          end
+        end
+
         def ruby3x?(ruby_ver)
           ruby_ver[0] == "3"
         end
@@ -63,6 +95,30 @@ module Tebako
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 2
         end
 
+        def ruby32only?(ruby_ver)
+          ruby3x?(ruby_ver) && ruby_ver[2].to_i == 2
+        end
+
+        def ruby33?(ruby_ver)
+          ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 3
+        end
+
+        # Sets up temporary environment variables and yields to the
+        # block. When the block exits, the environment variables are set
+        # back to their original values.
+        def with_env(hash)
+          old = {}
+          hash.each do |k, v|
+            old[k] = ENV.fetch(k, nil)
+            ENV[k] = v
+          end
+          begin
+            yield
+          ensure
+            hash.each_key { |k| ENV[k] = old[k] }
+          end
+        end
+
         def yaml_reference(ruby_ver)
           ruby32?(ruby_ver) ? "-l:libyaml.a" : ""
         end

data/lib/tebako/packager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -30,6 +30,7 @@ require "fileutils"
 require_relative "error"
 require_relative "packager/pass1"
 require_relative "packager/pass2"
+require_relative "packager/patch_helpers"
 
 # Tebako - an executable packager
 module Tebako
@@ -62,20 +63,45 @@ module Tebako
       "TEBAKO_PASS_THROUGH" => "1"
     }.freeze
 
+    # Magic version numbers used to ensure compatibility for Ruby 2.7.x, 3.0.x
+    # These are the minimal versions required to provide linux-gnu / linux-musl differentiantion by bundler
+    # Ruby 3.1+ default bubdler/rubygems versions work correctly out of the box
+    BUNDLER_VERSION = "2.4.22"
+    RUBYGEMS_VERSION = "3.4.22"
+
     class << self
+      # Deploy
+      def deploy(src_dir, tbd, gflength)
+        puts "-- Running deploy script"
+
+        ruby_ver = ruby_version(tbd)
+        update_rubygems(tbd, "#{src_dir}/lib", ruby_ver, RUBYGEMS_VERSION)
+        install_gem tbd, "tebako-runtime"
+        install_gem tbd, "bundler", (PatchHelpers.ruby31?(ruby_ver) ? nil : BUNDLER_VERSION) if gflength.to_i != 0
+      end
+
+      # Deploy
+      def init(stash_dir, src_dir, pre_dir, bin_dir)
+        puts "-- Running init script"
+
+        puts "   ... creating packaging environment at #{src_dir}"
+        PatchHelpers.recreate([src_dir, pre_dir, bin_dir])
+        FileUtils.cp_r "#{stash_dir}/.", src_dir
+      end
+
       # Pass1
       # Executed before Ruby build, patching ensures that Ruby itself is linked statically
       def pass1(ostype, ruby_source_dir, mount_point, src_dir, ruby_ver)
         puts "-- Running pass1 script"
 
-        recreate(src_dir)
+        PatchHelpers.recreate(src_dir)
         do_patch(Pass1.get_patch_map(ostype, mount_point, ruby_ver), ruby_source_dir)
 
         # Roll back pass2 patches
         # Just in case we are recovering after some error
-        restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir)
-        restore_and_save_files(FILES_TO_RESTORE_MUSL, ruby_source_dir) if ostype =~ /linux-musl/
-        restore_and_save_files(FILES_TO_RESTORE_MSYS, ruby_source_dir) if ostype =~ /msys/
+        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir)
+        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MUSL, ruby_source_dir) if ostype =~ /linux-musl/
+        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MSYS, ruby_source_dir) if ostype =~ /msys/
       end
 
       # Pass2
@@ -100,81 +126,54 @@ module Tebako
         #    end
 
         puts "   ... saving pristine ruby environment to #{stash_dir}"
-        recreate(stash_dir)
+        PatchHelpers.recreate(stash_dir)
         FileUtils.cp_r "#{src_dir}/.", stash_dir
       end
 
-      # Deploy
-      def deploy(stash_dir, src_dir, pre_dir, bin_dir, tbd)
-        puts "-- Running deploy script"
-
-        puts "   ... creating packaging environment at #{src_dir}"
-        recreate([src_dir, pre_dir, bin_dir])
-        FileUtils.cp_r "#{stash_dir}/.", src_dir
-
-        install_gem tbd, "tebako-runtime"
-      end
-
       private
 
-      def install_gem(tbd, name)
-        puts "   ... installing #{name} gem"
-        with_env(DEPLOY_ENV) do
-          out, st = Open3.capture2e("#{tbd}/gem", "install", name.to_s, "--no-doc")
+      def install_gem(tbd, name, ver = nil)
+        puts "   ... installing #{name} gem#{" version #{ver}" if ver}"
+        PatchHelpers.with_env(DEPLOY_ENV) do
+          params = ["#{tbd}/gem", "install", name.to_s]
+          params.push("-v", ver.to_s) if ver
+
+          out, st = Open3.capture2e(*params)
           raise Tebako::Error, "Failed to install #{name} (#{st}):\n #{out}" unless st.exitstatus.zero?
         end
       end
 
       def do_patch(patch_map, root)
-        patch_map.each { |fname, mapping| patch_file("#{root}/#{fname}", mapping) }
+        patch_map.each { |fname, mapping| PatchHelpers.patch_file("#{root}/#{fname}", mapping) }
       end
 
-      def patch_file(fname, mapping)
-        raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
+      def ruby_version(tbd)
+        ruby_version = nil
+        PatchHelpers.with_env(DEPLOY_ENV) do
+          out, st = Open3.capture2e("#{tbd}/ruby", "--version")
+          raise Tebako::Error, "Failed to run ruby --version" unless st.exitstatus.zero?
 
-        puts "   ... patching #{fname}"
-        restore_and_save(fname)
-        contents = File.read(fname)
-        mapping.each { |pattern, subst| contents.sub!(pattern, subst) }
-        File.open(fname, "w") { |file| file << contents }
-      end
-
-      def recreate(dirname)
-        FileUtils.rm_rf(dirname, noop: nil, verbose: nil, secure: true)
-        FileUtils.mkdir(dirname)
-      end
-
-      def restore_and_save(fname)
-        raise Tebako::Error, "Could not save #{fname} because it does not exist." unless File.exist?(fname)
+          match = out.match(/ruby (\d+\.\d+\.\d+)/)
+          raise Tebako::Error, "Failed to parse Ruby version from #{out}" unless match
 
-        old_fname = "#{fname}.old"
-        if File.exist?(old_fname)
-          FileUtils.rm_f(fname)
-          File.rename(old_fname, fname)
+          ruby_version = match[1]
         end
-        FileUtils.cp(fname, old_fname)
+        ruby_version
       end
 
-      def restore_and_save_files(files, ruby_source_dir)
-        files.each do |fname|
-          restore_and_save "#{ruby_source_dir}/#{fname}"
-        end
-      end
+      def update_rubygems(tbd, tld, ruby_ver, gem_ver)
+        return if PatchHelpers.ruby31?(ruby_ver)
 
-      # Sets up temporary environment variables and yields to the
-      # block. When the block exits, the environment variables are set
-      # back to their original values.
-      def with_env(hash)
-        old = {}
-        hash.each do |k, v|
-          old[k] = ENV.fetch(k, nil)
-          ENV[k] = v
-        end
-        begin
-          yield
-        ensure
-          hash.each { |k, _v| ENV[k] = old[k] }
+        puts "   ... updating rubygems to #{gem_ver}"
+        PatchHelpers.with_env(DEPLOY_ENV) do
+          out, st = Open3.capture2e("#{tbd}/gem", "update", "--no-doc", "--system", gem_ver.to_s)
+          raise Tebako::Error, "Failed to update rubugems to #{gem_ver} (#{st}):\n #{out}" unless st.exitstatus.zero?
         end
+        ruby_api_ver = ruby_ver.split(".")[0..1].join(".")
+        # Autoload cannot handle statically linked openssl extension
+        # Changing it to require seems to be the simplest solution
+        PatchHelpers.patch_file("#{tld}/ruby/site_ruby/#{ruby_api_ver}.0/rubygems/openssl.rb",
+                                { "autoload :OpenSSL, \"openssl\"" => "require \"openssl\"" })
       end
     end
   end

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.5.5"
+  VERSION = "0.5.7"
 end

data/tools/.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2024, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -35,7 +35,7 @@ jobs:
   shellcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ludeeus/action-shellcheck@master
         env:
           SHELLCHECK_OPTS: -x

data/tools/.github/workflows/test.yml

@@ -0,0 +1,124 @@
+# 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.
+
+name: test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
+jobs:
+  test-setup-librachive:
+    name: test setup-librachive on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-20.04, macos-11.0 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run cmake script
+        run: |
+          cmake -B build/setup-librachive -DROOT=$PWD tests/setup-librachive
+          cmake --build build/setup-librachive
+
+      - name: Test setup-librachive
+        run: |
+          set -o errexit -o pipefail -o noclobber -o nounset
+          test -f build/setup-librachive/deps/lib/pkgconfig/libarchive.pc
+          test -f build/setup-librachive/deps/lib/libarchive.so || test -f build/setup-librachive/deps/lib/libarchive.dylib
+          test -f build/setup-librachive/deps/lib/libarchive.a
+          test -f build/setup-librachive/deps/include/archive.h
+          test -f build/setup-librachive/deps/include/archive_entry.h
+
+  test-setup-libutfcpp:
+    name: test setup-libutfcpp on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-20.04, macos-11.0 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run cmake script
+        run: |
+          cmake -B build/setup-libutfcpp -DROOT=$PWD tests/setup-libutfcpp
+          cmake --build build/setup-libutfcpp
+
+      - name: Test setup-libutfcpp
+        run: |
+          set -o errexit -o pipefail -o noclobber -o nounset
+          test -f build/setup-libutfcpp/deps/include/utf8.h
+          test -d build/setup-libutfcpp/deps/include/utf8
+
+  test-setup-libhowardhinnerdate:
+    name: test setup-libhowardhinnerdate on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-20.04, macos-11.0 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run cmake script
+        run: |
+          cmake -B build/setup-libhowardhinnerdate -DROOT=$PWD tests/setup-libhowardhinnerdate
+          cmake --build build/setup-libhowardhinnerdate
+
+      - name: Test setup-libhowardhinnerdate
+        run: |
+          set -o errexit -o pipefail -o noclobber -o nounset
+          test -f build/setup-libhowardhinnerdate/deps/include/date/date.h
+
+  test-cross-brew-install:
+    name: test arm-brew-setup/install
+    runs-on: macos-11.0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run arm-brew-setup
+        run: ci-scripts/arm-brew-setup.sh $PWD
+
+      - name: Run arm-brew-install
+        run: ci-scripts/arm-brew-install.sh $PWD glog
+
+      - name: Test
+        run: |
+          set -o errexit -o pipefail -o noclobber -o nounset
+          test -f $PWD/arm-homebrew/lib/libgflags.dylib
+          test -f $PWD/arm-homebrew/lib/libglog.dylib

data/tools/.gitignore

@@ -0,0 +1 @@
+build/