tebako 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0c260fa919b77603c20cc5db12e51595c0a0fd0da649dd6f64d2022bebc50dc
-  data.tar.gz: 1bd24a7fa0d74fb44b95f0b5f41f736323553725741327b130cfadc36cb45cb6
+  metadata.gz: edab24288967cc4085b927ef069adab649b24282a6cc320a595bc2b20cb636e9
+  data.tar.gz: 7964a2bcf62cf28d4cd34ee1f1744afe21980e934a4fa1a649f0b854b15b1ca3
 SHA512:
-  metadata.gz: 145fe0a5fe1cb275c21db9e9d4b9092e7c7b342ee43e232d1a6e61a5bc606c62329c9a6a0082843a8b7c017667fda09317c1faa2f3371687e5e64c4a49a176b2
-  data.tar.gz: 4708ff850fc763b41d7e1d8e84bee81d4c6a17f1653ac6f697f39e7146fe8acb60ca7922ac1ff7693086fae3f5216d82d83bd1cb97b596c9607769ce022c00f0
+  metadata.gz: 1a77dc3a2c810aad7597cab4a3d5a8f3c6378d2f9313e129edf17097700a0210eb9008b73bb5402921af53e5cccf450602865b4cc1518e5f8a2fd0e34e15163c
+  data.tar.gz: 40b417b5bb8e13e40618015d04f5f3c085bc08325d798bba5fb1cf6c43c0e44daef392755473f2110cb21c95134dcee24c6559933226eee0f41a5f9fc074d602

data/CMakeLists.txt

@@ -117,6 +117,7 @@ set(IS_MSYS OFF)
 set(IS_DARWIN OFF)
 set(RB_W32 OFF)
 set(FORCE_RUBY_PLATFORM "false")
+set(NOKOGIRI_OPTION "--no-use-system-libraries")
 set(RUBY_WITHOUT_EXT "dbm,win32,win32ole")
 set(RUBY_NAME "ruby")
 set(RUBY_SUFFIX "")
@@ -132,6 +133,7 @@ if("${OSTYPE_TXT}" MATCHES "^linux-musl.*")
 elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(IS_MSYS ON)
   set(FORCE_RUBY_PLATFORM "true")
+  set(NOKOGIRI_OPTION "--use-system-libraries")
   # set(DWARFS_PRELOAD ON)
   set(RB_W32 ON)
   set(RUBY_WITHOUT_EXT "dbm,syslog,pty,gdbm,readline")
@@ -368,6 +370,7 @@ 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 "libyaml Ruby option='${LIBYAML_RUBY_OPTION}'")
+message(STATUS "nokogiri build option='${NOKOGIRI_OPTION}'")
 
 ExternalProject_Add(${RUBY_PRJ}
   PREFIX ${DEPS}
@@ -438,7 +441,7 @@ else (${SETUP_MODE})
           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                       ${TBD}/bundle${BAT_SUFFIX} config set --local build.ffi --disable-system-libffi
           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                      ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri --use-system-libraries
+                                      ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri ${NOKOGIRI_OPTION}
           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
                                       ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
           COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_PRE_DIR} ${CMAKE_COMMAND} -E  env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
@@ -480,16 +483,16 @@ else (${SETUP_MODE})
        COMMAND test -f ${FS_ROOT}/${FS_ENTRANCE} ||
                   (${CMAKE_COMMAND} -E echo "Entry point ${FS_ROOT}/${FS_ENTRANCE} does not exist or is not accessible" &&
                    ${CMAKE_COMMAND} -E false )
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${TLD}
-       COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${TLD} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
-       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/bundle${BAT_SUFFIX} config set --local build.ffi --disable-system-libffi
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${TLD}
+        COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${FS_ROOT} -DTARGET_DIR=${TLD} -P ${CMAKE_SOURCE_DIR}/cmake/copy_dir.cmake
+        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                          ${TBD}/bundle${BAT_SUFFIX} config set --local build.ffi --disable-system-libffi
+        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                          ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri ${NOKOGIRI_OPTION}
+        COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
+                                          ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
         COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/bundle${BAT_SUFFIX} config set --local build.nokogiri --use-system-libraries
-       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/bundle${BAT_SUFFIX} config set --local force_ruby_platform ${FORCE_RUBY_PLATFORM}
-       COMMAND ${CMAKE_COMMAND} -E chdir ${TLD} ${CMAKE_COMMAND} -E env --unset=GEM_HOME --unset=GEM_PATH TEBAKO_PASS_THROUGH=1
-                                           ${TBD}/bundle${BAT_SUFFIX} install --jobs=${NCORES}
+                                          ${TBD}/bundle${BAT_SUFFIX} install --jobs=${NCORES}
 #       COMMAND_EXPAND_LISTS
 # [TODO] Open question - how to deploy a project to source filesystem
 #        ruby packer does bundle install --deployment --binstubs

data/README.adoc

@@ -119,7 +119,7 @@ apk --no-cache --upgrade add build-base cmake git bash autoconf boost-static   \
    brotli-static jemalloc-dev fmt-dev xz-static
 ----
 
-=== macOS 12 (Monterey)
+=== macOS 12 (Monterey) through macOS 14 (Sonoma)
 
 [source,sh]
 ----
@@ -211,6 +211,23 @@ gem install tebako
 gem install tebako
 ----
 
+=== Tebako Root Folder (aka Prefix) Selection
+
+The prefix in Tebako determines the base directory for the Tebako setup. It is an essential part of configuring how Tebako operates within your system.
+The selection of the prefix follows a specific order of precedence to ensure flexibility and ease of use:
+
+. *User-Specified Prefix*: The most direct way to set the root folder is by specifying it through an option. This can be done via command-line argument.
+
+. *Current Working Directory (PWD)*: If the prefix option is explicitly set to "PWD", Tebako uses the current working directory as Tebako root folder.
+
+. *Environment Variable (TEBAKO_PREFIX)*: In the absence of a user-specified option, Tebako looks for an environment variable named `TEBAKO_PREFIX`. If found, its value is used as the root folder.
+
+. *Default Value*: If no prefix is specified and the `TEBAKO_DIR` environment variable is not set, Tebako defaults to using a directory named `.tebako` in the user's home directory.
+
+
+Path Expansion: Regardless of the method used to set the prefix, Tebako expands the provided path to an absolute path. This expansion includes resolving relative paths based on the current working
+directory and expanding user directory shortcuts like `~`.
+
 ==== Press
 
 This command "presses" a Ruby project using the Tebako setup from the Tebako root
@@ -227,7 +244,7 @@ cmmands below.
 ----
 tebako press     \
   [-p|--prefix=<tebako-root-folder>] \
-  [-R|--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]   \
+  [-R|--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]   \
   -r|--root=<project-root-folder>     \
   -e|--entry-point=<entry-point>      \
   [-o|--output=<packaged file name>] \
@@ -236,10 +253,9 @@ tebako press     \
 
 Where:
 
-* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
-folder)
+* `<tebako-root-folder>`, the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
-* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.4)
+* `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
 
 * `<project-root>`, a folder at the host source file system where project files
 are located
@@ -284,8 +300,7 @@ tebako setup     \
 
 Where:
 
-* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
-folder)
+* `<tebako-root-folder>`, the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
 * `Ruby` parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
 
@@ -302,8 +317,7 @@ tebako clean \
 
 Where:
 
-* `<tebako-root-folder>`, the Tebako setup folder (optional, defaults to current
-folder)
+* `<tebako-root-folder>`, the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
 [example]
 ====
@@ -322,7 +336,7 @@ Normally you do not need to do it since tebako packager optimizes artifacts life
 ----
 tebako clean_ruby
   [-p|--prefix=<tebako-root-folder>]
-  [-R|--Ruby=<2.7.8|3.0.6|3.1.4|3.2.3>]
+  [-R|--Ruby=<2.7.8|3.0.7|3.1.4|3.1.5|3.1.6|3.2.3|3.2.4>]
 ----
 
 Where:

data/lib/tebako/cli_helpers.rb

@@ -115,10 +115,20 @@ module Tebako
                    end
     end
 
+    def handle_nil_prefix
+      env_prefix = ENV.fetch("TEBAKO_PREFIX", nil)
+      if env_prefix.nil?
+        puts "No prefix specified, using ~/.tebako"
+        File.expand_path("~/.tebako")
+      else
+        puts "Using TEBAKO_PREFIX environment variable as prefix"
+        File.expand_path(env_prefix)
+      end
+    end
+
     def prefix
       @prefix ||= if options["prefix"].nil?
-                    puts "No prefix specified, using ~/.tebako"
-                    File.expand_path("~/.tebako")
+                    handle_nil_prefix
                   elsif options["prefix"] == "PWD"
                     Dir.pwd
                   else

data/lib/tebako/version.rb

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

data/version.txt

@@ -1 +1 @@
-0.7.0
+0.7.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor