tebako 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573cd1ec24b37fafbebc82a0a8a11a4a1c05e22b6feeba1af89dc8670923c5e2
-  data.tar.gz: 03d3c8f200d209a6b419960f76f499c4ccad0a0b726cf8ba85a780fb6c6d3aa4
+  metadata.gz: b93ceda3b8a6329b0a332f3ebfbf4c24ff030eda6c1727109623a98bbf868eae
+  data.tar.gz: 78e53009d65e1841a8c706b3be9fcbe17f7976864d23e5f70bf07357f3f2701f
 SHA512:
-  metadata.gz: 5a362b80444f6288964158034d58fd4e86749127f173d0f4d30445790d4a86481467b3b82e75a4d7398729633bdb537f0f146ff168d5893db57f155d0d16776c
-  data.tar.gz: 3da8e9e840d4bbf72f28c6b4e3b4c75bcdc076da51c000ef2e9a2d63121b8a694154be279d787694ee9728961e045a98e4f919740112c36579104b7d3565291e
+  metadata.gz: c256ed82865bea01ac84c9c5bc33f7ef0c99df2d143eb78ac1f6b486492d42affb10fe14f590665a7a00b2c397ae57d9ba7cd3c52b6742b5740965340eeb1c77
+  data.tar.gz: 2d5dd78d7ccdf95f06b7453b4939ebc81e759242fbf37259edd95e598901adc6a5af6828cf1c57c081c7c7f487c6a4609e3f1c8d2b59e070a5be0869448781f1

data/CMakeLists.txt

@@ -73,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")
@@ -85,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 "-")
@@ -174,7 +172,12 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(RUBY_MAKEFILE "--file=GNUmakefile")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
-  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@1.1")
+  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
@@ -217,7 +220,7 @@ if(IS_MSYS)
 endif(IS_MSYS)
 
 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})
@@ -411,11 +414,6 @@ endif()
 set(C_FLAGS_DEST cppflags)
 
 if(IS_DARWIN)
-  if(${RUBY_VER} VERSION_LESS "3.2.2")
-    set(OPENSSL_VER "1.1")
-  else(${RUBY_VER} VERSION_LESS "3.2.2")
-    set(OPENSSL_VER "3")
-  endif(${RUBY_VER} VERSION_LESS "3.2.2")
   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}")
@@ -488,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/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.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/packager/pass2.rb

@@ -34,18 +34,8 @@ module Tebako
     # Ruby patching definitions (pass2)
     module Pass2
       class << self
-        def get_dir_c_patch(ostype)
-          dir_c_patch = patch_c_file(ostype =~ /msys/ ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST")
-          dir_c_patch.merge!(DIR_C_BASE_PATCH)
-        end
-
         def get_patch_map(ostype, deps_lib_dir, ruby_ver)
-          patch_map = {
-            "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
-            "main.c" => MAIN_C_PATCH,
-            "tool/mkconfig.rb" => TOOL_MKCONFIG_RB_PATCH,
-            "dir.c" => get_dir_c_patch(ostype)
-          }
+          patch_map = get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
 
           C_FILES_TO_PATCH.each { |patch| patch_map.store(patch[0], patch_c_file(patch[1])) }
           patch_map.store("thread_pthread.c", LINUX_MUSL_THREAD_PTHREAD_PATCH) if ostype =~ /linux-musl/
@@ -58,6 +48,21 @@ module Tebako
 
         include Tebako::Packager::PatchLiterals
 
+        def get_dir_c_patch(ostype)
+          dir_c_patch = patch_c_file(ostype =~ /msys/ ? "/* define system APIs */" : "#ifdef HAVE_GETATTRLIST")
+          dir_c_patch.merge!(DIR_C_BASE_PATCH)
+        end
+
+        def get_patch_map_base(ostype, deps_lib_dir, ruby_ver)
+          {
+            "template/Makefile.in" => template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver),
+            "main.c" => MAIN_C_PATCH,
+            "tool/mkconfig.rb" => TOOL_MKCONFIG_RB_PATCH,
+            "gem_prelude.rb" => GEM_PRELUDE_RB_PATCH,
+            "dir.c" => get_dir_c_patch(ostype)
+          }
+        end
+
         def process_brew_libs!(libs, brew_libs)
           brew_libs.each { |lib| libs << "#{PatchHelpers.get_prefix(lib[0]).chop}/lib/lib#{lib[1]}.a " }
         end
@@ -73,16 +78,12 @@ module Tebako
           SUBST
         end
 
-        def yaml_reference(ruby_ver)
-          PatchHelpers.ruby32?(ruby_ver) ? "-l:libyaml.a" : ""
-        end
-
         def linux_gnu_libs(ruby_ver)
           <<~SUBST
             -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -l:libfolly.a -l:libfsst.a -l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a \
             -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a -l:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
             -l:libzstd.a -l:libgdbm.a -l:libreadline.a -l:libtinfo.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:libcrypt.a -l:libanl.a -l:liblzma.a \
-            #{yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
+            #{PatchHelpers.yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
           SUBST
         end
 
@@ -91,7 +92,7 @@ module Tebako
             -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -l:libfolly.a -l:libfsst.a -l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a \
             -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a -l:libiberty.a -l:libacl.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
             -l:libzstd.a -l:libgdbm.a -l:libreadline.a -l:libffi.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:libcrypt.a -l:liblzma.a \
-            #{yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
+            #{PatchHelpers.yaml_reference(ruby_ver)} -l:libboost_system.a -l:libstdc++.a -l:librt.a -ldl -lpthread
           SUBST
         end
 
@@ -100,7 +101,7 @@ module Tebako
             -l:libtebako-fs.a -l:libdwarfs-wr.a -l:libdwarfs.a -l:libfolly.a -l:libfsst.a -l:libmetadata_thrift.a -l:libthrift_light.a -l:libxxhash.a \
             -l:libfmt.a -l:libdouble-conversion.a -l:libglog.a -l:libgflags.a -l:libevent.a -l:libssl.a -l:libcrypto.a -l:liblz4.a -l:libz.a \
             -l:libzstd.a -l:libffi.a -l:libgdbm.a -l:libncurses.a -l:libjemalloc.a -l:libunwind.a -l:liblzma.a -l:libiberty.a \
-            #{yaml_reference(ruby_ver)} -l:libstdc++.a -l:libdl.a -lole32 -loleaut32 -luuid
+            #{PatchHelpers.yaml_reference(ruby_ver)} -l:libstdc++.a -l:libdl.a -lole32 -loleaut32 -luuid
           SUBST
         end
 
@@ -138,14 +139,7 @@ module Tebako
         end
 
         def template_makefile_in_patch(ostype, deps_lib_dir, ruby_ver)
-          base_patch = {
-            "LIBS = @LIBS@ $(EXTLIBS)" => <<~SUBST
-              # -- Start of tebako patch --
-              LIBS = $(MAINLIBS) @LIBS@
-              # -- End of tebako patch --
-            SUBST
-          }
-          base_patch.merge!(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
+          base_patch = TEMPLATE_MAKEFILE_IN_BASE_PATCH_ONE.merge(mlibs_subst(ostype, deps_lib_dir, ruby_ver))
           base_patch.merge!(template_makefile_in_patch_two(ruby_ver))
         end
 

data/lib/tebako/packager/patch_helpers.rb

@@ -52,6 +52,10 @@ module Tebako
         def ruby32?(ruby_ver)
           ruby3x?(ruby_ver) && ruby_ver[2].to_i >= 2
         end
+
+        def yaml_reference(ruby_ver)
+          ruby32?(ruby_ver) ? "-l:libyaml.a" : ""
+        end
       end
     end
   end

data/lib/tebako/packager/patch_literals.rb

@@ -168,6 +168,14 @@ module Tebako
         ["dln.c", "static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;"]
       ].freeze
 
+      TEMPLATE_MAKEFILE_IN_BASE_PATCH_ONE = {
+        "LIBS = @LIBS@ $(EXTLIBS)" => <<~SUBST
+          # -- Start of tebako patch --
+          LIBS = $(MAINLIBS) @LIBS@
+          # -- End of tebako patch --
+        SUBST
+      }.freeze
+
       TEMPLATE_MAKEFILE_IN_BASE_PATTERN_TWO_PRE_3_1 =
         "\t\t$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) " \
         "$(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@"
@@ -199,6 +207,20 @@ module Tebako
         /* -- End of tebako patch -- */
       SUBST
 
+      GEM_PRELUDE_RB_PATCH = {
+        "if defined?(DidYouMean)" => <<~SUBST
+          if defined?(DidYouMean)
+
+          # -- Start of tebako patch --
+          begin
+            require 'tebako-runtime'
+          rescue LoadError
+            warn "'tebako-runtime' was not loaded."
+          end
+          # -- End of tebako patch --
+        SUBST
+      }.freeze
+
       MSYS_PATCHES = {
         "ruby.c" => {
           "#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))" =>

data/lib/tebako/packager.rb

@@ -42,6 +42,7 @@ module Tebako
       file.c
       io.c
       tool/mkconfig.rb
+      gem_prelude.rb
     ].freeze
 
     FILES_TO_RESTORE_MSYS = %w[
@@ -55,6 +56,12 @@ module Tebako
       thread_pthread.c
     ].freeze
 
+    DEPLOY_ENV = {
+      "GEM_HOME" => nil,
+      "GEM_PATH" => nil,
+      "TEBAKO_PASS_THROUGH" => "1"
+    }.freeze
+
     class << self
       # Pass1
       # Executed before Ruby build, patching ensures that Ruby itself is linked statically
@@ -83,7 +90,7 @@ module Tebako
       # Saves pristine Ruby environment that is used to deploy applications for packaging
       def stash(src_dir, stash_dir)
         puts "-- Running stash script"
-        #  .... this code snippet is executed 'outdside' of Ruby scripts
+        #  .... this code snippet is executed 'outside' of Ruby scripts
         # shall be reconsidered
         #    FileUtils.cd ruby_source_dir do
         #        puts "   ... creating pristine ruby environment at #{src_dir} [patience, it will take some time]"
@@ -98,18 +105,40 @@ module Tebako
       end
 
       # Deploy
-      # To be extended
-      # Now it just recreates Ruby prostine environment from stash
-      def deploy(stash_dir, src_dir, pre_dir, bin_dir)
+      def deploy(stash_dir, src_dir, pre_dir, bin_dir, tbd)
         puts "-- Running deploy script"
 
         puts "   ... creating packaging environment at #{src_dir}"
         recreate([src_dir, pre_dir, bin_dir])
         FileUtils.cp_r "#{stash_dir}/.", src_dir
+
+        install_gem tbd, "tebako-runtime"
       end
 
       private
 
+      def install_gem(tbd, name)
+        puts "   ... installing #{name} gem"
+        with_env(DEPLOY_ENV) do
+          out, st = Open3.capture2e("#{tbd}/gem", "install", name.to_s, "--no-doc")
+          raise Tebako::Error, "Failed to install #{name} (#{st}):\n #{out}" unless st.exitstatus.zero?
+        end
+      end
+
+      def do_patch(patch_map, root)
+        patch_map.each { |fname, mapping| patch_file("#{root}/#{fname}", mapping) }
+      end
+
+      def patch_file(fname, mapping)
+        raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
+
+        puts "   ... patching #{fname}"
+        restore_and_save(fname)
+        contents = File.read(fname)
+        mapping.each { |pattern, subst| contents.sub!(pattern, subst) }
+        File.open(fname, "w") { |file| file << contents }
+      end
+
       def recreate(dirname)
         FileUtils.rm_rf(dirname, noop: nil, verbose: nil, secure: true)
         FileUtils.mkdir(dirname)
@@ -132,18 +161,20 @@ module Tebako
         end
       end
 
-      def patch_file(fname, mapping)
-        raise Tebako::Error, "Could not patch #{fname} because it does not exist." unless File.exist?(fname)
-
-        puts "   ... patching #{fname}"
-        restore_and_save(fname)
-        contents = File.read(fname)
-        mapping.each { |pattern, subst| contents.sub!(pattern, subst) }
-        File.open(fname, "w") { |file| file << contents }
-      end
-
-      def do_patch(patch_map, root)
-        patch_map.each { |fname, mapping| patch_file("#{root}/#{fname}", mapping) }
+      # Sets up temporary environment variables and yields to the
+      # block. When the block exits, the environment variables are set
+      # back to their original values.
+      def with_env(hash)
+        old = {}
+        hash.each do |k, v|
+          old[k] = ENV.fetch(k, nil)
+          ENV[k] = v
+        end
+        begin
+          yield
+        ensure
+          hash.each { |k, _v| ENV[k] = old[k] }
+        end
       end
     end
   end

data/lib/tebako/version.rb

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

data/version.txt

@@ -1 +1 @@
-0.5.3
+0.5.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -57,7 +57,6 @@ files:
 - bin/console
 - bin/setup
 - cmake/copy_dir.cmake
-- cmake/def_tty_colours.cmake
 - common.env
 - exe/tebako
 - exe/tebako-packager

data/cmake/def_tty_colours.cmake

@@ -1,19 +0,0 @@
-if(NOT WIN32)
-  string(ASCII 27 Escape)
-  set(ColourReset       "${Escape}[m")
-  set(ColourBold        "${Escape}[1m")
-  set(ColourRed         "${Escape}[31m")
-  set(ColourGreen       "${Escape}[32m")
-  set(ColourYellow      "${Escape}[33m")
-  set(ColourBlue        "${Escape}[34m")
-  set(ColourMagenta     "${Escape}[35m")
-  set(ColourCyan        "${Escape}[36m")
-  set(ColourWhite       "${Escape}[37m")
-  set(ColourBoldRed     "${Escape}[1;31m")
-  set(ColourBoldGreen   "${Escape}[1;32m")
-  set(ColourBoldYellow  "${Escape}[1;33m")
-  set(ColourBoldBlue    "${Escape}[1;34m")
-  set(ColourBoldMagenta "${Escape}[1;35m")
-  set(ColourBoldCyan    "${Escape}[1;36m")
-  set(ColourBoldWhite   "${Escape}[1;37m")
-endif()