tebako 0.7.2.rc2 → 0.7.2.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c6393e228f7a9b35f5e4e134145d61d050e043b3f71fd6b7470bc6ae9fe84c
-  data.tar.gz: 950729b6f6eeed71c400f114fc45a0820919cbd8ddf22c8682e4d5cc77ed38b5
+  metadata.gz: 4bfa5dde3a184cd2689178ae837ee3a5eff510cecb0ed1385617d4d3f170c707
+  data.tar.gz: b67d902a82ff37050ff7c273b770e96b8be23c83c9056a4e5bc88c4936d2bbb8
 SHA512:
-  metadata.gz: 547a0f3dca568dc52dd40cd0fbca7e09d96ab51de383edfb70e7e1bb16fde23c81135250ba7cdd4bf9c7fe7658e1241e753ef62dea0c96181496fbcf7da06ea3
-  data.tar.gz: 9653a599391afb40aed074d456b3d04e779091501223f1d6e41aa4c85ad1071838e6a90a7f4b1c2eb834061e5b9f8d875346c8438c904ac221a05d3a22d0571a
+  metadata.gz: ce1166b1042a38f95db4f8190e5d2de55c7a62d40d3d4db990527c27199d23ffc5590af7ae094e0f8cafdfc5b0c2e9c7e3140fd6f8ad5d56dcfc8627b845a552
+  data.tar.gz: 398b4088288778241c404de5d68b1703d2ee42647060833b5c8c7b0b16f22223c92fe1abc7b6982b7124d57a95b732ee98a48e7ea9d913858c5ec0a396faffec

data/CMakeLists.txt

@@ -116,9 +116,7 @@ set(IS_MUSL OFF)
 set(IS_MSYS OFF)
 set(IS_DARWIN OFF)
 set(RB_W32 OFF)
-set(FORCE_RUBY_PLATFORM "false")
-set(NOKOGIRI_OPTION "--no-use-system-libraries")
-set(RUBY_WITHOUT_EXT "dbm,win32,win32ole")
+set(RUBY_WITHOUT_EXT "dbm,win32,win32ole,'-test-'")
 set(RUBY_NAME "ruby")
 set(RUBY_SUFFIX "")
 set(EXE_SUFFIX "")
@@ -129,14 +127,11 @@ set(DWARFS_PRELOAD OFF)
 
 if("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
   set(IS_MUSL ON)
-  set(FORCE_RUBY_PLATFORM "true")
 elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(IS_MSYS ON)
-  set(FORCE_RUBY_PLATFORM "true")
-  set(NOKOGIRI_OPTION "--use-system-libraries")
   # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
-  set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline")
+  set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline,'-test-'")
   #set(RUBY_SUFFIX "w")
   set(EXE_SUFFIX ".exe")
   set(CMD_SUFFIX ".cmd")
@@ -216,7 +211,7 @@ if(DWARFS_PRELOAD)
   list(GET LIBDWARFS_WR_VER_COMPONENTS 2 LIBDWARFS_WR_VER_PATCH)
   set (LIBDWARFS_WR_VER_M ${LIBDWARFS_WR_VER_MAJOR}.${LIBDWARFS_WR_VER_MINOR}.${LIBDWARFS_WR_VER_PATCH})
 else(DWARFS_PRELOAD)
-  def_ext_prj_g(DWARFS_WR "v0.5.2")
+  def_ext_prj_g(DWARFS_WR "v0.5.3")
 endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")
@@ -274,7 +269,6 @@ message(STATUS "Building for Win32 Ruby (RB_W32): ${RB_W32}")
 # ...................................................................
 # Other options
 
-message(STATUS "Force Ruby platform for Gems: ${FORCE_RUBY_PLATFORM}")
 message(STATUS "Not building Ruby extensions: ${RUBY_WITHOUT_EXT}")
 
 # ...................................................................
@@ -370,7 +364,6 @@ message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
 message(STATUS "Ruby build LDFLAGS='${RUBY_L_FLAGS}'")
 message(STATUS "openssl Ruby option='${OPENSSL_RUBY_OPTION}'")
 message(STATUS "libyaml Ruby option='${LIBYAML_RUBY_OPTION}'")
-message(STATUS "nokogiri build option='${NOKOGIRI_OPTION}'")
 
 ExternalProject_Add(${RUBY_PRJ}
   PREFIX ${DEPS}
@@ -418,125 +411,41 @@ else (${SETUP_MODE})
   list(LENGTH GEMFILES GFLENGTH)
   list(LENGTH GEMS     GLENGTH)
 
-  add_custom_target(clean_filesystem
-      COMMAND ruby ${EXE}/tebako-packager deploy ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${RUBY_STASH_DIR}
-                                                 ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR}
-                                                 ${GFLENGTH} ${APP_NAME} ${RUBY_VER}
-      DEPENDS ${RUBY_PRJ}
-  )
-
   if(GSLENGTH GREATER 0)
     if(GSLENGTH GREATER 1)
       message(FATAL_ERROR "Multiple gemspecs detected in ${FS_ROOT}")
     else(GSLENGTH GREATER 1)
-      list(GET GEMSPECS 0 GEMSPEC)
-      list(LENGTH GEMFILES GFLENGTH)
       if(GFLENGTH GREATER 0)
 #  Found xxx.gemspec and Gemfile
-        message("Collecting gem from gemspec ${GEMSPEC} and Gemfile")
         set(FS_ENTRY_POINT "/bin/${FS_ENTRANCE}")
-        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}/bundle${BAT_SUFFIX} config set --local build.ffi --disable-system-libffi
-          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                      ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri ${NOKOGIRI_OPTION}
-          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                      ${TBD}/bundle${BAT_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
-                                      ${TBD}/bundle${BAT_SUFFIX} install
-          COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                      ${TBD}/bundle${BAT_SUFFIX} exec ${TBD}/gem${CMD_SUFFIX} build ${GEMSPEC}
-          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 *.gem --verbose --no-document --install-dir ${TGD}
-          COMMAND test -f  ${DATA_SRC_DIR}${FS_ENTRY_POINT} ||
-                   (${CMAKE_COMMAND} -E echo "Entry point ${DATA_SRC_DIR}${FS_ENTRY_POINT} does not exist" &&
-                    ${CMAKE_COMMAND} -E false )
-          DEPENDS clean_filesystem
-        )
       else(GFLENGTH GREATER 0)
 #  Found xxx.gemspec but no Gemfile
-        message("Collecting gem from gemspec ${GEMSPEC}")
         set(FS_ENTRY_POINT "/bin/${FS_ENTRANCE}")
-        message("Target entry point will be at ${FS_MOUNT_POINT}${FS_ENTRY_POINT}")
-        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} build ${GEMSPEC}
-            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 *.gem --verbose --no-document --install-dir ${TGD}
-            COMMAND test -f  ${DATA_SRC_DIR}${FS_ENTRY_POINT} ||
-                    (${CMAKE_COMMAND} -E echo "Entry point ${DATA_SRC_DIR}${FS_ENTRY_POINT} does not exist" &&
-                     ${CMAKE_COMMAND} -E false )
-            DEPENDS clean_filesystem
-         )
       endif(GFLENGTH GREATER 0)
     endif(GSLENGTH GREATER 1)
   elseif(GFLENGTH GREATER 0)
 #  Found Gemfile but no gemspec
-    message("Deploying Gemfile")
     set(FS_ENTRY_POINT "/local/${FS_ENTRANCE}")
-    message("Target entry point will be at ${FS_MOUNT_POINT}${FS_ENTRY_POINT}")
-    add_custom_target(source_filesystem
-       COMMAND test -f ${FS_ROOT}/${FS_ENTRANCE} ||
-                  (${CMAKE_COMMAND} -E echo "Entry point ${FS_ROOT}/${FS_ENTRANCE} does not exist or is not accessible" &&
-                   ${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}/bundle${BAT_SUFFIX} config set --local 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
-                                          ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri ${NOKOGIRI_OPTION}
-        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                          ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
-        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                          ${TBD}/bundle${BAT_SUFFIX} install --jobs=${NCORES}
-#       COMMAND_EXPAND_LISTS
-# [TODO] Open question - how to deploy a project to source filesystem
-#        ruby packer does bundle install --deployment --binstubs
-#       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-#                                    ${TBD}/bundle lock
-#       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-#                                    ${TBD}/bundle install --deployment --jobs=${NCORES}
-        DEPENDS clean_filesystem
-    )
   elseif(GLENGTH GREATER 0)
   # xxx.gem, no gemspec, no gemfile
-    list(GET GEMS 0 GEM)
     if(GLENGTH GREATER 1)
       message(FATAL_ERROR "Multiple gems detected in ${FS_ROOT}")
     else(GLENGTH GREATER 1)
-      message("Installing Ruby gem from ${GEM}")
       set(FS_ENTRY_POINT "/bin/${FS_ENTRANCE}")
-      message("Target entry point will be at ${FS_MOUNT_POINT}${FS_ENTRY_POINT}")
-      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 chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                     ${TBD}/gem${CMD_SUFFIX} install ${GEM} --verbose --no-document --install-dir ${TGD}
-         COMMAND test -f ${DATA_SRC_DIR}${FS_ENTRY_POINT} ||
-                  (${CMAKE_COMMAND} -E echo "Entry point ${DATA_SRC_DIR}${FS_ENTRY_POINT} does not exist or is not accessible" &&
-                   ${CMAKE_COMMAND} -E false )
-         DEPENDS clean_filesystem
-      )
     endif(GLENGTH GREATER 1)
   else()
 # No gem, no gemspec, no gemfile
 # Simple ruby script
-    message("Collecting simple Ruby script from ${FS_ROOT}")
     set(FS_ENTRY_POINT "/local/${FS_ENTRANCE}")
-    message("Target entry point will be at ${FS_MOUNT_POINT}${FS_ENTRY_POINT}")
-    add_custom_target(source_filesystem
-       COMMAND test -f ${FS_ROOT}/${FS_ENTRANCE} ||
-                  (${CMAKE_COMMAND} -E echo "Entry point ${FS_ROOT}/${FS_ENTRANCE} does not exist or is not accessible" &&
-                   ${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
-       DEPENDS clean_filesystem
-    )
   endif()
 
+  add_custom_target(source_filesystem
+      COMMAND ruby ${EXE}/tebako-packager deploy ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${RUBY_STASH_DIR}
+                                                 ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR}
+                                                 ${FS_ROOT} ${FS_ENTRANCE} ${FS_MOUNT_POINT} ${APP_NAME} ${RUBY_VER}
+      DEPENDS ${RUBY_PRJ}
+  )
+
 # ...................................................................
 # Packaged filesystem
 

data/README.adoc

@@ -150,55 +150,9 @@ There is no workaround for this issue as it lloks like is a limitation of the ma
 
 === General
 
-Tebako is distributed as a Ruby gem
-
-[source,sh]
-----
-gem install tebako
-----
-
-=== Quick setup on Ubuntu 20.04 on Docker
-
-Launch a container on the target platform:
-
-[source,sh]
-----
-# For x86_64
-docker run -it --platform linux/x86_64 ubuntu bash
-
-# For Apple M1
-docker run -it --platform linux/aarch64 ubuntu bash
-----
-
-In the container:
-
-[source,sh]
-----
-export DEBIAN_FRONTEND=noninteractive
-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-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
-apt-get install -y cmake
-
-apt-get -y install sudo git curl build-essential pkg-config bison flex autoconf \
-   binutils-dev libevent-dev acl-dev libfmt-dev libjemalloc-dev libiberty-dev    \
-   libdouble-conversion-dev liblz4-dev liblzma-dev libssl-dev libunwind-dev      \
-   libboost-filesystem-dev libboost-program-options-dev libboost-system-dev      \
-   libboost-iostreams-dev  libboost-date-time-dev libboost-context-dev           \
-   libboost-regex-dev libboost-thread-dev libbrotli-dev libdwarf-dev libelf-dev  \
-   libgoogle-glog-dev libffi-dev libgdbm-dev libyaml-dev libncurses-dev          \
-   libreadline-dev libutfcpp-dev libncurses-dev libreadline-dev gcc-10 g++-10    \
-   ruby-dev ruby-bundler
-
-gem install tebako
-
-----
+Tebako is distributed as a Ruby gem.
+Additionally, Docker containers for Ubuntu and Alpine Linux with a preinstalled Tebako packaging environment
+are available at https://github.com/orgs/tamatebako/packages.
 
 == Usage
 
@@ -248,7 +202,8 @@ tebako press     \
   -r|--root=<project-root-folder>     \
   -e|--entry-point=<entry-point>      \
   [-o|--output=<packaged file name>] \
-  [-l|--log-level=<error|warn|debug|trace>]
+  [-l|--log-level=<error|warn|debug|trace>] \
+  [-D|--devmode]
 ----
 
 Where:
@@ -268,6 +223,9 @@ point base name`)
 
 * `log-level`, the logging level for tebako built-in memory filesystem driver (optional, defaults to `error`)
 
+* `devmode` flag activates development mode, in which Tebako's cache and packaging consistency checks are relaxed.
+Please note that this mode is not intended for production use and should only be used during development.
+
 [example]
 ====
 [source,sh]
@@ -295,7 +253,8 @@ based on ```tebako setup``` output. Building cache based on ```tebako press``` m
 ----
 tebako setup     \
   [-p |--prefix=<tebako-root-folder>] \
-  [-R |--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]
+  [-R |--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>] \
+  [-D | --devmode]
 ----
 
 Where:
@@ -304,6 +263,9 @@ Where:
 
 * `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
 
+* `devmode` flag activates development mode, in which Tebako's cache and packaging consistency checks are relaxed.
+Please note that this mode is not intended for production use and should only be used during development.
+
 ==== Clean
 
 This command deletes tebako artifacts created by setup and press commands.

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.5.2
+DWARFS_WR_TAG=v0.5.3
 RUBY_VER=3.1.6

data/exe/tebako-packager

@@ -99,18 +99,20 @@ begin
     #       ARGV[4] -- DATA_SRC_DIR
     #       ARGV[5] -- DATA_PRE_DIR
     #       ARGV[6] -- DATA_BIN_DIR
-    #       ARGV[7] -- GFLENGTH
-    #       ARGV[8] -- APP_NAME
-    #       ARGV[9] -- RUBY_VER
-    unless ARGV.length == 10
+    #       ARGV[7] -- FS_ROOT
+    #       ARGV[8] -- FS_ENTRANCE
+    #       ARGV[9] -- FS_MOUNT_POINT
+    #       ARGV[10] -- APP_NAME
+    #       ARGV[11] -- RUBY_VER
+    unless ARGV.length == 12
       raise Tebako::Error,
-            "tebako-packager deploy command expects 10 arguments, #{ARGV.length} has been provided."
+            "tebako-packager deploy command expects 12 arguments, #{ARGV.length} has been provided."
     end
     Tebako::Packager.init(ARGV[3], ARGV[4], ARGV[5], ARGV[6])
-    Tebako::Packager.create_implib(ARGV[2], ARGV[4], File.basename(ARGV[8]), ARGV[9]) if ARGV[1] =~ /msys/
+    Tebako::Packager.create_implib(ARGV[2], ARGV[4], File.basename(ARGV[10]), ARGV[11]) if ARGV[1] =~ /msys/
     # Assume that "<TARGET_BIN_DIR (TBD)>" is <DATA_SRC_DIR>/bin"
     # That shall match CMakeLists.txt settings
-    Tebako::Packager.deploy(ARGV[4], ARGV[9], ARGV[7])
+    Tebako::Packager.deploy(ARGV[1], ARGV[4], ARGV[5], ARGV[11], ARGV[7], ARGV[8], ARGV[9])
 
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"

data/lib/tebako/cli.rb

@@ -69,7 +69,7 @@ module Tebako
 
     desc "hash", "Print build script hash (ci cache key)"
     def hash
-      print Digest::SHA256.hexdigest File.read File.join(source, "CMakeLists.txt")
+      print Digest::SHA256.hexdigest [File.read(File.join(source, "CMakeLists.txt")), Tebako::VERSION].join
     end
 
     desc "press", "Press tebako image"
@@ -84,7 +84,7 @@ module Tebako
                          enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
                          desc: "Tebako package Ruby version, #{Tebako::CliRubies::DEFAULT_RUBY_VERSION} by default"
     def press
-      (clean_output unless version_match?) unless options[:devmode]
+      version_cache_check unless options[:devmode]
 
       puts press_announce
       do_press
@@ -99,7 +99,7 @@ module Tebako
                          enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
                          desc: "Tebako package Ruby version, #{Tebako::CliRubies::DEFAULT_RUBY_VERSION} by default."
     def setup
-      (clean_output unless version_match?) unless options[:devmode]
+      version_cache_check unless options[:devmode]
 
       puts "Setting up tebako packaging environment"
       do_setup

data/lib/tebako/cli_helpers.rb

@@ -204,20 +204,42 @@ module Tebako
       @version_key ||= "#{Tebako::VERSION} at #{source}"
     end
 
-    def version_match? # rubocop:disable Metrics/MethodLength
-      begin
-        version_file_path = File.join(prefix, E_VERSION_FILE)
-        file_version = File.open(version_file_path, &:readline).strip
-        rs = file_version == version_key
-        unless rs
-          puts "CMake cache was created by a gem version #{file_version} " \
-               "and cannot be used for gem version #{version_key}"
-        end
-      rescue StandardError
-        # In case of any error (e.g., file not readable), return false
-        rs = false
+    def version_cache
+      version_file_path = File.join(prefix, E_VERSION_FILE)
+      file_version = File.open(version_file_path, &:readline).strip
+
+      file_version.match(/(?<version>.+) at (?<source>.+)/)
+    end
+
+    def version_cache_check
+      match_data = version_cache
+
+      return version_unknown unless match_data
+
+      if match_data[:version] != Tebako::VERSION
+        version_mismatch(match_data[:version])
+      elsif match_data[:source] != source
+        version_source_mismatch(match_data[:source])
       end
-      rs
+    rescue StandardError
+      version_unknown
+    end
+
+    def version_mismatch(cached_version)
+      puts "Tebako cache was created by a gem version #{cached_version} " \
+           "and cannot be used for gem version #{Tebako::VERSION}"
+      clean_cache
+    end
+
+    def version_source_mismatch(cached_source)
+      puts "CMake cache was created for a different source directory '#{cached_source}' " \
+           "and cannot be used for '#{source}'"
+      clean_output
+    end
+
+    def version_unknown
+      puts "CMake cache version was not recognized, cleaning up"
+      clean_cache
     end
   end
 end

data/lib/tebako/deploy_helper.rb

@@ -0,0 +1,281 @@
+# 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.
+
+require "fileutils"
+require "find"
+
+require_relative "error"
+
+# Tebako - an executable packager
+module Tebako
+  # 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 differentiation by bundler
+  # Ruby 3.1+ default rubygems versions work correctly out of the box
+  BUNDLER_VERSION = "2.4.22"
+  RUBYGEMS_VERSION = "3.4.22"
+
+  # Tebako packaging support (deployer)
+  class DeployHelper # rubocop:disable Metrics/ClassLength
+    def initialize(fs_root, fs_entrance, fs_mount_point, target_dir, pre_dir)
+      @fs_root = fs_root
+      @fs_entrance = fs_entrance
+      @fs_mount_point = fs_mount_point
+      @target_dir = target_dir
+      @pre_dir = pre_dir
+      @verbose = ENV["VERBOSE"] == "yes" || ENV["VERBOSE"] == "true"
+    end
+
+    attr_reader :bundler_command, :gem_command, :gem_home
+
+    def config(os_type, ruby_ver)
+      @ruby_ver = ruby_ver
+      @os_type = os_type
+
+      @tbd = File.join(@target_dir, "bin")
+      @tgd = @gem_home = File.join(@target_dir, "lib", "ruby", "gems", ruby_api_version)
+      @tld = File.join(@target_dir, "local")
+
+      lookup_files
+      configure_scenario
+      configure_commands
+    end
+
+    def deploy
+      install_gem("tebako-runtime")
+      install_gem("bundler", Tebako::BUNDLER_VERSION) if needs_bundler?
+
+      deploy_solution
+    end
+
+    def deploy_env
+      { "GEM_HOME" => gem_home,
+        "GEM_PATH" => gem_home,
+        "TEBAKO_PASS_THROUGH" => "1" }
+    end
+
+    def install_gem(name, ver = nil)
+      puts "   ... installing #{name} gem#{" version #{ver}" if ver}"
+
+      params = [@gem_command, "install", name.to_s]
+      params.push("-v", ver.to_s) if ver
+      ["--no-document", "--install-dir", @tgd].each do |param|
+        params.push(param)
+      end
+      run_with_capture_v(params)
+    end
+
+    def ruby_api_version
+      @ruby_api_version ||= "#{@ruby_ver.split(".")[0..1].join(".")}.0"
+    end
+
+    def needs_bundler?
+      @gf_length.positive?
+    end
+
+    def update_rubygems
+      puts "   ... updating rubygems to #{Tebako::RUBYGEMS_VERSION}"
+      run_with_capture_v([@gem_command, "update", "--no-doc", "--system", Tebako::RUBYGEMS_VERSION])
+    end
+
+    private
+
+    def bundle_config
+      run_with_capture_v([@bundler_command, "config", "set", "--local", "build.ffi", "--disable-system-libffi"])
+      run_with_capture_v([@bundler_command, "config", "set", "--local", "build.nokogiri", @nokogiri_option])
+      run_with_capture_v([@bundler_command, "config", "set", "--local", "force_ruby_platform", @force_ruby_platform])
+    end
+
+    def check_entry_point(entry_point_root)
+      fs_entry_point = File.join(entry_point_root, @fs_entrance)
+      puts "   ... target entry point will be at #{File.join(@fs_mount_point, fs_entry_point)}"
+
+      return if File.exist?(File.join(@target_dir, fs_entry_point))
+
+      raise Tebako::Error.new("Entry point #{fs_entry_point} does not exist or is not accessible", 106)
+    end
+
+    def collect_and_deploy_gem(gemspec)
+      puts "   ... Collecting gem from gemspec #{gemspec}"
+
+      copy_files(@pre_dir)
+
+      Dir.chdir(@pre_dir) do
+        run_with_capture_v([@gem_command, "build", gemspec])
+        install_all_gems_or_fail
+      end
+
+      check_entry_point("bin")
+    end
+
+    def collect_and_deploy_gem_and_gemfile(gemspec)
+      puts "   ... collecting gem from gemspec #{gemspec} and Gemfile"
+
+      copy_files(@pre_dir)
+
+      Dir.chdir(@pre_dir) do
+        bundle_config
+        puts "   *** It may take a long time for a big project. It takes REALLY long time on Windows ***"
+        run_with_capture_v([@bundler_command, "install", "--jobs=#{ncores}"])
+        run_with_capture_v([@bundler_command, "exec", @gem_command, "build", gemspec])
+        install_all_gems_or_fail
+      end
+
+      check_entry_point("bin")
+    end
+
+    def configure_commands
+      @cmd_suffix = @os_type =~ /msys/ ? ".cmd" : ""
+      @bat_suffix = @os_type =~ /msys/ ? ".bat" : ""
+
+      @gem_command = File.join(@tbd, "gem#{@cmd_suffix}")
+      @bundler_command = File.join(@tbd, "bundle#{@bat_suffix}")
+
+      @force_ruby_platform = @os_type =~ /msys|linux-musl/ ? "true" : "false"
+      @nokogiri_option = @os_type =~ /msys/ ? "--use-system-libraries" : "--no-use-system-libraries"
+    end
+
+    def configure_scenario
+      case @gs_length
+      when 0
+        configure_scenario_no_gemspec
+      when 1
+        @scenario = @gf_length.positive? ? :gemspec_and_gemfile : :gemspec
+      else
+        raise Tebako::Error, "Multiple Ruby gemspecs found in #{@fs_root}"
+      end
+    end
+
+    def configure_scenario_no_gemspec
+      @scenario = if @gf_length.positive?
+                    :gemfile
+                  elsif @g_length.positive?
+                    :gem
+                  else
+                    :simple_script
+                  end
+    end
+
+    def copy_files(dest)
+      FileUtils.mkdir_p(dest)
+      if Dir.exist?(@fs_root) && File.readable?(@fs_root)
+        begin
+          FileUtils.cp_r(File.join(@fs_root, "."), dest)
+        rescue StandardError
+          raise Tebako::Error.new("#{@fs_root} is not accessible or does not exist.", 107)
+        end
+        return
+      end
+      raise Tebako::Error.new("#{@fs_root} is not accessible or is not a directory.", 107)
+    end
+
+    def deploy_gem(gem)
+      puts "   ... installing Ruby gem from #{gem}"
+      copy_files(@pre_dir)
+      Dir.chdir(@pre_dir) { install_gem(gem) }
+      check_entry_point("bin")
+    end
+
+    def deploy_gemfile
+      puts "   ... deploying Gemfile"
+      copy_files(@tld)
+
+      Dir.chdir(@tld) do
+        bundle_config
+        puts "   *** It may take a long time for a big project. It takes REALLY long time on Windows ***"
+        run_with_capture_v([@bundler_command, "install", "--jobs=#{ncores}"])
+      end
+
+      check_entry_point("local")
+    end
+
+    def deploy_simple_script
+      puts "   ... collecting simple Ruby script from #{@fs_root}"
+      copy_files(@tld)
+      check_entry_point("local")
+    end
+
+    def deploy_solution # rubocop:disable Metrics/MethodLength
+      case @scenario
+      when :simple_script
+        deploy_simple_script
+      when :gem
+        deploy_gem(Dir.glob(File.join(@fs_root, "*.gem")).first)
+      when :gemfile
+        deploy_gemfile
+      when :gemspec
+        collect_and_deploy_gem(Dir.glob(File.join(@fs_root, "*.gemspec")).first)
+      when :gemspec_and_gemfile
+        collect_and_deploy_gem_and_gemfile(Dir.glob(File.join(@fs_root, "*.gemspec")).first)
+      end
+    end
+
+    def install_all_gems_or_fail
+      gem_files = Dir.glob("*.gem").map { |file| File.expand_path(file) }
+      raise Tebako::Error, "No gem files found after build" if gem_files.empty?
+
+      gem_files.each { |gem_file| install_gem(gem_file) }
+    end
+
+    def lookup_files
+      @gs_length = Dir.glob(File.join(@fs_root, "*.gemspec")).length
+      @gf_length = Dir.glob(File.join(@fs_root, "Gemfile")).length
+      @g_length = Dir.glob(File.join(@fs_root, "*.gem")).length
+    end
+
+    def ncores
+      if RUBY_PLATFORM.include?("darwin")
+        out, st = Open3.capture2e("sysctl", "-n", "hw.ncpu")
+      else
+        out, st = Open3.capture2e("nproc", "--all")
+      end
+
+      @ncores ||= if st.exitstatus.zero?
+                    out.strip.to_i
+                  else
+                    4
+                  end
+    end
+
+    def run_with_capture(args)
+      puts "   ... @ #{args.join(" ")}"
+      out, st = Open3.capture2e(*args)
+      raise Tebako::Error, "Failed to run #{args.join(" ")} (#{st}):\n #{out}" unless st.exitstatus.zero?
+
+      out
+    end
+
+    def run_with_capture_v(args)
+      if @verbose
+        args_v = args.dup
+        args_v.push("--verbose")
+        puts run_with_capture(args_v)
+      else
+        run_with_capture(args)
+      end
+    end
+  end
+end

data/lib/tebako/error.rb

@@ -32,7 +32,9 @@ module Tebako
     102 => "'tebako setup' build step failed",
     103 => "'tebako press' configure step failed",
     104 => "'tebako press' build step failed",
-    105 => "Failed to map MSys path to Windows"
+    105 => "Failed to map MSys path to Windows",
+    106 => "Entry point does not exist or is not accessible",
+    107 => "Project root does not exist or is not accessible"
   }.freeze
 
   class << self

data/lib/tebako/packager/pass1.rb

@@ -88,9 +88,9 @@ module Tebako
         SUBST
       }.freeze
 
-      DARWIN_CONFIGURE_PATCH = {
-        "EXTDLDFLAGS=\"-bundle_loader '\\$(BUILTRUBY)'\"" => ""
-      }.freeze
+      # DARWIN_CONFIGURE_PATCH = {
+      #  "EXTDLDFLAGS=\"-bundle_loader '\\$(BUILTRUBY)'\"" => ""
+      # }.freeze
 
       OPENSSL_EXTCONF_RB_SUBST = <<~SUBST
         # Start of tebako patch
@@ -138,7 +138,10 @@ module Tebako
 
           # ....................................................
           # Fixing (bypassing) configure script bug where a variable is used before initialization
-          patch_map.store("configure", DARWIN_CONFIGURE_PATCH) if ostype =~ /darwin/
+          # On MacOS it generates bod EXTDLDFLAGS WITH -bundle_loader <missing parameter>
+          # However, it loooks likes EXTDLDFLAGS are just redundant for final Ruby linkage, so we are
+          # just removing it on pass 2 (at least for now)
+          # patch_map.store("configure", DARWIN_CONFIGURE_PATCH) if ostype =~ /darwin/
 
           # ....................................................
           # autoload :OpenSSL, "openssl"

data/lib/tebako/packager/patch_buildsystem.rb

@@ -53,7 +53,7 @@ module Tebako
 
       TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1 =
         "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) " \
         "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
@@ -63,13 +63,13 @@ module Tebako
 
       TEMPLATE_MAKEFILE_IN_BASE_PATCH =
         "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(MAINOBJ) " \
         "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
       TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS =
         "# -- Start of tebako patch --\n" \
-        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(XLDFLAGS) $(RUBY_EXP) $(MAINOBJ) " \
+        "\t\t$(Q) $(PURIFY) $(CC) $(EXE_LDFLAGS) $(RUBY_EXP) $(MAINOBJ) " \
         "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 

data/lib/tebako/packager.rb

@@ -26,8 +26,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require "fileutils"
+require "find"
+require "pathname"
 
 require_relative "error"
+require_relative "deploy_helper"
 require_relative "packager/pass1"
 require_relative "packager/pass1a"
 require_relative "packager/pass2"
@@ -59,12 +62,6 @@ module Tebako
       thread_pthread.c
     ].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 differentiation by bundler
-    # Ruby 3.1+ default rubygems versions work correctly out of the box
-    BUNDLER_VERSION = "2.4.22"
-    RUBYGEMS_VERSION = "3.4.22"
-
     class << self
       # Create implib
       def create_implib(src_dir, package_src_dir, app_name, ruby_ver)
@@ -77,18 +74,18 @@ module Tebako
       end
 
       # Deploy
-      def deploy(target_dir, ruby_ver, gflength)
+      def deploy(os_type, target_dir, pre_dir, ruby_ver, fs_root, fs_entrance, fs_mount_point) # rubocop:disable Metrics/ParameterLists
         puts "-- Running deploy script"
 
-        ruby_api_ver = ruby_api_version(ruby_ver)
-        gem_home = "#{target_dir}/lib/ruby/gems/#{ruby_api_ver}"
-
-        deploy_env = { "GEM_HOME" => gem_home, "GEM_PATH" => gem_home, "TEBAKO_PASS_THROUGH" => "1" }
+        deploy_helper = Tebako::DeployHelper.new(fs_root, fs_entrance, fs_mount_point, target_dir, pre_dir)
+        deploy_helper.config(os_type, ruby_ver)
 
-        PatchHelpers.with_env(deploy_env) do
-          update_rubygems(target_dir, ruby_api_ver, RUBYGEMS_VERSION) unless PatchHelpers.ruby31?(ruby_ver)
-          install_gem(target_dir, "tebako-runtime")
-          install_gem(target_dir, "bundler", BUNDLER_VERSION) if gflength.to_i != 0
+        PatchHelpers.with_env(deploy_helper.deploy_env) do
+          unless PatchHelpers.ruby31?(ruby_ver)
+            deploy_helper.update_rubygems
+            patch_after_rubygems_update(target_dir, deploy_helper.ruby_api_version)
+          end
+          deploy_helper.deploy
         end
       end
 
@@ -174,24 +171,10 @@ module Tebako
         File.join(src_dir, "lib", "libx64-ucrt-ruby#{ruby_ver[0]}#{ruby_ver[2]}0.a")
       end
 
-      def install_gem(target_dir, name, ver = nil)
-        puts "   ... installing #{name} gem#{" version #{ver}" if ver}"
-
-        params = ["#{target_dir}/bin/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
-
       def do_patch(patch_map, root)
         patch_map.each { |fname, mapping| PatchHelpers.patch_file("#{root}/#{fname}", mapping) }
       end
 
-      def ruby_api_version(ruby_ver)
-        "#{ruby_ver.split(".")[0..1].join(".")}.0"
-      end
-
       def ruby_version(tbd)
         ruby_version = nil
         PatchHelpers.with_env(DEPLOY_ENV) do
@@ -206,11 +189,7 @@ module Tebako
         ruby_version
       end
 
-      def update_rubygems(target_dir, ruby_api_ver, gem_ver)
-        puts "   ... updating rubygems to #{gem_ver}"
-        out, st = Open3.capture2e("#{target_dir}/bin/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?
-
+      def patch_after_rubygems_update(target_dir, ruby_api_ver)
         # Autoload cannot handle statically linked openssl extension
         # Changing it to require seems to be the simplest solution
         PatchHelpers.patch_file("#{target_dir}/lib/ruby/site_ruby/#{ruby_api_ver}/rubygems/openssl.rb",

data/lib/tebako/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.7.2.rc2"
+  VERSION = "0.7.2.rc4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.7.2.rc2
+  version: 0.7.2.rc4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,7 @@ files:
 - lib/tebako/cli.rb
 - lib/tebako/cli_helpers.rb
 - lib/tebako/cli_rubies.rb
+- lib/tebako/deploy_helper.rb
 - lib/tebako/error.rb
 - lib/tebako/packager.rb
 - lib/tebako/packager/pass1.rb