tebako 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 947ddeae8f5a9459277f7c6e254a91f51fc918814d0fa6cf29b746b4920a70b5
-  data.tar.gz: f4a69bc6c2bc30472ab3671eb95b24c41c3e335d946b91014b7f9566c5744fb9
+  metadata.gz: '032183c7c687a30c7ae3d9619a05ebddca242795f0f82a675909d8be6172b1b7'
+  data.tar.gz: '08d41f73148e4df92dd8da6500a0e006ead6d88e4896a265019d958945633bf8'
 SHA512:
-  metadata.gz: 756c567674b257ffa0f3ba8f6633084350ab3719d5f532404cc0c2303f952f77fe1f6ad08a741bb68ffb2e8a91e1d5b4c9c24839f833ab3beda18da10d5adcb4
-  data.tar.gz: 9ad9dccb6509c33bf3403f3aada58270d29784912f1850934dd5ffc44f8cd124f028940bccbe8d01e5d2d60fda20e6cb95372ddb2984d9163150c0ac7a9dd153
+  metadata.gz: 4416ed5d575a79a1d9c3f6d7639bb6430311da5c64aede123bcc63216aea4c2f391f40b4257f11a110a33969c6ae1439277ed688a93774ca2113e65ee9985c1e
+  data.tar.gz: 3116d78993775081a86120b51bac0ea7a21d763a147976cd1838df65447cc8af0f03d8214bb4b5ee15ff5a9a6a65d226cbd336f599b78f1af9e06da838a468ea

data/CMakeLists.txt

@@ -201,8 +201,7 @@ set(DEPS_LIB_DIR ${DEPS}/lib)
 set(DEPS_BIN_DIR ${DEPS}/bin)
 set(DEPS_SBIN_DIR ${DEPS}/sbin)
 
-set(PATCHES ${CMAKE_CURRENT_SOURCE_DIR}/patches)
-set(LIB ${CMAKE_CURRENT_SOURCE_DIR}/lib/tebako)
+set(EXE ${CMAKE_CURRENT_SOURCE_DIR}/exe)
 
 # Project resources that are used during CMake configuration stage
 set(DATA_RES_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/resources)
@@ -450,7 +449,7 @@ ExternalProject_Add(${RUBY_PRJ}
   DOWNLOAD_NO_PROGRESS true
   SOURCE_DIR ${RUBY_SOURCE_DIR}
   BUILD_IN_SOURCE true
-  PATCH_COMMAND ruby ${LIB}/packager.rb pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
+  PATCH_COMMAND ruby ${EXE}/tebako-packager pass1 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${FS_MOUNT_POINT} ${DATA_SRC_DIR} ${RUBY_VER}
   CONFIGURE_COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION}      \
                                                         --enable-bundled-libyaml              \
                                                         --without-gmp                         \
@@ -465,7 +464,7 @@ ExternalProject_Add(${RUBY_PRJ}
                                                         LDFLAGS=\"${RUBY_L_FLAGS}\""
   BUILD_COMMAND    make ${RUBY_MAKEFILE}
   INSTALL_COMMAND  make ${RUBY_MAKEFILE} install
-  COMMAND          ruby ${LIB}/packager.rb pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}
+  COMMAND          ruby ${EXE}/tebako-packager pass2 ${OSTYPE_TXT} ${RUBY_SOURCE_DIR} ${DEPS_LIB_DIR} ${DATA_SRC_DIR} ${RUBY_STASH_DIR} ${RUBY_VER}
 )
 
 add_dependencies(${RUBY_PRJ} ${DWARFS_WR_PRJ})
@@ -497,7 +496,7 @@ else (${SETUP_MODE})
   list(LENGTH GEMS     GLENGTH)
 
   add_custom_target(clean_filesystem
-      COMMAND ruby ${LIB}/packager.rb deploy ${RUBY_STASH_DIR} ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR}
+      COMMAND ruby ${EXE}/tebako-packager deploy ${RUBY_STASH_DIR} ${DATA_SRC_DIR} ${DATA_PRE_DIR} ${DATA_BIN_DIR}
       DEPENDS ${RUBY_PRJ}
   )
   if(GSLENGTH GREATER 0)

data/README.adoc

@@ -5,8 +5,8 @@ image:https://github.com/tamatebako/tebako/actions/workflows/alpine.yml/badge.sv
 image:https://github.com/tamatebako/tebako/actions/workflows/macos.yml/badge.svg["MacOS amd64", link="https://github.com/tamatebako/tebako/actions/workflows/macos.yml"]
 image:https://github.com/tamatebako/tebako/actions/workflows/lint.yml/badge.svg["lint", link="https://github.com/tamatebako/tebako/actions/workflows/lint.yml"]
 
-image:https://api.cirrus-ci.com/github/tamatebako/tebako.svg?branch=main&task=ubuntu-aarch64["Ubuntu aarch64", link="https://cirrus-ci.com/github/tamatebako/tebako"]
 image:https://api.cirrus-ci.com/github/tamatebako/tebako.svg?branch=main&task=macos-arm64["MacOS arm64", link="https://cirrus-ci.com/github/tamatebako/tebako"]
+image:https://api.cirrus-ci.com/github/tamatebako/tebako.svg?branch=main&task=ubuntu-aarch64["Ubuntu aarch64", link="https://cirrus-ci.com/github/tamatebako/tebako"]
 
 == Purpose
 

data/exe/tebako

@@ -26,6 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require_relative "../lib/cli"
+require_relative "../lib/tebako"
+require_relative "../lib/tebako/cli"
 
-Tebako::TebakoCli.start
+Tebako::Cli.start

data/exe/tebako-packager

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Copyright (c) 2023 [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 "../lib/tebako/packager"
+
+begin
+  unless ARGV.length.positive?
+    raise Tebako::Error, "tebako-packager needs at least 1 argument (command), none has been provided."
+  end
+
+  case ARGV[0]
+  when "pass1"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- OSTYPE
+    #       ARGV[2] -- RUBY_SOURCE_DIR
+    #       ARGV[3] -- FS_MOUNT_POINT
+    #       ARGV[4] -- DATA_SRC_DIR
+    #       ARGV[5] -- RUBY_VER
+    unless ARGV.length == 6
+      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])
+  when "stash"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- DATA_SRC_DIR
+    #       ARGV[2] -- RUBY_STASH_DIR
+    unless ARGV.length == 3
+      raise Tebako::Error,
+            "tebako-packager stash command expects 3 arguments, #{ARGV.length} has been provided."
+    end
+
+    Tebako::Packager.stash(ARGV[1], ARGV[2])
+  when "pass2"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- OSTYPE
+    #       ARGV[2] -- RUBY_SOURCE_DIR
+    #       ARGV[3] -- DEPS_LIB_DIR
+    #       ARGV[4] -- DATA_SRC_DIR
+    #       ARGV[5] -- RUBY_STASH_DIR
+    #       ARGV[6] -- RUBY_VER
+    unless ARGV.length == 7
+      raise Tebako::Error,
+            "tebako-packager pass2 command expects 7 arguments, #{ARGV.length} has been provided."
+    end
+
+    Tebako::Packager.stash(ARGV[4], ARGV[5])
+    Tebako::Packager.pass2(ARGV[1], ARGV[2], ARGV[3], ARGV[6])
+  when "deploy"
+    #       ARGV[0] -- command
+    #       ARGV[1] -- FS_STASH_DIR
+    #       ARGV[2] -- DATA_SRC_DIR
+    #       ARGV[3] -- DATA_PRE_DIR
+    #       ARGV[4] -- DATA_BIN_DIR
+    unless ARGV.length == 5
+      raise Tebako::Error,
+            "tebako-packager deploy command expects 5 arguments, #{ARGV.length} has been provided."
+    end
+    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4])
+  else
+    raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
+  end
+rescue Tebako::Error => e
+  puts "tebako-packager failed: #{e.message} [#{e.error_code}]"
+  exit(e.error_code)
+end
+
+exit(0)

data/lib/tebako/cli.rb

@@ -32,14 +32,13 @@ require "yaml"
 
 require_relative "cli_helpers"
 require_relative "error"
-require_relative "version"
 
 # Tebako - an executable packager
 # Implementation of tebako command-line interface
 module Tebako
   OPTIONS_FILE = ".tebako.yml"
   # Tebako packager front-end
-  class TebakoCli < Thor
+  class Cli < Thor
     package_name "Tebako"
     class_option :prefix, type: :string, aliases: "-p", required: false,
                           desc: "A path to tebako packaging environment, '~/.tebako' ('$HOME/.tebako') by default"
@@ -64,7 +63,7 @@ module Tebako
     def press
       puts press_announce
       do_press
-    rescue TebakoError => e
+    rescue Tebako::Error => e
       puts "Tebako script failed: #{e.message} [#{e.error_code}]"
       exit e.error_code
     end
@@ -76,7 +75,7 @@ module Tebako
     def setup
       puts "Setting up tebako packaging environment"
       do_setup
-    rescue TebakoError => e
+    rescue Tebako::Error => e
       puts "Tebako script failed: #{e.message} [#{e.error_code}]"
       exit e.error_code
     end
@@ -92,7 +91,6 @@ module Tebako
         return original_options unless File.exist?(OPTIONS_FILE)
 
         defaults = ::YAML.load_file(OPTIONS_FILE) || {}
-        puts defaults.merge(original_options)
         Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
       end
 

data/lib/tebako/cli_helpers.rb

@@ -36,7 +36,7 @@ require_relative "version"
 # Tebako - an executable packager
 # Command-line interface methods
 module Tebako
-  # TebakoCli methods
+  # Cli methods
   module CliHelpers
     def b_env
       u_flags = if RbConfig::CONFIG["host_os"] =~ /darwin/
@@ -72,8 +72,10 @@ module Tebako
     def extend_ruby_version
       version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
       unless RUBY_VERSIONS.key?(version)
-        raise TebakoError.new "Ruby version #{version} is not supported yet, exiting",
-                              253
+        raise Tebako::Error.new(
+          "Ruby version #{version} is not supported yet, exiting",
+          253
+        )
       end
 
       @extend_ruby_version ||= [version, RUBY_VERSIONS[version]]
@@ -87,6 +89,7 @@ module Tebako
                    end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def m_files
       @m_files ||= case RbConfig::CONFIG["host_os"]
                    when /linux/, /darwin/
@@ -94,9 +97,13 @@ module Tebako
                    when /msys/
                      "Ninja"
                    else
-                     raise TebakoError.new "#{RbConfig::CONFIG["host_os"]} is not supported yet, exiting", 254
+                     raise Tebako::Error.new(
+                       "#{RbConfig::CONFIG["host_os"]} is not supported yet, exiting",
+                       254
+                     )
                    end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def output
       @output ||= File.join(prefix, "output")
@@ -120,7 +127,7 @@ module Tebako
     def packaging_error(code)
       msg = PACKAGING_ERRORS[code]
       msg = "Unknown packaging error" if msg.nil?
-      raise TebakoError.new msg, code
+      raise Tebako::Error.new msg, code
     end
 
     def prefix

data/lib/tebako/error.rb

@@ -29,7 +29,7 @@
 # Tebako error class
 module Tebako
   # Tebako error class
-  class TebakoError < StandardError
+  class Error < StandardError
     def initialize(msg = "Unspecified error", code = 255)
       @error_code = code
       super(msg)

data/lib/tebako/packager/pass1.rb

@@ -27,128 +27,130 @@
 
 # Tebako - an executable packager
 module Tebako
-  # Ruby patching definitions (pass1)
-  module Pass1
-    TOOL_RBINSTALL_RB_PATCH = {
-      "    next if files.empty?" => "# tebako patched    next if files.empty?"
-    }.freeze
-
-    RUBYGEM_OPENSSL_RB_PATCH = {
-      'autoload :OpenSSL, "openssl"' => "require \"openssl\"\nautoload :OpenSSL, \"openssl\""
-    }.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
-
-    CONFIGURE_PATCH = {
-      "EXTDLDFLAGS=\"-bundle_loader '\\$(BUILTRUBY)'\"" => ""
-    }.freeze
-
-    class << self
-      def get_patch_map(ostype, mount_point, ruby_ver)
-        patch_map = {
-          # ....................................................
-          # 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)
-          "tool/rbinstall.rb" => TOOL_RBINSTALL_RB_PATCH,
+  module Packager
+    # Ruby patching definitions (pass1)
+    module Pass1
+      TOOL_RBINSTALL_RB_PATCH = {
+        "    next if files.empty?" => "# tebako patched    next if files.empty?"
+      }.freeze
+
+      RUBYGEM_OPENSSL_RB_PATCH = {
+        'autoload :OpenSSL, "openssl"' => "require \"openssl\"\nautoload :OpenSSL, \"openssl\""
+      }.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
+
+      CONFIGURE_PATCH = {
+        "EXTDLDFLAGS=\"-bundle_loader '\\$(BUILTRUBY)'\"" => ""
+      }.freeze
+
+      class << self
+        def get_patch_map(ostype, mount_point, ruby_ver)
+          patch_map = {
+            # ....................................................
+            # 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)
+            "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
+          }
           # ....................................................
-          # 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,
+          # Fixing (bypassing) configure script bug where a variable is used before initialization
+          patch_map.store("configure", CONFIGURE_PATCH) if ostype =~ /darwin/
 
           # ....................................................
-          # Allow only packaged gems (from within memfs)
-          "lib/rubygems/path_support.rb" => rubygems_path_support_patch(mount_point),
+          # 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[0] == "3"
 
-          # ....................................................
-          # Disable dynamic extensions
-          "ext/Setup" => EXT_SETUP_PATCH
-        }
-        # ....................................................
-        # Fixing (bypassing) configure script bug where a variable is used before initialization
-        patch_map.store("configure", 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[0] == "3"
-
-        patch_map
-      end
+          patch_map
+        end
 
-      private
+        private
 
-      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 --
+        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
+          SUBST
+        end
 
-      def rubygems_path_support_patch_two(mount_point)
-        <<~SUBST
+        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
+              @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
-          # -- End of tebako patch --
+            # -- End of tebako patch --
 
-        SUBST
-      end
+          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)
-        }
+        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