sktop 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8dee8bdcd3f097ef51306b502c32a52bcdeafbc9530f3bb772384a7313fe59
-  data.tar.gz: c8d92835a338e49c2018e3bb355cd7fda64632ba26b5425c15d1544e06938707
+  metadata.gz: 72e27a287d42246bf03393f3f5d8fd83fcf2dcb52d3c32a242f6631a556d5a90
+  data.tar.gz: a26fa56421cf3fa038f2d7fa7ec86e204189be4bd21419d1ddf896631f59a8cc
 SHA512:
-  metadata.gz: 1cb75f32423642511c8f026fe5ba681771b97db3fcd6aa07dbad769f0b9b95ee095551c02e5691115b4b1e6a468ca955e2f2fe9f5e52da52eee08caeb614ebf4
-  data.tar.gz: 420e5fa5c70237c4c39c92701bd43077a9672cdfe8b869c66f5e567860f03f9cc2185b9dad2d9a34174075b3ab85bbb803ec41fe62ca24d15e47cd958d18e3de
+  metadata.gz: d7aa57eac65085688adadc80a4d587c6c3e0c100c09518675bf4cc65fdcfac93e37e404a7476eda3a4b4ec2d2b7a595f3e6231a2b1c414475c4907fd52ff4275
+  data.tar.gz: ef09ee20ae517a01e85c427bc291d8adff140e0239342336f22365df774efdf83c0df76b34839ed99e15d63a66c36de4eaeb4f7634a24d098c27fab6894055ec

data/lib/sktop/cli.rb

@@ -164,6 +164,10 @@ module Sktop
       # Set up signal handler for Ctrl+C (works even when blocked)
       Signal.trap("INT") { @running = false }
 
+      # Render loading screen immediately
+      @display.connection_status = :connecting
+      @display.render_loading
+
       # Start background thread for data fetching
       fetch_thread = Thread.new do
         while @running
@@ -179,6 +183,7 @@ module Sktop
           next unless can_fetch
 
           begin
+            @display.connection_status = :updating
             collector.refresh!
             # Cache a snapshot of the data
             snapshot = {
@@ -190,12 +195,24 @@ module Sktop
               scheduled_jobs: collector.scheduled_jobs(limit: 500),
               dead_jobs: collector.dead_jobs(limit: 500)
             }
+
+            # If viewing queue jobs, refresh that data too
+            if @display.current_view == :queue_jobs && @display.selected_queue
+              snapshot[:queue_jobs] = collector.queue_jobs(@display.selected_queue, limit: 500)
+            end
+
             @data_mutex.synchronize do
+              # Preserve queue_jobs if not refreshed above but still in that view
+              if @cached_data && @cached_data[:queue_jobs] && !snapshot[:queue_jobs]
+                snapshot[:queue_jobs] = @cached_data[:queue_jobs]
+              end
               @cached_data = snapshot
               @data_version += 1
             end
+            @display.connection_status = :connected
           rescue => e
-            # Ignore fetch errors, will retry next interval
+            @display.connection_status = :error
+            # Will retry next interval
           ensure
             @fetch_mutex.synchronize { @fetch_in_progress = false }
           end
@@ -211,13 +228,7 @@ module Sktop
       begin
         # Set up raw mode for keyboard input
         STDIN.raw do |stdin|
-          # Wait for initial data (with timeout)
-          10.times do
-            break if @data_mutex.synchronize { @cached_data }
-            sleep 0.1
-          end
-
-          # Initial render
+          # Initial render (will show loading or data if already fetched)
           render_cached_data
 
           while @running
@@ -258,9 +269,11 @@ module Sktop
 
     def render_cached_data
       data = @data_mutex.synchronize { @cached_data }
-      return unless data
-
-      @display.render_refresh_from_cache(data)
+      if data
+        @display.render_refresh_from_cache(data)
+      else
+        @display.render_loading
+      end
     end
 
     def handle_keypress(key, stdin)
@@ -279,6 +292,8 @@ module Sktop
         @display.current_view = :dead
       when 'm', 'M'
         @display.current_view = :main
+      when "\r", "\n"  # Enter key
+        handle_enter_action
       when "\x12"  # Ctrl+R - retry job
         handle_retry_action
       when "\x18"  # Ctrl+X - delete job
@@ -296,8 +311,10 @@ module Sktop
             @display.select_up
           when "[B"  # Down arrow
             @display.select_down
-          when "[C"  # Right arrow (unused for now)
-          when "[D"  # Left arrow (unused for now)
+          when "[C"  # Right arrow - next view
+            @display.next_view
+          when "[D"  # Left arrow - previous view
+            @display.previous_view
           when "[5~"  # Page Up
             @display.page_up
           when "[6~"  # Page Down
@@ -307,12 +324,12 @@ module Sktop
           when "x", "X"  # Alt+X - Delete All
             handle_delete_all_action
           else
-            # Just Escape key - go to main
-            @display.current_view = :main
+            # Just Escape key - go back or to main
+            handle_escape_action
           end
         else
-          # Just Escape key - go to main
-          @display.current_view = :main
+          # Just Escape key - go back or to main
+          handle_escape_action
         end
       when "\u0003"  # Ctrl+C
         raise Interrupt
@@ -359,6 +376,12 @@ module Sktop
     end
 
     def handle_delete_action
+      # Handle queue_jobs view separately
+      if @display.current_view == :queue_jobs
+        handle_delete_queue_job_action
+        return
+      end
+
       return unless [:retries, :dead].include?(@display.current_view)
 
       data = @data_mutex.synchronize { @cached_data }
@@ -497,5 +520,104 @@ module Sktop
       end
     end
 
+    def handle_enter_action
+      return unless @display.current_view == :queues
+
+      data = @data_mutex.synchronize { @cached_data }
+      unless data
+        @display.set_status("No data available")
+        return
+      end
+
+      queues = data[:queues]
+      selected_idx = @display.selected_index
+
+      if queues.empty?
+        @display.set_status("No queues")
+        return
+      end
+
+      if selected_idx >= queues.length
+        @display.set_status("Invalid selection")
+        return
+      end
+
+      queue = queues[selected_idx]
+      queue_name = queue[:name]
+
+      # Fetch jobs from the queue
+      begin
+        collector = StatsCollector.new
+        jobs = collector.queue_jobs(queue_name, limit: 500)
+
+        # Update cached data with queue jobs
+        @data_mutex.synchronize do
+          @cached_data[:queue_jobs] = jobs
+        end
+
+        @display.selected_queue = queue_name
+        @display.current_view = :queue_jobs
+        @display.set_status("Loaded #{jobs.length} jobs from #{queue_name}")
+      rescue => e
+        @display.set_status("Error loading queue: #{e.message}")
+      end
+    end
+
+    def handle_escape_action
+      if @display.current_view == :queue_jobs
+        # Go back to queues view
+        @display.current_view = :queues
+        @display.selected_queue = nil
+      else
+        # Go to main view
+        @display.current_view = :main
+      end
+    end
+
+    def handle_delete_queue_job_action
+      return unless @display.current_view == :queue_jobs
+
+      data = @data_mutex.synchronize { @cached_data }
+      unless data
+        @display.set_status("No data available")
+        return
+      end
+
+      jobs = data[:queue_jobs] || []
+      selected_idx = @display.selected_index
+      queue_name = @display.selected_queue
+
+      if jobs.empty?
+        @display.set_status("No jobs to delete")
+        return
+      end
+
+      if selected_idx >= jobs.length
+        @display.set_status("Invalid selection")
+        return
+      end
+
+      job = jobs[selected_idx]
+      unless job[:jid]
+        @display.set_status("Job has no JID")
+        return
+      end
+
+      begin
+        Sktop::JobActions.delete_queue_job(queue_name, job[:jid])
+        @display.set_status("Deleted #{job[:class]}")
+
+        # Refresh the queue jobs
+        collector = StatsCollector.new
+        new_jobs = collector.queue_jobs(queue_name, limit: 500)
+        @data_mutex.synchronize do
+          @cached_data[:queue_jobs] = new_jobs
+        end
+        @rendered_version = -1
+      rescue => e
+        @display.set_status("Error: #{e.message}")
+      end
+    end
+
   end
 end

data/lib/sktop/display.rb

@@ -2,7 +2,7 @@
 
 module Sktop
   class Display
-    attr_accessor :current_view
+    attr_accessor :current_view, :connection_status, :last_update
 
     def initialize
       @pastel = Pastel.new
@@ -13,8 +13,13 @@ module Sktop
       @selected_index = Hash.new(0)  # Track selected row per view
       @status_message = nil
       @status_time = nil
+      @connection_status = :connecting  # :connecting, :connected, :updating, :error
+      @last_update = nil
+      @selected_queue = nil  # Track which queue is being viewed in queue_jobs view
     end
 
+    attr_accessor :selected_queue
+
     def scroll_up
       @scroll_offsets[@current_view] = [@scroll_offsets[@current_view] - 1, 0].max
     end
@@ -40,7 +45,7 @@ module Sktop
     end
 
     def selectable_view?
-      [:processes, :retries, :dead].include?(@current_view)
+      [:queues, :queue_jobs, :processes, :retries, :dead].include?(@current_view)
     end
 
     def page_up(page_size = nil)
@@ -84,6 +89,18 @@ module Sktop
       # Don't reset scroll when switching views - preserve position
     end
 
+    VIEW_ORDER = [:main, :queues, :processes, :workers, :retries, :scheduled, :dead].freeze
+
+    def next_view
+      current_idx = VIEW_ORDER.index(@current_view) || 0
+      @current_view = VIEW_ORDER[(current_idx + 1) % VIEW_ORDER.length]
+    end
+
+    def previous_view
+      current_idx = VIEW_ORDER.index(@current_view) || 0
+      @current_view = VIEW_ORDER[(current_idx - 1) % VIEW_ORDER.length]
+    end
+
     def reset_cursor
       print @cursor.move_to(0, 0)
       print @cursor.hide
@@ -114,11 +131,24 @@ module Sktop
     end
 
     def render_refresh_from_cache(data)
+      @connection_status = :connected
+      @last_update = Time.now
       cached = CachedData.new(data)
       content = build_output(cached)
       render_with_overwrite(content)
     end
 
+    def render_loading
+      lines = []
+      lines << header_bar
+      lines << ""
+      lines << @pastel.cyan("  Connecting to Redis...")
+      lines << ""
+      lines << @pastel.dim("  Waiting for data...")
+      lines << :footer
+      render_with_overwrite(lines)
+    end
+
     # Simple wrapper to make cached hash act like collector
     class CachedData
       def initialize(data)
@@ -152,6 +182,10 @@ module Sktop
       def dead_jobs(limit: 50)
         @data[:dead_jobs]&.first(limit) || []
       end
+
+      def queue_jobs_cache
+        @data[:queue_jobs] || []
+      end
     end
 
     private
@@ -160,6 +194,8 @@ module Sktop
       case @current_view
       when :queues
         build_queues_detail(collector)
+      when :queue_jobs
+        build_queue_jobs_detail(collector)
       when :processes
         build_processes_detail(collector)
       when :workers
@@ -230,7 +266,18 @@ module Sktop
       lines << ""
       # Calculate available rows: height - header(1) - blank(1) - section(1) - table_header(1) - footer(1) = height - 5
       max_rows = terminal_height - 5
-      queues_scrollable(collector.queues, max_rows).each_line(chomp: true) { |l| lines << l }
+      queues_selectable(collector.queues, max_rows).each_line(chomp: true) { |l| lines << l }
+      lines << :footer
+      lines
+    end
+
+    def build_queue_jobs_detail(collector)
+      lines = []
+      lines << header_bar
+      lines << ""
+      max_rows = terminal_height - 5
+      jobs = collector.respond_to?(:queue_jobs_cache) ? collector.queue_jobs_cache : []
+      queue_jobs_selectable(jobs, max_rows).each_line(chomp: true) { |l| lines << l }
       lines << :footer
       lines
     end
@@ -370,15 +417,47 @@ module Sktop
       timestamp = Time.now.strftime("%H:%M:%S")
       title = "sktop"
 
+      # Connection status indicator
+      status_text = case @connection_status
+                    when :connecting
+                      @pastel.yellow.on_blue(" ● Connecting ")
+                    when :updating
+                      @pastel.cyan.on_blue(" ↻ Updating ")
+                    when :error
+                      @pastel.red.on_blue(" ✗ Error ")
+                    else # :connected
+                      if @last_update
+                        age = Time.now - @last_update
+                        if age < 5
+                          @pastel.green.on_blue(" ● Connected ")
+                        else
+                          @pastel.green.on_blue(" ● #{format_update_age(age)} ago ")
+                        end
+                      else
+                        @pastel.green.on_blue(" ● Connected ")
+                      end
+                    end
+
       left = @pastel.white.on_blue.bold(" #{title} ")
       right = @pastel.white.on_blue.bold(" #{timestamp} ")
 
       left_len = visible_string_length(left)
+      status_len = visible_string_length(status_text)
       right_len = visible_string_length(right)
-      middle_width = width - left_len - right_len
-      middle = @pastel.on_blue(" " * middle_width)
+      middle_width = width - left_len - status_len - right_len
+      middle = @pastel.on_blue(" " * [middle_width, 0].max)
 
-      left + middle + right
+      left + status_text + middle + right
+    end
+
+    def format_update_age(seconds)
+      if seconds < 60
+        "#{seconds.round}s"
+      elsif seconds < 3600
+        "#{(seconds / 60).round}m"
+      else
+        "#{(seconds / 3600).round}h"
+      end
     end
 
     def section_bar(title)
@@ -554,6 +633,133 @@ module Sktop
       lines.join("\n")
     end
 
+    # Selectable queues view - press Enter to view queue contents
+    def queues_selectable(queues, max_rows)
+      width = terminal_width
+      lines = []
+
+      scroll_offset = @scroll_offsets[@current_view]
+      data_rows = max_rows - 3  # Account for section bar, header, and status line
+      max_scroll = [queues.length - data_rows, 0].max
+      scroll_offset = [[scroll_offset, 0].max, max_scroll].min
+      @scroll_offsets[@current_view] = scroll_offset
+
+      # Clamp selected index
+      @selected_index[@current_view] = [[@selected_index[@current_view], 0].max, [queues.length - 1, 0].max].min
+
+      # Auto-scroll to keep selection visible
+      selected = @selected_index[@current_view]
+      if selected < scroll_offset
+        scroll_offset = selected
+        @scroll_offsets[@current_view] = scroll_offset
+      elsif selected >= scroll_offset + data_rows
+        scroll_offset = selected - data_rows + 1
+        @scroll_offsets[@current_view] = scroll_offset
+      end
+
+      scroll_indicator = queues.length > data_rows ? " [#{scroll_offset + 1}-#{[scroll_offset + data_rows, queues.length].min}/#{queues.length}]" : ""
+      lines << section_bar("Queues#{scroll_indicator} - ↑↓ select, Enter=view jobs, m=main")
+
+      if queues.empty?
+        lines << @pastel.dim("  No queues")
+        return lines.join("\n")
+      end
+
+      name_width = [40, width - 40].max
+      header = sprintf("  %-#{name_width}s %10s %10s %10s", "NAME", "SIZE", "LATENCY", "STATUS")
+      lines << format_table_header(header)
+
+      queues.drop(scroll_offset).first(data_rows).each_with_index do |queue, idx|
+        actual_idx = scroll_offset + idx
+        row = format_queue_row(queue, name_width)
+
+        if actual_idx == selected
+          lines << @pastel.black.on_white(row + " " * [width - visible_string_length(row), 0].max)
+        else
+          lines << row
+        end
+      end
+
+      remaining = queues.length - scroll_offset - data_rows
+      if remaining > 0
+        lines << @pastel.dim("  ↓ #{remaining} more")
+      end
+
+      # Status message
+      if @status_message && @status_time && (Time.now - @status_time) < 3
+        lines << @pastel.green("  #{@status_message}")
+      end
+
+      lines.join("\n")
+    end
+
+    # Selectable queue jobs view - press Ctrl+X to delete job
+    def queue_jobs_selectable(jobs, max_rows)
+      width = terminal_width
+      lines = []
+
+      scroll_offset = @scroll_offsets[@current_view]
+      data_rows = max_rows - 3  # Account for section bar, header, and status line
+      max_scroll = [jobs.length - data_rows, 0].max
+      scroll_offset = [[scroll_offset, 0].max, max_scroll].min
+      @scroll_offsets[@current_view] = scroll_offset
+
+      # Clamp selected index
+      @selected_index[@current_view] = [[@selected_index[@current_view], 0].max, [jobs.length - 1, 0].max].min
+
+      # Auto-scroll to keep selection visible
+      selected = @selected_index[@current_view]
+      if selected < scroll_offset
+        scroll_offset = selected
+        @scroll_offsets[@current_view] = scroll_offset
+      elsif selected >= scroll_offset + data_rows
+        scroll_offset = selected - data_rows + 1
+        @scroll_offsets[@current_view] = scroll_offset
+      end
+
+      queue_name = @selected_queue || "unknown"
+      scroll_indicator = jobs.length > data_rows ? " [#{scroll_offset + 1}-#{[scroll_offset + data_rows, jobs.length].min}/#{jobs.length}]" : ""
+      lines << section_bar("Queue: #{queue_name}#{scroll_indicator} - ↑↓ select, ^X=delete, Esc=back")
+
+      if jobs.empty?
+        lines << @pastel.dim("  No jobs in queue")
+        return lines.join("\n")
+      end
+
+      job_width = [35, (width - 50) / 2].max
+      args_width = [35, (width - 50) / 2].max
+
+      header = sprintf("  %-#{job_width}s %-20s %-#{args_width}s", "JOB", "ENQUEUED", "ARGS")
+      lines << format_table_header(header)
+
+      jobs.drop(scroll_offset).first(data_rows).each_with_index do |job, idx|
+        actual_idx = scroll_offset + idx
+        klass = truncate(job[:class].to_s, job_width)
+        enqueued = job[:enqueued_at]&.strftime("%Y-%m-%d %H:%M:%S") || "N/A"
+        args = truncate(job[:args].inspect, args_width)
+
+        row = sprintf("  %-#{job_width}s %-20s %-#{args_width}s", klass, enqueued, args)
+
+        if actual_idx == selected
+          lines << @pastel.black.on_white(row + " " * [width - visible_string_length(row), 0].max)
+        else
+          lines << row
+        end
+      end
+
+      remaining = jobs.length - scroll_offset - data_rows
+      if remaining > 0
+        lines << @pastel.dim("  ↓ #{remaining} more")
+      end
+
+      # Status message
+      if @status_message && @status_time && (Time.now - @status_time) < 3
+        lines << @pastel.green("  #{@status_message}")
+      end
+
+      lines.join("\n")
+    end
+
     def format_queue_row(queue, name_width)
       name = truncate(queue[:name], name_width)
       size = format_number(queue[:size])
@@ -1036,31 +1242,36 @@ module Sktop
     end
 
     def function_bar
-      items = if @current_view == :main
-        [
-          ["q", "Queues"],
-          ["p", "Procs"],
-          ["w", "Workers"],
-          ["r", "Retries"],
-          ["s", "Sched"],
-          ["d", "Dead"],
-          ["^C", "Quit"]
-        ]
-      else
-        [
-          ["m", "Main"],
-          ["q", "Queues"],
-          ["p", "Procs"],
-          ["w", "Workers"],
-          ["r", "Retries"],
-          ["s", "Sched"],
-          ["d", "Dead"],
-          ["^C", "Quit"]
-        ]
-      end
+      # Map keys to views for highlighting
+      view_keys = {
+        "m" => :main,
+        "q" => :queues,
+        "p" => :processes,
+        "w" => :workers,
+        "r" => :retries,
+        "s" => :scheduled,
+        "d" => :dead
+      }
+
+      items = [
+        ["m", "Main"],
+        ["q", "Queues"],
+        ["p", "Procs"],
+        ["w", "Workers"],
+        ["r", "Retries"],
+        ["s", "Sched"],
+        ["d", "Dead"],
+        ["^C", "Quit"]
+      ]
 
       bar = items.map do |key, label|
-        @pastel.black.on_cyan.bold(key) + @pastel.white.on_blue(label)
+        view = view_keys[key]
+        if view && view == @current_view
+          # Highlight current view with inverted colors
+          @pastel.black.on_white.bold(key) + @pastel.black.on_green.bold(label)
+        else
+          @pastel.black.on_cyan.bold(key) + @pastel.white.on_blue(label)
+        end
       end.join(" ")
 
       width = terminal_width

data/lib/sktop/job_actions.rb

@@ -41,6 +41,15 @@ module Sktop
         count
       end
 
+      def delete_queue_job(queue_name, jid)
+        queue = Sidekiq::Queue.new(queue_name)
+        job = queue.find { |j| j.jid == jid }
+        raise "Job not found in queue #{queue_name} (JID: #{jid})" unless job
+
+        job.delete
+        true
+      end
+
       def quiet_process(identity)
         process = find_process(identity)
         raise "Process not found (identity: #{identity})" unless process

data/lib/sktop/stats_collector.rb

@@ -63,15 +63,61 @@ module Sktop
 
     def workers
       Sidekiq::Workers.new.map do |process_id, thread_id, work|
+        extract_worker_info(process_id, thread_id, work)
+      end
+    end
+
+    def extract_worker_info(process_id, thread_id, work)
+      # Sidekiq 7+ returns Work objects, older versions return hashes
+      if work.is_a?(Hash)
+        # Older Sidekiq - work is a hash with string keys
+        payload = work["payload"]
         {
           process_id: process_id,
           thread_id: thread_id,
           queue: work["queue"],
-          class: work["payload"]["class"],
-          args: work["payload"]["args"],
+          class: payload["class"],
+          args: payload["args"] || [],
           run_at: Time.at(work["run_at"]),
           elapsed: Time.now - Time.at(work["run_at"])
         }
+      elsif work.respond_to?(:job)
+        # Sidekiq 7+ Work object with job accessor
+        job = work.job
+        {
+          process_id: process_id,
+          thread_id: thread_id,
+          queue: work.queue,
+          class: job["class"],
+          args: job["args"] || [],
+          run_at: Time.at(work.run_at),
+          elapsed: Time.now - Time.at(work.run_at)
+        }
+      else
+        # Fallback for other versions - try payload
+        payload = work.payload
+        {
+          process_id: process_id,
+          thread_id: thread_id,
+          queue: work.queue,
+          class: payload["class"],
+          args: payload["args"] || [],
+          run_at: Time.at(work.run_at),
+          elapsed: Time.now - Time.at(work.run_at)
+        }
+      end
+    end
+
+    def queue_jobs(queue_name, limit: 100)
+      queue = Sidekiq::Queue.new(queue_name)
+      queue.first(limit).map do |job|
+        {
+          jid: job.jid,
+          class: job.klass,
+          args: job.args,
+          enqueued_at: job.enqueued_at,
+          created_at: job.created_at
+        }
       end
     end
 

data/lib/sktop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sktop
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sktop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - James
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-17 00:00:00.000000000 Z
+date: 2026-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq