tebako 0.9.3 → 0.10.0

data/lib/tebako/codegen.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require "pathname"
+require "fileutils"
+
+# Tebako - an executable packager
+module Tebako
+  # Code geberation
+  module Codegen
+    COMMON_C_HEADER = <<~SUBST
+      /**
+      * THIS FILE WAS GENERATED AUTOMATICALLY BY TEBAKO. DO NOT CHANGE IT, PLEASE
+      **/
+
+    SUBST
+
+    COMMON_RUBY_HEADER = <<~SUBST
+      #!/usr/bin/env ruby
+      # frozen_string_literal: true
+
+      # THIS FILE WAS GENERATED AUTOMATICALLY BY TEBAKO. DO NOT CHANGE IT, PLEASE
+
+    SUBST
+
+    class << self
+      def deploy_crt_implib(opt, scm)
+        crt = ""
+        if scm.msys?
+          crt = <<~SUBST
+            Tebako::Packager.create_implib("#{opt.ruby_src_dir}", "#{opt.data_src_dir}",
+                                           "#{File.basename(opt.package)}", rv)
+          SUBST
+        end
+        crt
+      end
+
+      def deploy_cwd(opt)
+        opt.cwd.nil? ? "nil" : "\"#{opt.cwd}\""
+      end
+
+      def deploy_rb(opt, scm)
+        <<~SUBST
+          #{deploy_rq}
+
+          rv = Tebako::RubyVersion.new("#{opt.ruby_ver}")
+          Tebako::Packager::init("#{opt.stash_dir}", "#{opt.data_src_dir}",
+                               "#{opt.data_pre_dir}", "#{opt.data_bin_dir}")
+          #{deploy_crt_implib(opt, scm)}
+          Tebako::Packager.deploy("#{opt.data_src_dir}", "#{opt.data_pre_dir}",
+                                  rv , "#{opt.root}",
+                                  "#{scm.fs_entrance}", #{deploy_cwd(opt)})
+          Tebako::Packager.mkdwarfs("#{opt.deps_bin_dir}", "#{opt.data_bin_file}",
+                                    "#{opt.data_src_dir}")
+        SUBST
+      end
+
+      def deploy_rq
+        <<~SUBST
+          require "#{File.join(__dir__, "packager.rb")}"
+          require "#{File.join(__dir__, "ruby_version.rb")}"
+        SUBST
+      end
+
+      def generate_deploy_rb(options_manager, scenario_manager)
+        fname = File.join(options_manager.deps, "bin", "deploy.rb")
+        FileUtils.mkdir_p(File.dirname(fname))
+
+        File.open(fname, "w") do |file|
+          file.write(COMMON_RUBY_HEADER)
+          file.write(deploy_rb(options_manager, scenario_manager))
+        end
+      end
+
+      def generate_tebako_fs_cpp(options_manager, scenario_manager)
+        fname = File.join(options_manager.deps, "src", "tebako", "tebako-fs.cpp")
+        FileUtils.mkdir_p(File.dirname(fname))
+
+        File.open(fname, "w") do |file|
+          file.write(COMMON_C_HEADER)
+          file.write(tebako_fs_cpp(options_manager, scenario_manager))
+        end
+      end
+
+      def generate_tebako_version_h(options_manager, v_parts)
+        fname = File.join(options_manager.deps, "include", "tebako", "tebako-version.h")
+        FileUtils.mkdir_p(File.dirname(fname))
+
+        File.open(fname, "w") do |file|
+          file.write(COMMON_C_HEADER)
+          file.write(tebako_version_h(v_parts))
+        end
+      end
+
+      def package_cwd(options_manager, scenario_manager)
+        if options_manager.cwd.nil?
+          "nullptr"
+        else
+          "\"#{scenario_manager.fs_mount_point}/#{options_manager.cwd}\""
+        end
+      end
+
+      def tebako_fs_cpp(options_manager, scenario_manager)
+        <<~SUBST
+          #include <incbin/incbin.h>
+
+          namespace tebako {
+            const  char * fs_log_level   = "#{options_manager.l_level}";
+            const  char * fs_mount_point = "#{scenario_manager.fs_mount_point}";
+            const  char * fs_entry_point = "#{scenario_manager.fs_entry_point}";
+            const  char * package_cwd 	 = #{package_cwd(options_manager, scenario_manager)};
+            char   original_cwd[PATH_MAX];
+
+            INCBIN(fs, "#{options_manager.output_folder}/p/fs.bin");
+          }
+        SUBST
+      end
+
+      def tebako_version_h(v_parts)
+        <<~SUBST
+          #pragma once
+
+          const unsigned int tebako_version_major = #{v_parts[0]};
+          const unsigned int tebako_version_minor = #{v_parts[1]};
+          const unsigned int tebako_version_teeny = #{v_parts[2]};
+        SUBST
+      end
+    end
+  end
+end

data/lib/tebako/deploy_helper.rb

@@ -31,6 +31,7 @@ require "find"
 require_relative "error"
 require_relative "build_helpers"
 require_relative "packager/patch_helpers"
+require_relative "scenario_manager"
 
 # Tebako - an executable packager
 module Tebako
@@ -41,11 +42,11 @@ module Tebako
   RUBYGEMS_VERSION = "3.4.22"
 
   # Tebako packaging support (deployer)
-  class DeployHelper # rubocop:disable Metrics/ClassLength
-    def initialize(fs_root, fs_entrance, fs_mount_point, target_dir, pre_dir)
+  class DeployHelper < ScenarioManager # rubocop:disable Metrics/ClassLength
+    def initialize(fs_root, fs_entrance, target_dir, pre_dir)
+      super(fs_root, fs_entrance)
       @fs_root = fs_root
       @fs_entrance = fs_entrance
-      @fs_mount_point = fs_mount_point
       @target_dir = target_dir
       @pre_dir = pre_dir
       @verbose = ENV["VERBOSE"] == "yes" || ENV["VERBOSE"] == "true"
@@ -54,16 +55,14 @@ module Tebako
 
     attr_reader :bundler_command, :gem_command, :gem_home
 
-    def config(os_type, ruby_ver, cwd)
+    def configure(ruby_ver, cwd)
       @ruby_ver = ruby_ver
-      @os_type = os_type
       @cwd = cwd
 
       @tbd = File.join(@target_dir, "bin")
       @tgd = @gem_home = File.join(@target_dir, "lib", "ruby", "gems", @ruby_ver.api_version)
       @tld = File.join(@target_dir, "local")
 
-      lookup_files
       configure_scenario
       configure_commands
     end
@@ -171,7 +170,7 @@ module Tebako
     end
 
     def configure_commands
-      if @os_type =~ /msys/
+      if msys?
         configure_commands_msys
       else
         configure_commands_not_msys
@@ -195,27 +194,6 @@ module Tebako
       @nokogiri_option = "--no-use-system-libraries"
     end
 
-    def configure_scenario
-      case @gs_length
-      when 0
-        configure_scenario_no_gemspec
-      when 1
-        @scenario = @gf_length.positive? ? :gemspec_and_gemfile : :gemspec
-      else
-        raise Tebako::Error, "Multiple Ruby gemspecs found in #{@fs_root}"
-      end
-    end
-
-    def configure_scenario_no_gemspec
-      @scenario = if @gf_length.positive?
-                    :gemfile
-                  elsif @g_length.positive?
-                    :gem
-                  else
-                    :simple_script
-                  end
-    end
-
     def copy_files(dest)
       FileUtils.mkdir_p(dest)
       if Dir.exist?(@fs_root) && File.readable?(@fs_root)
@@ -277,12 +255,6 @@ module Tebako
       gem_files.each { |gem_file| install_gem(gem_file) }
     end
 
-    def lookup_files
-      @gs_length = Dir.glob(File.join(@fs_root, "*.gemspec")).length
-      @gf_length = Dir.glob(File.join(@fs_root, "Gemfile")).length
-      @g_length = Dir.glob(File.join(@fs_root, "*.gem")).length
-    end
-
     def patch_after_rubygems_update(target_dir, ruby_api_ver)
       # Autoload cannot handle statically linked openssl extension
       # Changing it to require seems to be the simplest solution

data/lib/tebako/error.rb

@@ -35,7 +35,14 @@ module Tebako
     105 => "Failed to map MSys path to Windows",
     106 => "Entry point does not exist or is not accessible",
     107 => "Project root does not exist or is not accessible",
-    108 => "Package working directory does not exist"
+    108 => "Package working directory does not exist",
+    109 => "Invalid Ruby version format",
+    110 => "Ruby version is not supported",
+    111 => "Ruby version is not supported on Windows",
+    112 => "OS is not supported",
+    113 => "Path to root shall be absolute. Relative path is not allowed",
+    114 => "Entry point is not within the project root",
+    201 => "Warning. Could not create cache version file"
   }.freeze
 
   class << self

data/lib/tebako/options_manager.rb

@@ -0,0 +1,237 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2023-2024 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require "etc"
+require "fileutils"
+require "pathname"
+require "rbconfig"
+
+require_relative "codegen"
+require_relative "error"
+require_relative "ruby_version"
+require_relative "version"
+
+# Tebako - an executable packager
+# Command-line interface methods
+module Tebako
+  # Cli helpers
+  class OptionsManager # rubocop:disable Metrics/ClassLength
+    def initialize(options)
+      @options = options
+      @rv = Tebako::RubyVersion.new(@options["Ruby"])
+      @ruby_ver, @ruby_hash = @rv.extend_ruby_version
+    end
+
+    attr_reader :ruby_ver, :rv
+
+    def b_env
+      u_flags = if RbConfig::CONFIG["host_os"] =~ /darwin/
+                  "-DTARGET_OS_SIMULATOR=0 -DTARGET_OS_IPHONE=0  #{ENV.fetch("CXXFLAGS", nil)}"
+                else
+                  ENV.fetch("CXXFLAGS", nil)
+                end
+      @b_env ||= { "CXXFLAGS" => u_flags }
+    end
+
+    def cfg_options
+      ## {v_parts[3]} may be something like rc1 that won't work with CMake
+      v_parts = Tebako::VERSION.split(".")
+      # Cannot use 'xxx' as parameters because it does not work in Windows shells
+      # 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_folder}\" -S \"#{source}\" " \
+        "#{remove_glibc_private} -DTEBAKO_VERSION:STRING=\"#{v_parts[0]}.#{v_parts[1]}.#{v_parts[2]}\""
+    end
+
+    def cwd
+      f_cwd = @options["cwd"]&.gsub("\\", "/")
+      @cwd ||= f_cwd
+    end
+
+    # DATA_BIN_DIR folder is used to create packaged filesystem
+    # set(DATA_BIN_DIR  ${CMAKE_CURRENT_BINARY_DIR}/p)
+    def data_bin_dir
+      @data_bin_dir ||= File.join(output_folder, "p")
+    end
+
+    # DATA_BIN_FILE is packaged filesystem itself
+    # set(DATA_BIN_FILE ${DATA_BIN_DIR}/fs.bin)
+    def data_bin_file
+      @data_bin_file ||= File.join(data_bin_dir, "fs.bin")
+    end
+
+    # DATA_PRE_DIR folder is used to build gems  that need to be packaged
+    # set(DATA_PRE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/r)
+    def data_pre_dir
+      @data_pre_dir ||= File.join(output_folder, "r")
+    end
+
+    # DATA_SRC_DIR folder is used to collect all files that need to be packaged
+    # set(DATA_SRC_DIR  ${CMAKE_CURRENT_BINARY_DIR}/s)
+    def data_src_dir
+      @data_src_dir ||= File.join(output_folder, "s")
+    end
+
+    def deps
+      @deps ||= File.join(prefix, "deps")
+    end
+
+    def deps_bin_dir
+      @deps_bin_dir ||= File.join(deps, "bin")
+    end
+
+    def fs_current
+      fs_current = Dir.pwd
+      if RUBY_PLATFORM =~ /msys|mingw|cygwin/
+        fs_current, cygpath_res = Open3.capture2e("cygpath", "-w", fs_current)
+        Tebako.packaging_error(101) unless cygpath_res.success?
+        fs_current.strip!
+      end
+      @fs_current ||= fs_current&.gsub("\\", "/")
+    end
+
+    def fs_entrance
+      @fs_entrance ||= @options["entry-point"]&.gsub("\\", "/")
+    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.gsub("\\", "/"))
+      end
+    end
+
+    def l_level
+      @l_level ||= if @options["log-level"].nil?
+                     "error"
+                   else
+                     @options["log-level"]
+                   end
+    end
+
+    def m_files
+      # [TODO]
+      # Ninja generates incorrect script for tebako press target -- gets lost in a chain custom targets
+      # Using makefiles has negative performance impact so it needs to be fixed
+      @m_files ||= case RUBY_PLATFORM
+                   when /linux/, /darwin/
+                     "Unix Makefiles"
+                   when /msys|mingw|cygwin/
+                     "MinGW Makefiles"
+                   else
+                     raise Tebako::Error.new("#{RUBY_PLATFORM} is not supported.", 112)
+                   end
+    end
+
+    def output_folder
+      @output_folder ||= File.join(prefix, "o")
+    end
+
+    def package
+      package = if @options["output"].nil?
+                  File.join(Dir.pwd, File.basename(fs_entrance, ".*"))
+                else
+                  @options["output"]&.gsub("\\", "/")
+                end
+      @package ||= if relative?(package)
+                     File.join(fs_current, package)
+                   else
+                     package
+                   end
+    end
+
+    def prefix
+      @prefix ||= if @options["prefix"].nil?
+                    handle_nil_prefix
+                  elsif @options["prefix"] == "PWD"
+                    Dir.pwd
+                  else
+                    File.expand_path(@options["prefix"]&.gsub("\\", "/"))
+                  end
+    end
+
+    def press_announce
+      cwd_announce = cwd.nil? ? "<Host current directory>" : cwd
+      @press_announce ||= <<~ANN
+        Running tebako press at #{prefix}
+           Ruby version:              '#{@ruby_ver}'
+           Project root:              '#{root}'
+           Application entry point:   '#{fs_entrance}'
+           Package file name:         '#{package}'
+           Loging level:              '#{l_level}'
+           Package working directory: '#{cwd_announce}'
+      ANN
+    end
+
+    def press_options
+      @press_options ||= "-DPCKG:STRING='#{package}' -DLOG_LEVEL:STRING='#{l_level}' " \
+    end
+
+    def relative?(path)
+      Pathname.new(path).relative?
+    end
+
+    def remove_glibc_private
+      @remove_glibc_private ||= if RUBY_PLATFORM.end_with?("linux") || RUBY_PLATFORM.end_with?("linux-gnu")
+                                  "-DREMOVE_GLIBC_PRIVATE=#{@options["patchelf"] ? "ON" : "OFF"}"
+                                else
+                                  ""
+                                end
+    end
+
+    def root
+      f_root = @options["root"].nil? ? "" : @options["root"].gsub("\\", "/")
+      @root ||= if relative?(f_root)
+                  File.join(fs_current, f_root)
+                else
+                  File.join(f_root, "")
+                end
+    end
+
+    def ruby_src_dir
+      @ruby_src_dir ||= File.join(deps, "src", "_ruby_#{@ruby_ver}")
+    end
+
+    def source
+      c_path = Pathname.new(__FILE__).realpath
+      @source ||= File.expand_path("../../..", c_path)
+    end
+
+    def stash_dir
+      @stash_dir ||= "#{stash_dir_all}_#{@ruby_ver}"
+    end
+
+    def stash_dir_all
+      @stash_dir_all ||= File.join(deps, "stash")
+    end
+  end
+end

data/lib/tebako/packager.rb

@@ -69,19 +69,19 @@ module Tebako
       def create_implib(src_dir, package_src_dir, app_name, ruby_ver)
         create_def(src_dir, app_name)
         puts "   ... creating Windows import library"
-        params = ["dlltool", "-d", def_fname(src_dir, app_name), "-D", out_fname(app_name),
-                  "--output-lib", lib_fname(package_src_dir, ruby_ver)]
+        params = ["dlltool", "-d", def_fname(src_dir, app_name), "-D", out_fname(app_name), "--output-lib",
+                  lib_fname(package_src_dir, ruby_ver)]
         BuildHelpers.run_with_capture(params)
       end
 
       # Deploy
-      def deploy(os_type, target_dir, pre_dir, ruby_ver, fs_root, fs_entrance, fs_mount_point, cwd) # rubocop:disable Metrics/ParameterLists
+      def deploy(target_dir, pre_dir, ruby_ver, fs_root, fs_entrance, cwd) # rubocop:disable Metrics/ParameterLists
         puts "-- Running deploy script"
 
-        deploy_helper = Tebako::DeployHelper.new(fs_root, fs_entrance, fs_mount_point, target_dir, pre_dir)
-        deploy_helper.config(os_type, ruby_ver, cwd)
+        deploy_helper = Tebako::DeployHelper.new(fs_root, fs_entrance, target_dir, pre_dir)
+        deploy_helper.configure(ruby_ver, cwd)
         deploy_helper.deploy
-        Tebako::Stripper.strip(os_type, target_dir)
+        Tebako::Stripper.strip(deploy_helper, target_dir)
       end
 
       def finalize(os_type, src_dir, app_name, ruby_ver, patchelf)
@@ -106,6 +106,12 @@ module Tebako
         FileUtils.cp_r "#{stash_dir}/.", src_dir
       end
 
+      def mkdwarfs(deps_bin_dir, data_bin_file, data_src_dir)
+        puts "-- Running mkdwarfs script"
+        params = [File.join(deps_bin_dir, "mkdwarfs"), "-o", data_bin_file, "-i", data_src_dir, "--no-progress"]
+        BuildHelpers.run_with_capture_v(params)
+      end
+
       # Pass1
       # Executed before Ruby build, patching ensures that Ruby itself is linked statically
       def pass1(ostype, ruby_source_dir, mount_point, src_dir, ruby_ver)

data/lib/tebako/{cli_rubies.rb → ruby_version.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2024 [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
 #
@@ -25,18 +25,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require "fileutils"
-require "pathname"
-require "rbconfig"
-
 require_relative "error"
-require_relative "version"
 
 # Tebako - an executable packager
-# Command-line interface methods
 module Tebako
-  # Ruby version helpers
-  module CliRubies
+  # Ruby version checks
+  class RubyVersion
     RUBY_VERSIONS = {
       "2.7.8" => "c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0",
       "3.0.7" => "2a3411977f2850431136b0fab8ad53af09fb74df2ee2f4fb7f11b378fe034388",
@@ -51,29 +45,69 @@ module Tebako
     MIN_RUBY_VERSION_WINDOWS = "3.1.6"
     DEFAULT_RUBY_VERSION = "3.2.5"
 
-    def version_check(version)
-      return if RUBY_VERSIONS.key?(version)
+    # rub_ver version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
+    def initialize(ruby_version)
+      @ruby_version = ruby_version.nil? ? DEFAULT_RUBY_VERSION : ruby_version
+
+      version_check_format
+      version_check
+      version_check_msys
+    end
+
+    attr_reader :ruby_version
+
+    def ruby3x?
+      @ruby3x ||= @ruby_version[0] == "3"
+    end
+
+    def ruby31?
+      @ruby31 ||= ruby3x? && @ruby_version[2].to_i >= 1
+    end
+
+    def ruby32?
+      @ruby32 ||= ruby3x? && @ruby_version[2].to_i >= 2
+    end
+
+    def ruby32only?
+      @ruby32only ||= ruby3x? && @ruby_version[2] == "2"
+    end
+
+    def ruby33?
+      @ruby33 ||= ruby3x? && @ruby_version[2].to_i >= 3
+    end
+
+    def api_version
+      @api_version ||= "#{@ruby_version.split(".")[0..1].join(".")}.0"
+    end
+
+    def lib_version
+      @lib_version ||= "#{@ruby_version.split(".")[0..1].join}0"
+    end
+
+    def version_check
+      return if RUBY_VERSIONS.key?(@ruby_version)
 
       raise Tebako::Error.new(
-        "Ruby version #{version} is not supported, exiting",
-        253
+        "Ruby version #{@ruby_version} is not supported",
+        110
       )
     end
 
-    def version_check_msys(version)
-      if Gem::Version.new(version) < Gem::Version.new(MIN_RUBY_VERSION_WINDOWS) && RUBY_PLATFORM =~ /msys|mingw|cygwin/
-        raise Tebako::Error.new(
-          "Windows packaging works for Ruby #{MIN_RUBY_VERSION_WINDOWS} or above, version #{version} is not supported",
-          252
-        )
+    def version_check_format
+      return if @ruby_version =~ /^\d+\.\d+\.\d+$/
+
+      raise Tebako::Error.new("Invalid Ruby version format '#{@ruby_version}'. Expected format: x.y.z", 109)
+    end
+
+    def version_check_msys
+      if Gem::Version.new(@ruby_version) < Gem::Version.new(MIN_RUBY_VERSION_WINDOWS) &&
+         RUBY_PLATFORM =~ /msys|mingw|cygwin/
+        raise Tebako::Error.new("Ruby version #{@ruby_version} is not supported on Windows", 111)
       end
     end
 
     def extend_ruby_version
-      version = options["Ruby"].nil? ? DEFAULT_RUBY_VERSION : options["Ruby"]
-      version_check(version)
-      version_check_msys(version)
-      @extend_ruby_version ||= [version, RUBY_VERSIONS[version]]
+      @extend_ruby_version ||= [@ruby_version, RUBY_VERSIONS[@ruby_version]]
     end
   end
 end