tebako 0.10.0 → 0.12.0

data/lib/tebako/ruby_version.rb

@@ -37,15 +37,17 @@ module Tebako
       "3.1.6" => "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22",
       "3.2.4" => "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692",
       "3.2.5" => "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16",
+      "3.2.6" => "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370",
       "3.3.3" => "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2",
       "3.3.4" => "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34",
-      "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196"
+      "3.3.5" => "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196",
+      "3.3.6" => "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d",
+      "3.4.1" => "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f"
     }.freeze
 
     MIN_RUBY_VERSION_WINDOWS = "3.1.6"
-    DEFAULT_RUBY_VERSION = "3.2.5"
+    DEFAULT_RUBY_VERSION = "3.2.6"
 
-    # rub_ver version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
     def initialize(ruby_version)
       @ruby_version = ruby_version.nil? ? DEFAULT_RUBY_VERSION : ruby_version
 
@@ -76,6 +78,10 @@ module Tebako
       @ruby33 ||= ruby3x? && @ruby_version[2].to_i >= 3
     end
 
+    def ruby34?
+      @ruby34 ||= ruby3x? && @ruby_version[2].to_i >= 4
+    end
+
     def api_version
       @api_version ||= "#{@ruby_version.split(".")[0..1].join(".")}.0"
     end

data/lib/tebako/scenario_manager.rb

@@ -35,7 +35,7 @@ module Tebako
   class ScenarioManager
     def initialize(fs_root, fs_entrance)
       initialize_root(fs_root)
-      initialize_entry_point(fs_entrance)
+      initialize_entry_point(fs_entrance || "stub.rb")
     end
 
     attr_reader :fs_entry_point, :fs_mount_point, :fs_entrance

data/lib/tebako/version.rb

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

data/src/tebako-main.cpp

@@ -53,9 +53,20 @@
 #include <tebako/tebako-version.h>
 #include <tebako/tebako-main.h>
 #include <tebako/tebako-fs.h>
-#include <tebako/tebako-cmdline-helpers.h>
+#include <tebako/tebako-cmdline.h>
 
 static int running_miniruby = 0;
+static tebako::cmdline_args* args = nullptr;
+static std::vector<char> package;
+
+static void tebako_clean(void)
+{
+  unmount_root_memfs();
+  if (args) {
+    delete args;
+    args = nullptr;
+  }
+}
 
 extern "C" int tebako_main(int* argc, char*** argv)
 {
@@ -70,26 +81,41 @@ extern "C" int tebako_main(int* argc, char*** argv)
     running_miniruby = -1;
   }
   else {
+    std::string mount_point = tebako::fs_mount_point;
+    std::string entry_point = tebako::fs_entry_point;
+    std::optional<std::string> cwd;
+    if (tebako::package_cwd != nullptr) {
+      cwd = tebako::package_cwd;
+    }
+    const void* data = &gfsData[0];
+    size_t size = gfsSize;
+
     try {
-      fsret = mount_root_memfs(&gfsData[0], gfsSize, tebako::fs_log_level, nullptr, nullptr, nullptr, nullptr, nullptr);
+      args = new tebako::cmdline_args(*argc, (const char**)*argv);
+      args->parse_arguments();
+      if (args->with_application()) {
+        args->process_package();
+        auto descriptor = args->get_descriptor();
+        package = std::move(args->get_package());
+        if (descriptor.has_value()) {
+          mount_point = descriptor->get_mount_point().c_str();
+          entry_point = descriptor->get_entry_point().c_str();
+          cwd = descriptor->get_cwd();
+          data = package.data();
+          size = package.size();
+        }
+      }
 
+      fsret = mount_root_memfs(data, size, tebako::fs_log_level, nullptr, nullptr, nullptr, nullptr, "auto");
       if (fsret == 0) {
-        if ((*argc > 1) && strcmp((*argv)[1], "--tebako-extract") == 0) {
-          ret = tebako::build_arguments_for_extract(argc, argv, tebako::fs_mount_point);
-        }
-        else {
-          auto [mountpoints, parsed_argv] = tebako::parse_arguments(*argc, *argv);
-          // for (auto& mp : mountpoints) {
-          // printf("Mountpoint: %s\n", mp.c_str());
-          // }
-          tebako::process_mountpoints(mountpoints);
-          std::tie(*argc, *argv) = tebako::build_arguments(parsed_argv, tebako::fs_mount_point, tebako::fs_entry_point);
-          ret = 0;
-        }
+        args->process_mountpoints();
+        args->build_arguments(mount_point.c_str(), entry_point.c_str());
+        *argc = args->get_argc();
+        *argv = args->get_argv();
+        ret = 0;
+        atexit(tebako_clean);
       }
-      atexit(unmount_root_memfs);
     }
-
     catch (std::exception e) {
       printf("Failed to process command line: %s\n", e.what());
     }
@@ -99,9 +125,9 @@ extern "C" int tebako_main(int* argc, char*** argv)
       ret = -1;
     }
 
-    if (tebako::package_cwd != nullptr) {
-      if (tebako_chdir(tebako::package_cwd) != 0) {
-        printf("Failed to chdir to '%s' : %s\n", tebako::package_cwd, strerror(errno));
+    if (cwd.has_value()) {
+      if (tebako_chdir(cwd->c_str()) != 0) {
+        printf("Failed to chdir to '%s' : %s\n", cwd->c_str(), strerror(errno));
         ret = -1;
       }
     }
@@ -110,17 +136,7 @@ extern "C" int tebako_main(int* argc, char*** argv)
   if (ret != 0) {
     try {
       printf("Tebako initialization failed\n");
-      if (new_argv) {
-        delete new_argv;
-        new_argv = nullptr;
-      }
-      if (argv_memory) {
-        delete argv_memory;
-        argv_memory = nullptr;
-      }
-      if (fsret == 0) {
-        unmount_root_memfs();
-      }
+      tebako_clean();
     }
     catch (...) {
       // Nested error, no recovery :(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,6 +162,7 @@ files:
 - exe/tebako-packager
 - include/tebako/tebako-fs.h
 - include/tebako/tebako-main.h
+- include/tebako/tebako-prism.h
 - lib/tebako.rb
 - lib/tebako/build_helpers.rb
 - lib/tebako/cache_manager.rb
@@ -171,15 +172,18 @@ files:
 - lib/tebako/deploy_helper.rb
 - lib/tebako/error.rb
 - lib/tebako/options_manager.rb
+- lib/tebako/package_descriptor.rb
 - lib/tebako/packager.rb
-- lib/tebako/packager/pass1.rb
-- lib/tebako/packager/pass1a.rb
+- lib/tebako/packager/pass1_patch.rb
+- lib/tebako/packager/pass1a_patch.rb
 - lib/tebako/packager/pass2.rb
+- lib/tebako/packager/patch.rb
 - lib/tebako/packager/patch_buildsystem.rb
 - 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/packager_lite.rb
 - lib/tebako/ruby_builder.rb
 - lib/tebako/ruby_version.rb
 - lib/tebako/scenario_manager.rb

data/lib/tebako/packager/pass1.rb

@@ -1,242 +0,0 @@
-# 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_helpers"
-require_relative "patch_buildsystem"
-
-# Tebako - an executable packager
-module Tebako
-  module Packager
-    # Ruby patching definitions (pass1)
-    module Pass1
-      # [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
-
-      EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH = {
-        "#include \"ruby/ruby.h\"" => <<~SUBST
-          #include "ruby/ruby.h"
-
-          /* -- Start of tebako patch -- */
-          #ifndef HAVE_RB_SYM2STR
-          #define HAVE_RB_SYM2STR  1
-          #endif
-
-          #ifndef HAVE_RB_ARRAY_CONST_PTR
-          #define HAVE_RB_ARRAY_CONST_PTR 1
-          #endif
-
-          #ifndef HAVE_RB_RATIONAL_NUM
-          #define HAVE_RB_RATIONAL_NUM 1
-          #endif
-
-          #ifndef HAVE_RB_RATIONAL_DEN
-          #define HAVE_RB_RATIONAL_DEN 1
-          #endif
-
-          #ifndef HAVE_RB_COMPLEX_REAL
-          #define HAVE_RB_COMPLEX_REAL
-          #endif
-
-          #ifndef HAVE_RB_COMPLEX_IMAG
-          #define HAVE_RB_COMPLEX_IMAG
-          #endif
-          /* -- End of tebako patch -- */
-
-        SUBST
-      }.freeze
-
-      # The logic for statically linked extensions is broken entirely in the latest Ruby versions.
-      # The code below looks reasonble - we do not set -bundle_loader when building with -with-static-ext option
-      # However Gems bundled with Ruby just ignore with-static-ext option and build extensions as shared libraries
-      # So  the -bundler_loader option is required for them to link.
-      # It is strange that it is disabled in any case because this option does not create any issues for static
-      # libraries.
-      # ---------------------------------------------------
-      # elif test "x$EXTSTATIC" = x
-      # then :
-      #
-      #                            # When building exts as bundles, a mach-o bundle needs to know its loader
-      #                            # program to bind symbols from the ruby executable
-      #                            EXTDLDFLAGS="-bundle_loader '\$(BUILTRUBY)'"
-
-      DARWIN_CONFIGURE_PATCH = {
-        "elif test \"x$EXTSTATIC\" = x" => "elif true"
-      }.freeze
-
-      OPENSSL_EXTCONF_RB_SUBST = <<~SUBST
-        # Start of tebako patch
-        $defs.push("-DRUBY_EXPORT=1")
-        # End of tebako patch
-
-        Logging::message "=== Checking done. ===\\n"
-      SUBST
-
-      OPENSSL_EXTCONF_RB_PATCH = {
-        "Logging::message \"=== Checking done. ===\\n\"" => OPENSSL_EXTCONF_RB_SUBST
-      }.freeze
-
-      class << self
-        def get_base_patch_map(mount_point)
-          {
-            # ....................................................
-            # It won't install gems with no files defined in spec
-            # However if
-            #   -- we are installing a default gem from extension
-            #   -- extension is build statically
-            #  there may be no files install in addition to spec
-            # Example: io/wait extension (and others)
-            # [TODO]  Check if it is still required
-            # No match and patching on Ruby 3.1.4 but works wo issues
-            "tool/rbinstall.rb" => TOOL_RBINSTALL_RB_PATCH,
-
-            # ....................................................
-            # This is something that I cannnot explain
-            # (this patch does not seem related to static compilation)
-            "ext/bigdecimal/bigdecimal.h" => EXT_BIGDECIMAL_BIGDECIMAL_H_PATCH,
-
-            # ....................................................
-            # Allow only packaged gems (from within memfs)
-            "lib/rubygems/path_support.rb" => rubygems_path_support_patch(mount_point),
-
-            # ....................................................
-            # Disable dynamic extensions
-            "ext/Setup" => EXT_SETUP_PATCH
-          }
-        end
-
-        def get_patch_map(ostype, mount_point, ruby_ver)
-          patch_map = get_base_patch_map(mount_point)
-
-          # ....................................................
-          patch_map.store("configure", DARWIN_CONFIGURE_PATCH) if ostype =~ /darwin/
-
-          # ....................................................
-          # 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 ruby_ver.ruby3x?
-
-          if ostype =~ /msys/
-            # ....................................................
-            # Generate export definitions; use WinMain to build rubyw.exe
-            patch_map.store("cygwin/GNUmakefile.in", get_gnumakefile_in_patch_p1(ruby_ver))
-            # ....................................................
-            # RUBY_EXPORT=1 (shall be set for static builds but is missing in openssl extension)
-            patch_map.store("ext/openssl/extconf.rb", OPENSSL_EXTCONF_RB_PATCH)
-          end
-
-          patch_map
-        end
-
-        private
-
-        include Tebako::Packager::PatchLiterals
-        include Tebako::Packager::PatchBuildsystem
-
-        def get_gnumakefile_in_patch_p1(ruby_ver) # rubocop:disable Metrics/MethodLength
-          objext = ruby_ver.ruby32? ? "$(OBJEXT)" : "@OBJEXT@"
-          {
-            "  DLLWRAP += -mno-cygwin" =>
-              "# tebako patched  DLLWRAP += -mno-cygwin",
-
-            "$(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 \\",
-
-            "--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)" =>
-              "--export-all $(LIBRUBY_A) $(LIBS) -o program-stub.exe   # tebako patched",
-
-            "@rm -f $(PROGRAM)" =>
-              "@rm -f program-stub.exe   # tebako patched",
-
-            "	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)" =>
-             "# tebako patched  $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)",
-
-            "RUBYDEF = $(DLL_BASE_NAME).def" => GNUMAKEFILE_IN_WINMAIN_SUBST
-          }
-        end
-
-        def rubygems_path_support_patch_one(mount_point)
-          <<~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(mount_point)
-          <<~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(mount_point)
-          {
-            '  @home = env["GEM_HOME"] || Gem.default_dir' => rubygems_path_support_patch_one(mount_point),
-            '  @path = split_gem_path env["GEM_PATH"], @home' => rubygems_path_support_patch_two(mount_point)
-          }
-        end
-      end
-    end
-  end
-end