tebako 0.7.2.rc4 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bfa5dde3a184cd2689178ae837ee3a5eff510cecb0ed1385617d4d3f170c707
-  data.tar.gz: b67d902a82ff37050ff7c273b770e96b8be23c83c9056a4e5bc88c4936d2bbb8
+  metadata.gz: 97605b16776ccfa3d1b92dba5ced54dd84181fab77d36be7e3c9bcc5badbc4ba
+  data.tar.gz: e6844adde257c9029eaf90545a2bdb3dd2de700fcd87be84181868e7eb51c691
 SHA512:
-  metadata.gz: ce1166b1042a38f95db4f8190e5d2de55c7a62d40d3d4db990527c27199d23ffc5590af7ae094e0f8cafdfc5b0c2e9c7e3140fd6f8ad5d56dcfc8627b845a552
-  data.tar.gz: 398b4088288778241c404de5d68b1703d2ee42647060833b5c8c7b0b16f22223c92fe1abc7b6982b7124d57a95b732ee98a48e7ea9d913858c5ec0a396faffec
+  metadata.gz: 041c4f6a0e0ce0ff89260ef1c0663d096d16756e7f05f0361db238725fe6fc95f7714ffc757454a0a6fe36680e9c7f2748a53ecae912e622468b3c407dbbc058
+  data.tar.gz: 0a240ef7aa055f123f7342cb662c45b3996c74542258623c3b00f469bf60fe81c2fb4434e70563239bb6afa04a393b9f438d8563bd37756367c0d590c5dfd914

data/lib/tebako/cli_helpers.rb

@@ -81,7 +81,7 @@ module Tebako
     end
 
     def ensure_version_file
-      version_file_path = File.join(prefix, E_VERSION_FILE)
+      version_file_path = File.join(deps, E_VERSION_FILE)
 
       begin
         File.write(version_file_path, version_key)
@@ -205,9 +205,8 @@ module Tebako
     end
 
     def version_cache
-      version_file_path = File.join(prefix, E_VERSION_FILE)
+      version_file_path = File.join(deps, E_VERSION_FILE)
       file_version = File.open(version_file_path, &:readline).strip
-
       file_version.match(/(?<version>.+) at (?<source>.+)/)
     end
 

data/lib/tebako/deploy_helper.rb

@@ -65,6 +65,7 @@ module Tebako
     end
 
     def deploy
+      system("#{gem_command} env")
       install_gem("tebako-runtime")
       install_gem("bundler", Tebako::BUNDLER_VERSION) if needs_bundler?
 
@@ -72,9 +73,12 @@ module Tebako
     end
 
     def deploy_env
-      { "GEM_HOME" => gem_home,
+      {
+        "GEM_HOME" => gem_home,
         "GEM_PATH" => gem_home,
-        "TEBAKO_PASS_THROUGH" => "1" }
+        "GEM_SPEC_CACHE" => File.join(@target_dir, "spec_cache"),
+        "TEBAKO_PASS_THROUGH" => "1"
+      }
     end
 
     def install_gem(name, ver = nil)

data/lib/tebako/version.rb

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

data/tools/.github/workflows/test.yml

@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0 ]
+        os: [ ubuntu-20.04, macos-12 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0 ]
+        os: [ ubuntu-20.04, macos-12 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, macos-11.0 ]
+        os: [ ubuntu-20.04, macos-12 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -106,7 +106,7 @@ jobs:
 
   test-cross-brew-install:
     name: test arm-brew-setup/install
-    runs-on: macos-11.0
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -122,3 +122,24 @@ jobs:
           set -o errexit -o pipefail -o noclobber -o nounset
           test -f $PWD/arm-homebrew/lib/libgflags.dylib
           test -f $PWD/arm-homebrew/lib/libglog.dylib
+
+  test-macos-environment-script:
+    name: test macos-environment.cmake on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-12, macos-13, macos-14 ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install packages
+        run: brew install flex bison bash
+
+      - name: Run CMake test
+        run: cmake -B test.build -S tests/cmake

data/tools/cmake-scripts/macos-environment.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2021-2024, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tamatebako
 #
@@ -25,14 +25,32 @@
 #
 
 if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
+
+  function(find_and_set_homebrew_prefix package_name pkg_name executable_name)
+    execute_process(
+      COMMAND brew --prefix ${package_name}
+      RESULT_VARIABLE BREW_${pkg_name}_RESULT
+      OUTPUT_VARIABLE BREW_${pkg_name}_PREFIX_TMP
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if (BREW_${pkg_name}_RESULT EQUAL 0 AND EXISTS "${BREW_${pkg_name}_PREFIX_TMP}")
+      set(BREW_${pkg_name}_PREFIX "${BREW_${pkg_name}_PREFIX_TMP}" CACHE PATH "${package_name} prefix")
+      message(STATUS "Found ${package_name} keg installed by Homebrew at ${BREW_${pkg_name}_PREFIX}")
+      set(${executable_name} "${BREW_${pkg_name}_PREFIX}/bin/${package_name}" CACHE FILEPATH "${executable_name} executable")
+    endif()
+  endfunction()
+
+
   execute_process(
     COMMAND brew --prefix
     RESULT_VARIABLE BREW_PREFIX_RES
-    OUTPUT_VARIABLE BREW_PREFIX
+    OUTPUT_VARIABLE BREW_PREFIX_TMP
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${BREW_PREFIX}))
+  if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${BREW_PREFIX_TMP}))
     message(FATAL "Could not find build brew setup")
+  else()
+    set(BREW_PREFIX "${BREW_PREFIX_TMP}" CACHE PATH "Brew installation prefix")
   endif()
 
   message(STATUS "Using brew environment at ${BREW_PREFIX}")
@@ -40,41 +58,12 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
   set(OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@3")
   set(CMAKE_PREFIX_PATH "${BREW_PREFIX}")
   include_directories("${OPENSSL_ROOT_DIR}/include")
-  include_directories("${TARGET_BREW_PREFIX}/include")
+  include_directories("${BREW_PREFIX}/include")
 
   #  https://stackoverflow.com/questions/53877344/cannot-configure-cmake-to-look-for-homebrew-installed-version-of-bison
-  execute_process(
-    COMMAND brew --prefix bison
-    RESULT_VARIABLE BREW_BISON
-    OUTPUT_VARIABLE BREW_BISON_PREFIX
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (BREW_BISON EQUAL 0 AND EXISTS "${BREW_BISON_PREFIX}")
-    message(STATUS "Found Bison keg installed by Homebrew at ${BREW_BISON_PREFIX}")
-    set(BISON_EXECUTABLE "${BREW_BISON_PREFIX}/bin/bison")
-  endif()
-
-  execute_process(
-    COMMAND brew --prefix flex
-    RESULT_VARIABLE BREW_FLEX
-    OUTPUT_VARIABLE BREW_FLEX_PREFIX
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (BREW_FLEX EQUAL 0 AND EXISTS "${BREW_FLEX_PREFIX}")
-    message(STATUS "Found Flex keg installed by Homebrew at ${BREW_FLEX_PREFIX}")
-    set(FLEX_EXECUTABLE "${BREW_FLEX_PREFIX}/bin/flex")
-  endif()
-
-  execute_process(
-    COMMAND brew --prefix bash
-    RESULT_VARIABLE BREW_BASH
-    OUTPUT_VARIABLE BREW_BASH_PREFIX
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (BREW_BASH EQUAL 0 AND EXISTS "${BREW_BASH_PREFIX}")
-    message(STATUS "Found GNU bash keg installed by Homebrew at ${BREW_BASH_PREFIX}")
-    set(GNU_BASH "${BREW_BASH_PREFIX}/bin/bash")
-  endif()
+  find_and_set_homebrew_prefix("bison" "BISON" "BISON_EXECUTABLE")
+  find_and_set_homebrew_prefix("flex" "FLEX" "FLEX_EXECUTABLE")
+  find_and_set_homebrew_prefix("bash" "BASH" "GNU_BASH")
 
 # Suppress superfluous randlib warnings about "*.a" having no symbols on MacOSX.
   set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")

data/tools/tests/cmake/CMakeLists.txt

@@ -0,0 +1,81 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.15)
+project(cmake-tests)
+
+
+# Adjust the path to where your macos-environment.cmake is located
+include("${CMAKE_CURRENT_LIST_DIR}/../../cmake-scripts/macos-environment.cmake")
+
+# Function to check if a variable is set (not empty)
+function(check_variable_set VAR_NAME)
+    if(NOT ${VAR_NAME})
+        message(FATAL_ERROR "${VAR_NAME} is not set.")
+    endif()
+endfunction()
+
+# Function to check if a file/directory exists at the path specified by a variable
+function(check_exists VAR_NAME TYPE)
+    if(NOT EXISTS "${${VAR_NAME}}")
+        if(TYPE STREQUAL "FILE")
+            message(FATAL_ERROR "The file specified in ${VAR_NAME} does not exist: ${${VAR_NAME}}")
+        elseif(TYPE STREQUAL "DIRECTORY")
+            message(FATAL_ERROR "The directory specified in ${VAR_NAME} does not exist: ${${VAR_NAME}}")
+        endif()
+    endif()
+endfunction()
+
+message(STATUS "BREW_PREFIX: ${BREW_PREFIX}")
+check_variable_set(BREW_PREFIX)
+check_exists(BREW_PREFIX DIRECTORY)
+
+message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
+check_variable_set(OPENSSL_ROOT_DIR)
+check_exists(OPENSSL_ROOT_DIR DIRECTORY)
+
+message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
+check_variable_set(CMAKE_PREFIX_PATH)
+check_exists(CMAKE_PREFIX_PATH DIRECTORY)
+
+message(STATUS "BREW_BISON_PREFIX: ${BREW_BISON_PREFIX}")
+check_variable_set(BREW_BISON_PREFIX)
+check_exists(BREW_BISON_PREFIX DIRECTORY)
+
+message(STATUS "BREW_FLEX_PREFIX: ${BREW_FLEX_PREFIX}")
+check_variable_set(BREW_FLEX_PREFIX)
+check_exists(BREW_FLEX_PREFIX DIRECTORY)
+
+message(STATUS "FLEX_EXECUTABLE: ${FLEX_EXECUTABLE}")
+check_variable_set(FLEX_EXECUTABLE)
+check_exists(FLEX_EXECUTABLE FILE)
+
+message(STATUS "BREW_BASH_PREFIX: ${BREW_BASH_PREFIX}")
+check_variable_set(BREW_BASH_PREFIX)
+check_exists(BREW_BASH_PREFIX DIRECTORY)
+
+message(STATUS "GNU_BASH: ${GNU_BASH}")
+check_variable_set(GNU_BASH)
+check_exists(GNU_BASH FILE)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tebako
 version: !ruby/object:Gem::Version
-  version: 0.7.2.rc4
+  version: 0.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,6 +104,7 @@ files:
 - tools/cmake-scripts/setup-openssl.cmake
 - tools/cmake-scripts/version.cmake
 - tools/include/pro-statvfs.h
+- tools/tests/cmake/CMakeLists.txt
 - tools/tests/setup-libhowardhinnerdate/CMakeLists.txt
 - tools/tests/setup-librachive/CMakeLists.txt
 - tools/tests/setup-libutfcpp/CMakeLists.txt