tebako 0.12.0 → 0.12.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78803d4ebbfe58cdf860a80c9ec60fe44a80e2d12bd695678a37c914f069948b
-  data.tar.gz: f13f3e254a4058044a7c84c03f07ebc3c5a07c3fc00eda1e4ced0e336326fa55
+  metadata.gz: 06e1e30ca9498fc820c4542d21d2538595cdda40a6e2ec11ca7e659cf08f719c
+  data.tar.gz: a557881dc9479db05f80619f0f5fddcd0c4750ca4e876729dfd56b2a73c03d0f
 SHA512:
-  metadata.gz: f76bd6166857ebf239218e3871136142a6c158a5d568f019eb374ea694b9af07d342378ee23e3e760063049b3e84048a42a92ed5b0dc420957898aef7679dd64
-  data.tar.gz: 15c95e6dcb0f746f4708548b5ceda202552fd2c9ed6461d4f814707ddb9c80d6d58fddf00791437a26142eb9db703f4d3017bb47f74f55afeb1a78fc6e78c585
+  metadata.gz: '02589f8549280219cbdfff069cca76d78f65b38ba2bcfce8f594bb068a2ef4258a356825e83154eed837c3ee0bb20dab48760e308421751f7275a928e47b52b8'
+  data.tar.gz: efa5b3bcd94ff118540fbce181669a93c72634abecb4d34b1352301ea4c59f09005ef3ab303f7b012b8931dc839759c95b68c3845770d85198ef5b57493b54c9

data/CMakeLists.txt

@@ -91,8 +91,6 @@ set(IS_MSYS OFF)
 set(IS_DARWIN OFF)
 set(RB_W32 OFF)
 set(RUBY_WITHOUT_EXT "dbm,win32,win32ole,-test-/*")
-set(RUBY_NAME "ruby")
-set(EXE_SUFFIX "")
 set(DWARFS_PRELOAD OFF)
 set(WITH_PATCHELF OFF)
 
@@ -108,7 +106,6 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
   set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline,-test-/*")
-  set(EXE_SUFFIX ".exe")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
   if(${RUBY_VER} VERSION_LESS "3.1.0")
@@ -162,7 +159,6 @@ if ("-${RUBY_VER}" STREQUAL "-" OR "-${RUBY_HASH}" STREQUAL "-")
   message(FATAL_ERROR "Ruby version is not specified")
 endif()
 
-set(RUBY_NAME ruby)
 set(RUBY_PRJ _ruby_${RUBY_VER})
 set(RUBY_SOURCE_DIR ${DEPS}/src/${RUBY_PRJ})
 set(RUBY_BINARY_DIR ${DEPS}/src/${RUBY_PRJ})
@@ -380,7 +376,6 @@ ExternalProject_Add(${RUBY_PRJ}
   COMMAND          ruby ${EXE}/tebako-packager pass1a ${RUBY_SOURCE_DIR}
   BUILD_COMMAND    make -j${NCORES}
   INSTALL_COMMAND  make install -j${NCORES}
-  COMMAND          ${GNU_BASH} -c "chmod +x ${DEPS_BIN_DIR}/mkdwarfs${EXE_SUFFIX}"
   COMMAND          ${GNU_BASH} -c "ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}"
 )
 

data/README.adoc

@@ -1131,15 +1131,6 @@ Here is a summary of the scenarios:
 | Any
 
 
-| 5
-| Rails project
-| Deploy project to packaged filesystem using `bundle install`
-| `<mount_point>/local/<entry_point base name>`
-| No
-| One
-| Any
-
-
 | Error
 | Error: Two or more `*.gem` files present
 | -

data/lib/tebako/cli.rb

@@ -53,7 +53,7 @@ module Tebako
                             desc: "tebako configuration file 'tebafile', '$PWD/.tebako.yml' by default"
     desc "clean", "Clean tebako packaging environment"
     def clean
-      (_, cm) = bootstrap
+      (_, cm) = bootstrap(clean: true)
       cm.clean_cache
     end
 
@@ -63,7 +63,7 @@ module Tebako
                          desc: "Ruby version to clean, all available versions by default"
     def clean_ruby
       puts "Cleaning Ruby sources from tebako packaging environment"
-      (om,) = bootstrap
+      (om,) = bootstrap(clean: true)
 
       suffix = options["Ruby"].nil? ? "" : "_#{options["Ruby"]}"
       nmr = "src/_ruby#{suffix}*"
@@ -139,11 +139,11 @@ module Tebako
     end
 
     no_commands do
-      def bootstrap
+      def bootstrap(clean: false)
         options_manager = Tebako::OptionsManager.new(options)
         cache_manager = Tebako::CacheManager.new(options_manager.deps, options_manager.source,
                                                  options_manager.output_folder)
-        cache_manager.version_cache_check unless options[:devmode]
+        cache_manager.version_cache_check unless options[:devmode] || clean
         [options_manager, cache_manager]
       end
 

data/lib/tebako/cli_helpers.rb

@@ -41,45 +41,52 @@ require_relative "packager_lite"
 module Tebako
   # Cli helpers
   module CliHelpers
+    WARN = <<~WARN
+
+      ******************************************************************************************************************
+      *                                                                                                                *
+      *  WARNING: You are packaging in-place, i.e.: tebako package will be placed inside application root.             *
+      *  It is not an error but we do not recommend it because it is a way to keep packaging old versions recrsively.  *
+      *                                                                                                                *
+      ******************************************************************************************************************
+
+    WARN
+
     def do_press(options_manager)
       scenario_manager = Tebako::ScenarioManager.new(options_manager.root, options_manager.fs_entrance)
       puts options_manager.press_announce(scenario_manager.msys?)
 
-      if options_manager.mode == "both" || options_manager.mode == "runtime" || options_manager.mode == "bundle"
-        do_press_runtime(options_manager, scenario_manager)
-      end
-
-      if options_manager.mode == "both" || options_manager.mode == "application"
-        do_press_application(options_manager, scenario_manager)
+      if options_manager.package_within_root?
+        puts WARN
+        sleep 5
       end
 
-      true
+      do_press_runtime(options_manager, scenario_manager)
+      do_press_application(options_manager, scenario_manager)
     end
 
     def do_press_application(options_manager, scenario_manager)
+      return unless %w[both application].include?(options_manager.mode)
+
       packager = Tebako::PackagerLite.new(options_manager, scenario_manager)
       packager.create_package
     end
 
     def do_press_runtime(options_manager, scenario_manager)
+      return unless %w[both runtime bundle].include?(options_manager.mode)
+
       generate_files(options_manager, scenario_manager)
-      cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=OFF #{options_manager.cfg_options} #{options_manager.press_options}"
-      build_cmd = "cmake --build #{options_manager.output_folder} --target tebako --parallel #{Etc.nprocessors}"
       merged_env = ENV.to_h.merge(options_manager.b_env)
-      Tebako.packaging_error(103) unless system(merged_env, cfg_cmd)
-      Tebako.packaging_error(104) unless system(merged_env, build_cmd)
-      true
+      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
 
     def do_setup(options_manager)
       puts "Setting up tebako packaging environment"
 
-      cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=ON #{options_manager.cfg_options}"
-      build_cmd = "cmake --build \"#{options_manager.output_folder}\" --target setup --parallel #{Etc.nprocessors}"
       merged_env = ENV.to_h.merge(options_manager.b_env)
-      Tebako.packaging_error(101) unless system(merged_env, cfg_cmd)
-      Tebako.packaging_error(102) unless system(merged_env, build_cmd)
-      true
+      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
 
     def generate_files(options_manager, scenario_manager)
@@ -91,7 +98,7 @@ module Tebako
       Tebako::Codegen.generate_tebako_fs_cpp(options_manager, scenario_manager)
       Tebako::Codegen.generate_deploy_rb(options_manager, scenario_manager)
 
-      return unless options_manager.mode == "both" || options_manager.mode == "runtime"
+      return unless %w[both runtime].include?(options_manager.mode)
 
       Tebako::Codegen.generate_stub_rb(options_manager)
     end
@@ -107,5 +114,21 @@ module Tebako
       puts e.message
       {}
     end
+
+    def press_build_cmd(options_manager)
+      "cmake --build #{options_manager.output_folder} --target tebako --parallel #{Etc.nprocessors}"
+    end
+
+    def press_cfg_cmd(options_manager)
+      "cmake -DSETUP_MODE:BOOLEAN=OFF #{options_manager.cfg_options} #{options_manager.press_options}"
+    end
+
+    def setup_build_cmd(options_manager)
+      "cmake --build \"#{options_manager.output_folder}\" --target setup --parallel #{Etc.nprocessors}"
+    end
+
+    def setup_cfg_cmd(options_manager)
+      "cmake -DSETUP_MODE:BOOLEAN=ON #{options_manager.cfg_options}"
+    end
   end
 end

data/lib/tebako/codegen.rb

@@ -62,12 +62,14 @@ module Tebako
       end
 
       def deploy_mk(opt, scm)
-        case opt.mode
-        when "bundle"
-          deploy_mk_bundle(opt, scm)
-        when /runtime|both/
-          deploy_mk_stub(opt)
-        end
+        <<~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
       end
 
       def deploy_mk_bundle(opt, scm)
@@ -79,6 +81,15 @@ 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}",
@@ -101,6 +112,7 @@ module Tebako
 
       def deploy_rq
         <<~SUBST
+          require "#{File.join(__dir__, "error.rb")}"
           require "#{File.join(__dir__, "package_descriptor.rb")}"
           require "#{File.join(__dir__, "packager.rb")}"
           require "#{File.join(__dir__, "ruby_version.rb")}"

data/lib/tebako/deploy_helper.rb

@@ -25,6 +25,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+# require "bundler"
 require "fileutils"
 require "find"
 
@@ -49,7 +50,7 @@ module Tebako
       @fs_entrance = fs_entrance
       @target_dir = target_dir
       @pre_dir = pre_dir
-      @verbose = ENV["VERBOSE"] == "yes" || ENV["VERBOSE"] == "true"
+      @verbose = %w[yes true].include?(ENV.fetch("VERBOSE", nil))
       @ncores = BuildHelpers.ncores
     end
 
@@ -92,7 +93,7 @@ module Tebako
 
       params = [@gem_command, "install", name.to_s]
       params.push("-v", ver.to_s) if ver
-      ["--no-document", "--install-dir", @tgd].each do |param|
+      ["--no-document", "--install-dir", @tgd, "--bindir", @tbd].each do |param|
         params.push(param)
       end
       BuildHelpers.run_with_capture_v(params)
@@ -141,11 +142,15 @@ module Tebako
     end
 
     def collect_and_deploy_gem(gemspec)
-      puts "   ... Collecting gem from gemspec #{gemspec}"
+      puts "   ... collecting gem from gemspec #{gemspec}"
 
       copy_files(@pre_dir)
 
       Dir.chdir(@pre_dir) do
+        # spec = Bundler.load_gemspec(gemspec)
+        # puts spec.executables.first unless spec.executables.empty?
+        # puts spec.bindir
+
         BuildHelpers.run_with_capture_v([@gem_command, "build", gemspec])
         install_all_gems_or_fail
       end
@@ -200,7 +205,7 @@ module Tebako
         begin
           FileUtils.cp_r(File.join(@fs_root, "."), dest)
         rescue StandardError
-          raise Tebako::Error.new("#{@fs_root} is not accessible or does not exist.", 107)
+          raise Tebako::Error.new("#{@fs_root} does not exist or is not accessible.", 107)
         end
         return
       end

data/lib/tebako/options_manager.rb

@@ -185,6 +185,15 @@ module Tebako
                    end
     end
 
+    def package_within_root?
+      package_path = Pathname.new(package.chomp("/"))
+      root_path = Pathname.new(root.chomp("/"))
+      package_path.ascend do |path|
+        return true if path == root_path
+      end
+      false
+    end
+
     def prefix
       @prefix ||= if @options["prefix"].nil?
                     handle_nil_prefix

data/lib/tebako/packager/patch_helpers.rb

@@ -91,8 +91,12 @@ module Tebako
           FileUtils.mkdir(dirname)
         end
 
-        def restore_and_save(fname)
-          raise Tebako::Error, "Could not save #{fname} because it does not exist." unless File.exist?(fname)
+        def restore_and_save(fname, strict: true)
+          unless File.exist?(fname)
+            return unless strict
+
+            raise Tebako::Error, "Could not save #{fname} because it does not exist."
+          end
 
           old_fname = "#{fname}.old"
           if File.exist?(old_fname)
@@ -102,9 +106,9 @@ module Tebako
           FileUtils.cp(fname, old_fname)
         end
 
-        def restore_and_save_files(files, ruby_source_dir)
+        def restore_and_save_files(files, ruby_source_dir, strict: true)
           files.each do |fname|
-            restore_and_save "#{ruby_source_dir}/#{fname}"
+            restore_and_save("#{ruby_source_dir}/#{fname}", strict: strict)
           end
         end
 

data/lib/tebako/packager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2021-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -43,25 +43,29 @@ module Tebako
   # Tebako packaging support (internal)
   module Packager
     FILES_TO_RESTORE = %w[
-      main.c
+      common.mk
+      configure
+      config.status
       dir.c
       dln.c
       file.c
-      io.c
-      tool/mkconfig.rb
       gem_prelude.rb
-    ].freeze
-
-    FILES_TO_RESTORE_MSYS = %w[
+      io.c
+      main.c
+      Makefile
       ruby.c
-      win32/file.c
-    ].freeze
-    # Do not need to restore cygwin/GNUmakefile.in
-    # because it is patched (differently) both on pass 1 and pass2
-    # cygwin/GNUmakefile.in
-
-    FILES_TO_RESTORE_MUSL = %w[
       thread_pthread.c
+      util.c
+      ext/bigdecimal/bigdecimal.h
+      ext/Setup
+      cygwin/GNUmakefile.in
+      include/ruby/onigmo.h
+      lib/rubygems/openssl.rb
+      lib/rubygems/path_support.rb
+      template/Makefile.in
+      tool/mkconfig.rb
+      win32/winmain.c
+      win32/file.c
     ].freeze
 
     class << self
@@ -108,6 +112,7 @@ module Tebako
 
       def mkdwarfs(deps_bin_dir, data_bin_file, data_src_dir, descriptor = nil)
         puts "-- Running mkdwarfs script"
+        FileUtils.chmod("a+x", Dir.glob(File.join(deps_bin_dir, "mkdwarfs*")))
         params = [File.join(deps_bin_dir, "mkdwarfs"), "-o", data_bin_file, "-i", data_src_dir, "--no-progress"]
         params << "--header" << descriptor if descriptor
         BuildHelpers.run_with_capture_v(params)
@@ -117,16 +122,14 @@ module Tebako
       # Executed before Ruby build, patching ensures that Ruby itself is linked statically
       def pass1(ostype, ruby_source_dir, mount_point, src_dir, ruby_ver)
         puts "-- Running pass1 script"
-
         PatchHelpers.recreate(src_dir)
-        patch = crt_pass1_patch(ostype, mount_point, ruby_ver)
-        do_patch(patch.patch_map, ruby_source_dir)
 
-        # Roll back pass1a, pass2 patches
+        # Roll all known patches
         # Just in case we are recovering after some error
-        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir)
-        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MUSL, ruby_source_dir) if ostype =~ /linux-musl/
-        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE_MSYS, ruby_source_dir) if ostype =~ /msys/
+        PatchHelpers.restore_and_save_files(FILES_TO_RESTORE, ruby_source_dir, strict: false)
+
+        patch = crt_pass1_patch(ostype, mount_point, ruby_ver)
+        do_patch(patch.patch_map, ruby_source_dir)
       end
 
       # Pass1A

data/lib/tebako/stripper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2024-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -36,7 +36,8 @@ module Tebako
   module Stripper
     DELETE_EXTENSIONS = %w[o lo obj a la lib].freeze
     BIN_FILES = %w[
-      bundle bundler rbs erb gem irb racc racc2y rake rdoc ri y2racc rdbg typeprof
+      bundle bundler rbs erb gem irb racc racc2y
+      rake rdoc ri y2racc rdbg syntax_suggest typeprof
     ].freeze
     CMD_SUFFIX = ".cmd"
     BAT_SUFFIX = ".bat"
@@ -44,8 +45,6 @@ module Tebako
     class << self
       # Strip
       # Removes build artefacts, strip shared objects
-      # [TODO] We probably need debug option/flag to say whether we shall delete ruby binaries
-      #        from memfs or not. For debugging purposes it is very handy to have it here
       def strip(scm, src_dir)
         puts "   ... stripping the output"
         strip_bs(src_dir)

data/lib/tebako/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2025 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Tebako
-  VERSION = "0.12.0"
+  VERSION = "0.12.2.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.2.rc1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -243,9 +243,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.19
 signing_key: