From 08cc02804daa237f26484b0171ef82dea754bb53 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Sun, 23 Nov 2025 18:22:32 +0100 Subject: [PATCH] Invoke setup script in gem --- Gemfile.saas | 2 +- Gemfile.saas.lock | 17 ++++++++--------- bin/setup | 8 ++------ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Gemfile.saas b/Gemfile.saas index 52f6197c4..81ff0abb6 100644 --- a/Gemfile.saas +++ b/Gemfile.saas @@ -3,6 +3,6 @@ eval_gemfile "Gemfile" gem "activeresource", require: "active_resource" gem "queenbee", bc: "queenbee-plugin" -gem "fizzy-saas", bc: "fizzy-saas" +gem "fizzy-saas", path: "/home/jorge/Work/basecamp/fizzy-saas" gem "rails_structured_logging", bc: "rails-structured-logging" diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock index 4a3483eb9..0a9643f3e 100644 --- a/Gemfile.saas.lock +++ b/Gemfile.saas.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/basecamp/fizzy-saas - revision: 7efcfdc7d1b787aa5f023ea96656b9f67bcbfe7f - specs: - fizzy-saas (0.1.0) - queenbee - rails (>= 8.1.0.beta1) - rails_structured_logging - GIT remote: https://github.com/basecamp/queenbee-plugin revision: 15faf03a876c5e66b67753d2e1ddb24f1eb5abb2 @@ -134,6 +125,14 @@ GIT tsort (>= 0.2) zeitwerk (~> 2.6) +PATH + remote: ../fizzy-saas + specs: + fizzy-saas (0.1.0) + queenbee + rails (>= 8.1.0.beta1) + rails_structured_logging + GEM remote: https://rubygems.org/ specs: diff --git a/bin/setup b/bin/setup index 9835df835..0b7fb10f7 100755 --- a/bin/setup +++ b/bin/setup @@ -80,12 +80,8 @@ bundle config set --local auto_install true step "Installing RubyGems" bundle install if [ -n "$SAAS" ]; then - if [ -e tmp/minio-dev.txt ]; then - step "Starting Docker services" bash -c "[ -d ~/Work/basecamp/docker-dev ] && git -C ~/Work/basecamp/docker-dev pull || gh repo clone basecamp/docker-dev ~/Work/basecamp/docker-dev && ~/Work/basecamp/docker-dev/setup minio" - step "Configuring MinIO" bin/minio-setup - fi - - step "Starting mysql" bash -c "[ -d ~/Work/basecamp/docker-dev ] && git -C ~/Work/basecamp/docker-dev pull || gh repo clone basecamp/docker-dev ~/Work/basecamp/docker-dev && ~/Work/basecamp/docker-dev/setup mysql80" + saas_setup=$(bundle show fizzy-saas)/bin/setup + source "$saas_setup" fi if [[ $* == *--reset* ]]; then