tebako 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91362403f264faf856ec42bf6eb6d8411a595ba037e8d102132147301975f4b1
-  data.tar.gz: 559b3f4aa269c5b0d0b271ebce87046f591adf229afb51a2f5715ac184b2e3de
+  metadata.gz: d3ce7f498e5f82482a720d99b95c4f5e405c595f4ded4d5dffa5ac3030679530
+  data.tar.gz: 7fb7a07898f02dad4bcffe7f058c142311f6c9873dfb1accb460cd9442390064
 SHA512:
-  metadata.gz: 40d38a252bd29670656293ba1d5beb9bf166159a15380e2e8862448d0312146364882bb441c20891d53aa9742ff07c918f3ff2bb5bb1963b7978392376eb8ea4
-  data.tar.gz: 91228cf1d10a6392b0725418eacfb35a00f982f8a111ed95811c37353a10720f7e786bc169036e41f335faf38e148caf7cdb63410b0fa025bdbf032401b481c5
+  metadata.gz: e089f8dc1edd455cb028b3ca888285b260df832228296891167bc248f2e39df650696b031c7201db0f2115e26242f2edfada4045dec1d42e82e8635cf01dd57d
+  data.tar.gz: 632d3337eae51876bfa9bf48a77d33a80e16b86439c66f0b406a7cf3bcb004d7f18f8a9f46bb858f8bc76cda2565078ea9883a5f1d1279ef6e3c80ff3f2808e0

data/CMakeLists.txt

@@ -194,7 +194,7 @@ string(SUBSTRING ${RUBY_VER} 0 3 RUBY_VER_BASE)
 string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
 
 #if(DWARFS_PRELOAD)
-#  def_ext_prj_t(LIBDWARFS_WR "0.5.5" "7bf8e5b4432f35b65f6034f614067c2018995c1bebaf935e8cdddc1a3e045c01")
+#  def_ext_prj_t(LIBDWARFS_WR "0.5.8" "7bf8e5b4432f35b65f6034f614067c2018995c1bebaf935e8cdddc1a3e045c01")
 #
 #  string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1;\\2;\\3" LIBDWARFS_WR_VER_COMPONENTS ${LIBDWARFS_WR_VER})
 #
@@ -203,7 +203,7 @@ string(CONCAT RUBY_API_VER ${RUBY_VER_BASE} ".0")
 #  list(GET LIBDWARFS_WR_VER_COMPONENTS 2 LIBDWARFS_WR_VER_PATCH)
 #  set (LIBDWARFS_WR_VER_M ${LIBDWARFS_WR_VER_MAJOR}.${LIBDWARFS_WR_VER_MINOR}.${LIBDWARFS_WR_VER_PATCH})
 #else(DWARFS_PRELOAD)
-def_ext_prj_g(DWARFS_WR "v0.5.7")
+def_ext_prj_g(DWARFS_WR "v0.5.8")
 #endif(DWARFS_PRELOAD)
 
 set(LIBYAML_RUBY_OPTION "")

data/Gemfile

@@ -29,7 +29,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in tebako.gemspec
 gemspec
-gem "hoe"
-gem "minitest"
-gem "rubocop", "~> 1.52"
-gem "rubocop-rubycw"

data/README.adoc

@@ -10,7 +10,8 @@ Platform tests on Cirrus:
 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"]
 
 Quality:
-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://github.com/tamatebako/tebako/actions/workflows/lint-and-rspec.yml/badge.svg["lint and rspec", link="https://github.com/tamatebako/tebako/actions/workflows/lint-and-rspec.yml"]
+image:https://codecov.io/gh/tamatebako/tebako/graph/badge.svg?token=XD3emQ5qsY["Tebako cli rspec coverage", link="https://codecov.io/gh/tamatebako/tebako"]
 
 == Purpose
 
@@ -86,8 +87,8 @@ with debug information unstripped. You can opt to run 'strip -S' manually, it mo
 
 | 2.7.8 | Linux, macOS
 | 3.0.7 | Linux, macOS
-| 3.1.{4,5,6} | Linux, macOS, Windows
-| 3.2.{3,4} | Linux, macOS, Windows
+| 3.1.6 | Linux, macOS, Windows
+| 3.2.4 | Linux, macOS, Windows
 | 3.3.{3,4} | Linux, macOS, Windows
 
 |===
@@ -232,8 +233,6 @@ Displays the Tebako version.
 Displays the help message.
 
 
-
-
 == Usage
 
 === General
@@ -291,9 +290,6 @@ docker run -v <application_folder>:/mnt/w \
   tebako {command} {parameters}
 ----
 
-
-
-
 ==== Packaging from outside the container
 
 To package your application from outside the container, just run a single Docker
@@ -659,7 +655,8 @@ tebako press \
   [-R|--Ruby=<ruby-version>] \
   [-o|--output=<packaged-file-name>] \
   [-l|--log-level=<error|warn|debug|trace>] \
-  [-D|--devmode]
+  [-D|--devmode] \
+  [-t|--tebafile=<path-to-tebafile>]
 ----
 
 Where:
@@ -668,7 +665,7 @@ Where:
 the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
 `Ruby`::
-This parameter defines Ruby version that will be packaged (optional, defaults to
+this parameter defines Ruby version that will be packaged (optional, defaults to
 `3.1.6`)
 
 `<project-root>`::
@@ -685,11 +682,16 @@ the output file name (optional, defaults to `<current folder>/<entry point base
 logging level for the Tebako built-in memory filesystem driver
 (optional, defaults to `error`)
 
+`tebafile`::
+the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
+Please refer to the separate section below for tebafile description.
+
 `devmode`:: flag that activates development mode, in which Tebako's cache and
 packaging consistency checks are relaxed.
 +
-NOTE: Development mode is *not intended for production use* and should only be
-used during development.
+NOTES:
+  * Development mode is *not intended for production use* and should only be used during development.
+  * `entry-point` and `project-root-folder` are required parameters and may be provided either via command-line or in `tebafile`.
 
 [example]
 ====
@@ -724,16 +726,21 @@ based on `tebako press` may create inconsistent environment upon restore.
 $ tebako setup \
   [-p|--prefix=<tebako-root-folder>] \
   [-R|--Ruby=<ruby-version>] \
-  [-D|--devmode]
+  [-D|--devmode] \
+  [-t|--tebafile=<path-to-tebafile>]
 ----
 
 Where:
 
 `<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)
+`Ruby`:: parameter defines Ruby version that will be packaged (optional, defaults to 3.1.6)
+
+`tebafile`::
+the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
+Please refer to the separate section below for tebafile description.
 
-`devmode` flag activates development mode, in which Tebako's cache and packaging consistency checks are relaxed.
+`devmode`:: flag activates development mode, in which Tebako's cache and packaging consistency checks are relaxed.
 Please note that this mode is not intended for production use and should only be used during development.
 
 ==== Clean
@@ -746,13 +753,18 @@ Normally you do not need to do it since tebako packager optimizes artifacts life
 [source,sh]
 ----
 $ tebako clean \
-  [-p|--prefix=<tebako-root-folder>]
+  [-p|--prefix=<tebako-root-folder>] \
+  [-t|--tebafile=<path-to-tebafile>]
 ----
 
 Where:
 
 `<tebako-root-folder>`:: the Tebako root folder (see details in the Tebako Root Folder Selection section)
 
+`tebafile`::
+the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
+Please refer to the separate section below for tebafile description.
+
 [example]
 ====
 [source,sh]
@@ -777,7 +789,9 @@ NOTE: Compiled DwarFS libraries are not cleaned.
 ----
 $ tebako clean_ruby
   [-p|--prefix=<tebako-root-folder>] \
-  [-R|--Ruby=<ruby-version>]
+  [-R|--Ruby=<ruby-version>] \
+  [-t|--tebafile=<path-to-tebafile>]
+
 ----
 
 Where:
@@ -788,6 +802,10 @@ the Tebako setup folder (optional, defaults to current folder)
 `Ruby`::
 defines Ruby version that will cleaned (optional, cleans all versions by default)
 
+`tebafile`::
+the tebako configuration file (optional, defaults to `$PWD/.tebako.yml`).
+Please refer to the separate section below for tebafile description.
+
 [example]
 ====
 [source,sh]
@@ -806,6 +824,26 @@ as a cache key in CI/CD pipelines.
 $ tebako hash
 ----
 
+=== Tebako configuration file
+
+It is possible to provide all or some options for the `tebako setup/press/clean/clean_ruby` commands via Tebako configuration file ('tebafile').
+Tebafile is a YAML file with a single section 'options'. The options are the same as long names for the command line. For, example for the prefix option
+
+[source]
+----
+-p|--prefix=<tebako-root-folder>
+----
+the key in the YAML file would be 'prefix'.
+
+Below is an example tebafile that sets values for prefix and Ruby options
+[source,yaml]
+----
+options:
+  prefix: /tmp/tebako
+  Ruby: 3.2.4
+----
+
+Please note that the options provided on the command line have preference over tebafile settings.
 
 === Image extraction
 

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2023 [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -27,10 +27,12 @@
 
 require "bundler/gem_tasks"
 require "rubocop/rake_task"
+require "rspec/core/rake_task"
 
 RuboCop::RakeTask.new
+RSpec::Core::RakeTask.new(:spec)
 
-task default: %i[rubocop]
+task default: %i[rubocop spec]
 
 desc "Generate version.txt"
 task "generate_version_txt" do

data/common.env

@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
 DEPS=deps
 INCBIN_TAG=348e36b
-DWARFS_WR_TAG=v0.5.7
+DWARFS_WR_TAG=v0.5.8
 RUBY_VER=3.1.6

data/lib/tebako/cli.rb

@@ -40,7 +40,7 @@ require_relative "version"
 # Tebako - an executable packager
 # Implementation of tebako command-line interface
 module Tebako
-  OPTIONS_FILE = ".tebako.yml"
+  DEFAULT_TEBAFILE = ".tebako.yml"
   # Tebako packager front-end
   class Cli < Thor
     package_name "Tebako"
@@ -48,7 +48,8 @@ module Tebako
                           desc: "A path to tebako packaging environment, '~/.tebako' ('$HOME/.tebako') by default"
     class_option :devmode, type: :boolean, aliases: "-D", required: false,
                            desc: "Developer mode, please do not use if unsure"
-
+    class_option :tebafile, type: :string, aliases: "-t", required: false,
+                            desc: "tebako configuration file 'tebafile', '$PWD/.tebako.yml' by default"
     desc "clean", "Clean tebako packaging environment"
     def clean
       clean_cache
@@ -123,35 +124,19 @@ module Tebako
 
       def options
         original_options = super
-
-        return original_options unless File.exist?(OPTIONS_FILE)
-
-        defaults = ::YAML.load_file(OPTIONS_FILE) || {}
-        Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
+        tebafile = original_options["tebafile"].nil? ? DEFAULT_TEBAFILE : original_options["tebafile"]
+        if File.exist?(tebafile)
+          Thor::CoreExt::HashWithIndifferentAccess.new(options_from_tebafile(tebafile).merge(original_options))
+        else
+          puts "Warning: Tebako configuration file '#{tebafile}' not found." unless original_options["tebafile"].nil?
+          original_options
+        end
       end
     end
 
-    private
-
     no_commands do
-      def do_press
-        cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=OFF #{cfg_options} #{press_options}"
-        build_cmd = "cmake --build #{output} --target tebako --parallel #{Etc.nprocessors}"
-        merged_env = ENV.to_h.merge(b_env)
-        Tebako.packaging_error(103) unless system(merged_env, cfg_cmd)
-        Tebako.packaging_error(104) unless system(merged_env, build_cmd)
-      end
-
-      def do_setup
-        cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=ON #{cfg_options}"
-        build_cmd = "cmake --build \"#{output}\" --target setup --parallel #{Etc.nprocessors}"
-        merged_env = ENV.to_h.merge(b_env)
-        Tebako.packaging_error(101) unless system(merged_env, cfg_cmd)
-        Tebako.packaging_error(102) unless system(merged_env, build_cmd)
-      end
+      include Tebako::CliHelpers
+      include Tebako::CliRubies
     end
-
-    include Tebako::CliHelpers
-    include Tebako::CliRubies
   end
 end

data/lib/tebako/cli_helpers.rb

@@ -55,31 +55,47 @@ module Tebako
       # So we have to use \"xxx\"
       @cfg_options ||=
         "-DCMAKE_BUILD_TYPE=Release -DRUBY_VER:STRING=\"#{ruby_ver}\" -DRUBY_HASH:STRING=\"#{ruby_hash}\" " \
-        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output}\" -S \"#{source}\""
+        "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output_folder}\" -S \"#{source}\""
     end
 
     def clean_cache
       puts "Cleaning tebako packaging environment"
       # Using File.join(deps, "") to ensure that the slashes are appropriate
-      FileUtils.rm_rf([File.join(deps, ""), File.join(output, "")], secure: true)
+      FileUtils.rm_rf([File.join(deps, ""), File.join(output_folder, "")], secure: true)
     end
 
     def clean_output
       puts "Cleaning CMake cache and Ruby build files"
-      # Using File.join(output, "") to ensure that the slashes are appropriate
 
       nmr = "src/_ruby_*"
       nms = "stash_*"
       FileUtils.rm_rf(Dir.glob(File.join(deps, nmr)), secure: true)
       FileUtils.rm_rf(Dir.glob(File.join(deps, nms)), secure: true)
 
-      FileUtils.rm_rf(File.join(output, ""), secure: true)
+      # Using File.join(output_folder, "") to ensure that the slashes are appropriate
+      FileUtils.rm_rf(File.join(output_folder, ""), secure: true)
     end
 
     def deps
       @deps ||= File.join(prefix, "deps")
     end
 
+    def do_press
+      cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=OFF #{cfg_options} #{press_options}"
+      build_cmd = "cmake --build #{output_folder} --target tebako --parallel #{Etc.nprocessors}"
+      merged_env = ENV.to_h.merge(b_env)
+      Tebako.packaging_error(103) unless system(merged_env, cfg_cmd)
+      Tebako.packaging_error(104) unless system(merged_env, build_cmd)
+    end
+
+    def do_setup
+      cfg_cmd = "cmake -DSETUP_MODE:BOOLEAN=ON #{cfg_options}"
+      build_cmd = "cmake --build \"#{output_folder}\" --target setup --parallel #{Etc.nprocessors}"
+      merged_env = ENV.to_h.merge(b_env)
+      Tebako.packaging_error(101) unless system(merged_env, cfg_cmd)
+      Tebako.packaging_error(102) unless system(merged_env, build_cmd)
+    end
+
     def ensure_version_file
       version_file_path = File.join(deps, E_VERSION_FILE)
 
@@ -128,8 +144,20 @@ module Tebako
     end
     # rubocop:enable Metrics/MethodLength
 
-    def output
-      @output ||= File.join(prefix, "o")
+    def options_from_tebafile(tebafile)
+      ::YAML.load_file(tebafile)["options"] || {}
+    rescue Psych::SyntaxError => e
+      puts "Warning: The tebafile '#{tebafile}' contains invalid YAML syntax."
+      puts e.message
+      {}
+    rescue StandardError => e
+      puts "An unexpected error occurred while loading the tebafile '#{tebafile}'."
+      puts e.message
+      {}
+    end
+
+    def output_folder
+      @output_folder ||= File.join(prefix, "o")
     end
 
     def package

data/lib/tebako/version.rb

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

data/src/tebako-main.cpp

@@ -145,6 +145,8 @@ extern "C" int tebako_main(int* argc, char*** argv) {
 				// Nested error, no recovery :(
 			}
 		}
+
+		// tebako_chdir("/__tebako_memfs__/local");
 	}
 	return ret;
 }

data/tebako.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files --recurse-submodules -z`.split("\x0").reject do |f|
       (f == __FILE__) ||
-        f.match(%r{\A(?:(?:tests|tests-2|features|deps|output|common\.env)/|\.(?:git|cirrus|tebako|rubocop))})
+        f.match(%r{\A(?:(?:tests|tests-2|spec|deps|output|common\.env)/|\.(?:git|rspec|cirrus|tebako|rubocop))})
     end
   end
 
@@ -63,4 +63,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 1.2"
   spec.add_dependency "yaml", "~> 0.2.1"
+
+  spec.add_development_dependency "hoe"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "rubocop", "~> 1.52"
+  spec.add_development_dependency "rubocop-rubycw"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-cobertura"
 end

data/version.txt

@@ -1 +1 @@
-0.8.1
+0.8.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,104 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.52'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.52'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rubycw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Tebako is an executable packager. It packages a set of files into a single
   executable binary that allows a user to run a selected file from the