tebako 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ce7f498e5f82482a720d99b95c4f5e405c595f4ded4d5dffa5ac3030679530
-  data.tar.gz: 7fb7a07898f02dad4bcffe7f058c142311f6c9873dfb1accb460cd9442390064
+  metadata.gz: b43c94809ed1e1d7ad41d66c9092ae6b7c407c732c86dd1223799b857bd92d27
+  data.tar.gz: d5c772c813731c424b6e85f157bf9a18354b00201a6691f58032695123b3c74e
 SHA512:
-  metadata.gz: e089f8dc1edd455cb028b3ca888285b260df832228296891167bc248f2e39df650696b031c7201db0f2115e26242f2edfada4045dec1d42e82e8635cf01dd57d
-  data.tar.gz: 632d3337eae51876bfa9bf48a77d33a80e16b86439c66f0b406a7cf3bcb004d7f18f8a9f46bb858f8bc76cda2565078ea9883a5f1d1279ef6e3c80ff3f2808e0
+  metadata.gz: bcd2e75b1a14c3b6abfdea79311adffc6cda1cac33bdcf9d82e9d5ffe49ccbe355fd4672d518f32af2e51d54dbd3b06c5a57052795d075da005cfdb361414e12
+  data.tar.gz: 2d2034828dcb86ca8eca33dc50e5885fe5b33a0a274ec8c347bbde33c4ac8948964934ccd91fc999edbc1f5425eae3f24c594f67cab4479917ed6373398571b5

data/CMakeLists.txt

@@ -33,8 +33,9 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.23.10")
   cmake_policy(SET CMP0135 NEW)
 endif()
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake-scripts/version.cmake)
-determine_version("${CMAKE_CURRENT_SOURCE_DIR}" TEBAKO)
+if ("-${TEBAKO_VERSION}" STREQUAL "-")
+  message(FATAL_ERROR "Tebako version is not specified.")
+endif()
 
 project(tebako_packager VERSION ${TEBAKO_VERSION})
 
@@ -246,6 +247,14 @@ else(${IS_MSYS})
   set(FS_MOUNT_POINT "/__tebako_memfs__")
 endif(${IS_MSYS})
 
+if(PACKAGE_NEEDS_CWD)
+  set(NEEDS_CWD true)
+  set(PACKAGE_CWD_FULL ${FS_MOUNT_POINT}/${PACKAGE_CWD})
+else(PACKAGE_NEEDS_CWD)
+  set(NEEDS_CWD false)
+  set(PACKAGE_CWD "")
+  set(PACKAGE_CWD_FULL "")
+endif(PACKAGE_NEEDS_CWD)
 
 message(STATUS "DATA_SRC_DIR: ${DATA_SRC_DIR}")
 message(STATUS "DATA_PRE_DIR: ${DATA_PRE_DIR}")
@@ -435,6 +444,7 @@ else (${SETUP_MODE})
       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}
+                                                 ${PACKAGE_CWD}
       DEPENDS ${RUBY_PRJ}
   )
 
@@ -481,19 +491,7 @@ else (${SETUP_MODE})
 
   add_dependencies(tebako-fs packaged_filesystem)
 
-  if (${RUBY_VER} VERSION_LESS "3.0.0")
-    add_custom_target(tebako
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make -j${NCORES}
-      COMMAND ruby ${EXE}/tebako-packager finalize ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${APP_NAME}
-      )
-  else()
-    add_custom_target(tebako
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make ruby -j${NCORES}
-      COMMAND ${CMAKE_COMMAND} -E chdir ${RUBY_SOURCE_DIR} make -j${NCORES}
-      COMMAND ruby ${EXE}/tebako-packager finalize ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${APP_NAME}
-      )
-  endif()
-
+  add_custom_target(tebako COMMAND ruby ${EXE}/tebako-packager finalize ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${APP_NAME} ${RUBY_VER})
   add_dependencies(tebako setup tebako-fs)
 
 endif(${SETUP_MODE})

data/README.adoc

@@ -88,7 +88,7 @@ with debug information unstripped. You can opt to run 'strip -S' manually, it mo
 | 2.7.8 | Linux, macOS
 | 3.0.7 | Linux, macOS
 | 3.1.6 | Linux, macOS, Windows
-| 3.2.4 | Linux, macOS, Windows
+| 3.2.{4,5} | Linux, macOS, Windows
 | 3.3.{3,4} | Linux, macOS, Windows
 
 |===
@@ -655,6 +655,7 @@ tebako press \
   [-R|--Ruby=<ruby-version>] \
   [-o|--output=<packaged-file-name>] \
   [-l|--log-level=<error|warn|debug|trace>] \
+  [-c|--cwd=<package current working directory>]
   [-D|--devmode] \
   [-t|--tebafile=<path-to-tebafile>]
 ----
@@ -668,10 +669,10 @@ the Tebako root folder (see details in the Tebako Root Folder Selection section)
 this parameter defines Ruby version that will be packaged (optional, defaults to
 `3.1.6`)
 
-`<project-root>`::
+`project-root`::
 a folder at the host source file system where project files are located
 
-`<entry-point>`::
+`entry-point`::
 an executable file (binary executable or script) that shall be started when
 packaged file is called
 
@@ -682,6 +683,12 @@ the output file name (optional, defaults to `<current folder>/<entry point base
 logging level for the Tebako built-in memory filesystem driver
 (optional, defaults to `error`)
 
+`cwd`::
+a folder within Tebako memfs where the packaged application will start. This folder should be specified relative to the memfs root.
+If not provided, the application will start within the current folder of the host (i.e., at $PWD).
+This option is required because it is not possible to change the directory to a memfs folder until the package is started, as opposed to any host folder
+that can be set as the current directory before Tebako package invocation.  Tebako saves original working directory in a global Ruby variable `$tebako_original_pwd`.
+
 `tebafile`::
 the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
 Please refer to the separate section below for tebafile description.

data/Rakefile

@@ -33,14 +33,3 @@ RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
 task default: %i[rubocop spec]
-
-desc "Generate version.txt"
-task "generate_version_txt" do
-  require_relative "lib/tebako/version"
-  version_without_rc = Tebako::VERSION.gsub(/\.rc\d+/, "")
-  File.write(File.join(__dir__, "version.txt"), "#{version_without_rc}\n")
-  puts "Generating #{File.join(__dir__, "version.txt")}; version = #{version_without_rc}"
-end
-
-task build: :generate_version_txt
-task release: :generate_version_txt

data/common.env

@@ -2,4 +2,4 @@ BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
 DWARFS_WR_TAG=v0.5.8
-RUBY_VER=3.1.6
+RUBY_VER=3.2.5

data/exe/tebako-packager

@@ -28,6 +28,7 @@
 
 require_relative "../lib/tebako/packager"
 require_relative "../lib/tebako/stripper"
+require_relative "../lib/tebako/build_helpers"
 
 begin
   unless ARGV.length.positive?
@@ -46,8 +47,8 @@ begin
       raise Tebako::Error,
             "tebako-packager pass1 command expects 6 arguments, #{ARGV.length} has been provided."
     end
-
-    Tebako::Packager.pass1(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
+    ruby_ver = Tebako::RubyVersion.new(ARGV[5])
+    Tebako::Packager.pass1(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ruby_ver)
 
   when "pass1a"
     #       ARGV[0] -- command
@@ -69,9 +70,9 @@ begin
       raise Tebako::Error,
             "tebako-packager pass2 command expects 7 arguments, #{ARGV.length} has been provided."
     end
-
+    ruby_ver = Tebako::RubyVersion.new(ARGV[6])
     Tebako::Packager.stash(ARGV[4], ARGV[5])
-    Tebako::Packager.pass2(ARGV[1], ARGV[2], ARGV[3], ARGV[6])
+    Tebako::Packager.pass2(ARGV[1], ARGV[2], ARGV[3], ruby_ver)
   when "deploy"
     #       ARGV[0] -- command
     #       ARGV[1] -- OSTYPE
@@ -85,26 +86,31 @@ begin
     #       ARGV[9] -- FS_MOUNT_POINT
     #       ARGV[10] -- APP_NAME
     #       ARGV[11] -- RUBY_VER
-    unless ARGV.length == 12
+    #       ARGV[12] -- CWD
+    unless ARGV.length == 13 || ARGV.length == 12
       raise Tebako::Error,
-            "tebako-packager deploy command expects 12 arguments, #{ARGV.length} has been provided."
+            "tebako-packager deploy command expects 12 or 13 arguments, #{ARGV.length} has been provided."
     end
+    ruby_ver = Tebako::RubyVersion.new(ARGV[11])
     Tebako::Packager.init(ARGV[3], ARGV[4], ARGV[5], ARGV[6])
-    Tebako::Packager.create_implib(ARGV[2], ARGV[4], File.basename(ARGV[10]), ARGV[11]) if ARGV[1] =~ /msys/
+    Tebako::Packager.create_implib(ARGV[2], ARGV[4], File.basename(ARGV[10]), ruby_ver) 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[1], ARGV[4], ARGV[5], ARGV[11], ARGV[7], ARGV[8], ARGV[9])
+    Tebako::Packager.deploy(ARGV[1], ARGV[4], ARGV[5], ruby_ver, ARGV[7], ARGV[8], ARGV[9],
+                            ARGV.length == 13 ? ARGV[12] : nil)
 
   when "finalize"
     #       ARGV[0] -- command
     #       ARGV[1] -- OSTYPE
     #       ARGV[2] -- RUBY_SOURCE_DIR
     #       ARGV[3] -- APP_NAME
-    unless ARGV.length == 4
+    #       ARGV[4] -- RUBY_VER
+    unless ARGV.length == 5
       raise Tebako::Error,
-            "tebako-packager finalize command expects 4 arguments, #{ARGV.length} has been provided."
+            "tebako-packager finalize command expects 5 arguments, #{ARGV.length} has been provided."
     end
-    Tebako::Packager.finalize(ARGV[1], ARGV[2], ARGV[3])
+    ruby_ver = Tebako::RubyVersion.new(ARGV[4])
+    Tebako::Packager.finalize(ARGV[1], ARGV[2], ARGV[3], ruby_ver)
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/include/tebako/tebako-fs.h

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (c) 2021, [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
  *
@@ -37,4 +37,7 @@ namespace tebako {
 	extern const char* fs_log_level;
 	extern const char* fs_mount_point;
 	extern const char* fs_entry_point;
+	extern       bool  needs_cwd;
+	extern const char* package_cwd;
+	extern       char  original_cwd[PATH_MAX];
 }

data/include/tebako/tebako-main.h

@@ -33,6 +33,7 @@ extern "C" {
 	int tebako_main(int* argc, char*** argv);
 	const char* tebako_mount_point(void);
 	int tebako_is_running_miniruby(void);
+	const char* tebako_original_pwd(void);
 #ifdef RB_W32
 	int tebako_file_load_ok(const char *path);
 #endif

data/lib/tebako/build_helpers.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2023-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 "open3"
+
+# Tebako - an executable packager
+module Tebako
+  # Ruby build helpers
+  module BuildHelpers
+    class << self
+      def ncores
+        if RUBY_PLATFORM.include?("darwin")
+          out, st = Open3.capture2e("sysctl", "-n", "hw.ncpu")
+        else
+          out, st = Open3.capture2e("nproc", "--all")
+        end
+
+        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
+
+      # 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
+    end
+  end
+
+  # Ruby version checks
+  class RubyVersion
+    def initialize(ruby_ver)
+      unless ruby_ver =~ /^\d+\.\d+\.\d+$/
+        raise Tebako::Error, "Invalid Ruby version format '#{ruby_ver}'. Expected format: x.y.z"
+      end
+
+      @ruby_ver = ruby_ver
+    end
+
+    def ruby3x?
+      @ruby3x ||= @ruby_ver[0] == "3"
+    end
+
+    def ruby31?
+      @ruby31 ||= ruby3x? && @ruby_ver[2].to_i >= 1
+    end
+
+    def ruby32?
+      @ruby32 ||= ruby3x? && @ruby_ver[2].to_i >= 2
+    end
+
+    def ruby32only?
+      @ruby32only ||= ruby3x? && @ruby_ver[2] == "2"
+    end
+
+    def ruby33?
+      @ruby33 ||= ruby3x? && @ruby_ver[2].to_i >= 3
+    end
+
+    def api_version
+      @api_version ||= "#{@ruby_ver.split(".")[0..1].join(".")}.0"
+    end
+
+    def lib_version
+      @lib_version ||= "#{@ruby_ver.split(".")[0..1].join}0"
+    end
+  end
+end

data/lib/tebako/cli.rb

@@ -73,7 +73,14 @@ module Tebako
       print Digest::SHA256.hexdigest [File.read(File.join(source, "CMakeLists.txt")), Tebako::VERSION].join
     end
 
+    CWD_DESCRIPTION = <<~DESC
+      Current working directory for packaged application. This directory shall be specified relative to root.
+      #{" " * 62}# If this parameter is not set, the application will start in the current directory of the host file system.
+    DESC
+
     desc "press", "Press tebako image"
+    method_option :cwd, type: :string, aliases: "-c", required: false,
+                        desc: CWD_DESCRIPTION
     method_option :"entry-point", type: :string, aliases: ["-e", "--entry"], required: true,
                                   desc: "Ruby application entry point"
     method_option :"log-level", type: :string, aliases: "-l", required: false, enum: %w[error warn debug trace],

data/lib/tebako/cli_helpers.rb

@@ -55,7 +55,8 @@ module Tebako
       # So we have to use \"xxx\"
       @cfg_options ||=
         "-DCMAKE_BUILD_TYPE=Release -DRUBY_VER:STRING=\"#{ruby_ver}\" -DRUBY_HASH:STRING=\"#{ruby_hash}\" " \
-        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output_folder}\" -S \"#{source}\""
+        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output_folder}\" -S \"#{source}\" " \
+        "-DTEBAKO_VERSION:STRING=\"#{Tebako::VERSION}\""
     end
 
     def clean_cache
@@ -137,7 +138,7 @@ module Tebako
                      "MinGW Makefiles"
                    else
                      raise Tebako::Error.new(
-                       "#{RUBY_PLATFORM} is not supported yet, exiting",
+                       "#{RUBY_PLATFORM} is not supported, exiting",
                        254
                      )
                    end
@@ -195,20 +196,28 @@ module Tebako
     end
 
     def press_announce
+      cwd_announce = options["cwd"].nil? ? "<Host current directory>" : options["cwd"]
       @press_announce ||= <<~ANN
         Running tebako press at #{prefix}
-           Ruby version:            '#{extend_ruby_version[0]}'
-           Project root:            '#{root}'
-           Application entry point: '#{options["entry-point"]}'
-           Package file name:       '#{package}'
-           Loging level:            '#{l_level}'
+           Ruby version:              '#{extend_ruby_version[0]}'
+           Project root:              '#{root}'
+           Application entry point:   '#{options["entry-point"]}'
+           Package file name:         '#{package}'
+           Loging level:              '#{l_level}'
+           Package working directory: '#{cwd_announce}'
       ANN
     end
 
     def press_options
+      cwd_option = if options["cwd"].nil?
+                     "-DPACKAGE_NEEDS_CWD:BOOL=OFF"
+                   else
+                     "-DPACKAGE_NEEDS_CWD:BOOL=ON -DPACKAGE_CWD:STRING='#{options["cwd"]}'"
+                   end
       @press_options ||=
         "-DROOT:STRING='#{root}' -DENTRANCE:STRING='#{options["entry-point"]}' " \
-        "-DPCKG:STRING='#{package}' -DLOG_LEVEL:STRING='#{options["log-level"]}' "
+        "-DPCKG:STRING='#{package}' -DLOG_LEVEL:STRING='#{options["log-level"]}' " \
+        "#{cwd_option}"
     end
 
     def relative?(path)

data/lib/tebako/cli_rubies.rb

@@ -42,25 +42,27 @@ module Tebako
       "3.0.7" => "2a3411977f2850431136b0fab8ad53af09fb74df2ee2f4fb7f11b378fe034388",
       "3.1.6" => "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22",
       "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692",
+      "3.2.5" => "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16",
       "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2",
       "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34"
     }.freeze
 
-    DEFAULT_RUBY_VERSION = "3.1.6"
+    MIN_RUBY_VERSION_WINDOWS = "3.1.6"
+    DEFAULT_RUBY_VERSION = "3.2.5"
 
     def version_check(version)
       return if RUBY_VERSIONS.key?(version)
 
       raise Tebako::Error.new(
-        "Ruby version #{version} is not supported yet, exiting",
+        "Ruby version #{version} is not supported, exiting",
         253
       )
     end
 
     def version_check_msys(version)
-      if Gem::Version.new(version) < Gem::Version.new(DEFAULT_RUBY_VERSION) && RUBY_PLATFORM =~ /msys|mingw|cygwin/
+      if Gem::Version.new(version) < Gem::Version.new(MIN_RUBY_VERSION_WINDOWS) && RUBY_PLATFORM =~ /msys|mingw|cygwin/
         raise Tebako::Error.new(
-          "Windows packaging works for Ruby #{DEFAULT_RUBY_VERSION} or above, version #{version} is not supported",
+          "Windows packaging works for Ruby #{MIN_RUBY_VERSION_WINDOWS} or above, version #{version} is not supported",
           252
         )
       end

data/lib/tebako/deploy_helper.rb

@@ -29,6 +29,7 @@ require "fileutils"
 require "find"
 
 require_relative "error"
+require_relative "build_helpers"
 require_relative "packager/patch_helpers"
 
 # Tebako - an executable packager
@@ -48,16 +49,18 @@ module Tebako
       @target_dir = target_dir
       @pre_dir = pre_dir
       @verbose = ENV["VERBOSE"] == "yes" || ENV["VERBOSE"] == "true"
+      @ncores = BuildHelpers.ncores
     end
 
     attr_reader :bundler_command, :gem_command, :gem_home
 
-    def config(os_type, ruby_ver)
+    def config(os_type, ruby_ver, cwd)
       @ruby_ver = ruby_ver
       @os_type = os_type
+      @cwd = cwd
 
       @tbd = File.join(@target_dir, "bin")
-      @tgd = @gem_home = File.join(@target_dir, "lib", "ruby", "gems", ruby_api_version)
+      @tgd = @gem_home = File.join(@target_dir, "lib", "ruby", "gems", @ruby_ver.api_version)
       @tld = File.join(@target_dir, "local")
 
       lookup_files
@@ -66,15 +69,13 @@ module Tebako
     end
 
     def deploy
-      Packager::PatchHelpers.with_env(deploy_env) do
-        unless Packager::PatchHelpers.ruby31?(@ruby_ver)
-          update_rubygems
-          patch_after_rubygems_update(@target_dir, @ruby_api_version)
-        end
+      BuildHelpers.with_env(deploy_env) do
+        update_rubygems
         system("#{gem_command} env")
         install_gem("tebako-runtime")
         install_gem("bundler", BUNDLER_VERSION) if needs_bundler?
         deploy_solution
+        check_cwd
       end
     end
 
@@ -95,11 +96,7 @@ module Tebako
       ["--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"
+      BuildHelpers.run_with_capture_v(params)
     end
 
     def needs_bundler?
@@ -107,16 +104,23 @@ module Tebako
     end
 
     def update_rubygems
+      return if @ruby_ver.ruby31?
+
       puts "   ... updating rubygems to #{Tebako::RUBYGEMS_VERSION}"
-      run_with_capture_v([@gem_command, "update", "--no-doc", "--system", Tebako::RUBYGEMS_VERSION])
+      BuildHelpers.run_with_capture_v([@gem_command, "update", "--no-doc", "--system",
+                                       Tebako::RUBYGEMS_VERSION])
+      patch_after_rubygems_update(@target_dir, @ruby_ver.api_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])
+      BuildHelpers.run_with_capture_v([@bundler_command, "config", "set", "--local", "build.ffi",
+                                       "--disable-system-libffi"])
+      BuildHelpers.run_with_capture_v([@bundler_command, "config", "set", "--local", "build.nokogiri",
+                                       @nokogiri_option])
+      BuildHelpers.run_with_capture_v([@bundler_command, "config", "set", "--local", "force_ruby_platform",
+                                       @force_ruby_platform])
     end
 
     def check_entry_point(entry_point_root)
@@ -128,13 +132,22 @@ module Tebako
       raise Tebako::Error.new("Entry point #{fs_entry_point} does not exist or is not accessible", 106)
     end
 
+    def check_cwd
+      return if @cwd.nil?
+
+      cwd_full = File.join(@target_dir, @cwd)
+      return if File.directory?(cwd_full)
+
+      raise Tebako::Error.new("Package working directory #{@cwd} does not exist", 108)
+    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])
+        BuildHelpers.run_with_capture_v([@gem_command, "build", gemspec])
         install_all_gems_or_fail
       end
 
@@ -149,8 +162,8 @@ module Tebako
       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])
+        BuildHelpers.run_with_capture_v([@bundler_command, "install", "--jobs=#{@ncores}"])
+        BuildHelpers.run_with_capture_v([@bundler_command, "exec", @gem_command, "build", gemspec])
         install_all_gems_or_fail
       end
 
@@ -216,7 +229,7 @@ module Tebako
       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}"])
+        BuildHelpers.run_with_capture_v([@bundler_command, "install", "--jobs=#{@ncores}"])
       end
 
       check_entry_point("local")
@@ -256,43 +269,11 @@ module Tebako
       @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 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
       Packager::PatchHelpers.patch_file("#{target_dir}/lib/ruby/site_ruby/#{ruby_api_ver}/rubygems/openssl.rb",
                                         { "autoload :OpenSSL, \"openssl\"" => "require \"openssl\"" })
     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

@@ -34,7 +34,8 @@ module Tebako
     104 => "'tebako press' build step failed",
     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"
+    107 => "Project root does not exist or is not accessible",
+    108 => "Package working directory does not exist"
   }.freeze
 
   class << self

data/lib/tebako/packager/pass1.rb

@@ -156,7 +156,7 @@ module Tebako
           # ....................................................
           # autoload :OpenSSL, "openssl"
           # fails to deal with a default gem from statically linked extension
-          patch_map.store("lib/rubygems/openssl.rb", RUBYGEM_OPENSSL_RB_PATCH) if PatchHelpers.ruby3x?(ruby_ver)
+          patch_map.store("lib/rubygems/openssl.rb", RUBYGEM_OPENSSL_RB_PATCH) if ruby_ver.ruby3x?
 
           if ostype =~ /msys/
             # ....................................................
@@ -176,7 +176,7 @@ module Tebako
         include Tebako::Packager::PatchBuildsystem
 
         def get_gnumakefile_in_patch_p1(ruby_ver) # rubocop:disable Metrics/MethodLength
-          objext = PatchHelpers.ruby32?(ruby_ver) ? "$(OBJEXT)" : "@OBJEXT@"
+          objext = ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
           {
             "  DLLWRAP += -mno-cygwin" =>
               "# tebako patched  DLLWRAP += -mno-cygwin",

data/lib/tebako/packager/pass2.rb

@@ -26,6 +26,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require_relative "patch_literals"
+require_relative "patch_main"
 require_relative "patch_libraries"
 require_relative "patch_helpers"
 require_relative "patch_buildsystem"
@@ -41,7 +42,7 @@ module Tebako
           patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if ostype =~ /linux-musl/
           if PatchHelpers.msys?(ostype)
             patch_map.merge!(get_msys_patches(ruby_ver))
-          elsif PatchHelpers.ruby3x?(ruby_ver)
+          elsif ruby_ver.ruby3x?
             patch_map.store("common.mk", COMMON_MK_PATCH)
           end
           extend_patch_map_r33(patch_map, ostype, deps_lib_dir, ruby_ver)
@@ -52,7 +53,7 @@ module Tebako
         include Tebako::Packager::PatchBuildsystem
         include Tebako::Packager::PatchLiterals
         def extend_patch_map_r33(patch_map, ostype, deps_lib_dir, ruby_ver)
-          if PatchHelpers.ruby33?(ruby_ver) || PatchHelpers.msys?(ostype)
+          if ruby_ver.ruby33? || PatchHelpers.msys?(ostype)
             patch_map.store("config.status",
                             get_config_status_patch(ostype, deps_lib_dir, ruby_ver))
           end
@@ -75,7 +76,7 @@ module Tebako
           }
 
           if PatchHelpers.msys?(ostype)
-            patch = PatchHelpers.ruby32?(ruby_ver) ? DLN_C_MSYS_PATCH : DLN_C_MSYS_PATCH_PRE32
+            patch = ruby_ver.ruby32? ? DLN_C_MSYS_PATCH : DLN_C_MSYS_PATCH_PRE32
             dln_c_patch.merge!(patch)
           end
 
@@ -83,7 +84,7 @@ module Tebako
         end
 
         def get_io_c_msys_patch(ruby_ver)
-          io_c_msys_patch = PatchHelpers.ruby32?(ruby_ver) ? IO_C_MSYS_PATCH : IO_C_MSYS_PATCH_PRE_32
+          io_c_msys_patch = ruby_ver.ruby32? ? IO_C_MSYS_PATCH : IO_C_MSYS_PATCH_PRE_32
           io_c_msys_patch.merge(IO_C_MSYS_BASE_PATCH)
         end
 
@@ -94,7 +95,7 @@ module Tebako
         end
 
         def get_util_c_patch(ruby_ver)
-          if PatchHelpers.ruby31?(ruby_ver)
+          if ruby_ver.ruby31?
             PatchHelpers.patch_c_file_post("#endif /* !HAVE_GNU_QSORT_R */")
           else
             PatchHelpers.patch_c_file_pre("#ifndef S_ISDIR")
@@ -122,14 +123,14 @@ module Tebako
             "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
             "tool/mkconfig.rb" => get_tool_mkconfig_rb_patch(ostype),
             "dir.c" => get_dir_c_patch(ostype),            "dln.c" => get_dln_c_patch(ostype, ruby_ver),
-            "io.c" => get_io_c_patch(ostype, ruby_ver),    "main.c" => MAIN_C_PATCH,
+            "io.c" => get_io_c_patch(ostype, ruby_ver),    "main.c" => PatchMain.get_main_c_patch(ruby_ver),
             "file.c" => PatchHelpers.patch_c_file_pre("/* define system APIs */"),
             "util.c" => get_util_c_patch(ruby_ver)
           }
         end
 
         def mlibs_subst(ostype, deps_lib_dir, ruby_ver)
-          yjit_libs = PatchHelpers.ruby32only?(ruby_ver) ? "$(YJIT_LIBS) " : ""
+          yjit_libs = ruby_ver.ruby32only? ? "$(YJIT_LIBS) " : ""
           {
             "MAINLIBS = #{yjit_libs}@MAINLIBS@" =>
               "# -- Start of tebako patch -- \n" \

data/lib/tebako/packager/patch_buildsystem.rb

@@ -80,7 +80,7 @@ module Tebako
       def template_makefile_in_subst(ostype, ruby_ver)
         if PatchHelpers.msys?(ostype)
           TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS
-        elsif !PatchHelpers.ruby31?(ruby_ver)
+        elsif !ruby_ver.ruby31?
           TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1
         else
           TEMPLATE_MAKEFILE_IN_BASE_PATCH
@@ -88,9 +88,9 @@ module Tebako
       end
 
       def template_makefile_in_patch_two(ostype, ruby_ver)
-        if !PatchHelpers.ruby31?(ruby_ver)
+        if !ruby_ver.ruby31?
           { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => template_makefile_in_subst(ostype, ruby_ver) }
-        elsif !PatchHelpers.ruby33?(ruby_ver)
+        elsif !ruby_ver.ruby33?
           { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_3 => template_makefile_in_subst(ostype, ruby_ver) }
         else
           { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => template_makefile_in_subst(ostype, ruby_ver) }
@@ -136,7 +136,7 @@ module Tebako
       #  - Introduce LIBRUBY dependency on static extensions
       #    This is an addition to COMMON_MK_PATCH specified above
       def get_gnumakefile_in_patch_p2(ruby_ver) # rubocop:disable Metrics/MethodLength
-        objext = PatchHelpers.ruby32?(ruby_ver) ? "$(OBJEXT)" : "@OBJEXT@"
+        objext = ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
 
         {
           "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>

data/lib/tebako/packager/patch_helpers.rb

@@ -108,44 +108,8 @@ module Tebako
           end
         end
 
-        def ruby3x?(ruby_ver)
-          ruby_ver[0] == "3"
-        end
-
-        def ruby31?(ruby_ver)
-          ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 1
-        end
-
-        def ruby32?(ruby_ver)
-          ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 2
-        end
-
-        def ruby32only?(ruby_ver)
-          ruby3x?(ruby_ver) && ruby_ver[2] == "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" : ""
+          ruby_ver.ruby32? ? "-l:libyaml.a" : ""
         end
       end
     end

data/lib/tebako/packager/patch_libraries.rb

@@ -125,7 +125,7 @@ module Tebako
           libs = String.new
 
           DARWIN_DEP_LIBS_1.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }
-          process_brew_libs!(libs, PatchHelpers.ruby31?(ruby_ver) ? DARWIN_BREW_LIBS_31 : DARWIN_BREW_LIBS_PRE_31)
+          process_brew_libs!(libs, ruby_ver.ruby31? ? DARWIN_BREW_LIBS_31 : DARWIN_BREW_LIBS_PRE_31)
           process_brew_libs!(libs, DARWIN_BREW_LIBS)
 
           DARWIN_DEP_LIBS_2.each { |lib| libs << "#{deps_lib_dir}/lib#{lib}.a " }

data/lib/tebako/packager/patch_literals.rb

@@ -125,21 +125,6 @@ module Tebako
         SUBST
       }.freeze
 
-      MAIN_C_PATCH = {
-        "int\nmain(int argc, char **argv)" =>
-        "#include <tebako/tebako-main.h>\n\nint\nmain(int argc, char **argv)",
-
-        "    ruby_sysinit(&argc, &argv);" => <<~SUBST
-              ruby_sysinit(&argc, &argv);
-          /* -- Start of tebako patch -- */
-              if (tebako_main(&argc, &argv) != 0) {
-                printf("Tebako intialization failed.");
-                return -1;
-              }
-          /* -- End of tebako patch -- */
-        SUBST
-      }.freeze
-
       # Compensate ruby incorrect processing of (f)getattrlist returning ENOTSUP
       # Note. We are not patching need_normalization function
       # In this function (f)getattrlist failure with ENOTSUP is processed correctly

data/lib/tebako/packager/patch_main.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2023-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.
+
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Ruby patching literals (main.c)
+    module PatchMain
+      MAIN_C_SUBST_RB_MAIN = <<~SUBST
+        /* -- Start of tebako patch -- */
+        #include <tebako/tebako-main.h>
+        /* -- End of tebako patch -- */
+
+        static int
+        rb_main(int argc, char **argv)
+      SUBST
+
+      MAIN_C_SUBST_MAIN = <<~SUBST
+        /* -- Start of tebako patch -- */
+        #include <tebako/tebako-main.h>
+        /* -- End of tebako patch -- */
+
+        int
+        main(int argc, char **argv)
+      SUBST
+
+      MAIN_C_SUBST_RB_MAIN_INNER = <<~SUBST
+        ruby_init();
+        /* -- Start of tebako patch -- */
+            if (!tebako_is_running_miniruby())
+            {
+                VALUE cwd = rb_str_new_cstr(tebako_original_pwd());
+                rb_gv_set("$tebako_original_pwd", cwd);
+            }
+        /* -- End of tebako patch -- */
+      SUBST
+
+      MAIN_C_SUBST_MAIN_INNER = <<~SUBST
+            ruby_sysinit(&argc, &argv);
+        /* -- Start of tebako patch -- */
+            if (tebako_main(&argc, &argv) != 0) {
+                printf("Tebako intialization failed.");
+                return -1;
+            }
+        /* -- End of tebako patch -- */
+      SUBST
+
+      class << self
+        def get_main_c_patch(ruby_ver)
+          puts get_main_c_main_pattern(ruby_ver)
+          {
+            get_main_c_main_pattern(ruby_ver) => get_main_c_main_subst(ruby_ver),
+            "ruby_init();" => MAIN_C_SUBST_RB_MAIN_INNER,
+            "    ruby_sysinit(&argc, &argv);" => MAIN_C_SUBST_MAIN_INNER
+          }
+        end
+
+        private
+
+        def get_main_c_main_pattern(ruby_ver)
+          ruby_ver.ruby32? ? "static int\nrb_main(int argc, char **argv)" : "int\nmain(int argc, char **argv)"
+        end
+
+        def get_main_c_main_subst(ruby_ver)
+          ruby_ver.ruby32? ? MAIN_C_SUBST_RB_MAIN : MAIN_C_SUBST_MAIN
+        end
+      end
+    end
+  end
+end

data/lib/tebako/packager.rb

@@ -31,6 +31,7 @@ require "pathname"
 
 require_relative "error"
 require_relative "deploy_helper"
+require_relative "ruby_builder"
 require_relative "stripper"
 require_relative "packager/pass1"
 require_relative "packager/pass1a"
@@ -75,16 +76,17 @@ module Tebako
       end
 
       # Deploy
-      def deploy(os_type, target_dir, pre_dir, ruby_ver, fs_root, fs_entrance, fs_mount_point) # rubocop:disable Metrics/ParameterLists
+      def deploy(os_type, target_dir, pre_dir, ruby_ver, fs_root, fs_entrance, fs_mount_point, cwd) # rubocop:disable Metrics/ParameterLists
         puts "-- Running deploy script"
 
         deploy_helper = Tebako::DeployHelper.new(fs_root, fs_entrance, fs_mount_point, target_dir, pre_dir)
-        deploy_helper.config(os_type, ruby_ver)
+        deploy_helper.config(os_type, ruby_ver, cwd)
         deploy_helper.deploy
         Tebako::Stripper.strip(os_type, target_dir)
       end
 
-      def finalize(os_type, src_dir, app_name)
+      def finalize(os_type, src_dir, app_name, ruby_ver)
+        RubyBuilder.new(ruby_ver, src_dir).final_build
         exe_suffix = Packager::PatchHelpers.exe_suffix(os_type)
         src_name = File.join(src_dir, "ruby#{exe_suffix}")
         package_name = "#{app_name}#{exe_suffix}"
@@ -177,7 +179,7 @@ module Tebako
       end
 
       def lib_fname(src_dir, ruby_ver)
-        File.join(src_dir, "lib", "libx64-ucrt-ruby#{ruby_ver[0]}#{ruby_ver[2]}0.a")
+        File.join(src_dir, "lib", "libx64-ucrt-ruby#{ruby_ver.lib_version}.a")
       end
 
       def do_patch(patch_map, root)

data/lib/tebako/ruby_builder.rb

@@ -0,0 +1,52 @@
+# 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 "build_helpers"
+
+# Tebako - an executable packager
+module Tebako
+  # Tebako packaging support (ruby builder)
+  class RubyBuilder
+    def initialize(ruby_ver, src_dir)
+      @ruby_ver = ruby_ver
+      @src_dir = src_dir
+      @ncores = BuildHelpers.ncores
+    end
+
+    # Final build of tebako package
+    def final_build
+      puts "   ... building tebako package"
+      Dir.chdir(@src_dir) do
+        BuildHelpers.run_with_capture(["make", "ruby", "-j#{@ncores}"]) if @ruby_ver.ruby3x?
+        BuildHelpers.run_with_capture(["make", "-j#{@ncores}"])
+      end
+    end
+  end
+end

data/lib/tebako/version.rb

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

data/resources/tebako-fs.cpp.in

@@ -1,6 +1,6 @@
 /**
  *
- * 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,8 +30,11 @@
 #include <incbin/incbin.h>
 
 namespace tebako {
-	const char * fs_log_level   = "@LOG_LEVEL@";
-	const char * fs_mount_point = "@FS_MOUNT_POINT@";
-	const char * fs_entry_point = "@FS_ENTRY_POINT@";
+	const  char * fs_log_level   = "@LOG_LEVEL@";
+	const  char * fs_mount_point = "@FS_MOUNT_POINT@";
+	const  char * fs_entry_point = "@FS_ENTRY_POINT@";
+		   bool   needs_cwd	    = @NEEDS_CWD@;
+	const  char * package_cwd 	= "@PACKAGE_CWD_FULL@";
+	       char   original_cwd[PATH_MAX];
 	INCBIN(fs, "@DATA_BIN_FILE@");
 }

data/src/tebako-main.cpp

@@ -27,6 +27,7 @@
  *
  */
 
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,6 +35,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+
 #include <string>
 #include <cstdint>
 
@@ -132,6 +134,20 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 
 		}
 
+		if (!tebako_is_running_miniruby()) {
+        	if (getcwd(tebako::original_cwd, sizeof(tebako::original_cwd)) == NULL) {
+            	printf("Failed to get current directory: %s\n", strerror(errno));
+            	return -1;
+        	}
+
+			if (tebako::needs_cwd) {
+				if (tebako_chdir(tebako::package_cwd) != 0) {
+					printf("Failed to chdir to '%s' : %s\n", tebako::package_cwd, strerror(errno));
+					ret = -1;
+				}
+			}
+		}
+
 		if (ret != 0) {
 			try {
 				printf("Tebako initialization failed\n");
@@ -145,8 +161,6 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 				// Nested error, no recovery :(
 			}
 		}
-
-		// tebako_chdir("/__tebako_memfs__/local");
 	}
 	return ret;
 }
@@ -155,6 +169,10 @@ extern "C" const char* tebako_mount_point(void) {
 	return tebako::fs_mount_point;
 }
 
+extern "C" const char* tebako_original_pwd(void) {
+	return tebako::original_cwd;
+}
+
 extern "C" int tebako_is_running_miniruby(void) {
 	return running_miniruby;
 }

data/tebako.gemspec

@@ -55,8 +55,6 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.files << "version.txt"
-
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = %w[cmake exe ext include lib resources src tools/ci-scripts tools/cmake-scripts tools/includes]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -161,6 +161,7 @@ files:
 - include/tebako/tebako-fs.h
 - include/tebako/tebako-main.h
 - lib/tebako.rb
+- lib/tebako/build_helpers.rb
 - lib/tebako/cli.rb
 - lib/tebako/cli_helpers.rb
 - lib/tebako/cli_rubies.rb
@@ -174,6 +175,8 @@ files:
 - lib/tebako/packager/patch_helpers.rb
 - lib/tebako/packager/patch_libraries.rb
 - lib/tebako/packager/patch_literals.rb
+- lib/tebako/packager/patch_main.rb
+- lib/tebako/ruby_builder.rb
 - lib/tebako/stripper.rb
 - lib/tebako/version.rb
 - resources/tebako-fs.cpp.in
@@ -206,7 +209,6 @@ files:
 - tools/tests/setup-libhowardhinnerdate/CMakeLists.txt
 - tools/tests/setup-librachive/CMakeLists.txt
 - tools/tests/setup-libutfcpp/CMakeLists.txt
-- version.txt
 homepage: https://github.com/tamatebako/tebako
 licenses:
 - BSD-2-Clause
@@ -237,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Packager for Ruby executables

data/version.txt

@@ -1 +0,0 @@
-0.8.2