galaaz 2.1.10.pre.5 → 2.1.10.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c59c52dee0210e7429fd3e8e25b7b529c48bd1c4ef5dd93129a447f75f7cea
-  data.tar.gz: c288f1de871ea48cf8004fb12f40b25c966494a4056c8e12b21c41f7ad15b867
+  metadata.gz: b1175b28a0271d54017f9688e6436c326da0305c6b383285d9a4adb11538018d
+  data.tar.gz: 43c3c80c7764e8a959d45b382a781c1a504e4ea7b3c7028dc3763e8c3493b04e
 SHA512:
-  metadata.gz: 2d6ad40a8fe7d8bf9f9bc76f28af74ba64e740f2178607c2d63586af0cdcb4194a54941eda2132ab61a17acb6f899c189ba0416a5e4432bf5b2fe2fc431d7b19
-  data.tar.gz: e281f2595077ed37709e596d123966461eca7aaa189eb2f6a1e72a17346cc96ebb36f49cc610ae5a503a7d8642e2bb6443c352aae4f7e75a48e8094970b1fe77
+  metadata.gz: a038c5ac9ff9eaacd0cd85af5e8613675e27157e2eea28b006d15d6b9083f8059b65b45e5ad8eedacffba22b464c68e288c82f1c2cb2dbf0c3074526f16eaa2e
+  data.tar.gz: 4f2eb91d9ccf66c15ad503116a0e14602491b73623eca7395ca2a2dedc6342e900f34ba2d838405879660ff62a74b7fed62163658a6ea33ae0085108affc7149

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 2.1.10.pre.6
+
+### Changed
+
+- Omarchy **Galaaz (core)** no longer runs `gem install` / uninstall. Flow is:
+  `gem install galaaz` → `galaaz omarchy install` → menu core (setup + blogs).
+- `galaaz --version` / `-v` / `version` prints the installed gem version;
+  `galaaz doctor` shows `version:`.
+- `galaaz blogs sync` refreshes sty + logo includes without wiping blogs;
+  core installer syncs on re-run; `galaaz add knit` refreshes brand assets.
+
 ## 2.1.10.pre.5
 
 ### Fixed

data/lib/galaaz/cli.rb

@@ -48,12 +48,34 @@ module Galaaz
       File.expand_path('../..', __dir__)
     end
 
+    def gem_version
+      spec = Gem.loaded_specs['galaaz']
+      return spec.version.to_s if spec
+
+      begin
+        return Gem::Specification.find_by_name('galaaz').version.to_s
+      rescue LoadError, Gem::LoadError, NameError
+        # fall through to version.rb
+      end
+
+      version_rb = File.join(root, 'version.rb')
+      if File.file?(version_rb)
+        load version_rb
+        return $version.to_s if defined?($version) && $version
+      end
+
+      'unknown'
+    end
+
     def run(argv)
       cmd = argv[0]
       case cmd
       when nil, '-h', '--help', 'help'
         print_help
         0
+      when '-v', '--version', 'version'
+        puts "galaaz #{gem_version}"
+        0
       when 'setup'
         cmd_setup
       when 'blogs'
@@ -82,18 +104,21 @@ module Galaaz
     def print_help
       puts <<~HELP
         Usage: galaaz <command> [args]
+               galaaz --version
 
         Commands:
           setup                 Build the NewBridge gatekeeper; ensure Rcpp
           blogs init [DIR]      Copy blog sources (default: ~/galaaz-blogs)
                                 and sty/galaaz.sty for PDF headers
                                 Options: --force
+          blogs sync [DIR]      Refresh sty + logo includes without wiping blogs
           doctor                Report Ruby, R, gatekeeper, Rcpp, sty, profiles
           add PROFILE           Install an add-on (idempotent)
                                 Profiles: #{PROFILES.join(', ')}
           omarchy [install]     Install Omarchy menu overlay (bundled in gem)
                                 Options: --from-git [--ref REF]
           omarchy status        Show whether overlay helpers are installed
+          --version, -v         Print installed gem version (#{gem_version})
 
         Legacy: any other argument is passed to rake in the Galaaz root
         (e.g. galaaz master_list:scatter_plot).
@@ -316,7 +341,7 @@ module Galaaz
         system('fc-cache', '-f', fonts)
         system('fc-cache', '-f', user_fonts)
       end
-      warn 'galaaz omarchy: fully restart the Omarchy shell (logout/login or kill omarchy-shell) so Qt reloads fonts' \
+      warn 'galaaz omarchy: logout/reboot required for Qt to reload brand fonts (killall omarchy-shell is often not enough)' \
         if ENV['OMARCHY_PATH'] || File.directory?(File.expand_path('~/.config/omarchy'))
     end
 
@@ -327,11 +352,14 @@ module Galaaz
       case sub
       when 'init'
         blogs_init(argv[1..])
+      when 'sync'
+        blogs_sync(argv[1..])
       when nil, '-h', '--help'
         puts 'Usage: galaaz blogs init [DIR] [--force]'
+        puts '       galaaz blogs sync [DIR]   # refresh sty + logo includes (no wipe)'
         0
       else
-        raise CliError, "unknown blogs subcommand: #{sub.inspect} (try: init)"
+        raise CliError, "unknown blogs subcommand: #{sub.inspect} (try: init|sync)"
       end
     end
 
@@ -344,7 +372,7 @@ module Galaaz
       if File.exist?(dest)
         entries = Dir.children(dest).reject { |n| n.start_with?('.') }
         if !entries.empty? && !force
-          raise CliError, "#{dest} exists and is not empty (use --force to replace)"
+          raise CliError, "#{dest} exists and is not empty (use --force to replace, or: galaaz blogs sync)"
         end
         FileUtils.rm_rf(dest) if force
       end
@@ -359,16 +387,28 @@ module Galaaz
       end
 
       File.write(File.join(dest, BLOGS_MARKER), "galaaz blogs init\n")
-      install_galaaz_sty_for_blogs!(dest)
+      ensure_blog_knit_assets!(dest)
       puts "galaaz blogs init: #{dest}"
       puts "You can now knit with gknit (after: galaaz add knit)"
       0
     end
 
+    # Refresh sty + per-blog logo includes without wiping ~/galaaz-blogs.
+    # Needed after gem upgrades that ship new branding assets (pandoc error 99
+    # when _logo_before_body.html / lockup PNG / sty were missing from an older init).
+    def blogs_sync(argv)
+      dest = File.expand_path(argv[0] || detect_blogs_dir || DEFAULT_BLOGS_DIR)
+      abort_unless(File.directory?(dest), "blogs dir missing: #{dest} (run: galaaz blogs init)")
+      n = ensure_blog_knit_assets!(dest)
+      puts "galaaz blogs sync: #{dest} (#{n} brand files refreshed)"
+      0
+    end
+
     # ---- doctor ----
 
     def cmd_doctor
       puts "galaaz doctor"
+      puts "  version:  #{gem_version}"
       puts "  root:     #{root}"
       print_ruby_engines
 
@@ -551,6 +591,11 @@ module Galaaz
       end
       mark_profile!('knit')
       puts 'galaaz add knit: OK'
+      blogs = detect_blogs_dir
+      if blogs
+        ensure_blog_knit_assets!(blogs)
+        puts 'galaaz add knit: refreshed blog brand assets (sty + logos)'
+      end
       puts 'Example knits (after blogs init → ~/galaaz-blogs):'
       puts '  gknit ~/galaaz-blogs/oh_my/oh_my.Rmd'
       puts '  gknit ~/galaaz-blogs/galaaz_ggplot/galaaz_ggplot.Rmd'
@@ -917,6 +962,35 @@ module Galaaz
       dest
     end
 
+    # Copy/overwrite brand includes required by blog YAML (pandoc before_body + PDF splash).
+    # Returns number of files written.
+    def ensure_blog_knit_assets!(blogs_dest)
+      blogs_dest = File.expand_path(blogs_dest)
+      install_galaaz_sty_for_blogs!(blogs_dest)
+      written = 0
+      BLOG_NAMES.each do |name|
+        src_blog = File.join(root, 'blogs', name)
+        dest_blog = File.join(blogs_dest, name)
+        next unless File.directory?(src_blog) && File.directory?(dest_blog)
+
+        logo_html = '_logo_before_body.html'
+        src_html = File.join(src_blog, logo_html)
+        if File.file?(src_html)
+          FileUtils.cp(src_html, File.join(dest_blog, logo_html))
+          written += 1
+        end
+
+        lockup = File.join('images', 'galaaz-lockup-stacked.png')
+        src_png = File.join(src_blog, lockup)
+        if File.file?(src_png)
+          FileUtils.mkdir_p(File.join(dest_blog, 'images'))
+          FileUtils.cp(src_png, File.join(dest_blog, lockup))
+          written += 1
+        end
+      end
+      written
+    end
+
     # TinyTeX installs to ~/.TinyTeX and often ~/bin; Omarchy PATH prefers ~/.local/bin.
     def ensure_pdflatex_on_path!
       return if command_present?('pdflatex')

data/script/omarchy/README.md

@@ -6,16 +6,15 @@ or a real Omarchy install. Works **with or without** an upstream Omarchy PR.
 ## Recommended: `galaaz omarchy` (gem-bundled)
 
 ```bash
-gem install galaaz
-galaaz setup
-galaaz omarchy              # A: copy overlay from this gem
+gem install galaaz            # choose version yourself (stable or .pre.N)
+galaaz omarchy install        # menu overlay + helpers (no second gem install)
 # optional, newer overlay than the gem:
 # galaaz omarchy install --from-git
-# galaaz omarchy install --from-git --ref galaaz2_0
 galaaz omarchy status
 ```
 
-Then Super+Space → Install → Development → **Galaaz**.
+Then Super+Space → Install → Development → **Galaaz** → **Galaaz (core)**  
+(core configures R/gatekeeper/blogs using the **already-installed** gem).
 
 **Important:** `gem install galaaz` alone does **not** add an Omarchy menu until you run
 `galaaz omarchy` (or an upstream catalog row exists).
@@ -24,7 +23,7 @@ Then Super+Space → Install → Development → **Galaaz**.
 
 | File | Role |
 |------|------|
-| `install-galaaz.sh` | Core install; always writes `~/.local/share/galaaz/install-core.log` |
+| `install-galaaz.sh` | Core configure (R/setup/blogs); uses installed gem; log `~/.local/share/galaaz/install-core.log` |
 | `galaaz-guide.sh` | Guide / docs / knit-demo helper (`omarchy-galaaz-guide`) |
 | `galaaz-add.sh` | Add-on wrapper (`omarchy-galaaz-add`) — pandoc without Arch Haskell stack |
 | `galaaz-gknit.sh` | Safe HTML gknit helper |
@@ -67,10 +66,12 @@ chmod +x ~/.local/bin/omarchy-*
 ## TryOmarchy steps
 
 1. Install → Development → Ruby on Rails (mise Ruby).
-2. `gem install galaaz && galaaz setup && galaaz omarchy`
-3. Super+Space → search **Galaaz**, or Install → Development → **Galaaz** → **Galaaz (core)**.
+2. `gem install galaaz && galaaz omarchy install`
+3. Super+Space → Install → Development → **Galaaz** → **Galaaz (core)**.
 
-That action must finish **gem + setup + blogs + doctor**. It fails if the gatekeeper `.so` is missing — “gem installed” alone is not success.
+Core configures **setup + blogs + doctor** using the gem you already installed
+(it does **not** run `gem install` again). It fails if the gatekeeper `.so` is
+missing — “gem installed” alone is not success.
 
 4. After core finishes, the same submenu shows Knit / Arrow / TeX / Bio / Examples / Ledger.
 

data/script/omarchy/install-galaaz.sh

@@ -1,15 +1,17 @@
 #!/bin/bash
 # Omarchy-shaped core installer for Galaaz (R-on-Rails).
-# omarchy:summary=Install Galaaz (R-on-Rails)
+# omarchy:summary=Configure Galaaz (R-on-Rails)
 # omarchy:name=galaaz
 #
+# Prerequisite (do this yourself first — this script does NOT gem install):
+#   gem install galaaz          # or: gem install galaaz -v x.y.z / .pre.N
+#   galaaz omarchy install      # menu overlay + helpers
+# Then: Super+Space → Install → Development → Galaaz → Galaaz (core)
+#
 # Debug log (always written, even if TUI tee fails):
 #   ~/.local/share/galaaz/install-core.log
 set -euo pipefail
 
-# Optional pin: GALAAZ_GEM_VERSION=2.1.2 omarchy-install-galaaz
-# Default: latest from RubyGems (Omarchy/Rails shape).
-GALAAZ_GEM_VERSION="${GALAAZ_GEM_VERSION:-}"
 LOG_DIR="${HOME}/.local/share/galaaz"
 LOG="${LOG_DIR}/install-core.log"
 mkdir -p "${LOG_DIR}"
@@ -45,13 +47,13 @@ on_err() {
 }
 trap on_err ERR
 
-log "=== galaaz core install $(date -Iseconds) ==="
+log "=== galaaz core configure $(date -Iseconds) ==="
 log "log file: ${LOG}"
 log "script: ${BASH_SOURCE[0]}"
 log "pwd: $(pwd)"
 log "user: $(id -un) home=${HOME}"
 log "PATH: ${PATH}"
-log "GALAAZ_GEM_VERSION=${GALAAZ_GEM_VERSION:-latest}"
+log "(uses already-installed galaaz gem — does not gem install)"
 log ""
 
 pkg_add() {
@@ -167,35 +169,21 @@ WRAP
   log "wrapper: ${HOME}/.local/bin/galaaz"
 }
 
-run_ruby gem uninstall galaaz -x -a --ignore-dependencies >>"${LOG}" 2>&1 || true
-if [[ -n "${GALAAZ_GEM_VERSION}" ]]; then
-  log "==> gem install galaaz -v ${GALAAZ_GEM_VERSION}"
-  set +e
-  run_ruby gem install galaaz -v "${GALAAZ_GEM_VERSION}" --no-document --source https://rubygems.org 2>&1 | tee -a "${LOG}"
-  st=${PIPESTATUS[0]}
-  set -e
-  [[ ${st} -eq 0 ]] || exit "${st}"
-else
-  LATEST="$(curl -fsSL https://rubygems.org/api/v1/versions/galaaz/latest.json 2>/dev/null \
-    | sed -n 's/.*"version":"\([^"]*\)".*/\1/p' || true)"
-  if [[ -n "${LATEST}" ]]; then
-    log "==> gem install galaaz ${LATEST} (latest on RubyGems)"
-  else
-    log "==> gem install galaaz (latest on RubyGems)"
-  fi
-  set +e
-  run_ruby gem install galaaz --no-document --source https://rubygems.org 2>&1 | tee -a "${LOG}"
-  st=${PIPESTATUS[0]}
-  set -e
-  [[ ${st} -eq 0 ]] || exit "${st}"
+# Gem must already be installed (user: gem install galaaz [ -v … ]).
+# Do NOT gem install/uninstall here — that pulled stable latest over prereleases.
+log "==> require installed galaaz gem"
+if ! ROOT="$(gem_root 2>/dev/null)" || [[ -z "${ROOT}" || ! -d "${ROOT}" ]]; then
+  log "ERROR: galaaz gem not found under this Ruby."
+  log "Install first, then re-run core configure:"
+  log "  gem install galaaz    # or gem install galaaz -v <version>"
+  log "  galaaz omarchy install"
+  exit 1
 fi
-
 INSTALLED="$(run_ruby ruby -e "puts Gem::Specification.find_by_name('galaaz').version")"
-log "installed galaaz ${INSTALLED}"
+log "using galaaz ${INSTALLED}"
+log "gem root: ${ROOT}"
 
-ROOT="$(gem_root)"
 BRIDGE="${ROOT}/ext/new_bridge"
-log "gem root: ${ROOT}"
 log "bridge: ${BRIDGE}"
 ls -la "${BRIDGE}" >>"${LOG}" 2>&1 || true
 if [[ ! -f "${BRIDGE}/Makefile" ]]; then
@@ -254,8 +242,14 @@ log "gatekeeper OK: ${SO}"
 log "==> galaaz setup (CLI)"
 galaaz_cli setup >>"${LOG}" 2>&1 || log "WARN: galaaz setup non-zero (so exists; continuing)"
 
-log "==> galaaz blogs init"
-galaaz_cli blogs init "${HOME}/galaaz-blogs" >>"${LOG}" 2>&1
+log "==> galaaz blogs init/sync"
+# Fresh machine: init. Upgrade / re-run: sync brand assets without wiping blogs
+# (older gems omitted _logo_before_body.html → pandoc error 99).
+if [[ -f "${HOME}/galaaz-blogs/.galaaz-blogs" ]]; then
+  galaaz_cli blogs sync "${HOME}/galaaz-blogs" >>"${LOG}" 2>&1 || log "WARN: blogs sync non-zero"
+else
+  galaaz_cli blogs init "${HOME}/galaaz-blogs" >>"${LOG}" 2>&1 || log "WARN: blogs init non-zero"
+fi
 
 install_wrapper
 
@@ -327,7 +321,7 @@ mkdir -p "${HOME}/.config/galaaz/profiles"
 date -Iseconds >"${HOME}/.config/galaaz/profiles/core"
 
 log ""
-log "Core install complete."
+log "Core configure complete."
 log "Next: Super+Space → Install → Development → Galaaz → Guide (what's next)"
 log "Docs: https://rbotafogo.github.io/galaaz/"
 log "FULL LOG: ${LOG}"

data/script/omarchy/omarchy-menu.jsonc

@@ -21,7 +21,7 @@
     "icon": "\uE90E",
     "iconFont": "omarchy",
     "label": "Galaaz (core)",
-    "description": "gem + setup + blogs (not just gem install)",
+    "description": "setup + blogs (gem already installed)",
     "action": "omarchy-launch-tui omarchy-install-galaaz",
     "disabled": "test -f ~/.config/galaaz/profiles/core"
   },

data/version.rb

@@ -1,2 +1,2 @@
 $gem_name = "galaaz"
-$version="2.1.10.pre.5"
+$version="2.1.10.pre.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galaaz
 version: !ruby/object:Gem::Version
-  version: 2.1.10.pre.5
+  version: 2.1.10.pre.6
 platform: ruby
 authors:
 - Rodrigo Botafogo