sidekiq-spy 0.1.0 → 0.2.0

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

@@ -2,6 +2,14 @@ module SidekiqSpy
   module Display
     class Subpanel
       
+      attr_reader :height
+      attr_reader :width
+      attr_reader :top
+      attr_reader :left
+      attr_reader :data
+      attr_reader :dividers
+      attr_reader :content_width
+      
       def initialize(window, height, width, top, left, opts = {})
         @window = window
         @height = height
@@ -10,13 +18,13 @@ module SidekiqSpy
         @left   = left
         
         @data = {
-          :left  => opts[:data_l],
-          :right => opts[:data_r],
+          :left  => opts[:data_l] || '',
+          :right => opts[:data_r] || '',
         }
         
         @dividers = {
-          :left  => opts[:divider_l].to_s,
-          :right => opts[:divider_r].to_s,
+          :left  => opts[:divider_l] || '',
+          :right => opts[:divider_r] || '',
         }
         
         @content_width = @width - @dividers.values.map(&:length).inject(:+)
@@ -36,10 +44,10 @@ module SidekiqSpy
       private
       
       def content(data_l, data_r, width)
-        l = data_l.is_a?(Proc) ? data_l.call : data_l.to_s
-        r = data_r.is_a?(Proc) ? data_r.call : data_r.to_s
+        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.length}s" % r
+        ("#{l}%#{width - (l ? l.length : 0)}s" % r)[0...width]
       end
       
     end

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

@@ -62,7 +62,7 @@ module SidekiqSpy
         @stats.failed
       end
       
-      # private
+      private
       
       def redis
         Sidekiq.redis { |c| yield c }

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

@@ -0,0 +1,35 @@
+require 'time'
+require 'sidekiq'
+
+
+module SidekiqSpy
+  module Spy
+    class Workers
+      
+      attr_reader :data
+      
+      def initialize
+        @workers = Sidekiq::Workers.new
+        
+        refresh
+      end
+      
+      def refresh
+        h = {}
+        
+        @workers.each do |worker, msg|
+          h[worker] = {
+            :name       => worker,
+            :queue      => msg['queue'],
+            :class      => msg['payload']['class'],
+            :args       => msg['payload']['args'],
+            :started_at => (msg['run_at'].is_a?(Numeric) ? Time.at(msg['run_at']) : Time.parse(msg['run_at'])),
+          }
+        end
+        
+        @data = h
+      end
+      
+    end
+  end
+end

data/lib/sidekiq-spy/translatable.rb

@@ -3,10 +3,6 @@ module SidekiqSpy
     
     def t
       {
-        divider: {
-          left:  "",
-          right: "|",
-        },
         program: "Sidekiq Spy #{VERSION}",
         redis: {
           connection: "redis:",
@@ -25,6 +21,13 @@ module SidekiqSpy
           scheduled: "scheduled:",
           failed: "failed:",
         },
+        heading: {
+          worker: "WORKER",
+          queue: "QUEUE",
+          class: "CLASS",
+          args: "ARGUMENTS",
+          started_at: "STARTED",
+        }
       }
     end
     

data/lib/sidekiq-spy/version.rb

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

data/sidekiq-spy.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency "mocha", "~> 0.14"
 end

data/test/helper.rb

@@ -1,6 +1,2 @@
-require 'coveralls'
-Coveralls.wear! do
-  add_filter "/test/sidekiq-spy/"
-end
-
 require 'minitest/autorun'
+require 'mocha/setup'

data/test/sidekiq-spy/app_test.rb

@@ -3,9 +3,24 @@ require File.expand_path('../../helper', __FILE__)
 require File.expand_path('../../../lib/sidekiq-spy', __FILE__)
 
 
+def start_and_stop_app(app)
+  app_thread = Thread.new { app.start }
+  
+  sleep 1 # patience, patience; give app time to start
+  
+  app.stop
+  
+  app_thread.join(2)
+  
+  Thread.kill(app_thread)
+end
+
+
 describe SidekiqSpy::App do
   
   before do
+    SidekiqSpy::Display::Screen.stubs(:new)
+    
     @app = SidekiqSpy::App.new
   end
   
@@ -13,6 +28,101 @@ describe SidekiqSpy::App do
     @app.running.must_equal false
   end
   
+  describe "#configure" do
+    it "configures Sidekiq" do
+      Sidekiq.expects(:configure_client)
+      
+      @app.configure {  }
+    end
+  end
+  
+  describe "configure block main" do
+    before do
+      @app.configure do |c|
+        c.namespace = 'resque'
+        c.interval  = 1
+      end
+      
+      @config = @app.config
+    end
+    
+    it "configures namespace" do
+      @config.namespace.must_equal 'resque'
+    end
+    
+    it "configures interval" do
+      @config.interval.must_equal 1
+    end
+  end
+  
+  describe "configure block url" do
+    before do
+      @app.configure do |c|
+        c.url = 'redis://da.example.com:237/42'
+      end
+      
+      @config = @app.config
+    end
+    
+    it "configures host" do
+      @config.host.must_equal 'da.example.com'
+    end
+    
+    it "configures port" do
+      @config.port.must_equal 237
+    end
+    
+    it "configures database" do
+      @config.database.must_equal 42
+    end
+  end
+  
+  describe "configure block url-brief" do
+    before do
+      @app.configure do |c|
+        c.url = 'redis://da.example.com'
+      end
+      
+      @config = @app.config
+    end
+    
+    it "configures host" do
+      @config.host.must_equal 'da.example.com'
+    end
+    
+    it "configures port" do
+      @config.port.must_equal 6379
+    end
+    
+    it "configures database" do
+      @config.database.must_equal 0
+    end
+  end
+  
+  describe "configure block non-url" do
+    before do
+      @app.configure do |c|
+        c.host      = 'da.example.com'
+        c.port      = 237
+        c.database  = 42
+      end
+      
+      @config = @app.config
+    end
+    
+    it "configures host" do
+      @config.host.must_equal 'da.example.com'
+    end
+    
+    it "configures port" do
+      @config.port.must_equal 237
+    end
+    
+    it "configures database" do
+      @config.database.must_equal 42
+    end
+  end
+  
   describe "#start" do
     before do
       @app.configure do |c|
@@ -30,18 +140,42 @@ describe SidekiqSpy::App do
       Thread.kill(thread_app)
     end
     
-    it "stops running within 2s" do
+    it "stops running within 1s" do
       thread_app = Thread.new { @app.start }
       
       sleep 1 # patience, patience; give app time to start
       
       @app.stop; t0 = Time.now
       
-      thread_app.join(3)
+      thread_app.join(2)
       
       Thread.kill(thread_app)
       
-      assert_operator (Time.now - t0), :<=, 2
+      assert_operator (Time.now - t0), :<=, 1
+    end
+    
+    it "calls #setup hook" do
+      @app.expects(:setup)
+      
+      start_and_stop_app(@app)
+    end
+    
+    it "calls #refresh hook" do
+      @app.expects(:refresh)
+      
+      start_and_stop_app(@app)
+    end
+    
+    it "calls #next_key hook" do
+      @app.expects(:next_key).at_least_once
+      
+      start_and_stop_app(@app)
+    end
+    
+    it "calls #cleanup hook" do
+      @app.expects(:cleanup)
+      
+      start_and_stop_app(@app)
     end
   end
   
@@ -57,4 +191,16 @@ describe SidekiqSpy::App do
     end
   end
   
+  describe "#do_command" do
+    before do
+      @app.instance_variable_set(:@running, true)
+    end
+    
+    it "<q> sets status not-running" do
+      @app.do_command('q')
+      
+      @app.running.must_equal false
+    end
+  end
+  
 end

data/test/sidekiq-spy/config_test.rb

@@ -1,15 +1,10 @@
 require File.expand_path('../../helper', __FILE__)
 
 require File.expand_path('../../../lib/sidekiq-spy/config', __FILE__)
-require File.expand_path('../../../lib/sidekiq-spy/app', __FILE__)
 
 
 describe SidekiqSpy::Config do
   
-  before do
-    @app = SidekiqSpy::App.new
-  end
-  
   describe "default" do
     before do
       @config = SidekiqSpy::Config.new
@@ -36,93 +31,6 @@ describe SidekiqSpy::Config do
     end
   end
   
-  describe "configure block main" do
-    before do
-      @app.configure do |c|
-        c.namespace = 'resque'
-        c.interval  = 1
-      end
-      
-      @config = @app.config
-    end
-    
-    it "configures namespace" do
-      @config.namespace.must_equal 'resque'
-    end
-    
-    it "configures interval" do
-      @config.interval.must_equal 1
-    end
-  end
-  
-  describe "configure block url" do
-    before do
-      @app.configure do |c|
-        c.url = 'redis://da.example.com:237/42'
-      end
-      
-      @config = @app.config
-    end
-    
-    it "configures host" do
-      @config.host.must_equal 'da.example.com'
-    end
-    
-    it "configures port" do
-      @config.port.must_equal 237
-    end
-    
-    it "configures database" do
-      @config.database.must_equal 42
-    end
-  end
-  
-  describe "configure block url-brief" do
-    before do
-      @app.configure do |c|
-        c.url = 'redis://da.example.com'
-      end
-      
-      @config = @app.config
-    end
-    
-    it "configures host" do
-      @config.host.must_equal 'da.example.com'
-    end
-    
-    it "configures port" do
-      @config.port.must_equal 6379
-    end
-    
-    it "configures database" do
-      @config.database.must_equal 0
-    end
-  end
-  
-  describe "configure block non-url" do
-    before do
-      @app.configure do |c|
-        c.host      = 'da.example.com'
-        c.port      = 237
-        c.database  = 42
-      end
-      
-      @config = @app.config
-    end
-    
-    it "configures host" do
-      @config.host.must_equal 'da.example.com'
-    end
-    
-    it "configures port" do
-      @config.port.must_equal 237
-    end
-    
-    it "configures database" do
-      @config.database.must_equal 42
-    end
-  end
-  
   describe "#url" do
     before do
       @config = SidekiqSpy::Config.new

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

@@ -0,0 +1,161 @@
+require File.expand_path('../../../helper', __FILE__)
+
+require File.expand_path('../../../../lib/sidekiq-spy/display/panel', __FILE__)
+
+
+describe SidekiqSpy::Display::Panel do
+  
+  before do
+    @window = stub
+    
+    Curses::Window.stubs(:new).returns(@window)
+    
+    @panel = SidekiqSpy::Display::Panel.new(24, 80, 1, 2)
+  end
+  
+  describe "#initialize" do
+    describe "required" do
+      it "sets height" do
+        @panel.height.must_equal 24
+      end
+      
+      it "sets width" do
+        @panel.width.must_equal 80
+      end
+      
+      it "sets top" do
+        @panel.top.must_equal 1
+      end
+      
+      it "sets left" do
+        @panel.left.must_equal 2
+      end
+      
+      it "defaults dividers" do
+        @panel.dividers.must_equal({
+          :left  => '',
+          :right => '',
+        })
+      end
+      
+      it "calculates divider_length" do
+        @panel.divider_length.must_equal 0
+      end
+      
+      it "sets up window with dimensions" do
+        Curses::Window.expects(:new).with(24, 80, 1, 2)
+        
+        SidekiqSpy::Display::Panel.new(24, 80, 1, 2)
+      end
+      
+      it "sets window" do
+        @panel.instance_variable_get(:@window).must_equal @window
+      end
+    end
+    
+    describe "optional" do
+      before do
+        @structure = [
+          [
+            [1, "busy:",    -> { 1 + 3 }], # S(0,0)
+            [1, "retries:", 2],  # S(0,1)
+          ],
+          [
+            [2, -> { 2 * 7 },     "long"],  # S(1,0)
+            [1, -> { "1" + "4" }, -> { "dark" }], # S(1,1)
+          ],
+        ]
+        
+        @panel = SidekiqSpy::Display::Panel.new(24, 80, 1, 2, @structure,
+          :divider_l => '<',
+          :divider_r => '>'
+        )
+        
+        @subpanels = @panel.instance_variable_get(:@subpanels)
+      end
+      
+      it "sets dividers" do
+        @panel.dividers.must_equal({
+          :left  => '<',
+          :right => '>',
+        })
+      end
+      
+      it "calculates divider_length" do
+        @panel.divider_length.must_equal 2
+      end
+      
+      it "builds enough subpanels" do
+        @subpanels.length.must_equal 4
+      end
+      
+      it "builds S(0,0)" do
+        @subpanels.count { |e|
+          e.height == 1 && e.width == 42 && e.top == 0 && e.left == 0 &&
+          e.data[:left] == "busy:" && e.data[:right].call == 4 &&
+          e.dividers[:left] == '' && e.dividers[:right] == '>' &&
+          e.content_width == 41
+        }.must_equal 1
+      end
+      
+      it "builds S(0,1)" do
+        @subpanels.count { |e|
+          e.height == 1 && e.width == 38 && e.top == 0 && e.left == 42 &&
+          e.data[:left] == "retries:" && e.data[:right] == 2 &&
+          e.dividers[:left] == '<' && e.dividers[:right] == '' &&
+          e.content_width == 37
+        }.must_equal 1
+      end
+      
+      it "builds S(1,0)" do
+        @subpanels.count { |e|
+          e.height == 1 && e.width == 56 && e.top == 1 && e.left == 0 &&
+          e.data[:left].call == 14 && e.data[:right] == "long" &&
+          e.dividers[:left] == '' && e.dividers[:right] == '>' &&
+          e.content_width == 55
+        }.must_equal 1
+      end
+      
+      it "builds S(1,1)" do
+        @subpanels.count { |e|
+          e.height == 1 && e.width == 24 && e.top == 1 && e.left == 56 &&
+          e.data[:left].call == "14" && e.data[:right].call == "dark" &&
+          e.dividers[:left] == '<' && e.dividers[:right] == '' &&
+          e.content_width == 23
+        }.must_equal 1
+      end
+    end
+  end
+  
+  describe "#close" do
+    it "closes window" do
+      @window.expects(:close)
+      
+      @panel.close
+    end
+  end
+  
+  describe "#refresh" do
+    it "refreshes subpanels" do
+      @window.stubs(:refresh)
+      
+      @subpanel2 = stub
+      @subpanel2.expects(:refresh)
+      
+      @panel.instance_variable_set(:@subpanels, [@subpanel2])
+      
+      @panel.refresh
+    end
+    
+    it "refreshes window" do
+      @subpanel2 = stub(:refresh => nil)
+      
+      @panel.instance_variable_set(:@subpanels, [@subpanel2])
+      
+      @window.expects(:refresh)
+      
+      @panel.refresh
+    end
+  end
+  
+end