tebako 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97effadb1d79ead536d7307438fce1d4e41b352c9f202e34f6d37986f350215d
-  data.tar.gz: c01f702f67e2bec7a2224ebc73aea1e0d583922936707c973e86cdb59cafea9a
+  metadata.gz: b93ceda3b8a6329b0a332f3ebfbf4c24ff030eda6c1727109623a98bbf868eae
+  data.tar.gz: 78e53009d65e1841a8c706b3be9fcbe17f7976864d23e5f70bf07357f3f2701f
 SHA512:
-  metadata.gz: 32f7c455cb6c3784cfd1892b06541c639dd43e9cc34711e40cfad0aabc0bad9b71e51046bf06acc5eb0ad5ed72614eed90f76357d310ce7aaaadc79158a2f561
-  data.tar.gz: ba76a9795e68cd101d68dd5f0824ab73bd3afee6fe717194b46d83c3a670ac57102bc63b06cd15b49516cfaaa5b4a77ac3f7949b99b386fdd295d16e5ac8d15b
+  metadata.gz: c256ed82865bea01ac84c9c5bc33f7ef0c99df2d143eb78ac1f6b486492d42affb10fe14f590665a7a00b2c397ae57d9ba7cd3c52b6742b5740965340eeb1c77
+  data.tar.gz: 2d5dd78d7ccdf95f06b7453b4939ebc81e759242fbf37259edd95e598901adc6a5af6828cf1c57c081c7c7f487c6a4609e3f1c8d2b59e070a5be0869448781f1

data/CMakeLists.txt

@@ -63,23 +63,6 @@ else(MINGW)
   set(FS_CURRENT ${FS_CURRENT_RAW})
 endif(MINGW)
 
-# External dependencies
-# ---------------------------------------------------------------------------------------------------
-# DwarFS dependencies:
-#        ronn binutils-dev libarchive-dev libevent-dev libjemalloc-dev acl-dev \
-#        libdouble-conversion-dev libiberty-dev liblz4-dev liblzma-dev libssl-dev \
-#        libboost-context-dev libboost-filesystem-dev libboost-program-options-dev \
-#        libboost-regex-dev libboost-system-dev libboost-thread-dev \
-#        libunwind-dev libdwarf-dev libelf-dev libfmt-dev libfuse3-dev libgoogle-glog-dev \
-#        bison flex fuse3 pkg-config libsodium-dev
-# ---------------------------------------------------------------------------------------------------
-# Ruby dependencies:
-#        libffi-dev libgdbm-dev libyaml-dev libncurses-dev libreadline-dev
-# ---------------------------------------------------------------------------------------------------
-# For Rails testing only:
-#        libsqlite3-dev
-# ---------------------------------------------------------------------------------------------------
-
 set(RUBY_DEBUG_BUILD OFF)
 
 include(ExternalProject)
@@ -90,8 +73,6 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/macos-environment.cmake)
 include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/msys-environment.cmake)
 include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/def-external-project.cmake)
 
-include(${CMAKE_SOURCE_DIR}/cmake/def_tty_colours.cmake)
-
 option(SETUP_MODE "Tebako setup" OFF)
 if(NOT LOG_LEVEL)
   set(LOG_LEVEL "error")
@@ -102,7 +83,7 @@ set(START_WITH_PACKAGED_FILESYSTEM OFF CACHE BOOL "Start workflow from 'packaged
 if (NOT ${SETUP_MODE})
   message("Running tebako press script")
   if (${START_WITH_PACKAGED_FILESYSTEM})
-    message("${ColourBoldRed}*** Starting workflow from 'packaged filesystem' target ***${ColourReset}")
+    message("*** Starting workflow from 'packaged filesystem' target ***")
   endif(${START_WITH_PACKAGED_FILESYSTEM})
 
   if ("-${ROOT}" STREQUAL "-")
@@ -191,6 +172,12 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(RUBY_MAKEFILE "--file=GNUmakefile")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
+  if(${RUBY_VER} VERSION_LESS "3.2.0")
+    set(OPENSSL_VER "1.1")
+  else(${RUBY_VER} VERSION_LESS "3.2.0")
+    set(OPENSSL_VER "3")
+  endif(${RUBY_VER} VERSION_LESS "3.2.0")
+  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
 endif()
 
 # Various locations for external projects
@@ -210,8 +197,8 @@ set(DATA_RES_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/resources)
 # External projects
 
 if ("-${RUBY_VER}" STREQUAL "-" OR "-${RUBY_HASH}" STREQUAL "-")
-  set(RUBY_VER "3.0.6")
-  set(RUBY_HASH "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e")
+  set(RUBY_VER "3.1.4")
+  set(RUBY_HASH "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6")
   message(STATUS "Using default Ruby version ${RUBY_VER}")
 endif()
 
@@ -232,12 +219,8 @@ if(IS_MSYS)
   include(${CMAKE_SOURCE_DIR}/tools/cmake-scripts/setup-openssl.cmake)
 endif(IS_MSYS)
 
-if(WITH_OPENSSL_BUILD)
-  def_ext_prj_g(OPENSSL "1.1.1s")
-endif(WITH_OPENSSL_BUILD)
-
 def_ext_prj_g(INCBIN "348e36b")
-def_ext_prj_g(DWARFS_WR "v0.3.4")
+def_ext_prj_g(DWARFS_WR "v0.3.5")
 
 if (DEFINED ENV{BUNDLER_VER})
  set(BUNDLER_VER $ENV{BUNDLER_VER})
@@ -255,6 +238,11 @@ else()
   set(WITH_NCURSES_BUILD OFF)
 endif()
 
+set(LIBYAML_RUBY_OPTION "")
+if(${RUBY_VER} VERSION_LESS "3.2.0")
+  set(LIBYAML_RUBY_OPTION "--enable-bundled-libyaml")
+endif(${RUBY_VER} VERSION_LESS "3.2.0")
+
 message("Configuration summary:")
 message(STATUS "ruby: v${RUBY_VER} at ${RUBY_SOURCE_DIR}")
 message(STATUS "bundler version: ${BUNDLER_VER} (${BUNDLER_ANNOTATION})")
@@ -267,6 +255,7 @@ if(WITH_NCURSES_BUILD)
 else()
   message(STATUS "ncurses: ${_LIBNCURSES}")
 endif(WITH_NCURSES_BUILD)
+
 message(STATUS "incbin: @${INCBIN_TAG} at ${INCBIN_SOURCE_DIR}")
 message(STATUS "dwarfs with tebako wrapper: @${DWARFS_WR_TAG} at ${DWARFS_WR_SOURCE_DIR}")
 
@@ -318,6 +307,7 @@ ExternalProject_Add(${INCBIN_PRJ}
    PREFIX ${DEPS}
    GIT_REPOSITORY https://github.com/graphitemaster/incbin.git
    GIT_TAG ${INCBIN_TAG}
+   BUILD_IN_SOURCE true
    CONFIGURE_COMMAND ""
    BUILD_COMMAND ""
    INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INCLUDE_DIR}/incbin
@@ -424,9 +414,9 @@ endif()
 set(C_FLAGS_DEST cppflags)
 
 if(IS_DARWIN)
-  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BUILD_BREW_PREFIX}/include -I/opt/openssl@1.1/include -I${BUILD_BREW_PREFIX}/opt/zlib/include")
-  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/lib -L${BUILD_BREW_PREFIX}/opt/openssl@1.1/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib")
-  set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@1.1")
+  string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BUILD_BREW_PREFIX}/opt/zlib/include -I${BUILD_BREW_PREFIX}/include")
+  string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib  -L${BUILD_BREW_PREFIX}/lib")
+  set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
   set(C_FLAGS_DEST cflags)
 endif(IS_DARWIN)
 
@@ -440,7 +430,8 @@ endif(RB_W32)
 
 message(STATUS "Ruby build ${C_FLAGS_DEST}='${RUBY_C_FLAGS}'")
 message(STATUS "Ruby build LDFLAGS='${RUBY_L_FLAGS}'")
-message(STATUS "Openssl Ruby option='${OPENSSL_RUBY_OPTION}'")
+message(STATUS "openssl Ruby option='${OPENSSL_RUBY_OPTION}'")
+message(STATUS "libyaml Ruby option='${LIBYAML_RUBY_OPTION}'")
 
 ExternalProject_Add(${RUBY_PRJ}
   PREFIX ${DEPS}
@@ -450,8 +441,7 @@ ExternalProject_Add(${RUBY_PRJ}
   SOURCE_DIR ${RUBY_SOURCE_DIR}
   BUILD_IN_SOURCE true
   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              \
+  CONFIGURE_COMMAND ${GNU_BASH} -c "${RUBY_SOURCE_DIR}/configure  ${OPENSSL_RUBY_OPTION} ${LIBYAML_RUBY_OPTION} \
                                                         --without-gmp                         \
                                                         --disable-dtrace                      \
                                                         --disable-debug-env                   \
@@ -496,7 +486,7 @@ else (${SETUP_MODE})
   list(LENGTH GEMS     GLENGTH)
 
   add_custom_target(clean_filesystem
-      COMMAND ruby ${EXE}/tebako-packager 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} ${TBD} ${TGD}
       DEPENDS ${RUBY_PRJ}
   )
   if(GSLENGTH GREATER 0)

data/README.adoc

@@ -40,9 +40,11 @@ The Tebako packager is tested on the following platforms:
 == Supported Ruby versions
 
 The Tebako packager supports the following versions of Ruby for packaging:
+
 * 2.7.7
 * 3.0.6
 * 3.1.4
+* 3.2.2
 
 Support of specific version including minor release requires some effort, sometimes extensive
 but our goal is to be able to package all maintained Ruby releases.
@@ -88,13 +90,11 @@ apt-get install -y binutils-dev libarchive-dev libevent-dev libjemalloc-dev acl-
 
 === General
 
-Just clone this repository, install Ruby bundle and run `tebako setup` as follows.
+Tebako is distributed as a Ruby gem
 
 [source,sh]
 ----
-git clone https://github.com/tamatebako/tebako
-bundle install
-tebako/exe/tebako setup
+gem install tebako
 ----
 
 === Quick setup on Ubuntu 20.04 on Docker
@@ -122,9 +122,6 @@ apt-get install -y software-properties-common
 add-apt-repository -y ppa:ubuntu-toolchain-r/test
 apt-get install -y gcc-9 g++-9
 
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9
-update-alternatives --set gcc /usr/bin/gcc-9
-
 apt-get install -y curl git ruby ruby-dev pkg-config bison flex make autoconf
 curl https://apt.kitware.com/kitware-archive.sh | bash
 apt-get install -y cmake
@@ -134,14 +131,10 @@ apt-get install -y binutils-dev libarchive-dev libevent-dev libjemalloc-dev acl-
   libboost-context-dev libboost-filesystem-dev libboost-program-options-dev \
   libboost-regex-dev libboost-system-dev libboost-thread-dev \
   libunwind-dev libdwarf-dev libelf-dev libfuse-dev libgoogle-glog-dev \
-  libffi-dev libgdbm-dev libyaml-dev libncurses-dev libreadline-dev \
-  libsqlite3-dev
+  libffi-dev libgdbm-dev libyaml-dev libncurses-dev libreadline-dev libfmt-dev
 
-apt-get install -y libfmt-dev
+gem install tebako
 
-git clone https://github.com/tamatebako/tebako
-bundle install
-tebako/exe/tebako setup
 ----
 
 == Usage
@@ -167,14 +160,14 @@ itself takes minutes.
 You can manage setup of packaging environment manually; please refer to description of setup and clean
 cmmands below.
 
-[source,sh]
+[source]
 ----
-<install-folder>/exe/tebako press     \
-  [-p |--prefix=<tebako-root-folder>] \
-  [-R | --Ruby=<2.7.7|3.0.6|3.1.4>]   \
+tebako press     \
+  [-p|--prefix=<tebako-root-folder>] \
+  [-R|--Ruby=<2.7.7|3.0.6|3.1.4|3.2.2>]   \
   -r|--root=<project-root-folder>     \
   -e|--entry-point=<entry-point>      \
-  [-o |--output=<packaged file name>] \
+  [-o|--output=<packaged file name>] \
   [-l|--log-level=<error|warn|debug|trace>]
 ----
 
@@ -200,7 +193,7 @@ point base name`)
 ====
 [source,sh]
 ----
-exe/tebako press \
+tebako press \
   --root='~/projects/myproject' \
   --entry=start.rb \
   --output=/temp/myproject.tebako
@@ -217,11 +210,11 @@ directories differ and nultiple Ruby versions within single configuration
 This command is optional, tebako creates packaging environment automatically upon the first
 invocation of press command.
 
-[source,sh]
+[source]
 ----
-<install-folder>/exe/tebako setup     \
+tebako setup     \
   [-p |--prefix=<tebako-root-folder>] \
-  [-R | --Ruby=<2.7.7|3.0.6|3.1.4>]
+  [-R |--Ruby=<2.7.7|3.0.6|3.1.4|3.2.2>]
 ----
 
 Where:
@@ -229,34 +222,66 @@ Where:
 * `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
 folder)
 
-* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.0.6)
-
-
+* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.4)
 
 ==== Clean
 
 This command deletes tebako artifacts created by setup and press commands.
 Normally you do not need to do it since tebako packager optimizes artifacts lifecycle on its own.
 
+[source]
+----
+tebako clean \
+  [-p|--prefix=<tebako-root-folder>]
+----
+
+Where:
+
+* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
+folder)
+
+[example]
+====
 [source,sh]
 ----
-exe/tebako press \
-  [-p |--prefix=<tebako-root-folder>]
+tebako clean --prefix='~/.tebako'
+----
+====
+
+==== Clean ruby
+
+This command deletes tebako Ruby artifacts created by setup and press commands. Dwarfs libraries are not cleaned.
+Normally you do not need to do it since tebako packager optimizes artifacts lifecycle on its own.
+
+[source]
+----
+tebako clean_ruby
+  [-p|--prefix=<tebako-root-folder>]
+  [-R|--Ruby=<2.7.7|3.0.6|3.1.4|3.2.2>]
 ----
 
 Where:
 
 * `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
 folder)
+* `Ruby` parameter defines Ruby version that will cleaned (optional, cleans all versions by default)
 
 [example]
 ====
 [source,sh]
 ----
-exe/tebako clean --root='~/projects/myproject'
+tebako clean_ruby --prefix='~/.tebako'
 ----
 ====
 
+==== Build script hash
+Hash command will calculate tebako script hash that may be used as a cache key in CI/CD environment like GitHub Actions
+
+[source]
+----
+tebako hash
+----
+
 === Exit codes
 
 [cols,"a,a"]

data/Rakefile

@@ -36,7 +36,7 @@ desc "Generate version.txt"
 task "generate_version_txt" do
   require_relative "lib/tebako/version"
   File.write(File.join(__dir__, "version.txt"), "#{Tebako::VERSION}\n")
-  puts "Generate version.txt #{Tebako::VERSION} ==> #{File.join(__dir__, "version.txt")}"
+  puts "Generating version.txt #{Tebako::VERSION} --> #{File.join(__dir__, "version.txt")}"
 end
 
 task build: :generate_version_txt

data/common.env

@@ -1,6 +1,6 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.3.4
+DWARFS_WR_TAG=v0.3.5
 BUNDLER_VER=2.3.22
-RUBY_VER=3.0.6
+RUBY_VER=3.1.4

data/exe/tebako-packager

@@ -78,11 +78,13 @@ begin
     #       ARGV[2] -- DATA_SRC_DIR
     #       ARGV[3] -- DATA_PRE_DIR
     #       ARGV[4] -- DATA_BIN_DIR
-    unless ARGV.length == 5
+    #       ARGV[5] -- TARGET_BIN_DIR (TBD)
+    #       ARGV[6] -- TARGET_GEM_DIR (TGD)
+    unless ARGV.length == 7
       raise Tebako::Error,
-            "tebako-packager deploy command expects 5 arguments, #{ARGV.length} has been provided."
+            "tebako-packager deploy command expects 7 arguments, #{ARGV.length} has been provided."
     end
-    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4])
+    Tebako::Packager.deploy(ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5])
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"
   end

data/lib/tebako/cli.rb

@@ -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 "digest"
 require "fileutils"
 require "thor"
 require "yaml"
@@ -49,6 +50,28 @@ module Tebako
       FileUtils.rm_rf([deps, output], secure: true)
     end
 
+    desc "clean_ruby", "Clean Ruby source from tebako packaging environment"
+    method_option :Ruby, type: :string, aliases: "-R", required: false,
+                         enum: Tebako::CliHelpers::RUBY_VERSIONS.keys,
+                         desc: "Ruby version to clean, all available versions by default"
+    def clean_ruby
+      puts "Cleaning Ruby sources from tebako packaging environment"
+      if options["Ruby"].nil?
+        nmr = "#{deps}/src/_ruby_*"
+        nms = "#{deps}/stash_*"
+      else
+        nmr = "#{deps}/src/_ruby_#{options["Ruby"]}*"
+        nms = "#{deps}/stash_#{options["Ruby"]}"
+      end
+      FileUtils.rm_rf(Dir.glob(nmr), secure: true)
+      FileUtils.rm_rf(Dir.glob(nms), secure: true)
+    end
+
+    desc "hash", "Print build script hash (ci cache key)"
+    def hash
+      print Digest::SHA256.hexdigest File.read File.join(__dir__, "../..", "CMakeLists.txt")
+    end
+
     desc "press", "Press tebako image"
     method_option :"entry-point", type: :string, aliases: ["-e", "--entry"], required: true,
                                   desc: "Ruby application entry point"

data/lib/tebako/cli_helpers.rb

@@ -63,11 +63,11 @@ module Tebako
     RUBY_VERSIONS = {
       "2.7.7" => "e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90",
       "3.0.6" => "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e",
-      "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6"
-      #      "3.2.2" => "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc"
+      "3.1.4" => "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6",
+      "3.2.2" => "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc"
     }.freeze
 
-    DEFAULT_RUBY_VERSION = "3.0.6"
+    DEFAULT_RUBY_VERSION = "3.1.4"
 
     def extend_ruby_version
       version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]

data/lib/tebako/packager/pass1.rb

@@ -25,6 +25,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+require_relative "patch_helpers"
+
 # Tebako - an executable packager
 module Tebako
   module Packager
@@ -111,7 +113,7 @@ module Tebako
           # ....................................................
           # 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.store("lib/rubygems/openssl.rb", RUBYGEM_OPENSSL_RB_PATCH) if PatchHelpers.ruby3x?(ruby_ver)
 
           patch_map
         end