tebako 0.7.1 → 0.7.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edab24288967cc4085b927ef069adab649b24282a6cc320a595bc2b20cb636e9
-  data.tar.gz: 7964a2bcf62cf28d4cd34ee1f1744afe21980e934a4fa1a649f0b854b15b1ca3
+  metadata.gz: 12c6393e228f7a9b35f5e4e134145d61d050e043b3f71fd6b7470bc6ae9fe84c
+  data.tar.gz: 950729b6f6eeed71c400f114fc45a0820919cbd8ddf22c8682e4d5cc77ed38b5
 SHA512:
-  metadata.gz: 1a77dc3a2c810aad7597cab4a3d5a8f3c6378d2f9313e129edf17097700a0210eb9008b73bb5402921af53e5cccf450602865b4cc1518e5f8a2fd0e34e15163c
-  data.tar.gz: 40b417b5bb8e13e40618015d04f5f3c085bc08325d798bba5fb1cf6c43c0e44daef392755473f2110cb21c95134dcee24c6559933226eee0f41a5f9fc074d602
+  metadata.gz: 547a0f3dca568dc52dd40cd0fbca7e09d96ab51de383edfb70e7e1bb16fde23c81135250ba7cdd4bf9c7fe7658e1241e753ef62dea0c96181496fbcf7da06ea3
+  data.tar.gz: 9653a599391afb40aed074d456b3d04e779091501223f1d6e41aa4c85ad1071838e6a90a7f4b1c2eb834061e5b9f8d875346c8438c904ac221a05d3a22d0571a

data/Rakefile

@@ -35,8 +35,9 @@ task default: %i[rubocop]
 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 "Generating #{File.join(__dir__, "version.txt")}; version = #{Tebako::VERSION}"
+  version_without_rc = Tebako::VERSION.gsub(/\.rc\d+/, "")
+  File.write(File.join(__dir__, "version.txt"), "#{version_without_rc}\n")
+  puts "Generating #{File.join(__dir__, "version.txt")}; version = #{version_without_rc}"
 end
 
 task build: :generate_version_txt

data/exe/tebako-packager

@@ -110,7 +110,7 @@ begin
     Tebako::Packager.create_implib(ARGV[2], ARGV[4], File.basename(ARGV[8]), ARGV[9]) if ARGV[1] =~ /msys/
     # Assume that "<TARGET_BIN_DIR (TBD)>" is <DATA_SRC_DIR>/bin"
     # That shall match CMakeLists.txt settings
-    Tebako::Packager.deploy(ARGV[4], "#{ARGV[4]}/bin", ARGV[7])
+    Tebako::Packager.deploy(ARGV[4], ARGV[9], ARGV[7])
 
   else
     raise Tebako::Error, "tebako-packager cannot process #{ARGV[0]} command"

data/lib/tebako/cli.rb

@@ -35,6 +35,7 @@ require "yaml"
 require_relative "cli_helpers"
 require_relative "cli_rubies"
 require_relative "error"
+require_relative "version"
 
 # Tebako - an executable packager
 # Implementation of tebako command-line interface
@@ -45,12 +46,12 @@ module Tebako
     package_name "Tebako"
     class_option :prefix, type: :string, aliases: "-p", required: false,
                           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"
 
     desc "clean", "Clean tebako packaging environment"
     def clean
-      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)
+      clean_cache
     end
 
     desc "clean_ruby", "Clean Ruby source from tebako packaging environment"
@@ -68,7 +69,7 @@ module Tebako
 
     desc "hash", "Print build script hash (ci cache key)"
     def hash
-      print Digest::SHA256.hexdigest File.read File.join(__dir__, "../..", "CMakeLists.txt")
+      print Digest::SHA256.hexdigest File.read File.join(source, "CMakeLists.txt")
     end
 
     desc "press", "Press tebako image"
@@ -83,8 +84,11 @@ module Tebako
                          enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
                          desc: "Tebako package Ruby version, #{Tebako::CliRubies::DEFAULT_RUBY_VERSION} by default"
     def press
+      (clean_output unless version_match?) unless options[:devmode]
+
       puts press_announce
       do_press
+      ensure_version_file
     rescue Tebako::Error => e
       puts "Tebako script failed: #{e.message} [#{e.error_code}]"
       exit e.error_code
@@ -95,8 +99,11 @@ module Tebako
                          enum: Tebako::CliRubies::RUBY_VERSIONS.keys,
                          desc: "Tebako package Ruby version, #{Tebako::CliRubies::DEFAULT_RUBY_VERSION} by default."
     def setup
+      (clean_output unless version_match?) unless options[:devmode]
+
       puts "Setting up tebako packaging environment"
       do_setup
+      ensure_version_file
     rescue Tebako::Error => e
       puts "Tebako script failed: #{e.message} [#{e.error_code}]"
       exit e.error_code
@@ -107,6 +114,13 @@ module Tebako
     end
 
     no_commands do
+      def initialize(*args)
+        super
+        return if args[2][:current_command].name.include?("hash")
+
+        puts "Tebako executable packager version #{Tebako::VERSION}"
+      end
+
       def options
         original_options = super
 

data/lib/tebako/cli_helpers.rb

@@ -37,6 +37,7 @@ require_relative "version"
 # Tebako - an executable packager
 # Command-line interface methods
 module Tebako
+  E_VERSION_FILE = ".environment.version"
   # Cli helpers
   module CliHelpers
     def b_env
@@ -57,10 +58,39 @@ module Tebako
         "-DDEPS:STRING=\"#{deps}\" -G \"#{m_files}\" -B \"#{output}\" -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)
+    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)
+    end
+
     def deps
       @deps ||= File.join(prefix, "deps")
     end
 
+    def ensure_version_file
+      version_file_path = File.join(prefix, E_VERSION_FILE)
+
+      begin
+        File.write(version_file_path, version_key)
+        # puts "Set version information for tebako packaging environment to #{Tebako::VERSION}"
+      rescue StandardError => e
+        puts "An error occurred while creating or updating #{E_VERSION_FILE}: #{e.message}"
+      end
+    end
+
     def fs_current
       fs_current = Dir.pwd
       if RUBY_PLATFORM =~ /msys|mingw|cygwin/
@@ -169,5 +199,25 @@ module Tebako
       c_path = Pathname.new(__FILE__).realpath
       @source ||= File.expand_path("../../..", c_path)
     end
+
+    def version_key
+      @version_key ||= "#{Tebako::VERSION} at #{source}"
+    end
+
+    def version_match? # rubocop:disable Metrics/MethodLength
+      begin
+        version_file_path = File.join(prefix, E_VERSION_FILE)
+        file_version = File.open(version_file_path, &:readline).strip
+        rs = file_version == version_key
+        unless rs
+          puts "CMake cache was created by a gem version #{file_version} " \
+               "and cannot be used for gem version #{version_key}"
+        end
+      rescue StandardError
+        # In case of any error (e.g., file not readable), return false
+        rs = false
+      end
+      rs
+    end
   end
 end

data/lib/tebako/packager.rb

@@ -59,12 +59,6 @@ module Tebako
       thread_pthread.c
     ].freeze
 
-    DEPLOY_ENV = {
-      "GEM_HOME" => nil,
-      "GEM_PATH" => nil,
-      "TEBAKO_PASS_THROUGH" => "1"
-    }.freeze
-
     # Magic version numbers used to ensure compatibility for Ruby 2.7.x, 3.0.x
     # These are the minimal versions required to provide linux-gnu / linux-musl differentiation by bundler
     # Ruby 3.1+ default rubygems versions work correctly out of the box
@@ -83,13 +77,19 @@ module Tebako
       end
 
       # Deploy
-      def deploy(src_dir, tbd, gflength)
+      def deploy(target_dir, ruby_ver, gflength)
         puts "-- Running deploy script"
 
-        ruby_ver = ruby_version(tbd)
-        update_rubygems(tbd, "#{src_dir}/lib", ruby_ver, RUBYGEMS_VERSION) unless PatchHelpers.ruby31?(ruby_ver)
-        install_gem tbd, "tebako-runtime"
-        install_gem(tbd, "bundler", BUNDLER_VERSION) if gflength.to_i != 0
+        ruby_api_ver = ruby_api_version(ruby_ver)
+        gem_home = "#{target_dir}/lib/ruby/gems/#{ruby_api_ver}"
+
+        deploy_env = { "GEM_HOME" => gem_home, "GEM_PATH" => gem_home, "TEBAKO_PASS_THROUGH" => "1" }
+
+        PatchHelpers.with_env(deploy_env) do
+          update_rubygems(target_dir, ruby_api_ver, RUBYGEMS_VERSION) unless PatchHelpers.ruby31?(ruby_ver)
+          install_gem(target_dir, "tebako-runtime")
+          install_gem(target_dir, "bundler", BUNDLER_VERSION) if gflength.to_i != 0
+        end
       end
 
       # Init
@@ -174,21 +174,24 @@ module Tebako
         File.join(src_dir, "lib", "libx64-ucrt-ruby#{ruby_ver[0]}#{ruby_ver[2]}0.a")
       end
 
-      def install_gem(tbd, name, ver = nil)
+      def install_gem(target_dir, name, ver = nil)
         puts "   ... installing #{name} gem#{" version #{ver}" if ver}"
-        PatchHelpers.with_env(DEPLOY_ENV) do
-          params = ["#{tbd}/gem", "install", name.to_s]
-          params.push("-v", ver.to_s) if ver
 
-          out, st = Open3.capture2e(*params)
-          raise Tebako::Error, "Failed to install #{name} (#{st}):\n #{out}" unless st.exitstatus.zero?
-        end
+        params = ["#{target_dir}/bin/gem", "install", name.to_s]
+        params.push("-v", ver.to_s) if ver
+
+        out, st = Open3.capture2e(*params)
+        raise Tebako::Error, "Failed to install #{name} (#{st}):\n #{out}" unless st.exitstatus.zero?
       end
 
       def do_patch(patch_map, root)
         patch_map.each { |fname, mapping| PatchHelpers.patch_file("#{root}/#{fname}", mapping) }
       end
 
+      def ruby_api_version(ruby_ver)
+        "#{ruby_ver.split(".")[0..1].join(".")}.0"
+      end
+
       def ruby_version(tbd)
         ruby_version = nil
         PatchHelpers.with_env(DEPLOY_ENV) do
@@ -203,16 +206,14 @@ module Tebako
         ruby_version
       end
 
-      def update_rubygems(tbd, tld, ruby_ver, gem_ver)
+      def update_rubygems(target_dir, ruby_api_ver, gem_ver)
         puts "   ... updating rubygems to #{gem_ver}"
-        PatchHelpers.with_env(DEPLOY_ENV) do
-          out, st = Open3.capture2e("#{tbd}/gem", "update", "--no-doc", "--system", gem_ver.to_s)
-          raise Tebako::Error, "Failed to update rubugems to #{gem_ver} (#{st}):\n #{out}" unless st.exitstatus.zero?
-        end
-        ruby_api_ver = ruby_ver.split(".")[0..1].join(".")
+        out, st = Open3.capture2e("#{target_dir}/bin/gem", "update", "--no-doc", "--system", gem_ver.to_s)
+        raise Tebako::Error, "Failed to update rubugems to #{gem_ver} (#{st}):\n #{out}" unless st.exitstatus.zero?
+
         # Autoload cannot handle statically linked openssl extension
         # Changing it to require seems to be the simplest solution
-        PatchHelpers.patch_file("#{tld}/ruby/site_ruby/#{ruby_api_ver}.0/rubygems/openssl.rb",
+        PatchHelpers.patch_file("#{target_dir}/lib/ruby/site_ruby/#{ruby_api_ver}/rubygems/openssl.rb",
                                 { "autoload :OpenSSL, \"openssl\"" => "require \"openssl\"" })
       end
     end

data/lib/tebako/version.rb

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

data/version.txt

@@ -1 +1 @@
-0.7.1
+0.7.2

metadata

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