sidekiq-spy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91574e1eabbcadaf02cc6fe5e70e3031e7022b33
-  data.tar.gz: da4ab6eb49ee18c42665a627abc08df7529e4972
+  metadata.gz: b36dea1a5c807a96adeb6f29737175c479fa5e17
+  data.tar.gz: b6f96e42e80c5af6a31c7ee959c2b137c5ab68b4
 SHA512:
-  metadata.gz: 49c09665f4349ada057861bb8d9f02dbd2a473ea33ad4fc0843613d03429228fc707b1dae3fb5a5c092d7a9725c5b9e6d4a55a17698a99cf98dc9573c7e2c36a
-  data.tar.gz: 0b80737bf8f199ff2be3daa6e41746438ee55033d23926c106f9228fdad43a58476bcf4020c4eb41206a564a84197c9a6660e38a2639f2821b94a35aa0565736
+  metadata.gz: 675ab03fb9c9ca6069c8c92f6bac13c829be63b83f6e1fcb8c0ac36c4e34e20c28bf3b6f1a83039d79a1d2902a2fac34015cb34103843e862a5d8c419c20b138
+  data.tar.gz: ed53c6bd5d7a6ec01e18a91e056dee64fe3c8067dbef7d89614a439d84e2c0aa33a15f14253a1b0fb56fdcc8cf94231c5cf76aea97cfc6385636ca78bc53028e

data/CHANGELOG.md

@@ -6,14 +6,16 @@ For many of commits by [tiredpixel](http://www.tiredpixel.com), the commit
 message provides information and examples.
 
 
-## 0.1.0
+## 0.3.0
 
-- first release
-- `sidekiq-spy` executable providing: `--url`, `--host`, `--port`, `--database`,
-  `--namespace`, `--interval`, `--help`, `--version`
-- core Redis statistics: redis, namespace, redis version, uptime (d),
-  connections, memory, memory peak
-- core Sidekiq statistics: busy, retries, processed, enqueued, scheduled, failed
+- sporadic screen-misdraws fix
+- redraw on terminal window resize
+- thread-waking instead of sleep increments for faster responses
+- friendly error-reporting when unreachable host, etc.
+- queues panel (like `Sidekiq::Web` Queues tab); press `<u>`
+- retries panel (like `Sidekiq::Web` Retries tab); press `<r>`
+- scheduled panel (like `Sidekiq::Web` Scheduled tab); press `<s>`
+- `<w>` for existing (default) workers panel
 
 
 ## 0.2.0
@@ -25,3 +27,13 @@ message provides information and examples.
 - smaller sleep increments for faster exit
 - content overrun fix
 - workers panel (like `Sidekiq::Web` Workers tab), reporting who is up to what
+
+
+## 0.1.0
+
+- first release
+- `sidekiq-spy` executable providing: `--url`, `--host`, `--port`, `--database`,
+  `--namespace`, `--interval`, `--help`, `--version`
+- core Redis statistics: redis, namespace, redis version, uptime (d),
+  connections, memory, memory peak
+- core Sidekiq statistics: busy, retries, processed, enqueued, scheduled, failed

data/README.md

@@ -13,12 +13,29 @@ no web server, this one's for you. <3
 
 This project is so hot out of the oven you might need mitts. But it's already
 functional, with the main statistics from the Sidekiq::Web homepage and the
-Workers tab. In time, it would be nice to add the Queues, Retries, and
-Scheduled tabs, too.
+Workers, Queues, Retries, and Scheduled tabs.
 
 More sleep lost by [tiredpixel](http://www.tiredpixel.com).
 
 
+## ASCII Art (a.k.a. Screenshot)
+
+    Sidekiq Spy 0.3.0    WORKERS qUeues Retries Scheduled             16:17:23 +0000
+    redis:                               127.0.0.1:6379/0|namespace:
+    redis version:      2.6.11|uptime (d):              2|connections:             5
+    memory:              4.89M|memory peak:         5.03M|
+
+    busy:                    5|retries:                15|processed:            1623
+    enqueued:                0|scheduled:               0|failed:               1535
+
+    WORKER                      QUEUE         CLASS         ARGUMENTS        STARTED
+    sep.da.local:17045-70130396 default       MakeSEPFields [2670]        2013-11-03
+    sep.da.local:17045-70130397 default       MakeSEPFields [2668]        2013-11-03
+    sep.da.local:17045-70130396 default       MakeSEPFields [2669]        2013-11-03
+    sep.da.local:17045-70130397 default       MakeSEPFields [2667]        2013-11-03
+    sep.da.local:17045-70130396 default       MakeSEPFields [2671]        2013-11-03
+
+
 ## Installation
 
 Install using:
@@ -50,25 +67,9 @@ We won't tell anyone! ;) (Resque is awesome, too!)
 
     $ sidekiq-spy -n resque
 
-To quit, press `<q>` or `<ctrl>+<c>`. That's about it.
+Navigate between tabs using the `<w>`, `<u>`, `<r>`, `<s>` keys.
 
-
-## ASCII Art (a.k.a. Screenshot)
-
-    Sidekiq Spy 0.2.0                                                 16:17:23 +0000
-    redis:                               127.0.0.1:6379/0|namespace:
-    redis version:      2.6.11|uptime (d):              2|connections:             5
-    memory:              4.89M|memory peak:         5.03M|
-
-    busy:                    5|retries:                15|processed:            1623
-    enqueued:                0|scheduled:               0|failed:               1535
-
-    WORKER                      QUEUE         CLASS         ARGUMENTS        STARTED
-    sep.da.local:17045-70130396 default       MakeSEPFields [2670]        2013-11-03
-    sep.da.local:17045-70130397 default       MakeSEPFields [2668]        2013-11-03
-    sep.da.local:17045-70130396 default       MakeSEPFields [2669]        2013-11-03
-    sep.da.local:17045-70130397 default       MakeSEPFields [2667]        2013-11-03
-    sep.da.local:17045-70130396 default       MakeSEPFields [2671]        2013-11-03
+To quit, press `<q>` or `<ctrl>+<c>`. That's about it.
 
 
 ## Stay Tuned
@@ -84,9 +85,9 @@ That was easy.
 
 Dear Me, Here is a vague wishlist:
 
-- Queues page
-- Retries page
-- Scheduled page
+- Queue (not Queues) page
+- Retry (not Retries) page
+- Paginated data
 - a little control to go with your monitoring, maybe...
 
 

data/bin/sidekiq-spy

@@ -55,6 +55,10 @@ OptionParser.new do |opts|
   
   opts.separator ""
   
+  opts.on("--debug", "Run in debug mode") do |o|
+    options[:debug] = o
+  end
+  
   opts.on_tail("--help",
     "Output (this) help and exit"
   ) do
@@ -95,5 +99,16 @@ end
 # = Run app
 
 trap('INT') { @app.stop }
+trap('WINCH') { @app.restart }
 
-@app.start
+begin
+  @app.start
+rescue => e
+  warn "#{$0}: #{e}"
+  
+  if options[:debug]
+    raise # reraise for stacktrace
+  else
+    exit 1 # same non-zero status as when --debug
+  end
+end

data/lib/sidekiq-spy.rb

@@ -6,6 +6,9 @@ require File.expand_path('../sidekiq-spy/app', __FILE__)
 
 require File.expand_path('../sidekiq-spy/spy/stats', __FILE__)
 require File.expand_path('../sidekiq-spy/spy/workers', __FILE__)
+require File.expand_path('../sidekiq-spy/spy/queues', __FILE__)
+require File.expand_path('../sidekiq-spy/spy/retries', __FILE__)
+require File.expand_path('../sidekiq-spy/spy/schedules', __FILE__)
 
 require File.expand_path('../sidekiq-spy/display/screen', __FILE__)
 require File.expand_path('../sidekiq-spy/display/panel', __FILE__)
@@ -15,3 +18,6 @@ require File.expand_path('../sidekiq-spy/display/panels/header', __FILE__)
 require File.expand_path('../sidekiq-spy/display/panels/redis_stats', __FILE__)
 require File.expand_path('../sidekiq-spy/display/panels/sidekiq_stats', __FILE__)
 require File.expand_path('../sidekiq-spy/display/panels/workers', __FILE__)
+require File.expand_path('../sidekiq-spy/display/panels/queues', __FILE__)
+require File.expand_path('../sidekiq-spy/display/panels/retries', __FILE__)
+require File.expand_path('../sidekiq-spy/display/panels/schedules', __FILE__)

data/lib/sidekiq-spy/app.rb

@@ -1,17 +1,16 @@
-require 'thread'
 require 'sidekiq'
 
 
 module SidekiqSpy
   class App
     
-    REFRESH_SUBINTERVAL = 0.1
-    
     attr_reader :running
+    attr_reader :restarting
     
     def initialize
-      @running = false
-      @threads = {}
+      @running    = false
+      @restarting = false
+      @threads    = {}
     end
     
     def config
@@ -46,13 +45,29 @@ module SidekiqSpy
     
     def stop
       @running = false
+      
+      wakey_wakey # for Ctrl+C route; #do_command route already wakes threads
+    end
+    
+    def restart
+      @restarting = true
     end
     
     def do_command(key)
       case key
-      when 'q' # quit
-        @running = false
+      when 'q' # Q is very natural for Quit; Queues comes second to this
+        stop
+      when 'w'
+        @screen.panel_main = :workers
+      when 'u' # Q is already taken
+        @screen.panel_main = :queues
+      when 'r'
+        @screen.panel_main = :retries
+      when 's'
+        @screen.panel_main = :schedules
       end
+      
+      wakey_wakey # wake threads for immediate response
     end
     
     private
@@ -67,9 +82,23 @@ module SidekiqSpy
       end
     end
     
+    def setup
+      @screen = Display::Screen.new
+    end
+    
+    def cleanup
+      @screen.close if @screen
+    end
+    
+    def wakey_wakey
+      @threads.each { |tname, t| t.run if t.status == 'sleep' }
+    end
+    
     def command_loop
       while @running do
-        key = next_key
+        next unless @screen # #refresh_loop might be reattaching screen
+        
+        key = @screen.next_key
         
         next unless key # keep listening if timeout
         
@@ -79,33 +108,25 @@ module SidekiqSpy
     
     def refresh_loop
       while @running do
-        refresh
-        
-        @sleep_timer = config.interval
+        next unless @screen # HACK: only certain test scenarios?
         
-        while @running && @sleep_timer > 0
-          sleep REFRESH_SUBINTERVAL
+        if @restarting || @screen.missized? # signal(s) or whilst still resizing
+          panel_main = @screen.panel_main
           
-          @sleep_timer -= REFRESH_SUBINTERVAL
+          cleanup
+          
+          setup
+          
+          @screen.panel_main = panel_main
+          
+          @restarting = false
         end
+        
+        @screen.refresh
+        
+        sleep config.interval # go to sleep; could be rudely awoken on quit
       end
     end
     
-    def setup
-      @screen = Display::Screen.new
-    end
-    
-    def refresh
-      @screen.refresh if @screen
-    end
-    
-    def next_key
-      @screen.next_key if @screen
-    end
-    
-    def cleanup
-      @screen.close if @screen
-    end
-    
   end
 end

data/lib/sidekiq-spy/display/panels/header.rb

@@ -3,18 +3,27 @@ module SidekiqSpy
     module Panels
       class Header < Display::Panel
         
+        attr_accessor :panel_main
+        
         def initialize(height, width, top, left)
-          super(height, width, top, left, structure)
+          super(height, width, top, left, structure, :divider_r => " ")
         end
         
         def structure
+          @panel_main = nil # set by Display::Screen#main_panel=
+          
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
           [
             [
               [1, t[:program], nil],
-              [1, nil,         -> { Time.now.strftime("%T %z") }],
+              [2, -> {
+                [:workers, :queues, :retries, :schedules].map do |e|
+                  t[:menu][(e == @panel_main ? :active : :inactive)][e]
+                end.join(" ")
+              }, nil],
+              [1, nil, -> { Time.now.strftime("%T %z") }],
             ],
           ]
         end

data/lib/sidekiq-spy/display/panels/queues.rb

@@ -0,0 +1,44 @@
+module SidekiqSpy
+  module Display
+    module Panels
+      class Queues < Display::Panel
+        
+        def initialize(height, width, top, left)
+          @height = height # #structure needs this before #initialize ends
+          
+          super(height, width, top, left, structure, :divider_r => " ")
+        end
+        
+        def refresh
+          @queues.refresh # refresh data feed
+          
+          super
+        end
+        
+        def structure
+          @queues = Spy::Queues.new
+          
+          # [
+          #   [relative_column_width, data_left, data_right]
+          # ]
+          s = [
+            [ # table header slots
+              [2, t[:heading][:queue],  nil],
+              [1, nil,                  t[:heading][:size]],
+            ],
+          ]
+          
+          (0...(@height - 1)).each do |i|
+            s << [ # table row slots
+              [2, -> { @queues.data.values[i][:name] rescue nil },  nil],
+              [1, nil,                                              -> { @queues.data.values[i][:size] rescue nil }],
+            ]
+          end
+          
+          s
+        end
+        
+      end
+    end
+  end
+end

data/lib/sidekiq-spy/display/panels/retries.rb

@@ -0,0 +1,52 @@
+module SidekiqSpy
+  module Display
+    module Panels
+      class Retries < Display::Panel
+        
+        def initialize(height, width, top, left)
+          @height = height # #structure needs this before #initialize ends
+          
+          super(height, width, top, left, structure, :divider_r => " ")
+        end
+        
+        def refresh
+          @retries.refresh # refresh data feed
+          
+          super
+        end
+        
+        def structure
+          @retries = Spy::Retries.new
+          
+          # [
+          #   [relative_column_width, data_left, data_right]
+          # ]
+          s = [
+            [ # table header slots
+              [1, t[:heading][:next_at], nil],
+              [1, t[:heading][:count],   nil],
+              [1, t[:heading][:queue],   nil],
+              [1, t[:heading][:class],   nil],
+              [1, t[:heading][:args],    nil],
+              [1, nil,                   t[:heading][:error]],
+            ],
+          ]
+          
+          (0...(@height - 1)).each do |i|
+            s << [ # table row slots
+              [1, -> { @retries.data[i][:next_at] rescue nil }, nil],
+              [1, -> { @retries.data[i][:count] rescue nil },   nil],
+              [1, -> { @retries.data[i][:queue] rescue nil },   nil],
+              [1, -> { @retries.data[i][:class] rescue nil },   nil],
+              [1, -> { @retries.data[i][:args] rescue nil },    nil],
+              [1, nil,                                          -> { @retries.data[i][:error_class] rescue nil }],
+            ]
+          end
+          
+          s
+        end
+        
+      end
+    end
+  end
+end

data/lib/sidekiq-spy/display/panels/schedules.rb

@@ -0,0 +1,48 @@
+module SidekiqSpy
+  module Display
+    module Panels
+      class Schedules < Display::Panel
+        
+        def initialize(height, width, top, left)
+          @height = height # #structure needs this before #initialize ends
+          
+          super(height, width, top, left, structure, :divider_r => " ")
+        end
+        
+        def refresh
+          @schedules.refresh # refresh data feed
+          
+          super
+        end
+        
+        def structure
+          @schedules = Spy::Schedules.new
+          
+          # [
+          #   [relative_column_width, data_left, data_right]
+          # ]
+          s = [
+            [ # table header slots
+              [1, t[:heading][:scheduled_at], nil],
+              [1, t[:heading][:queue],        nil],
+              [1, t[:heading][:class],        nil],
+              [1, nil,                        t[:heading][:args]],
+            ],
+          ]
+          
+          (0...(@height - 1)).each do |i|
+            s << [ # table row slots
+              [1, -> { @schedules.data[i][:scheduled_at] rescue nil }, nil],
+              [1, -> { @schedules.data[i][:queue] rescue nil },        nil],
+              [1, -> { @schedules.data[i][:class] rescue nil },        nil],
+              [1, nil,                                                 -> { @schedules.data[i][:args] rescue nil }],
+            ]
+          end
+          
+          s
+        end
+        
+      end
+    end
+  end
+end

data/lib/sidekiq-spy/display/screen.rb

@@ -17,19 +17,26 @@ module SidekiqSpy
         Curses.curs_set(0)
         Curses.timeout = CURSES_GETCH_TIMEOUT
         
-        @height = Curses.lines
-        @width  = Curses.cols
+        @height = term_height
+        @width  = term_width
         
         @panels = { # attach panels, defining height, width, top, left
-          :header        => Display::Panels::Header.new(      1,             @width, 0, 0),
-          :redis_stats   => Display::Panels::RedisStats.new(  3,             @width, 1, 0),
-          :sidekiq_stats => Display::Panels::SidekiqStats.new(2,             @width, 5, 0),
-          :workers       => Display::Panels::Workers.new(     (@height - 8), @width, 8, 0),
+          :header        => Display::Panels::Header.new(      1, @width, 0, 0),
+          :redis_stats   => Display::Panels::RedisStats.new(  3, @width, 1, 0),
+          :sidekiq_stats => Display::Panels::SidekiqStats.new(2, @width, 5, 0),
         }
+        
+        self.panel_main = :workers
+        
+        Curses.refresh
+      rescue
+        close
+        
+        raise
       end
       
       def close
-        @panels.each { |pname, panel| panel.close }
+        @panels.each { |pname, panel| panel.close } if @panels
         
         Curses.close_screen
       end
@@ -42,6 +49,41 @@ module SidekiqSpy
         Curses.getch
       end
       
+      def missized?
+        @height != term_height || @width != term_width
+      end
+      
+      def panel_main
+        @panels[:header].panel_main
+      end
+      
+      def panel_main=(pname)
+        @panels[:header].panel_main = pname
+        
+        @panels[:main].close if @panels[:main]
+        
+        @panels[:main] = case pname
+        when :workers
+          Display::Panels::Workers.new((@height - 8), @width, 8, 0)
+        when :queues
+          Display::Panels::Queues.new((@height - 8), @width, 8, 0)
+        when :retries
+          Display::Panels::Retries.new((@height - 8), @width, 8, 0)
+        when :schedules
+          Display::Panels::Schedules.new((@height - 8), @width, 8, 0)
+        end
+      end
+      
+      private
+      
+      def term_height
+        (ENV['LINES'] || Curses.lines).to_i
+      end
+      
+      def term_width
+        (ENV['COLUMNS'] || Curses.cols).to_i
+      end
+      
     end
   end
 end

data/lib/sidekiq-spy/display/subpanel.rb

@@ -47,7 +47,7 @@ module SidekiqSpy
         l = data_l.is_a?(Proc) ? data_l.call : data_l
         r = data_r.is_a?(Proc) ? data_r.call : data_r
         
-        ("#{l}%#{width - (l ? l.length : 0)}s" % r)[0...width]
+        ("#{l}%#{width - l.to_s.length}s" % r)[0...width]
       end
       
     end

data/lib/sidekiq-spy/spy/queues.rb

@@ -0,0 +1,31 @@
+require 'sidekiq'
+
+
+module SidekiqSpy
+  module Spy
+    class Queues
+      
+      attr_reader :data
+      
+      def initialize
+        @stats = Sidekiq::Stats.new
+        
+        refresh
+      end
+      
+      def refresh
+        h = {}
+        
+        @stats.queues.each do |queue, size|
+          h[queue] = {
+            :name => queue,
+            :size => size,
+          }
+        end
+        
+        @data = h
+      end
+      
+    end
+  end
+end

data/lib/sidekiq-spy/spy/retries.rb

@@ -0,0 +1,37 @@
+require 'time'
+require 'sidekiq'
+
+
+module SidekiqSpy
+  module Spy
+    class Retries
+      
+      attr_reader :data
+      
+      def initialize
+        @retries = Sidekiq::RetrySet.new
+        
+        refresh
+      end
+      
+      def refresh
+        h = []
+        
+        @retries.each do |retry_item|
+          h << {
+            :next_at       => retry_item.at,
+            :count         => retry_item['retry_count'],
+            :queue         => retry_item['queue'],
+            :class         => retry_item['class'],
+            :args          => retry_item['args'],
+            :error_class   => retry_item['error_class'],
+            :error_message => retry_item['error_message'],
+          }
+        end
+        
+        @data = h
+      end
+      
+    end
+  end
+end

data/lib/sidekiq-spy/spy/schedules.rb

@@ -0,0 +1,33 @@
+require 'sidekiq'
+
+
+module SidekiqSpy
+  module Spy
+    class Schedules
+      
+      attr_reader :data
+      
+      def initialize
+        @schedules = Sidekiq::ScheduledSet.new
+        
+        refresh
+      end
+      
+      def refresh
+        h = []
+        
+        @schedules.each do |schedule|
+          h << {
+            :scheduled_at => schedule.at,
+            :queue        => schedule['queue'],
+            :class        => schedule['class'],
+            :args         => schedule['args'],
+          }
+        end
+        
+        @data = h
+      end
+      
+    end
+  end
+end

data/lib/sidekiq-spy/translatable.rb

@@ -4,6 +4,20 @@ module SidekiqSpy
     def t
       {
         program: "Sidekiq Spy #{VERSION}",
+        menu: {
+          inactive: {
+            workers: "Workers",
+            queues: "qUeues",
+            retries: "Retries",
+            schedules: "Scheduled",
+          },
+          active: {
+            workers: "WORKERS",
+            queues: "QUEUES",
+            retries: "RETRIES",
+            schedules: "SCHEDULED",
+          },
+        },
         redis: {
           connection: "redis:",
           namespace: "namespace:",
@@ -27,6 +41,11 @@ module SidekiqSpy
           class: "CLASS",
           args: "ARGUMENTS",
           started_at: "STARTED",
+          size: "SIZE",
+          next_at: "NEXT",
+          count: "COUNT",
+          error: "ERROR",
+          scheduled_at: "SCHEDULED",
         }
       }
     end

data/lib/sidekiq-spy/version.rb

@@ -1,5 +1,5 @@
 module SidekiqSpy
   
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
   
 end

data/test/sidekiq-spy/app_test.rb

@@ -19,7 +19,14 @@ end
 describe SidekiqSpy::App do
   
   before do
-    SidekiqSpy::Display::Screen.stubs(:new)
+    @screen = stub(
+      :close     => nil,
+      :refresh   => nil,
+      :next_key  => nil,
+      :missized? => nil
+    )
+    
+    SidekiqSpy::Display::Screen.stubs(:new).returns(@screen)
     
     @app = SidekiqSpy::App.new
   end
@@ -28,6 +35,10 @@ describe SidekiqSpy::App do
     @app.running.must_equal false
   end
   
+  it "sets status not-restarting" do
+    @app.restarting.must_equal false
+  end
+  
   describe "#configure" do
     it "configures Sidekiq" do
       Sidekiq.expects(:configure_client)
@@ -160,14 +171,14 @@ describe SidekiqSpy::App do
       start_and_stop_app(@app)
     end
     
-    it "calls #refresh hook" do
-      @app.expects(:refresh)
+    it "calls #refresh on screen" do
+      @screen.expects(:refresh)
       
       start_and_stop_app(@app)
     end
     
-    it "calls #next_key hook" do
-      @app.expects(:next_key).at_least_once
+    it "calls #next_key on screen" do
+      @screen.expects(:next_key).at_least_once
       
       start_and_stop_app(@app)
     end
@@ -191,9 +202,22 @@ describe SidekiqSpy::App do
     end
   end
   
+  describe "#restart" do
+    before do
+      @app.instance_variable_set(:@restarting, false)
+    end
+    
+    it "sets status restarting" do
+      @app.restart
+      
+      @app.restarting.must_equal true
+    end
+  end
+  
   describe "#do_command" do
     before do
       @app.instance_variable_set(:@running, true)
+      @app.instance_variable_set(:@screen, @screen)
     end
     
     it "<q> sets status not-running" do
@@ -201,6 +225,18 @@ describe SidekiqSpy::App do
       
       @app.running.must_equal false
     end
+    
+    it "<w> switches to Workers panel" do
+      @screen.expects(:panel_main=).with(:workers)
+      
+      @app.do_command('w')
+    end
+    
+    it "<u> switches to Queues panel" do
+      @screen.expects(:panel_main=).with(:queues)
+      
+      @app.do_command('u')
+    end
   end
   
 end

data/test/sidekiq-spy/display/screen_test.rb

@@ -27,18 +27,23 @@ describe SidekiqSpy::Display::Screen do
       :noecho       => nil,
       :curs_set     => nil,
       :timeout=     => nil,
+      :refresh      => nil,
       :lines        => 24,
       :cols         => 80
     )
     
     @panel = stub(
-      :close => nil
+      :close       => nil,
+      :panel_main= => nil
     )
+    @panel_w = @panel.dup
+    @panel_q = @panel.dup
     
     SidekiqSpy::Display::Panels::Header.stubs(:new).returns(@panel)
     SidekiqSpy::Display::Panels::RedisStats.stubs(:new).returns(@panel)
     SidekiqSpy::Display::Panels::SidekiqStats.stubs(:new).returns(@panel)
-    SidekiqSpy::Display::Panels::Workers.stubs(:new).returns(@panel)
+    SidekiqSpy::Display::Panels::Workers.stubs(:new).returns(@panel_w)
+    SidekiqSpy::Display::Panels::Queues.stubs(:new).returns(@panel_q)
     
     @screen = SidekiqSpy::Display::Screen.new
   end
@@ -95,4 +100,46 @@ describe SidekiqSpy::Display::Screen do
     end
   end
   
+  describe "#missized?" do
+    it "returns false when not missized" do
+      @screen.stubs(:term_height).returns(24)
+      @screen.stubs(:term_width).returns(80)
+      
+      @screen.missized?.must_equal false
+    end
+    
+    it "returns true when missized" do
+      @screen.stubs(:term_height).returns(21)
+      @screen.stubs(:term_width).returns(40)
+      
+      @screen.missized?.must_equal true
+    end
+  end
+  
+  describe "#panel_main=" do
+    before do
+      @panels = @screen.instance_variable_get(:@panels)
+    end
+    
+    it "defaults panel_main to workers" do
+      @panels[:main].must_equal @panel_w
+    end
+    
+    it "sets panel_main to workers" do
+      @panels[:main] = nil
+      
+      @screen.panel_main = :workers
+      
+      @screen.instance_variable_get(:@panels)[:main].must_equal @panel_w
+    end
+    
+    it "sets panel_main to queues" do
+      @panels[:main] = nil
+      
+      @screen.panel_main = :queues
+      
+      @screen.instance_variable_get(:@panels)[:main].must_equal @panel_q
+    end
+  end
+  
 end

data/test/sidekiq-spy/display/subpanel_test.rb

@@ -156,7 +156,7 @@ describe SidekiqSpy::Display::Subpanel do
         
         @subpanel = SidekiqSpy::Display::Subpanel.new(@window, 24, 80, 0, 0, {
           :data_l => -> { "the answer:" },
-          :data_r => -> { 2 * 3 * 7 }
+          :data_r => -> { "42" }
         })
       end
       
@@ -168,6 +168,19 @@ describe SidekiqSpy::Display::Subpanel do
         @subpanel.refresh
       end
       
+      it "sets data when non-string" do
+        @subpanel = SidekiqSpy::Display::Subpanel.new(@window, 24, 10, 0, 0, {
+          :data_l => -> { 2 * 3 * 7 },
+          :data_r => -> { 42 }
+        })
+        
+        @window.stubs(:setpos)
+        
+        @window.expects(:addstr).with("42      42")
+        
+        @subpanel.refresh
+      end
+      
       it "sets empty data when nil" do
         @subpanel = SidekiqSpy::Display::Subpanel.new(@window, 24, 10, 0, 0, {
           :data_l => -> { nil },

data/test/sidekiq-spy/spy/queues_test.rb

@@ -0,0 +1,63 @@
+require 'time'
+
+
+require File.expand_path('../../../helper', __FILE__)
+
+require File.expand_path('../../../../lib/sidekiq-spy/spy/queues', __FILE__)
+
+
+describe SidekiqSpy::Spy::Queues do
+  
+  before do
+    @sidekiq_queues_data = {
+      'queue1' => 42,
+    }
+    
+    @spy_queues_data = {
+      'queue1' => {
+        :name => 'queue1',
+        :size => 42,
+      }
+    }
+    
+    @sidekiq_queues_data2 = {
+      'queue2' => 1764,
+    }
+    
+    @spy_queues_data2 = {
+      'queue2' => {
+        :name => 'queue2',
+        :size => 1764,
+      }
+    }
+    
+    Sidekiq::Stats.stubs(:new).returns(stub(
+      :queues => @sidekiq_queues_data
+    ))
+    
+    @queues = SidekiqSpy::Spy::Queues.new
+  end
+  
+  describe "#initialize" do
+    it "sets data list of queues" do
+      @queues.data.must_equal(@spy_queues_data)
+    end
+  end
+  
+  describe "#refresh" do
+    it "doesn't refresh if not called" do
+      @sidekiq_queues_data.merge!(@sidekiq_queues_data2)
+      
+      @queues.data.must_equal(@spy_queues_data)
+    end
+    
+    it "refreshes if called" do
+      @sidekiq_queues_data.merge!(@sidekiq_queues_data2)
+      
+      @queues.refresh
+      
+      @queues.data.must_equal(@spy_queues_data.merge(@spy_queues_data2))
+    end
+  end
+  
+end

data/test/sidekiq-spy/spy/retries_test.rb

@@ -0,0 +1,83 @@
+require 'time'
+
+
+require File.expand_path('../../../helper', __FILE__)
+
+require File.expand_path('../../../../lib/sidekiq-spy/spy/retries', __FILE__)
+
+
+describe SidekiqSpy::Spy::Retries do
+  
+  before do
+    @sidekiq_retries_data = [
+      {
+        'retry_count'   => 180,
+        'queue'         => 'Q',
+        'class'         => 'Geometry',
+        'args'          => ['Euclid', 360],
+        'error_class'   => 'MmmmmmmmPie',
+        'error_message' => 'Pie pie pie!',
+      },
+    ].each { |e| e.define_singleton_method(:at) { Time.at(11202710605) } }
+    
+    @spy_retries_data = [
+      {
+        :next_at       => Time.parse('2325-01-01 00:03:25 +0000'),
+        :count         => 180,
+        :queue         => 'Q',
+        :class         => 'Geometry',
+        :args          => ['Euclid', 360],
+        :error_class   => 'MmmmmmmmPie',
+        :error_message => 'Pie pie pie!',
+      },
+    ]
+    
+    @sidekiq_retries_data2 = [
+      {
+        'retry_count' => 90,
+        'queue'       => 'Queueueue',
+        'class'       => 'Elements',
+        'args'        => ['Lehrer', 102],
+      },
+    ].each { |e| e.define_singleton_method(:at) { Time.at(-1316908800) } }
+    
+    @spy_retries_data2 = [
+      {
+        :next_at       => Time.parse('1928-04-09 00:00:00 +0000'),
+        :count         => 90,
+        :queue         => 'Queueueue',
+        :class         => 'Elements',
+        :args          => ['Lehrer', 102],
+        :error_class   => nil,
+        :error_message => nil,
+      },
+    ]
+    
+    Sidekiq::RetrySet.stubs(:new).returns(@sidekiq_retries_data)
+    
+    @retries = SidekiqSpy::Spy::Retries.new
+  end
+  
+  describe "#initialize" do
+    it "sets data list of retries" do
+      @retries.data.must_equal(@spy_retries_data)
+    end
+  end
+  
+  describe "#refresh" do
+    it "doesn't refresh if not called" do
+      @sidekiq_retries_data.push(*@sidekiq_retries_data2)
+      
+      @retries.data.must_equal(@spy_retries_data)
+    end
+    
+    it "refreshes if called" do
+      @sidekiq_retries_data.push(*@sidekiq_retries_data2)
+      
+      @retries.refresh
+      
+      @retries.data.must_equal(@spy_retries_data + @spy_retries_data2)
+    end
+  end
+  
+end

data/test/sidekiq-spy/spy/schedules_test.rb

@@ -0,0 +1,73 @@
+require 'time'
+
+
+require File.expand_path('../../../helper', __FILE__)
+
+require File.expand_path('../../../../lib/sidekiq-spy/spy/schedules', __FILE__)
+
+
+describe SidekiqSpy::Spy::Schedules do
+  
+  before do
+    @sidekiq_schedules_data = [
+      {
+        'queue' => 'Q',
+        'class' => 'Geometry',
+        'args'  => ['Euclid', 360],
+      },
+    ].each { |e| e.define_singleton_method(:at) { Time.at(11202710605) } }
+    
+    @spy_schedules_data = [
+      {
+        :scheduled_at => Time.parse('2325-01-01 00:03:25 +0000'),
+        :queue        => 'Q',
+        :class        => 'Geometry',
+        :args         => ['Euclid', 360],
+      },
+    ]
+    
+    @sidekiq_schedules_data2 = [
+      {
+        'queue' => 'Queueueue',
+        'class' => 'Elements',
+        'args'  => ['Lehrer', 102],
+      },
+    ].each { |e| e.define_singleton_method(:at) { Time.at(-1316908800) } }
+    
+    @spy_schedules_data2 = [
+      {
+        :scheduled_at => Time.parse('1928-04-09 00:00:00 +0000'),
+        :queue        => 'Queueueue',
+        :class        => 'Elements',
+        :args         => ['Lehrer', 102],
+      },
+    ]
+    
+    Sidekiq::ScheduledSet.stubs(:new).returns(@sidekiq_schedules_data)
+    
+    @schedules = SidekiqSpy::Spy::Schedules.new
+  end
+  
+  describe "#initialize" do
+    it "sets data list of schedules" do
+      @schedules.data.must_equal(@spy_schedules_data)
+    end
+  end
+  
+  describe "#refresh" do
+    it "doesn't refresh if not called" do
+      @sidekiq_schedules_data.push(*@sidekiq_schedules_data2)
+      
+      @schedules.data.must_equal(@spy_schedules_data)
+    end
+    
+    it "refreshes if called" do
+      @sidekiq_schedules_data.push(*@sidekiq_schedules_data2)
+      
+      @schedules.refresh
+      
+      @schedules.data.must_equal(@spy_schedules_data + @spy_schedules_data2)
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-spy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tiredpixel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -90,11 +90,17 @@ files:
 - lib/sidekiq-spy/config.rb
 - lib/sidekiq-spy/display/panel.rb
 - lib/sidekiq-spy/display/panels/header.rb
+- lib/sidekiq-spy/display/panels/queues.rb
 - lib/sidekiq-spy/display/panels/redis_stats.rb
+- lib/sidekiq-spy/display/panels/retries.rb
+- lib/sidekiq-spy/display/panels/schedules.rb
 - lib/sidekiq-spy/display/panels/sidekiq_stats.rb
 - lib/sidekiq-spy/display/panels/workers.rb
 - lib/sidekiq-spy/display/screen.rb
 - lib/sidekiq-spy/display/subpanel.rb
+- lib/sidekiq-spy/spy/queues.rb
+- lib/sidekiq-spy/spy/retries.rb
+- lib/sidekiq-spy/spy/schedules.rb
 - lib/sidekiq-spy/spy/stats.rb
 - lib/sidekiq-spy/spy/workers.rb
 - lib/sidekiq-spy/translatable.rb
@@ -107,6 +113,9 @@ files:
 - test/sidekiq-spy/display/panel_test.rb
 - test/sidekiq-spy/display/screen_test.rb
 - test/sidekiq-spy/display/subpanel_test.rb
+- test/sidekiq-spy/spy/queues_test.rb
+- test/sidekiq-spy/spy/retries_test.rb
+- test/sidekiq-spy/spy/schedules_test.rb
 - test/sidekiq-spy/spy/stats_test.rb
 - test/sidekiq-spy/spy/workers_test.rb
 - test/sidekiq-spy/translatable_test.rb
@@ -131,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Sidekiq monitoring in the console.
@@ -143,6 +152,9 @@ test_files:
 - test/sidekiq-spy/display/panel_test.rb
 - test/sidekiq-spy/display/screen_test.rb
 - test/sidekiq-spy/display/subpanel_test.rb
+- test/sidekiq-spy/spy/queues_test.rb
+- test/sidekiq-spy/spy/retries_test.rb
+- test/sidekiq-spy/spy/schedules_test.rb
 - test/sidekiq-spy/spy/stats_test.rb
 - test/sidekiq-spy/spy/workers_test.rb
 - test/sidekiq-spy/translatable_test.rb