tebako 0.12.8 → 0.12.10

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)
@@ -233,7 +186,7 @@ module Tebako
 
       WIN32_WINMAIN_C_PATCH = {
         "WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)" =>
-          "wWinMain(HINSTANCE current, HINSTANCE prev, LPWSTR cmdline, int showcmd)"
+          "wWinMain(HINSTANCE current, HINSTANCE prev, LPWSTR cmdline, int showcmd) /* tebako patched */"
       }.freeze
 
       def patch_map
@@ -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)",
@@ -288,7 +239,7 @@ module Tebako
       def msys_patches
         pm = msys_base_patches
 
-        if @ruby_ver.ruby34?
+        if @ruby_ver.ruby337?
           # ....................................................
           # RUBY_EXTERN shall be extern for static build but is set to __declspec(dllimport) for encodin libarary
           pm.store("include/ruby/onigmo.h", INCLUDE_RUBY_ONIGMO_H_PATCH)

data/lib/tebako/packager/pass2_patch.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2021-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_relative "patch_literals"
+require_relative "patch_main"
+require_relative "patch_libraries"
+require_relative "patch_helpers"
+require_relative "patch_buildsystem"
+
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Ruby patching definitions (pass2)
+    class Pass2Patch < Patch
+      def initialize(ostype, deps_lib_dir, ruby_ver)
+        super()
+        @ostype = ostype
+        @scmb = ScenarioManagerBase.new(@ostype)
+        @deps_lib_dir = deps_lib_dir
+        @ruby_ver = ruby_ver
+      end
+
+      def patch_map
+        patch_map = patch_map_base
+        patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if @scmb.musl?
+        if @scmb.msys?
+          patch_map.merge!(msys_patches)
+        elsif @ruby_ver.ruby3x?
+          patch_map.store("common.mk", COMMON_MK_PATCH)
+        end
+        extend_patch_map_r33(patch_map)
+        patch_map.store("prism_compile.c", PRISM_PATCHES) if @ruby_ver.ruby34?
+        patch_map
+      end
+
+      private
+
+      include Tebako::Packager::PatchBuildsystem
+      include Tebako::Packager::PatchLiterals
+      def extend_patch_map_r33(patch_map)
+        if @ruby_ver.ruby33? || @scmb.msys?
+          patch_map.store("config.status",
+                          get_config_status_patch(@ostype, @deps_lib_dir, @ruby_ver))
+        end
+        patch_map
+      end
+
+      def dir_c_patch
+        pattern = ScenarioManagerBase.new.msys? ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST"
+        patch = PatchHelpers.patch_c_file_pre(pattern)
+        patch.merge!(DIR_C_BASE_PATCH)
+        patch
+      end
+
+      def dln_c_patch
+        pattern = "#ifndef dln_loaderror"
+        # Not using substitutions of dlxxx functions on Windows
+        patch = {
+          pattern => "#{@scmb.msys? ? C_FILE_SUBST_LESS : C_FILE_SUBST}\n#{pattern}\n"
+        }
+
+        if @scmb.msys?
+          patch.merge!(@ruby_ver.ruby32? ? DLN_C_MSYS_PATCH : DLN_C_MSYS_PATCH_PRE32)
+        end
+
+        patch
+      end
+
+      def io_c_msys_patch
+        patch = @ruby_ver.ruby32? ? IO_C_MSYS_PATCH : IO_C_MSYS_PATCH_PRE_32
+        patch.merge(IO_C_MSYS_BASE_PATCH)
+      end
+
+      def io_c_patch
+        patch = PatchHelpers.patch_c_file_pre("/* define system APIs */")
+        patch.merge!(io_c_msys_patch) if @scmb.msys?
+        patch
+      end
+
+      def util_c_patch
+        if @ruby_ver.ruby31?
+          PatchHelpers.patch_c_file_post("#endif /* !HAVE_GNU_QSORT_R */")
+        else
+          PatchHelpers.patch_c_file_pre("#ifndef S_ISDIR")
+        end
+      end
+
+      def tool_mkconfig_rb_patch
+        subst = @scmb.msys? ? TOOL_MKCONFIG_RB_SUBST_MSYS : TOOL_MKCONFIG_RB_SUBST
+        {
+          "    if fast[name]" => subst
+        }
+      end
+
+      def msys_patches
+        {
+          "cygwin/GNUmakefile.in" => get_gnumakefile_in_patch_p2(@ruby_ver),
+          "ruby.c" => RUBY_C_MSYS_PATCHES,
+          "win32/file.c" => WIN32_FILE_C_MSYS_PATCHES,
+          "win32/win32.c" => WIN32_WIN32_C_MSYS_PATCHES
+        }
+      end
+
+      def patch_map_base
+        {
+          "template/Makefile.in" => template_makefile_in_patch,
+          "tool/mkconfig.rb" => tool_mkconfig_rb_patch,
+          "dir.c" => dir_c_patch, "dln.c" => dln_c_patch,
+          "io.c" => io_c_patch, "main.c" => PatchMain.get_main_c_patch(@ruby_ver),
+          "file.c" => PatchHelpers.patch_c_file_pre("/* define system APIs */"),
+          "util.c" => util_c_patch
+        }
+      end
+
+      def mlibs_subst
+        yjit_libs = @ruby_ver.ruby32only? ? "$(YJIT_LIBS) " : ""
+        {
+          "MAINLIBS = #{yjit_libs}@MAINLIBS@" =>
+            "# -- Start of tebako patch -- \n" \
+            "MAINLIBS = #{yjit_libs}#{PatchLibraries.mlibs(@ostype, @deps_lib_dir, @ruby_ver, true)}\n" \
+            "# -- End of tebako patch -- \n"
+        }
+      end
+
+      def template_makefile_in_patch
+        template_makefile_in_patch_two(@ruby_ver).merge(mlibs_subst)
+      end
+    end
+  end
+end

data/lib/tebako/packager/patch_buildsystem.rb

@@ -77,8 +77,8 @@ module Tebako
         "$(EXTOBJS) $(LIBRUBYARG_STATIC) $(OUTFLAG)$@\n" \
         "# -- End of tebako patch --"
 
-      def template_makefile_in_subst(ostype, ruby_ver)
-        if PatchHelpers.msys?(ostype)
+      def template_makefile_in_subst(ruby_ver)
+        if ScenarioManagerBase.new.msys?
           TEMPLATE_MAKEFILE_IN_BASE_PATCH_MSYS
         elsif !ruby_ver.ruby31?
           TEMPLATE_MAKEFILE_IN_BASE_PATCH_PRE_3_1
@@ -87,16 +87,20 @@ module Tebako
         end
       end
 
-      def template_makefile_in_patch_two(ostype, ruby_ver)
+      def template_makefile_in_patch_two(ruby_ver)
         if !ruby_ver.ruby31?
-          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => template_makefile_in_subst(ostype, ruby_ver) }
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_1 => template_makefile_in_subst(ruby_ver) }
         elsif !ruby_ver.ruby33?
-          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_3 => template_makefile_in_subst(ostype, ruby_ver) }
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN_PRE_3_3 => template_makefile_in_subst(ruby_ver) }
         else
-          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => template_makefile_in_subst(ostype, ruby_ver) }
+          { TEMPLATE_MAKEFILE_IN_BASE_PATTERN => template_makefile_in_subst(ruby_ver) }
         end
       end
 
+      GNUMAKEFILE_IN_DLLTOOL_SUBST = <<~SUBST
+        $(Q) dlltool --output-lib=$(LIBRUBY) --output-def=tebako.def --export-all $(LIBRUBY_A) --output-exp=$(RUBY_EXP)   # tebako patched
+      SUBST
+
       # This MSYS specific thing ensure compilation of winmain.c
       # Did try to understand why it did not work out of the box
       GNUMAKEFILE_IN_WINMAIN_SUBST = <<~SUBST

data/lib/tebako/packager/patch_helpers.rb

@@ -62,18 +62,6 @@ module Tebako
           out
         end
 
-        def exe_suffix(ostype)
-          msys?(ostype) ? ".exe" : ""
-        end
-
-        def msys?(ostype)
-          ostype =~ /msys|cygwin|mingw/
-        end
-
-        def macos?(ostype)
-          ostype =~ /darwin/
-        end
-
         def patch_c_file_pre(pattern)
           {
             pattern => "#{PatchLiterals::C_FILE_SUBST}\n#{pattern}"

data/lib/tebako/packager/rubygems_patch.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024-2025 [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_relative "patch"
+# Tebako - an executable packager
+module Tebako
+  module Packager
+    # Shared accross Pass1Patch and RybugemsUpdatePatch
+    class RubygemsPatch < Patch
+      RUBYGEMS_OPENSSL_RB_SUBST = <<~SUBST
+        # Start of tebako patch
+        require "openssl"
+        # End of tebako patch
+        autoload :OpenSSL, "openssl"
+      SUBST
+
+      RUBYGEMS_OPENSSL_RB_PATCH = {
+        'autoload :OpenSSL, "openssl"' => RUBYGEMS_OPENSSL_RB_SUBST
+      }.freeze
+
+      def initialize(mount_point)
+        super()
+        @mount_point = mount_point
+      end
+
+      protected
+
+      def rubygems_path_support_patch(mount_point)
+        patch = <<~SUBST
+          # -- Start of tebako patch --
+              @home = Gem.default_dir unless @home.index("#{mount_point}") == 0 unless env["TEBAKO_PASS_THROUGH"]
+          # -- End of tebako patch --
+              @path = split_gem_path env["GEM_PATH"], @home
+          # -- Start of tebako patch --
+              @path.keep_if do |xpath|
+                xpath.index("#{mount_point}") == 0
+              end unless env["TEBAKO_PASS_THROUGH"]
+          # -- End of tebako patch --
+        SUBST
+
+        {
+          '  @path = split_gem_path env["GEM_PATH"], @home' => patch
+        }
+      end
+    end
+
+    # Rubygems patch after update
+    class RubygemsUpdatePatch < RubygemsPatch
+      def patch_map
+        pm = {
+          "rubygems/openssl.rb" => RUBYGEMS_OPENSSL_RB_PATCH,
+          "rubygems/path_support.rb" => rubygems_path_support_patch(@mount_point)
+        }
+        pm.merge!(super)
+        pm.freeze
+      end
+    end
+  end
+end

data/lib/tebako/packager.rb

@@ -35,7 +35,7 @@ require_relative "ruby_builder"
 require_relative "stripper"
 require_relative "packager/pass1_patch"
 require_relative "packager/pass1a_patch"
-require_relative "packager/pass2"
+require_relative "packager/pass2_patch"
 require_relative "packager/patch_helpers"
 
 # Tebako - an executable packager
@@ -89,15 +89,20 @@ module Tebako
         Tebako::Stripper.strip(deploy_helper, target_dir)
       end
 
-      def finalize(os_type, src_dir, app_name, ruby_ver, patchelf)
+      def do_patch(patch_map, root)
+        patch_map.each { |fname, mapping| PatchHelpers.patch_file("#{root}/#{fname}", mapping) }
+      end
+
+      def finalize(src_dir, app_name, ruby_ver, patchelf)
         puts "-- Running finalize script"
 
         RubyBuilder.new(ruby_ver, src_dir).target_build
-        exe_suffix = Packager::PatchHelpers.exe_suffix(os_type)
+        exe_suffix = ScenarioManagerBase.new.exe_suffix
         src_name = File.join(src_dir, "ruby#{exe_suffix}")
         patchelf(src_name, patchelf)
         package_name = "#{app_name}#{exe_suffix}"
-        strip_or_copy(os_type, src_name, package_name)
+        # strip_or_copy(os_type, src_name, package_name)
+        Tebako::Stripper.strip_file(src_name, package_name)
         puts "Created tebako package at \"#{package_name}\""
       end
 
@@ -145,7 +150,8 @@ module Tebako
       def pass2(ostype, ruby_source_dir, deps_lib_dir, ruby_ver)
         puts "-- Running pass2 script"
 
-        do_patch(Pass2.get_patch_map(ostype, deps_lib_dir, ruby_ver), ruby_source_dir)
+        patch = Pass2Patch.new(ostype, deps_lib_dir, ruby_ver).patch_map
+        do_patch(patch, ruby_source_dir)
       end
 
       # Stash
@@ -183,10 +189,6 @@ module Tebako
         File.join(src_dir, "lib", "libx64-ucrt-ruby#{ruby_ver.lib_version}.a")
       end
 
-      def do_patch(patch_map, root)
-        patch_map.each { |fname, mapping| PatchHelpers.patch_file("#{root}/#{fname}", mapping) }
-      end
-
       def patchelf(src_name, patchelf)
         return if patchelf.nil?
 
@@ -194,15 +196,15 @@ module Tebako
         BuildHelpers.run_with_capture(params)
       end
 
-      def strip_or_copy(os_type, src_name, package_name)
-        # [TODO] On MSys strip sometimes creates a broken executable
-        # https://github.com/tamatebako/tebako/issues/172
-        if Packager::PatchHelpers.msys?(os_type)
-          FileUtils.cp(src_name, package_name)
-        else
-          Tebako::Stripper.strip_file(src_name, package_name)
-        end
-      end
+      # def strip_or_copy(_os_type, src_name, package_name)
+      # [TODO] On MSys strip sometimes creates a broken executable
+      # https://github.com/tamatebako/tebako/issues/172
+      # if Packager::PatchHelpers.msys?(os_type)
+      # FileUtils.cp(src_name, package_name)
+      # else
+      # Tebako::Stripper.strip_file(src_name, package_name)
+      # end
+      # end
     end
   end
 end

data/lib/tebako/ruby_builder.rb

@@ -37,7 +37,7 @@ module Tebako
     def initialize(ruby_ver, src_dir)
       @ruby_ver = ruby_ver
       @src_dir = src_dir
-      @ncores = BuildHelpers.ncores
+      @ncores = ScenarioManagerBase.new.ncores
     end
 
     # Final build of tebako package

data/lib/tebako/ruby_version.rb

@@ -43,6 +43,7 @@ module Tebako
       "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34",
       "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196",
       "3.3.6" => "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d",
+      "3.3.7" => "9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628",
       "3.4.1" => "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f"
     }.freeze
 
@@ -89,6 +90,10 @@ module Tebako
       @ruby33 ||= ruby3x? && @ruby_version[2].to_i >= 3
     end
 
+    def ruby337?
+      @ruby337 ||= ruby34? || (ruby33? && @ruby_version[2] == "3" && @ruby_version[4].to_i >= 7)
+    end
+
     def ruby34?
       @ruby34 ||= ruby3x? && @ruby_version[2].to_i >= 4
     end
@@ -115,8 +120,7 @@ module Tebako
     end
 
     def version_check_msys
-      if Gem::Version.new(@ruby_version) < Gem::Version.new(MIN_RUBY_VERSION_WINDOWS) &&
-         RUBY_PLATFORM =~ /msys|mingw|cygwin/
+      if Gem::Version.new(@ruby_version) < Gem::Version.new(MIN_RUBY_VERSION_WINDOWS) && ScenarioManagerBase.new.msys?
         raise Tebako::Error.new("Ruby version #{@ruby_version} is not supported on Windows", 111)
       end
     end
@@ -127,14 +131,14 @@ module Tebako
     def initialize(ruby_version, gemfile_path)
       # Assuming that it does not attempt to load any gems or resolve dependencies
       # this can be done with any bundler version
-      gemfile = Bundler::Definition.build(gemfile_path, nil, nil)
-      ruby_v = gemfile.ruby_version&.versions
+      ruby_v = Bundler::Definition.build(gemfile_path, nil, nil).ruby_version&.versions
       if ruby_v.nil?
         super(ruby_version)
       else
         process_gemfile_ruby_version(ruby_version, ruby_v)
-        run_checks
       end
+    rescue Tebako::Error
+      raise
     rescue StandardError => e
       Tebako.packaging_error(115, e.message)
     end
@@ -148,12 +152,13 @@ module Tebako
       else
         process_gemfile_ruby_version_d(ruby_version, requirement)
       end
+      run_checks
     end
 
     def process_gemfile_ruby_version_d(ruby_version, requirement)
       current_version = Gem::Version.new(ruby_version)
       unless requirement.satisfied_by?(current_version)
-        raise Tebako::Error.new("Ruby version #{ruby_version} does not satisfy requirement #{ruby_v}", 116)
+        raise Tebako::Error.new("Ruby version #{ruby_version} does not satisfy requirement '#{requirement}'", 116)
       end
 
       @ruby_version = ruby_version