From f9b10af572a115443fc9a171fa0e6b145ddbce4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 27 May 2024 12:06:40 +0200
Subject: [PATCH] Use official ruby helpers now

---
 manifest.toml    |   2 +-
 scripts/backup   |   1 -
 scripts/install  |   1 -
 scripts/remove   |   1 -
 scripts/restore  |   1 -
 scripts/upgrade  |   1 -
 scripts/ynh_ruby | 303 -----------------------------------------------
 7 files changed, 1 insertion(+), 309 deletions(-)
 delete mode 100644 scripts/ynh_ruby

diff --git a/manifest.toml b/manifest.toml
index d40b469..11ccd62 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ website = "https://magicstone.dev"
 code = "https://github.com/magicstone-dev/acropolis"
 
 [integration]
-yunohost = ">=11.2"
+yunohost = ">=11.2.12"
 architectures = "all"
 multi_instance = false
 
diff --git a/scripts/backup b/scripts/backup
index 22f3a4c..7a474c5 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -6,7 +6,6 @@
 
 # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
-source ../settings/scripts/ynh_ruby
 source ../settings/scripts/ynh_add_swap
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/install b/scripts/install
index cd00bd2..289b379 100644
--- a/scripts/install
+++ b/scripts/install
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_ruby
 source ynh_add_swap
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/remove b/scripts/remove
index 4094ddc..e31f498 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_ruby
 source ynh_add_swap
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/restore b/scripts/restore
index 2711d38..0aab10f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,7 +6,6 @@
 
 # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
-source ../settings/scripts/ynh_ruby
 source ../settings/scripts/ynh_add_swap
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8d795e9..8dbb61f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_ruby
 source ynh_add_swap
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/ynh_ruby b/scripts/ynh_ruby
deleted file mode 100644
index f780763..0000000
--- a/scripts/ynh_ruby
+++ /dev/null
@@ -1,303 +0,0 @@
-
-ynh_ruby_try_bash_extension() {
-  if [ -x src/configure ]; then
-    src/configure && make -C src || {
-      ynh_print_info --message="Optional bash extension failed to build, but things will still work normally."
-    }
-  fi
-}
-
-rbenv_install_dir="/opt/rbenv"
-ruby_version_path="$rbenv_install_dir/versions"
-# RBENV_ROOT is the directory of rbenv, it needs to be loaded as a environment variable.
-export RBENV_ROOT="$rbenv_install_dir"
-export rbenv_root="$rbenv_install_dir"
-# Load the version of Ruby for an app, and set variables.
-#
-# ynh_use_ruby has to be used in any app scripts before using Ruby for the first time.
-# This helper will provide alias and variables to use in your scripts.
-#
-# To use gem or Ruby, use the alias `ynh_gem` and `ynh_ruby`
-# Those alias will use the correct version installed for the app
-# For example: use `ynh_gem install` instead of `gem install`
-#
-# With `sudo` or `ynh_exec_as`, use instead the fallback variables `$ynh_gem` and `$ynh_ruby`
-# And propagate $PATH to sudo with $ynh_ruby_load_path
-# Exemple: `ynh_exec_as $app $ynh_ruby_load_path $ynh_gem install`
-#
-# $PATH contains the path of the requested version of Ruby.
-# However, $PATH is duplicated into $ruby_path to outlast any manipulation of $PATH
-# You can use the variable `$ynh_ruby_load_path` to quickly load your Ruby version
-#  in $PATH for an usage into a separate script.
-# Exemple: $ynh_ruby_load_path $install_dir/script_that_use_gem.sh`
-#
-#
-# Finally, to start a Ruby service with the correct version, 2 solutions
-#  Either the app is dependent of Ruby or gem, but does not called it directly.
-#  In such situation, you need to load PATH
-#    `Environment="__YNH_RUBY_LOAD_ENV_PATH__"`
-#    `ExecStart=__INSTALL_DIR__/my_app`
-#     You will replace __YNH_RUBY_LOAD_ENV_PATH__ with $ynh_ruby_load_path
-#
-#  Or Ruby start the app directly, then you don't need to load the PATH variable
-#    `ExecStart=__YNH_RUBY__ my_app run`
-#     You will replace __YNH_RUBY__ with $ynh_ruby
-#
-#
-# one other variable is also available
-#   - $ruby_path: The absolute path to Ruby binaries for the chosen version.
-#
-# usage: ynh_use_ruby
-#
-# Requires YunoHost version 2.7.12 or higher.
-ynh_use_ruby () {
-    ruby_version=$(ynh_app_setting_get --app=$app --key=ruby_version)
-
-    # Get the absolute path of this version of Ruby
-    ruby_path="$ruby_version_path/$app/bin"
-
-    # Allow alias to be used into bash script
-    shopt -s expand_aliases
-
-    # Create an alias for the specific version of Ruby and a variable as fallback
-    ynh_ruby="$ruby_path/ruby"
-    alias ynh_ruby="$ynh_ruby"
-    # And gem
-    ynh_gem="$ruby_path/gem"
-    alias ynh_gem="$ynh_gem"
-
-    # Load the path of this version of Ruby in $PATH
-    if [[ :$PATH: != *":$ruby_path"* ]]; then
-        PATH="$ruby_path:$PATH"
-    fi
-    # Create an alias to easily load the PATH
-    ynh_ruby_load_path="PATH=$PATH"
-
-    # Sets the local application-specific Ruby version
-    pushd $install_dir
-        $rbenv_install_dir/bin/rbenv local $ruby_version
-    popd
-}
-
-# Install a specific version of Ruby
-#
-# ynh_install_ruby will install the version of Ruby provided as argument by using rbenv.
-#
-# This helper creates a /etc/profile.d/rbenv.sh that configures PATH environment for rbenv
-# for every LOGIN user, hence your user must have a defined shell (as opposed to /usr/sbin/nologin)
-#
-# Don't forget to execute ruby-dependent command in a login environment
-# (e.g. sudo --login option)
-# When not possible (e.g. in systemd service definition), please use direct path
-# to rbenv shims (e.g. $RBENV_ROOT/shims/bundle)
-#
-# usage: ynh_install_ruby --ruby_version=ruby_version
-# | arg: -v, --ruby_version= - Version of ruby to install.
-#
-# Requires YunoHost version 2.7.12 or higher.
-ynh_install_ruby () {
-    # Declare an array to define the options of this helper.
-    local legacy_args=v
-    local -A args_array=( [v]=ruby_version= )
-    local ruby_version
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
-
-    # Load rbenv path in PATH
-    local CLEAR_PATH="$rbenv_install_dir/bin:$PATH"
-
-    # Remove /usr/local/bin in PATH in case of Ruby prior installation
-    PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
-
-    # Move an existing Ruby binary, to avoid to block rbenv
-    test -x /usr/bin/ruby && mv /usr/bin/ruby /usr/bin/ruby_rbenv
-
-    # Install or update rbenv
-    rbenv="$(command -v rbenv $rbenv_install_dir/bin/rbenv | grep "$rbenv_install_dir/bin/rbenv" | head -1)"
-    if [ -n "$rbenv" ]; then
-        ynh_print_info --message="rbenv already seems installed in \`$rbenv'."
-        pushd "${rbenv%/*/*}"
-            if git remote -v 2>/dev/null | grep "https://github.com/rbenv/rbenv.git"; then
-                ynh_print_info --message="Trying to update with git..."
-                git pull -q --tags origin master
-                ynh_ruby_try_bash_extension
-            else
-                ynh_print_info --message="Reinstalling rbenv with git..."
-                cd ..
-                ynh_secure_remove --file=$rbenv_install_dir
-                mkdir -p $rbenv_install_dir
-                cd $rbenv_install_dir
-                git init -q
-                git remote add -f -t master origin https://github.com/rbenv/rbenv.git > /dev/null 2>&1
-                git checkout -q -b master origin/master
-                ynh_ruby_try_bash_extension
-                rbenv=$rbenv_install_dir/bin/rbenv
-            fi
-        popd
-    else
-        ynh_print_info --message="Installing rbenv with git..."
-        mkdir -p $rbenv_install_dir
-        pushd $rbenv_install_dir
-            git init -q
-            git remote add -f -t master origin https://github.com/rbenv/rbenv.git > /dev/null 2>&1
-            git checkout -q -b master origin/master
-            ynh_ruby_try_bash_extension
-            rbenv=$rbenv_install_dir/bin/rbenv
-        popd
-    fi
-
-    ruby_build="$(command -v "$rbenv_install_dir"/plugins/*/bin/rbenv-install rbenv-install | head -1)"
-    if [ -n "$ruby_build" ]; then
-        ynh_print_info --message="\`rbenv install' command already available in \`$ruby_build'."
-        pushd "${ruby_build%/*/*}"
-            if git remote -v 2>/dev/null | grep "https://github.com/rbenv/ruby-build.git"; then
-                ynh_print_info --message="Trying to update rbenv with git..."
-                git pull -q origin master
-            fi
-        popd
-    else
-        ynh_print_info --message="Installing ruby-build with git..."
-        mkdir -p "${rbenv_install_dir}/plugins"
-        git clone -q https://github.com/rbenv/ruby-build.git "${rbenv_install_dir}/plugins/ruby-build"
-    fi
-
-    rbenv_alias="$(command -v "$rbenv_install_dir"/plugins/*/bin/rbenv-alias rbenv-alias | head -1)"
-    if [ -n "$rbenv_alias" ]; then
-        ynh_print_info --message="\`rbenv alias' command already available in \`$rbenv_alias'."
-        pushd "${rbenv_alias%/*/*}"
-            if git remote -v 2>/dev/null | grep "https://github.com/tpope/rbenv-aliases.git"; then
-                ynh_print_info --message="Trying to update rbenv-aliases with git..."
-                git pull -q origin master
-            fi
-        popd
-    else
-        ynh_print_info --message="Installing rbenv-aliases with git..."
-        mkdir -p "${rbenv_install_dir}/plugins"
-        git clone -q https://github.com/tpope/rbenv-aliases.git "${rbenv_install_dir}/plugins/rbenv-aliase"
-    fi
-
-    rbenv_latest="$(command -v "$rbenv_install_dir"/plugins/*/bin/rbenv-latest rbenv-latest | head -1)"
-    if [ -n "$rbenv_latest" ]; then
-        ynh_print_info --message="\`rbenv latest' command already available in \`$rbenv_latest'."
-        pushd "${rbenv_latest%/*/*}"
-            if git remote -v 2>/dev/null | grep "https://github.com/momo-lab/xxenv-latest.git"; then
-                ynh_print_info --message="Trying to update xxenv-latest with git..."
-                git pull -q origin master
-            fi
-        popd
-    else
-        ynh_print_info --message="Installing xxenv-latest with git..."
-        mkdir -p "${rbenv_install_dir}/plugins"
-        git clone -q https://github.com/momo-lab/xxenv-latest.git "${rbenv_install_dir}/plugins/xxenv-latest"
-    fi
-
-    # Enable caching
-    mkdir -p "${rbenv_install_dir}/cache"
-
-    # Create shims directory if needed
-    mkdir -p "${rbenv_install_dir}/shims"
-
-    # Restore /usr/local/bin in PATH
-    PATH=$CLEAR_PATH
-
-    # And replace the old Ruby binary
-    test -x /usr/bin/ruby_rbenv && mv /usr/bin/ruby_rbenv /usr/bin/ruby
-
-    # Install the requested version of Ruby
-    local final_ruby_version=$(rbenv latest --print $ruby_version)
-    if ! [ -n "$final_ruby_version" ]; then
-        final_ruby_version=$ruby_version
-    fi
-    ynh_print_info --message="Installing Ruby-$final_ruby_version"
-    CONFIGURE_OPTS="--disable-install-doc --with-jemalloc" MAKE_OPTS="-j2" rbenv install --skip-existing $final_ruby_version > /dev/null 2>&1
-
-    # Store ruby_version into the config of this app
-    ynh_app_setting_set --app=$app --key=ruby_version --value=$final_ruby_version
-
-    # Remove app virtualenv
-    if  `rbenv alias --list | grep --quiet "$app " 1>/dev/null 2>&1`
-    then
-        rbenv alias $app --remove
-    fi
-
-    # Create app virtualenv
-    rbenv alias $app $final_ruby_version
-
-    # Cleanup Ruby versions
-    ynh_cleanup_ruby
-
-    # Set environment for Ruby users
-    echo  "#rbenv
-export RBENV_ROOT=$rbenv_install_dir
-export PATH=\"$rbenv_install_dir/bin:$PATH\"
-eval \"\$(rbenv init -)\"
-#rbenv" > /etc/profile.d/rbenv.sh
-
-    # Load the environment
-    eval "$(rbenv init -)"
-}
-
-# Remove the version of Ruby used by the app.
-#
-# This helper will also cleanup Ruby versions
-#
-# usage: ynh_remove_ruby
-ynh_remove_ruby () {
-    local ruby_version=$(ynh_app_setting_get --app=$app --key=ruby_version)
-
-    # Load rbenv path in PATH
-    local CLEAR_PATH="$rbenv_install_dir/bin:$PATH"
-
-    # Remove /usr/local/bin in PATH in case of Ruby prior installation
-    PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
-
-#REMOVEME?     rbenv alias $app --remove
-
-    # Remove the line for this app
-#REMOVEME?     ynh_app_setting_delete --app=$app --key=ruby_version
-
-    # Cleanup Ruby versions
-    ynh_cleanup_ruby
-}
-
-# Remove no more needed versions of Ruby used by the app.
-#
-# This helper will check what Ruby version are no more required,
-# and uninstall them
-# If no app uses Ruby, rbenv will be also removed.
-#
-# usage: ynh_cleanup_ruby
-ynh_cleanup_ruby () {
-
-    # List required Ruby versions
-    local installed_apps=$(yunohost app list | grep -oP 'id: \K.*$')
-    local required_ruby_versions=""
-    for installed_app in $installed_apps
-    do
-        local installed_app_ruby_version=$(ynh_app_setting_get --app=$installed_app --key="ruby_version")
-        if [[ $installed_app_ruby_version ]]
-        then
-            required_ruby_versions="${installed_app_ruby_version}\n${required_ruby_versions}"
-        fi
-    done
-
-    # Remove no more needed Ruby versions
-    local installed_ruby_versions=$(rbenv versions --bare --skip-aliases | grep -Ev '/')
-    for installed_ruby_version in $installed_ruby_versions
-    do
-        if ! `echo ${required_ruby_versions} | grep "${installed_ruby_version}" 1>/dev/null 2>&1`
-        then
-            ynh_print_info --message="Removing of Ruby-$installed_ruby_version"
-            $rbenv_install_dir/bin/rbenv uninstall --force $installed_ruby_version
-        fi
-    done
-
-    # If none Ruby version is required
-    if [[ ! $required_ruby_versions ]]
-    then
-        # Remove rbenv environment configuration
-        ynh_print_info --message="Removing of rbenv-$rbenv_version"
-        ynh_secure_remove --file="$rbenv_install_dir"
-        ynh_secure_remove --file="/etc/profile.d/rbenv.sh"
-    fi
-}