sktop 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8dee8bdcd3f097ef51306b502c32a52bcdeafbc9530f3bb772384a7313fe59
-  data.tar.gz: c8d92835a338e49c2018e3bb355cd7fda64632ba26b5425c15d1544e06938707
+  metadata.gz: 5a3ed9a8721d477335f08d009c76cd65793b96ab0c0a045466ebdfa05a5e7f12
+  data.tar.gz: cba94dc737356f0b9295cc04c00155dd2cc7eb60372dec1774b60489ae4c476d
 SHA512:
-  metadata.gz: 1cb75f32423642511c8f026fe5ba681771b97db3fcd6aa07dbad769f0b9b95ee095551c02e5691115b4b1e6a468ca955e2f2fe9f5e52da52eee08caeb614ebf4
-  data.tar.gz: 420e5fa5c70237c4c39c92701bd43077a9672cdfe8b869c66f5e567860f03f9cc2185b9dad2d9a34174075b3ab85bbb803ec41fe62ca24d15e47cd958d18e3de
+  metadata.gz: e26bc9fe20fdb3d540c417802ca15db53b5263f52dcab6f696afb1b4cf6d52134e8dafe6d09abf8378e694fdb5c0307c61b7c84a0e523aee12f9db5b2cb00bd1
+  data.tar.gz: 93eac6acd09dda870a90311fbd606a54ee7ad072919bba959951ecec91e31eb75d01e4a851aec1f111f9e0f193328c0f02e3adad914a15afdd17c67c02ec6ea5

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 = {
@@ -194,8 +199,10 @@ module Sktop
               @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 +218,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 +259,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)

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,6 +13,8 @@ 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
     end
 
     def scroll_up
@@ -114,11 +116,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)
@@ -370,15 +385,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)

data/lib/sktop/stats_collector.rb

@@ -63,15 +63,48 @@ 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
 

data/lib/sktop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sktop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James