pgbus 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11fc5e1aa1196d1332b426e72aab0364cc548925fe960ff6626a6cd8090b2de5
-  data.tar.gz: 52fd690b0a3afda834850f5fc0eb3a111fd18062af6b3ca7097fadc085abf1b9
+  metadata.gz: 85f2e8748cf70bb74cb736b23e3e0288be5ca0b946b0eb80c08e1d28650e98c0
+  data.tar.gz: d1fd675bb9d9a5beb4607f8e0da684c606d096a835948abf60034bd601cdd7f2
 SHA512:
-  metadata.gz: f232df26f7a0122db40119b43bf0d03290ea583eaf889ac58c95bb81850c5f745603fa81b848be437f4298ffff5ed65c82c64b890da64bc663ef600a4d05fe0c
-  data.tar.gz: c2d5f381fa2e4cf4943fe9bd27815459faaf9f92c7bf40d97bb2ea93b5622dcb5a197d8ccdb63249fd2ee681d4c10961070e7016093bacda2ba81010939cd7aa
+  metadata.gz: 99b168d4276ef5149effdbf7d18955c542b9f8507a67d022381a61c7c36cacdf58ab414e166e528495e244313ef12d10e054119361bbf77ca2e6cc260f6d1982
+  data.tar.gz: 606324c33ddd072b24135c91314258fc2c162e54b6610ec813457cae2b4df3ba5c0391fc5dbd8a1ff6e13f14032968320b41b9a1d9450d0b5fbe2d66686f2c9e

data/Rakefile

@@ -50,15 +50,24 @@ task :build do
   sh("rm -rf /tmp/gem-verify #{gem_file}")
 end
 
-desc "Release a new version (rake release[1.2.3] or rake release[pre])"
-task :release, [:version] do |_t, args|
+desc "Release a new version (rake release[1.2.3] or rake release[pre] or rake release[1.2.3,force])"
+task :release, %i[version force] do |_t, args|
   require_relative "lib/pgbus/version"
 
+  def info(msg)    = puts "\e[34m→\e[0m #{msg}"
+  def success(msg) = puts "\e[32m✓\e[0m #{msg}"
+  def skip(msg)    = puts "\e[33m⊘\e[0m #{msg} \e[33m(skipped)\e[0m"
+  def warn(msg)    = puts "\e[33m⚠\e[0m #{msg}"
+  def error(msg)   = puts "\e[31m✗\e[0m #{msg}"
+  def header(msg)  = puts "\n\e[1;36m#{msg}\e[0m\n#{"─" * msg.length}"
+
   new_version = args[:version]
-  abort "Usage: rake release[X.Y.Z] or rake release[pre]" unless new_version
+  abort "\e[31mUsage: rake release[X.Y.Z] or rake release[X.Y.Z,force]\e[0m" unless new_version
+
+  force = args[:force]&.to_s&.downcase == "force"
 
   dirty = `git status --porcelain`.strip
-  abort "Aborting: working directory is not clean.\n#{dirty}" unless dirty.empty?
+  abort "\e[31mAborting: working directory is not clean.\e[0m\n#{dirty}" unless dirty.empty?
 
   current = Pgbus::VERSION
   prerelease = new_version.match?(/alpha|beta|rc|pre/) || new_version == "pre"
@@ -69,43 +78,97 @@ task :release, [:version] do |_t, args|
   end
 
   tag = "v#{new_version}"
+  version_file = "lib/pgbus/version.rb"
 
-  puts "Current version: #{current}"
-  puts "New version:     #{new_version}"
-  puts "Tag:             #{tag}"
-  puts "Pre-release:     #{prerelease}"
-  puts ""
+  title = "Release #{tag}"
+  title += " (force)" if force
+  header title
+  info "Current version: #{current}"
+  info "New version:     #{new_version}"
+  info "Pre-release:     #{prerelease}"
+
+  # Step 0: Force cleanup — delete existing release and tag
+  if force
+    header "Force cleanup"
+    if system("gh release view #{tag} >/dev/null 2>&1")
+      sh("gh release delete #{tag} --yes --cleanup-tag")
+      success "Deleted release and remote tag #{tag}"
+    else
+      skip "No release #{tag} to delete"
+    end
+
+    if system("git rev-parse #{tag} >/dev/null 2>&1")
+      sh("git tag -d #{tag}")
+      success "Deleted local tag #{tag}"
+    else
+      skip "No local tag #{tag} to delete"
+    end
+  end
 
-  # Update version file if needed
-  version_file = "lib/pgbus/version.rb"
-  if new_version != current
+  # Step 1: Update version file
+  header "Version"
+  if new_version == current
+    skip "Version already #{new_version}"
+  else
     content = File.read(version_file)
     content.sub!(/VERSION = ".*"/, "VERSION = \"#{new_version}\"")
     File.write(version_file, content)
-    puts "Updated #{version_file}"
+    success "Updated #{version_file}"
   end
 
-  # Verify gem builds cleanly
+  # Step 2: Verify gem builds cleanly
+  header "Build verification"
   sh("gem build pgbus.gemspec --strict")
   sh("rm -f pgbus-*.gem")
+  success "Gem builds cleanly"
 
-  # Commit, push, and create release
-  if new_version != current
+  # Step 3: Commit version bump
+  header "Git commit"
+  version_changed = !`git diff #{version_file}`.strip.empty? || !`git diff --cached #{version_file}`.strip.empty?
+  if version_changed
     sh("git add #{version_file}")
     sh("git commit -m 'chore: bump version to #{new_version}'")
+    success "Committed version bump"
+  else
+    skip "No version change to commit"
+  end
+
+  # Step 4: Push to origin
+  header "Git push"
+  local_sha = `git rev-parse HEAD`.strip
+  remote_sha = `git rev-parse origin/main 2>/dev/null`.strip
+  if local_sha == remote_sha
+    skip "origin/main already at #{local_sha[0..6]}"
+  else
+    sh("git push origin main")
+    success "Pushed to origin/main"
   end
-  sh("git push origin main")
 
-  pre_flag = prerelease ? "--prerelease" : ""
-  sh("gh release create #{tag} --generate-notes --target main #{pre_flag}".strip)
+  # Step 5: Create release
+  header "Release"
+  tag_exists = system("git rev-parse #{tag} >/dev/null 2>&1")
+  release_exists = system("gh release view #{tag} >/dev/null 2>&1")
+
+  if release_exists
+    skip "Release #{tag} already exists (use force to re-create)"
+  elsif tag_exists
+    info "Tag #{tag} exists, creating release from it"
+    pre_flag = prerelease ? "--prerelease" : ""
+    sh("gh release create #{tag} --generate-notes #{pre_flag}".strip)
+    success "Release #{tag} created from existing tag"
+  else
+    pre_flag = prerelease ? "--prerelease" : ""
+    sh("gh release create #{tag} --generate-notes --target main #{pre_flag}".strip)
+    success "Release #{tag} created"
+  end
 
   puts ""
-  puts "Release #{tag} created! CI will handle the rest:"
-  puts "  - Run tests"
-  puts "  - Build + verify gem"
-  puts "  - Sign with Sigstore"
-  puts "  - Publish to RubyGems"
-  puts "  - Upload assets to the release"
+  success "\e[1mRelease #{tag} complete!\e[0m CI will handle the rest:"
+  puts "    • Run tests"
+  puts "    • Build + verify gem"
+  puts "    • Sign with Sigstore"
+  puts "    • Publish to RubyGems"
+  puts "    • Upload assets to the release"
 end
 
 task default: %i[spec rubocop]

data/app/controllers/pgbus/application_controller.rb

@@ -51,6 +51,7 @@ module Pgbus
       @available_locales ||= Dir[Pgbus::Engine.root.join("config", "locales", "*.yml")]
                              .map { |f| File.basename(f, ".yml").to_sym }
     end
+    helper_method :available_locales
 
     def data_source
       @data_source ||= Pgbus.configuration.web_data_source || Web::DataSource.new
@@ -67,9 +68,8 @@ module Pgbus
     def insights_minutes
       config = Pgbus.configuration
       default = config.insights_default_minutes.to_i
-      max = config.stats_retention.to_i / 60
       value = (params[:minutes] || default).to_i
-      value.clamp(1, [max, 1].max)
+      value.clamp(1, [default, 43_200].max)
     end
 
     def turbo_frame_request?

data/app/views/layouts/pgbus/application.html.erb

@@ -4,6 +4,12 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title><%= t("pgbus.layout.title") %></title>
+  <style>
+    /* Prevent white flash during navigation in dark mode.
+       Applied before Tailwind CDN loads so the background is correct immediately. */
+    html.dark { background-color: #030712; } /* gray-950 */
+    html.dark body { background-color: #030712; }
+  </style>
   <script src="https://cdn.tailwindcss.com"></script>
   <script>
     tailwind.config = { darkMode: 'class' };
@@ -17,24 +23,17 @@
       var isDark = document.documentElement.classList.toggle('dark');
       localStorage.setItem('pgbus-dark', isDark);
     }
-    // Locale dropdown toggle
+    // Close locale dropdown when clicking outside
     document.addEventListener('click', function(e) {
-      var btn = e.target.closest('[data-action="click->dropdown#toggle"]');
-      var menu = btn && btn.parentElement.querySelector('[data-dropdown-target="menu"]');
-      // Close all menus first
-      document.querySelectorAll('[data-dropdown-target="menu"]').forEach(function(m) {
-        if (m !== menu) m.classList.add('hidden');
-      });
-      if (menu) { menu.classList.toggle('hidden'); e.stopPropagation(); }
-    });
-    document.addEventListener('click', function() {
-      document.querySelectorAll('[data-dropdown-target="menu"]').forEach(function(m) {
-        m.classList.add('hidden');
-      });
+      var switcher = document.getElementById('pgbus-locale-switcher');
+      var menu = document.getElementById('pgbus-locale-menu');
+      if (menu && switcher && !switcher.contains(e.target)) {
+        menu.classList.add('hidden');
+      }
     });
   </script>
   <script type="module">
-    import * as Turbo from "https://cdn.jsdelivr.net/npm/@hotwired/turbo@8/dist/turbo.es2017.esm.js";
+    import * as Turbo from "https://esm.sh/@hotwired/turbo@8";
 
     <% if Pgbus.configuration.web_live_updates %>
     const interval = <%= Pgbus.configuration.web_refresh_interval %>;
@@ -43,7 +42,10 @@
       function refreshFrames() {
         if (document.hidden) return;
         document.querySelectorAll("turbo-frame[data-auto-refresh]")
-          .forEach(frame => frame.reload());
+          .forEach(frame => {
+            if (!frame.src && frame.dataset.src) frame.src = frame.dataset.src;
+            if (frame.src) frame.reload();
+          });
       }
       function start() { timer = setInterval(refreshFrames, interval); }
       function stop() { clearInterval(timer); }
@@ -81,19 +83,16 @@
 
           <div class="flex items-center space-x-2">
             <!-- Locale switcher -->
-            <div class="relative" data-controller="dropdown">
-              <button type="button" data-action="click->dropdown#toggle" class="rounded-md px-2 py-1.5 text-sm text-gray-300 hover:text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500">
+            <div class="relative" id="pgbus-locale-switcher">
+              <button type="button" onclick="document.getElementById('pgbus-locale-menu').classList.toggle('hidden')" class="rounded-md px-2 py-1 text-sm text-gray-300 hover:text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500">
                 <%= pgbus_locale_flag(I18n.locale) %> <%= I18n.locale.to_s.upcase %>
               </button>
-              <div data-dropdown-target="menu" class="hidden absolute right-0 z-50 mt-1 w-44 origin-top-right rounded-md bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5 dark:ring-white/10">
+              <div id="pgbus-locale-menu" class="hidden absolute right-0 z-50 mt-1 w-44 origin-top-right rounded-md bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5 dark:ring-white/10">
                 <div class="py-1" role="menu">
-                  <% controller.send(:available_locales).sort.each do |loc| %>
-                    <%= form_tag pgbus.set_locale_path, method: :post, class: "contents" do %>
-                      <%= hidden_field_tag :locale, loc %>
-                      <button type="submit" role="menuitem" class="w-full text-left px-3 py-1.5 text-sm <%= loc == I18n.locale ? 'bg-indigo-50 dark:bg-indigo-900/30 text-indigo-700 dark:text-indigo-300 font-medium' : 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700' %>">
-                        <%= pgbus_locale_flag(loc) %> <%= pgbus_locale_name(loc) %>
-                      </button>
-                    <% end %>
+                  <% available_locales.sort.each do |loc| %>
+                    <a href="<%= pgbus.set_locale_path(locale: loc) %>" role="menuitem" class="block px-3 py-1 text-sm no-underline <%= loc == I18n.locale ? 'bg-indigo-50 dark:bg-indigo-900/30 text-indigo-700 dark:text-indigo-300 font-medium' : 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700' %>">
+                      <%= pgbus_locale_flag(loc) %> <%= pgbus_locale_name(loc) %>
+                    </a>
                   <% end %>
                 </div>
               </div>

data/app/views/pgbus/dashboard/_processes_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="dashboard-processes" data-auto-refresh src="<%= pgbus.root_path(frame: 'processes') %>">
+<turbo-frame id="dashboard-processes" data-auto-refresh data-src="<%= pgbus.root_path(frame: 'processes') %>">
   <div>
     <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3"><%= t("pgbus.dashboard.processes_table.title") %></h2>
     <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">

data/app/views/pgbus/dashboard/_queues_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="dashboard-queues" data-auto-refresh src="<%= pgbus.root_path(frame: 'queues') %>">
+<turbo-frame id="dashboard-queues" data-auto-refresh data-src="<%= pgbus.root_path(frame: 'queues') %>">
   <div class="mb-8">
     <div class="flex items-center justify-between mb-3">
       <h2 class="text-lg font-semibold text-gray-900 dark:text-white"><%= t("pgbus.dashboard.queues_table.title") %></h2>

data/app/views/pgbus/dashboard/_recent_failures.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="dashboard-failures" data-auto-refresh src="<%= pgbus.root_path(frame: 'failures') %>">
+<turbo-frame id="dashboard-failures" data-auto-refresh data-src="<%= pgbus.root_path(frame: 'failures') %>">
   <div>
     <div class="flex items-center justify-between mb-3">
       <h2 class="text-lg font-semibold text-gray-900 dark:text-white"><%= t("pgbus.dashboard.recent_failures.title") %></h2>

data/app/views/pgbus/dashboard/_stats_cards.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="dashboard-stats" data-auto-refresh src="<%= pgbus.root_path(frame: 'stats') %>">
+<turbo-frame id="dashboard-stats" data-auto-refresh data-src="<%= pgbus.root_path(frame: 'stats') %>">
   <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-6 mb-8">
     <div class="rounded-lg bg-white dark:bg-gray-800 p-5 shadow ring-1 ring-gray-200 dark:ring-gray-700">
       <p class="text-sm font-medium text-gray-500 dark:text-gray-400"><%= t("pgbus.dashboard.stats_cards.queues") %></p>

data/app/views/pgbus/dead_letter/_messages_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="dlq-messages" data-auto-refresh src="<%= pgbus.dead_letter_index_path(frame: 'list') %>">
+<turbo-frame id="dlq-messages" data-auto-refresh data-src="<%= pgbus.dead_letter_index_path(frame: 'list') %>">
   <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
     <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
       <thead class="bg-gray-50 dark:bg-gray-900">

data/app/views/pgbus/jobs/_enqueued_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="jobs-enqueued" data-auto-refresh src="<%= pgbus.jobs_path(request.query_parameters.merge(frame: 'enqueued')) %>">
+<turbo-frame id="jobs-enqueued" data-auto-refresh data-src="<%= pgbus.jobs_path(request.query_parameters.merge(frame: 'enqueued')) %>">
   <div>
     <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3"><%= t("pgbus.jobs.enqueued_table.title") %></h2>
     <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">

data/app/views/pgbus/jobs/_failed_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="jobs-failed" data-auto-refresh src="<%= pgbus.jobs_path(frame: 'failed') %>">
+<turbo-frame id="jobs-failed" data-auto-refresh data-src="<%= pgbus.jobs_path(frame: 'failed') %>">
   <div class="mb-8">
     <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3"><%= t("pgbus.jobs.failed_table.title") %></h2>
     <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">

data/app/views/pgbus/processes/_processes_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="processes-list" data-auto-refresh src="<%= pgbus.processes_path(frame: 'list') %>">
+<turbo-frame id="processes-list" data-auto-refresh data-src="<%= pgbus.processes_path(frame: 'list') %>">
   <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
     <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
       <thead class="bg-gray-50 dark:bg-gray-900">

data/app/views/pgbus/queues/_queues_list.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="queues-list" data-auto-refresh src="<%= pgbus.queues_path(frame: 'list') %>">
+<turbo-frame id="queues-list" data-auto-refresh data-src="<%= pgbus.queues_path(frame: 'list') %>">
   <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
     <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
       <thead class="bg-gray-50 dark:bg-gray-900">

data/app/views/pgbus/recurring_tasks/_tasks_table.html.erb

@@ -1,4 +1,4 @@
-<turbo-frame id="recurring-tasks" data-auto-refresh src="<%= pgbus.recurring_tasks_path(frame: 'recurring_tasks') %>">
+<turbo-frame id="recurring-tasks" data-auto-refresh data-src="<%= pgbus.recurring_tasks_path(frame: 'recurring_tasks') %>">
   <div class="rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
     <% if @recurring_tasks.empty? %>
       <div class="p-8 text-center text-gray-500">

data/config/routes.rb

@@ -52,7 +52,7 @@ Pgbus::Engine.routes.draw do
   resources :locks, only: [:index]
   resource :insights, only: [:show], controller: "insights"
 
-  post :set_locale, to: "locale#update"
+  get :set_locale, to: "locale#update"
 
   namespace :api do
     get :stats, to: "stats#show"

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mikael Henriksson