tebako 0.12.9 → 0.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b93408ab1718355b8a6ccb757a94b3951c2af16e0449d0616743bdb3986fc5
-  data.tar.gz: e4ad854b4d2c4d1d8e516f3e5835476cab487baee61325215571f83ab163c18e
+  metadata.gz: '009ef5486538fdd768a0b44c2833236a1f4f5a86ec9a00d89608d4eb601a06d1'
+  data.tar.gz: 3e2fde5102b5dfc56d9ea8cb9ab133133634e5e586de593f2183ba67c2504eb4
 SHA512:
-  metadata.gz: 198b259985435064b0fe31ed655f7070eff1c0699b575958b97a0831a88212a1cb4707b5f6603900a840ef82305fb9cf29a57eb6ba72c6b8a2a0bf05cf1c3505
-  data.tar.gz: 174e44dd0f8d1e491d71412e044df9be265926ddf54f819765d0f86e77a702813c71a8d19615e58de56653a6c4b4a6ce3e52b4f5f52d516c8bfd2b8a994ca16e
+  metadata.gz: 7ffba2ca2bdd4724bdce1cf7179383028dbeea2e38d3c1ae070f25809eabfcb7bd16a1ed4550895259423d42ae8b190db2438f135cda439b28af9c2004192999
+  data.tar.gz: 49c62bfdbe3312f7582cc67b9b9766ec1fe38aee715a7888a8de61764b338b2fb21dc35cf2b91f1f96948b9baf5ab9d3ad5758737e91728420f754736ecebc7c

data/CMakeLists.txt

@@ -364,7 +364,7 @@ ExternalProject_Add(${RUBY_PRJ}
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
   # Make it for MacOS otherwise LDFLAGS are invalid
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_LIB_DIR}
+  # COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_LIB_DIR}
   COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION} ${LIBYAML_RUBY_OPTION} \
                                                         --without-gmp                         \
                                                         --disable-dtrace                      \
@@ -410,7 +410,7 @@ if (${SETUP_MODE})
 # Packaged filesystem
 
   add_custom_target(packaged_filesystem
-    COMMAND ruby ${DEPS_BIN_DIR}/deploy.rb
+    COMMAND ruby ${DEPS_BIN_DIR}/deploy.rb ${RUBY_VER}
     DEPENDS setup
     BYPRODUCTS ${DATA_BIN_FILE}
   )
@@ -431,7 +431,7 @@ if (${SETUP_MODE})
 
   add_dependencies(tebako-fs packaged_filesystem)
 
-  add_custom_target(tebako COMMAND ruby ${EXE}/tebako-packager finalize ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${APP_NAME} ${RUBY_VER} ${DEPS_BIN_DIR}/patchelf ${WITH_PATCHELF})
+  add_custom_target(tebako COMMAND ruby ${EXE}/tebako-packager finalize ${RUBY_SOURCE_DIR} ${APP_NAME} ${RUBY_VER} ${DEPS_BIN_DIR}/patchelf ${WITH_PATCHELF})
   add_dependencies(tebako setup tebako-fs)
 
 endif(${SETUP_MODE})

data/README.adoc

@@ -1075,33 +1075,47 @@ operation. The following table lists the possible exit codes and their meanings.
 | 116  | Ruby version does not satify Gemfile requirements
 |===
 
-== Package Ruby version selection rules
+== Ruby and bundler versions selection
 
 During packaging tebako creates its own Ruby execution environment that is independent from the host Ruby environment.
 The version of Ruby that is used in the package is defined by the combination of the `--Ruby` option and ruby requirement
 specified in Gemfile.
 
-.Package Ruby version selection Rules
+.Package Ruby version selection rules
 [cols="3", options="header"]
 |===
-| Gemfile requirement\--Ruby option | Specified | Not specified
+| Gemfile requirement
+| `--Ruby` option given
+| `--Ruby` option absent
 
-| Specified | The version specified by --Ruby option if it is supported and satisfies Gemfile requirement; error otherwise | The minimal supported Ruby option that satisfies Gemfile requirement; error otherwise
-| Not specified | The version specified by --Ruby option if it is supported; error otherwise | Default Tebako Ruby version (3.2.6).
+| *Specified*
+| The version specified by `--Ruby` option if it is supported and satisfies Gemfile requirement; error otherwise
+| The minimal supported Ruby version that satisfies Gemfile requirement; error otherwise
+| *Not specified*
+| The version specified by `--Ruby` option if it is supported; error otherwise | Default Tebako Ruby version (3.2.6).
 
 |===
 
+When bundler is used to package the application, the version of bundler that is used is determined by the Ruby version
+and the bundler version requirements specified in the Gemfile.
 
-== Packaging scenarios with Ruby
-
-Tebako for Ruby supports the following packaging scenarios.
+.Package bundler version selection rules
+[cols="3", options="header"]
+|===
+| Gemfile requirement
+|  Ruby version 2.7.8, 3.0.7
+|  Ruby version 3.1.x or above
 
-This is high-level description of the Tebako Ruby packaging mechanism.
+| *Specified*
+| The maximum version that meets Gemfile requirement if it is >= 2.4.22 ; error otherwise
+| The maximum version that meets Gemfile requirement if it is >= 2.4.22 ; error otherwise
+| *Not specified*
+| 2.4.22
+| Default bundler version for this version of Ruby.
 
-NOTE: These scenarios were inspired by the `ruby-packer` approach.
+|===
 
-NOTE: Tebako Ruby is created independently from `ruby-packer`, no line of code
-was copied from `ruby-packer`.
+== Packaging scenarios
 
 Depending on the configuration files that are present in the root project folder, the Tebako Ruby packager supports different packaging scenarios.
 

data/exe/tebako-packager

@@ -70,19 +70,18 @@ begin
 
   when "finalize"
     #       ARGV[0] -- command
-    #       ARGV[1] -- OSTYPE
-    #       ARGV[2] -- RUBY_SOURCE_DIR
-    #       ARGV[3] -- APP_NAME
-    #       ARGV[4] -- RUBY_VER
-    #       ARGV[5] -- patchelf executable
-    #       ARGV[6] -- WITH_PATHELF
-    unless ARGV.length == 7
+    #       ARGV[1] -- RUBY_SOURCE_DIR
+    #       ARGV[2] -- APP_NAME
+    #       ARGV[3] -- RUBY_VER
+    #       ARGV[4] -- patchelf executable
+    #       ARGV[5] -- WITH_PATHELF
+    unless ARGV.length == 6
       raise Tebako::Error,
-            "tebako-packager finalize command expects 7 arguments, #{ARGV.length} has been provided."
+            "tebako-packager finalize command expects 6 arguments, #{ARGV.length} has been provided."
     end
-    ruby_ver = Tebako::RubyVersion.new(ARGV[4])
-    with_patchelf = ARGV[6].casecmp("ON").zero? || ARGV[6].casecmp("YES").zero?
-    Tebako::Packager.finalize(ARGV[1], ARGV[2], ARGV[3], ruby_ver, with_patchelf ? ARGV[5] : nil)
+    ruby_ver = Tebako::RubyVersion.new(ARGV[3])
+    with_patchelf = ARGV[5].casecmp("ON").zero? || ARGV[5].casecmp("YES").zero?
+    Tebako::Packager.finalize(ARGV[1], ARGV[2], ruby_ver, with_patchelf ? ARGV[4] : nil)
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/lib/tebako/build_helpers.rb

@@ -32,21 +32,8 @@ 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.signaled? && st.exitstatus.zero?
-          out.strip.to_i
-        else
-          4
-        end
-      end
-
       def run_with_capture(args)
+        args = args.compact
         puts "   ... @ #{args.join(" ")}"
         out, st = Open3.capture2e(*args)
         raise Tebako::Error, "Failed to run #{args.join(" ")} (#{st}):\n #{out}" if st.signaled? || !st.exitstatus.zero?

data/lib/tebako/cli.rb

@@ -28,6 +28,8 @@
 
 require "digest"
 require "fileutils"
+require "find"
+require "pathname"
 require "open3"
 require "thor"
 require "yaml"
@@ -36,6 +38,7 @@ require_relative "cache_manager"
 require_relative "cli_helpers"
 require_relative "error"
 require_relative "ruby_version"
+require_relative "scenario_manager"
 require_relative "version"
 
 # Tebako - an executable packager
@@ -66,10 +69,11 @@ module Tebako
       (om,) = bootstrap(clean: true)
 
       suffix = options["Ruby"].nil? ? "" : "_#{options["Ruby"]}"
-      nmr = "src/_ruby#{suffix}*"
-      nms = "stash#{suffix}*"
-      FileUtils.rm_rf(Dir.glob(File.join(om.deps, nmr)), secure: true)
-      FileUtils.rm_rf(Dir.glob(File.join(om.deps, nms)), secure: true)
+      nmr = Dir.glob(File.join(om.deps, "src", "_ruby#{suffix}*"))
+      nms = Dir.glob(File.join(om.deps, "stash#{suffix}*"))
+
+      FileUtils.rm_rf(nmr + nms, secure: true)
+      extra_win_clean(nmr)
     end
 
     desc "hash", "Print build script hash (ci cache key)"
@@ -147,13 +151,29 @@ module Tebako
         [options_manager, cache_manager]
       end
 
+      # Ruby extension maker sometimes creates files with 'NUL' name on Windows
+      # This method removes such files
+      def extra_win_clean(nmr)
+        return unless nmr.any? && ScenarioManagerBase.new.msys?
+
+        nmr.each do |path|
+          if File.basename(path) == "NUL"
+            full_path = "//?/#{path}"
+            FileUtils.rm_f(full_path)
+          end
+        end
+        FileUtils.rm_rf(nmr, secure: true)
+      end
+
       def initialize(*args)
         super
         return if args[2][:current_command].name.include?("hash")
 
         puts "Tebako executable packager version #{Tebako::VERSION}"
       end
+    end
 
+    no_commands do
       def options
         original_options = super
         tebafile = original_options["tebafile"].nil? ? DEFAULT_TEBAFILE : original_options["tebafile"]
@@ -164,9 +184,7 @@ module Tebako
           original_options
         end
       end
-    end
 
-    no_commands do
       def source
         c_path = Pathname.new(__FILE__).realpath
         @source ||= File.expand_path("../../..", c_path)
@@ -177,7 +195,10 @@ module Tebako
 
         opts = ""
         opts += " '--root'" if options["root"].nil?
-        opts += " '--entry-point'" if options["entry-point"].nil?
+        if options["entry-point"].nil?
+          opts += ", " unless opts.empty?
+          opts += " '--entry-point'"
+        end
         raise Thor::Error, "No value provided for required options #{opts}" unless opts.empty?
       end
     end

data/lib/tebako/cli_helpers.rb

@@ -82,7 +82,7 @@ module Tebako
       return unless %w[both runtime bundle].include?(options_manager.mode)
 
       generate_files(options_manager, scenario_manager)
-      merged_env = ENV.to_h.merge(options_manager.b_env)
+      merged_env = ENV.to_h.merge(scenario_manager.b_env)
       Tebako.packaging_error(103) unless system(merged_env, press_cfg_cmd(options_manager))
       Tebako.packaging_error(104) unless system(merged_env, press_build_cmd(options_manager))
     end
@@ -90,7 +90,7 @@ module Tebako
     def do_setup(options_manager)
       puts "Setting up tebako packaging environment"
 
-      merged_env = ENV.to_h.merge(options_manager.b_env)
+      merged_env = ENV.to_h.merge(Tebako::ScenarioManagerBase.new.b_env)
       Tebako.packaging_error(101) unless system(merged_env, setup_cfg_cmd(options_manager))
       Tebako.packaging_error(102) unless system(merged_env, setup_build_cmd(options_manager))
     end

data/lib/tebako/codegen.rb

@@ -62,14 +62,12 @@ module Tebako
       end
 
       def deploy_mk(opt, scm)
-        <<~SUBST
-          begin
-            #{deploy_mk_inner(opt, scm)}
-          rescue Tebako::Error => e
-            puts "tebako-packager failed: \#{e.message} [\#{e.error_code}]"
-            exit(e.error_code)
-          end
-        SUBST
+        case opt.mode
+        when "bundle"
+          deploy_mk_bundle(opt, scm)
+        when /runtime|both/
+          deploy_mk_stub(opt)
+        end
       end
 
       def deploy_mk_bundle(opt, scm)
@@ -81,15 +79,6 @@ module Tebako
         SUBST
       end
 
-      def deploy_mk_inner(opt, scm)
-        case opt.mode
-        when "bundle"
-          deploy_mk_bundle(opt, scm)
-        when /runtime|both/
-          deploy_mk_stub(opt)
-        end
-      end
-
       def deploy_mk_stub(opt)
         <<~SUBST
           Tebako::Packager.deploy("#{opt.data_src_dir}", "#{opt.data_pre_dir}",
@@ -102,8 +91,20 @@ module Tebako
         <<~SUBST
           #{deploy_rq}
 
-          rv = Tebako::RubyVersion.new("#{opt.ruby_ver}")
-          Tebako::Packager::init("#{opt.stash_dir}", "#{opt.data_src_dir}",
+          begin
+            #{deploy_rb_inner(opt, scm)}
+          rescue Tebako::Error => e
+            puts "deploy script failed: \#{e.message} [\#{e.error_code}]"
+            exit(e.error_code)
+          end
+        SUBST
+      end
+
+      def deploy_rb_inner(opt, scm)
+        <<~SUBST
+          rv = Tebako::RubyVersion.new(ARGV[0])
+          stash = File.join("#{opt.deps}", "stash_\#{ARGV[0]}")
+          Tebako::Packager::init(stash.to_s, "#{opt.data_src_dir}",
                                "#{opt.data_pre_dir}", "#{opt.data_bin_dir}")
           #{deploy_crt_implib(opt, scm)}
           #{deploy_mk(opt, scm)}
@@ -121,7 +122,7 @@ module Tebako
 
       def stub_rb(opt)
         <<~SUBST
-          puts "Copyright (c) 2024 Ribose Inc (https://www.ribose.com)"
+          puts "Copyright (c) 2024-2025 Ribose Inc (https://www.ribose.com)"
           puts "Tebako runtime stub v#{Tebako::VERSION}"
           puts "To run your application please call #{File.basename(opt.package)} --tebako-run <your tebako package>"
         SUBST

data/lib/tebako/deploy_helper.rb

@@ -34,16 +34,13 @@ require_relative "build_helpers"
 require_relative "packager/patch_helpers"
 require_relative "scenario_manager"
 
+require_relative "packager/patch"
+require_relative "packager/rubygems_patch"
+
 # 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 < ScenarioManager # rubocop:disable Metrics/ClassLength
+  class DeployHelper < ScenarioManagerWithBundler # rubocop:disable Metrics/ClassLength
     def initialize(fs_root, fs_entrance, target_dir, pre_dir)
       super(fs_root, fs_entrance)
       @fs_root = fs_root
@@ -51,13 +48,13 @@ module Tebako
       @target_dir = target_dir
       @pre_dir = pre_dir
       @verbose = %w[yes true].include?(ENV.fetch("VERBOSE", nil))
-      @ncores = BuildHelpers.ncores
     end
 
-    attr_reader :bundler_command, :gem_command, :gem_home
+    attr_reader :gem_home
 
     def configure(ruby_ver, cwd)
       @ruby_ver = ruby_ver
+      @needs_bundler = true unless @ruby_ver.ruby31?
       @cwd = cwd
 
       @tbd = File.join(@target_dir, "bin")
@@ -73,7 +70,7 @@ module Tebako
         update_rubygems
         system("#{gem_command} env") if @verbose
         install_gem("tebako-runtime")
-        install_gem("bundler", BUNDLER_VERSION) if needs_bundler?
+        install_gem("bundler", @bundler_version) if @needs_bundler
         deploy_solution
         check_cwd
       end
@@ -99,28 +96,26 @@ module Tebako
       BuildHelpers.run_with_capture_v(params)
     end
 
-    def needs_bundler?
-      @with_gemfile && !@ruby_ver.ruby31?
-    end
-
     def update_rubygems
       return if @ruby_ver.ruby31?
 
       puts "   ... updating rubygems to #{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)
+
+      patch = Packager::RubygemsUpdatePatch.new(@fs_mount_point).patch_map
+      Packager.do_patch(patch, "#{@target_dir}/lib/ruby/site_ruby/#{@ruby_ver.api_version}")
     end
 
     private
 
     def bundle_config
-      BuildHelpers.run_with_capture_v([@bundler_command, "config", "set", "--local", "build.ffi",
+      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "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])
+      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "config",
+                                       "set", "--local", "build.nokogiri", @nokogiri_option])
+      BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "config",
+                                       "set", "--local", "force_ruby_platform", @force_ruby_platform])
     end
 
     def check_entry_point(entry_point_root)
@@ -166,8 +161,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 ***"
-        BuildHelpers.run_with_capture_v([@bundler_command, "install", "--jobs=#{@ncores}"])
-        BuildHelpers.run_with_capture_v([@bundler_command, "exec", @gem_command, "build", gemspec])
+        BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "install", "--jobs=#{ncores}"])
+        BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "exec", @gem_command, "build", gemspec])
         install_all_gems_or_fail
       end
 
@@ -226,7 +221,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 ***"
-        BuildHelpers.run_with_capture_v([@bundler_command, "install", "--jobs=#{@ncores}"])
+        BuildHelpers.run_with_capture_v([@bundler_command, bundler_reference, "install", "--jobs=#{ncores}"])
       end
 
       check_entry_point("local")
@@ -259,12 +254,5 @@ module Tebako
 
       gem_files.each { |gem_file| install_gem(gem_file) }
     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
   end
 end

data/lib/tebako/error.rb

@@ -44,6 +44,9 @@ module Tebako
     114 => "Entry point is not within the project root",
     115 => "Failed to load Gemfile",
     116 => "Ruby version does not satify Gemfile requirements",
+    117 => "Failed to load Gemfile.lock",
+    118 => "Bundler version in Gemfile.lock does satisfy minimal Tebako version requirememnts",
+    119 => "Failed to find compatible bundler version",
     201 => "Warning. Could not create cache version file"
   }.freeze
 

data/lib/tebako/options_manager.rb

@@ -44,19 +44,11 @@ module Tebako
       @options = options
       @rv = Tebako::RubyVersion.new(@options["Ruby"])
       @ruby_ver, @ruby_hash = @rv.extend_ruby_version
+      @scmb = ScenarioManagerBase.new
     end
 
     attr_reader :ruby_ver, :rv
 
-    def b_env
-      u_flags = if RbConfig::CONFIG["host_os"] =~ /darwin/
-                  "-DTARGET_OS_SIMULATOR=0 -DTARGET_OS_IPHONE=0  #{ENV.fetch("CXXFLAGS", nil)}"
-                else
-                  ENV.fetch("CXXFLAGS", nil)
-                end
-      @b_env ||= { "CXXFLAGS" => u_flags }
-    end
-
     def cfg_options
       ## {v_parts[3]} may be something like rc1 that won't work with CMake
       v_parts = Tebako::VERSION.split(".")
@@ -64,7 +56,7 @@ 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 \"#{@scmb.m_files}\" -B \"#{output_folder}\" -S \"#{source}\" " \
         "#{remove_glibc_private} -DTEBAKO_VERSION:STRING=\"#{v_parts[0]}.#{v_parts[1]}.#{v_parts[2]}\""
     end
 
@@ -127,7 +119,7 @@ module Tebako
 
     def fs_current
       fs_current = Dir.pwd
-      if RUBY_PLATFORM =~ /msys|mingw|cygwin/
+      if @scmb.msys?
         fs_current, cygpath_res = Open3.capture2e("cygpath", "-w", fs_current)
         Tebako.packaging_error(101) unless cygpath_res.success?
         fs_current.strip!
@@ -158,20 +150,6 @@ module Tebako
       @mode ||= @options["mode"].nil? ? "bundle" : @options["mode"]
     end
 
-    def m_files
-      # [TODO]
-      # Ninja generates incorrect script for tebako press target -- gets lost in a chain custom targets
-      # Using makefiles has negative performance impact so it needs to be fixed
-      @m_files ||= case RUBY_PLATFORM
-                   when /linux/, /darwin/
-                     "Unix Makefiles"
-                   when /msys|mingw|cygwin/
-                     "MinGW Makefiles"
-                   else
-                     raise Tebako::Error.new("#{RUBY_PLATFORM} is not supported.", 112)
-                   end
-    end
-
     def output_folder
       @output_folder ||= File.join(prefix, "o")
     end
@@ -329,8 +307,8 @@ module Tebako
       @source ||= File.expand_path("../../..", c_path)
     end
 
-    def stash_dir
-      @stash_dir ||= "#{stash_dir_all}_#{@ruby_ver}"
+    def stash_dir(rver = nil)
+      @stash_dir ||= "#{stash_dir_all}_#{rver || @ruby_ver}"
     end
 
     def stash_dir_all

data/lib/tebako/packager/pass1_patch.rb

@@ -29,6 +29,7 @@ require_relative "patch_helpers"
 require_relative "patch_buildsystem"
 
 require_relative "patch"
+require_relative "rubygems_patch"
 # Tebako - an executable packager
 module Tebako
   # Packager module
@@ -46,24 +47,13 @@ module Tebako
       end
     end
     # Ruby patching definitions (pass1 - common)
-    class Pass1Patch < Patch
+    class Pass1Patch < RubygemsPatch
       # [TODO] looks like it does not exist in 3.1.4
       # May be obsolete
       TOOL_RBINSTALL_RB_PATCH = {
         "    next if files.empty?" => "# tebako patched    next if files.empty?"
       }.freeze
 
-      RUBYGEM_OPENSSL_RB_SUBST = <<~SUBST
-        # Start of tebako patch
-        require "openssl"
-        # End of tebako patch
-        autoload :OpenSSL, "openssl"
-      SUBST
-
-      RUBYGEM_OPENSSL_RB_PATCH = {
-        'autoload :OpenSSL, "openssl"' => RUBYGEM_OPENSSL_RB_SUBST
-      }.freeze
-
       EXT_SETUP_PATCH = {
         "#option nodynamic" => "option nodynamic"
       }.freeze
@@ -131,9 +121,8 @@ module Tebako
         "Logging::message \"=== Checking done. ===\\n\"" => OPENSSL_EXTCONF_RB_SUBST
       }.freeze
 
-      def initialize(mountpoint, ruby_ver)
-        super()
-        @mountpoint = mountpoint
+      def initialize(mount_point, ruby_ver)
+        super(mount_point)
         @ruby_ver = ruby_ver
       end
 
@@ -152,7 +141,7 @@ module Tebako
 
           # ....................................................
           # Allow only packaged gems (from within memfs)
-          "lib/rubygems/path_support.rb" => rubygems_path_support_patch,
+          "lib/rubygems/path_support.rb" => rubygems_path_support_patch(@mount_point),
 
           # ....................................................
           # Disable dynamic extensions
@@ -170,46 +159,10 @@ module Tebako
         # ....................................................
         # autoload :OpenSSL, "openssl"
         # fails to deal with a default gem from statically linked extension
-        pm.store("lib/rubygems/openssl.rb", RUBYGEM_OPENSSL_RB_PATCH) if @ruby_ver.ruby3x?
+        pm.store("lib/rubygems/openssl.rb", RUBYGEMS_OPENSSL_RB_PATCH) if @ruby_ver.ruby3x?
 
         pm.freeze
       end
-
-      private
-
-      def rubygems_path_support_patch_one
-        <<~SUBST
-            @home = env["GEM_HOME"] || Gem.default_dir
-          # -- Start of tebako patch --
-              unless env["TEBAKO_PASS_THROUGH"]
-                @home = Gem.default_dir unless @home.index("#{@mount_point}") == 0
-              end
-          # -- End of tebako patch --
-
-        SUBST
-      end
-
-      def rubygems_path_support_patch_two
-        <<~SUBST
-
-            @path = split_gem_path env["GEM_PATH"], @home
-          # -- Start of tebako patch --
-              unless env["TEBAKO_PASS_THROUGH"]
-                @path.keep_if do |xpath|
-                  xpath.index("#{@mount_point}") == 0
-                end
-              end
-          # -- End of tebako patch --
-
-        SUBST
-      end
-
-      def rubygems_path_support_patch
-        {
-          '  @home = env["GEM_HOME"] || Gem.default_dir' => rubygems_path_support_patch_one,
-          '  @path = split_gem_path env["GEM_PATH"], @home' => rubygems_path_support_patch_two
-        }
-      end
     end
 
     # Ruby patching definitions (pass1 - darwin)
@@ -249,23 +202,21 @@ module Tebako
       def gnumakefile_in_patch_p1 # rubocop:disable Metrics/MethodLength
         objext = @ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
         {
-          "  DLLWRAP += -mno-cygwin" =>
-            "# tebako patched  DLLWRAP += -mno-cygwin",
+          "$(Q) $(DLLWRAP) \\" => GNUMAKEFILE_IN_DLLTOOL_SUBST,
 
           "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext}" =>
             "$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.#{objext} $(WINMAINOBJ)  # tebako patched",
 
           "$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@" =>
+
             "$(WINMAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@  # tebako patched",
 
-          "--output-exp=$(RUBY_EXP) \\" =>
-           "--output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) --output-def=tebako.def \\",
+          "--output-exp=$(RUBY_EXP) \\" => "# tebako patched --output-exp=$(RUBY_EXP) \\",
 
           "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
-            "--export-all $(LIBRUBY_A) $(LIBS) -o program-stub.exe   # tebako patched",
+            "# tebako patched --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)",
 
-          "@rm -f $(PROGRAM)" =>
-            "@rm -f program-stub.exe   # tebako patched",
+          "@rm -f $(PROGRAM)" => "# tebako patched @rm -f $(PROGRAM)",
 
           "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
            "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",