sidekiq-spy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b36dea1a5c807a96adeb6f29737175c479fa5e17
-  data.tar.gz: b6f96e42e80c5af6a31c7ee959c2b137c5ab68b4
+  metadata.gz: 7c1eeb7d31dc8ab0fc09db02331d9116b847af2d
+  data.tar.gz: 6fcef234faf6569e59c79195bcd657a5751e82ed
 SHA512:
-  metadata.gz: 675ab03fb9c9ca6069c8c92f6bac13c829be63b83f6e1fcb8c0ac36c4e34e20c28bf3b6f1a83039d79a1d2902a2fac34015cb34103843e862a5d8c419c20b138
-  data.tar.gz: ed53c6bd5d7a6ec01e18a91e056dee64fe3c8067dbef7d89614a439d84e2c0aa33a15f14253a1b0fb56fdcc8cf94231c5cf76aea97cfc6385636ca78bc53028e
+  metadata.gz: 5495713387031f47cdea190c120b51a1226a05b2cbf95e7dc6b83310f40bf0034c5dfc407d01445df23420953b4833d460fdb40dadde42d1af45d3079552d057
+  data.tar.gz: 868f3381360522b426f5ae2ac0565cc3e7860c55d0a6afb449fc2e2104c70529473fafbe49163ad0e9bb59a6dd5af0526f52f5821baa3456e6af98ce1b6c386d

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.0

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
+before_install:
+  - "gem install bundler -v '~> 1.5, != 1.5.0'"
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
 notifications:
   email:
     recipients:
@@ -11,4 +14,4 @@ notifications:
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx-19mode
+    - rvm: rbx-2.1.1

data/CHANGELOG.md

@@ -6,6 +6,13 @@ For many of commits by [tiredpixel](http://www.tiredpixel.com), the commit
 message provides information and examples.
 
 
+## 0.3.1
+
+- major refactoring of data structures
+- [#1] `Spy::Stats` data+refresh pattern like `Spy::Workers`
+- curses fix for Ruby 2.1.0, which is now supported
+
+
 ## 0.3.0
 
 - sporadic screen-misdraws fix

data/ext/mkrf_conf.rb

@@ -0,0 +1,27 @@
+require 'rubygems/dependency_installer'
+
+# SEE: http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems#How_to_install_different_versions_of_gems_depending_on_which_version_of_ruby_the_installee_is_using
+
+di = Gem::DependencyInstaller.new
+
+begin
+  if RUBY_VERSION >= '2.1'
+    puts "Installing curses because Ruby #{RUBY_VERSION}"
+    
+    # BEWARE: repetition; SEE: sidekiq-spy.gemspec
+    di.install "curses", "~> 1.0"
+  else
+    puts "Not installing curses because Ruby #{RUBY_VERSION}"
+  end
+rescue => e
+  warn "#{$0}: #{e}"
+  
+  exit!
+end
+
+puts "Writing fake Rakefile"
+
+# Write fake Rakefile for rake since Makefile isn't used
+File.open(File.join(File.dirname(__FILE__), 'Rakefile'), 'w') do |f|
+  f.write("task :default" + $/)
+end

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

@@ -30,6 +30,8 @@ module SidekiqSpy
         @window = Curses::Window.new(@height, @width, @top, @left)
         
         @subpanels = build_subpanels(structure)
+        
+        @spies = {} # data sources for #structure
       end
       
       def close
@@ -37,6 +39,8 @@ module SidekiqSpy
       end
       
       def refresh
+        @spies.each { |_, s| s.refresh } # refresh data sources
+        
         @subpanels.each(&:refresh) # build changes 
         
         @window.refresh # push changes to window

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

@@ -1,3 +1,6 @@
+require 'time'
+
+
 module SidekiqSpy
   module Display
     module Panels

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

@@ -4,20 +4,12 @@ module SidekiqSpy
       class Queues < Display::Panel
         
         def initialize(height, width, top, left)
-          @height = height # #structure needs this before #initialize ends
+          super(height, width, top, left, structure(height), :divider_r => " ")
           
-          super(height, width, top, left, structure, :divider_r => " ")
+          @spies[:queues] = Spy::Queues.new
         end
         
-        def refresh
-          @queues.refresh # refresh data feed
-          
-          super
-        end
-        
-        def structure
-          @queues = Spy::Queues.new
-          
+        def structure(height)
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
@@ -28,10 +20,10 @@ module SidekiqSpy
             ],
           ]
           
-          (0...(@height - 1)).each do |i|
+          (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 }],
+              [2, -> { @spies[:queues][i][:name] }, nil],
+              [1, nil,                              -> { @spies[:queues][i][:size] }],
             ]
           end
           

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

@@ -5,27 +5,27 @@ module SidekiqSpy
         
         def initialize(height, width, top, left)
           super(height, width, top, left, structure, :divider_r => "|")
+          
+          @spies[:stats] = Spy::Stats.new
         end
         
         def structure
-          stats = Spy::Stats.new
-          
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
           [
             [
-              [2, t[:redis][:connection], -> { stats.connection }],
-              [1, t[:redis][:namespace],  -> { stats.namespace }],
+              [2, t[:redis][:connection], -> { @spies[:stats][:connection] }],
+              [1, t[:redis][:namespace],  -> { @spies[:stats][:namespace] }],
             ],
             [
-              [1, t[:redis][:version],     -> { stats.redis_version }],
-              [1, t[:redis][:uptime],      -> { stats.uptime }],
-              [1, t[:redis][:connections], -> { stats.connections }],
+              [1, t[:redis][:version],     -> { @spies[:stats][:redis_version] }],
+              [1, t[:redis][:uptime],      -> { @spies[:stats][:uptime] }],
+              [1, t[:redis][:connections], -> { @spies[:stats][:connections] }],
             ],
             [
-              [1, t[:redis][:memory],      -> { stats.memory }],
-              [1, t[:redis][:memory_peak], -> { stats.memory_peak }],
+              [1, t[:redis][:memory],      -> { @spies[:stats][:memory] }],
+              [1, t[:redis][:memory_peak], -> { @spies[:stats][:memory_peak] }],
               [1, nil,                     nil],
             ],
           ]

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

@@ -4,20 +4,12 @@ module SidekiqSpy
       class Retries < Display::Panel
         
         def initialize(height, width, top, left)
-          @height = height # #structure needs this before #initialize ends
+          super(height, width, top, left, structure(height), :divider_r => " ")
           
-          super(height, width, top, left, structure, :divider_r => " ")
+          @spies[:retries] = Spy::Retries.new
         end
         
-        def refresh
-          @retries.refresh # refresh data feed
-          
-          super
-        end
-        
-        def structure
-          @retries = Spy::Retries.new
-          
+        def structure(height)
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
@@ -32,14 +24,14 @@ module SidekiqSpy
             ],
           ]
           
-          (0...(@height - 1)).each do |i|
+          (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 }],
+              [1, -> { @spies[:retries][i][:next_at] }, nil],
+              [1, -> { @spies[:retries][i][:count] },   nil],
+              [1, -> { @spies[:retries][i][:queue] },   nil],
+              [1, -> { @spies[:retries][i][:class] },   nil],
+              [1, -> { @spies[:retries][i][:args] },    nil],
+              [1, nil,                                  -> { @spies[:retries][i][:error_class] }],
             ]
           end
           

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

@@ -4,20 +4,12 @@ module SidekiqSpy
       class Schedules < Display::Panel
         
         def initialize(height, width, top, left)
-          @height = height # #structure needs this before #initialize ends
+          super(height, width, top, left, structure(height), :divider_r => " ")
           
-          super(height, width, top, left, structure, :divider_r => " ")
+          @spies[:schedules] = Spy::Schedules.new
         end
         
-        def refresh
-          @schedules.refresh # refresh data feed
-          
-          super
-        end
-        
-        def structure
-          @schedules = Spy::Schedules.new
-          
+        def structure(height)
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
@@ -30,12 +22,12 @@ module SidekiqSpy
             ],
           ]
           
-          (0...(@height - 1)).each do |i|
+          (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 }],
+              [1, -> { @spies[:schedules][i][:scheduled_at] }, nil],
+              [1, -> { @spies[:schedules][i][:queue] },        nil],
+              [1, -> { @spies[:schedules][i][:class] },        nil],
+              [1, nil,                                         -> { @spies[:schedules][i][:args] }],
             ]
           end
           

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

@@ -5,24 +5,24 @@ module SidekiqSpy
         
         def initialize(height, width, top, left)
           super(height, width, top, left, structure, :divider_r => "|")
+          
+          @spies[:stats] = Spy::Stats.new
         end
         
         def structure
-          stats = Spy::Stats.new
-          
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
           [
             [
-              [1, t[:sidekiq][:busy],      -> { stats.busy }],
-              [1, t[:sidekiq][:retries],   -> { stats.retries }],
-              [1, t[:sidekiq][:processed], -> { stats.processed }],
+              [1, t[:sidekiq][:busy],      -> { @spies[:stats][:busy] }],
+              [1, t[:sidekiq][:retries],   -> { @spies[:stats][:retries] }],
+              [1, t[:sidekiq][:processed], -> { @spies[:stats][:processed] }],
             ],
             [
-              [1, t[:sidekiq][:enqueued],  -> { stats.enqueued }],
-              [1, t[:sidekiq][:scheduled], -> { stats.scheduled }],
-              [1, t[:sidekiq][:failed],    -> { stats.failed }],
+              [1, t[:sidekiq][:enqueued],  -> { @spies[:stats][:enqueued] }],
+              [1, t[:sidekiq][:scheduled], -> { @spies[:stats][:scheduled] }],
+              [1, t[:sidekiq][:failed],    -> { @spies[:stats][:failed] }],
             ],
           ]
         end

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

@@ -4,20 +4,12 @@ module SidekiqSpy
       class Workers < Display::Panel
         
         def initialize(height, width, top, left)
-          @height = height # #structure needs this before #initialize ends
+          super(height, width, top, left, structure(height), :divider_r => " ")
           
-          super(height, width, top, left, structure, :divider_r => " ")
+          @spies[:workers] = Spy::Workers.new
         end
         
-        def refresh
-          @workers.refresh # refresh data feed
-          
-          super
-        end
-        
-        def structure
-          @workers = Spy::Workers.new
-          
+        def structure(height)
           # [
           #   [relative_column_width, data_left, data_right]
           # ]
@@ -31,13 +23,13 @@ module SidekiqSpy
             ],
           ]
           
-          (0...(@height - 1)).each do |i|
+          (0...(height - 1)).each do |i|
             s << [ # table row slots
-              [2, -> { @workers.data.values[i][:name] rescue nil },  nil],
-              [1, -> { @workers.data.values[i][:queue] rescue nil }, nil],
-              [1, -> { @workers.data.values[i][:class] rescue nil }, nil],
-              [1, -> { @workers.data.values[i][:args] rescue nil },  nil],
-              [1, nil,                                               -> { @workers.data.values[i][:started_at] rescue nil }],
+              [2, -> { @spies[:workers][i][:name] },  nil],
+              [1, -> { @spies[:workers][i][:queue] }, nil],
+              [1, -> { @spies[:workers][i][:class] }, nil],
+              [1, -> { @spies[:workers][i][:args] },  nil],
+              [1, nil,                                -> { @spies[:workers][i][:started_at] }],
             ]
           end
           

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

@@ -0,0 +1,17 @@
+module SidekiqSpy
+  module Spy
+    module Dataspyable
+      
+      include Enumerable
+      
+      def each(&block)
+        @data.each(&block)
+      end
+      
+      def [](key)
+        @data[key] || {}
+      end
+      
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module SidekiqSpy
   module Spy
     class Queues
       
-      attr_reader :data
+      include Spy::Dataspyable
       
       def initialize
         @stats = Sidekiq::Stats.new
@@ -14,10 +14,10 @@ module SidekiqSpy
       end
       
       def refresh
-        h = {}
+        h = []
         
         @stats.queues.each do |queue, size|
-          h[queue] = {
+          h << {
             :name => queue,
             :size => size,
           }

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

@@ -1,4 +1,3 @@
-require 'time'
 require 'sidekiq'
 
 
@@ -6,7 +5,7 @@ module SidekiqSpy
   module Spy
     class Retries
       
-      attr_reader :data
+      include Spy::Dataspyable
       
       def initialize
         @retries = Sidekiq::RetrySet.new

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

@@ -5,7 +5,7 @@ module SidekiqSpy
   module Spy
     class Schedules
       
-      attr_reader :data
+      include Spy::Dataspyable
       
       def initialize
         @schedules = Sidekiq::ScheduledSet.new

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

@@ -5,61 +5,40 @@ module SidekiqSpy
   module Spy
     class Stats
       
+      include Spy::Dataspyable
+      
       def initialize
         @stats   = Sidekiq::Stats.new
         @workers = Sidekiq::Workers.new
-      end
-      
-      def connection
-        redis { |c| "#{c.client.location}/#{c.client.db}" }
-      end
-      
-      def namespace
-        redis { |c| c.namespace if c.respond_to?(:namespace) }
-      end
-      
-      def redis_version
-        redis { |c| c.info['redis_version'] }
-      end
-      
-      def uptime
-        redis { |c| c.info['uptime_in_days'] }
-      end
-      
-      def connections
-        redis { |c| c.info['connected_clients'] }
-      end
-      
-      def memory
-        redis { |c| c.info['used_memory_human'] }
-      end
-      
-      def memory_peak
-        redis { |c| c.info['used_memory_peak_human'] }
-      end
-      
-      def busy
-        @workers.size
-      end
-      
-      def enqueued
-        @stats.enqueued
-      end
-      
-      def retries
-        @stats.retry_size
-      end
-      
-      def scheduled
-        @stats.scheduled_size
-      end
-      
-      def processed
-        @stats.processed
-      end
-      
-      def failed
-        @stats.failed
+        
+        refresh
+      end
+      
+      def refresh
+        h = {}
+        
+        redis do |c|
+          h.merge!({
+            :connection    => "#{c.client.location}/#{c.client.db}",
+            :namespace     => (c.respond_to?(:namespace) ? c.namespace : ""),
+            :redis_version => c.info['redis_version'],
+            :uptime        => c.info['uptime_in_days'],
+            :connections   => c.info['connected_clients'],
+            :memory        => c.info['used_memory_human'],
+            :memory_peak   => c.info['used_memory_peak_human'],
+          })
+        end
+        
+        h.merge!({
+          :busy      => @workers.size,
+          :enqueued  => @stats.enqueued,
+          :retries   => @stats.retry_size,
+          :scheduled => @stats.scheduled_size,
+          :processed => @stats.processed,
+          :failed    => @stats.failed,
+        })
+        
+        @data = h
       end
       
       private

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

@@ -6,7 +6,7 @@ module SidekiqSpy
   module Spy
     class Workers
       
-      attr_reader :data
+      include Spy::Dataspyable
       
       def initialize
         @workers = Sidekiq::Workers.new
@@ -15,10 +15,10 @@ module SidekiqSpy
       end
       
       def refresh
-        h = {}
+        h = []
         
         @workers.each do |worker, msg|
-          h[worker] = {
+          h << {
             :name       => worker,
             :queue      => msg['queue'],
             :class      => msg['payload']['class'],

data/lib/sidekiq-spy/version.rb

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

data/lib/sidekiq-spy.rb

@@ -4,6 +4,7 @@ require File.expand_path('../sidekiq-spy/config', __FILE__)
 require File.expand_path('../sidekiq-spy/translatable', __FILE__)
 require File.expand_path('../sidekiq-spy/app', __FILE__)
 
+require File.expand_path('../sidekiq-spy/spy/dataspyable', __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__)

data/sidekiq-spy.gemspec

@@ -18,9 +18,24 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
+  spec.extensions += [
+    'ext/mkrf_conf.rb',
+  ]
+  
   spec.add_dependency "sidekiq", "~> 2.15"
+  # spec.add_dependency "curses", "~> 1.0" # SEE: ext/mkrf_conf.rb
   
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.3", "!= 1.5.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "mocha", "~> 0.14"
+  
+  if RUBY_VERSION >= '2.1'
+    # This is only for development; note that RUBY_VERSION is evaluated at
+    # build-time, not install-time. ext/mkrf_conf.rb takes care of the install-
+    # time dependency; this takes care of the development-time dependency.
+    # Note that this doesn't work in Gemfile, since :ruby_21 is not a valid
+    # platform in Ruby 1.9.3 .
+    # BEWARE: repetition; SEE: ext/mkrf_conf.rb
+    spec.add_development_dependency "curses", "~> 1.0"
+  end
 end

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

@@ -13,23 +13,23 @@ describe SidekiqSpy::Spy::Queues do
       'queue1' => 42,
     }
     
-    @spy_queues_data = {
-      'queue1' => {
+    @spy_queues_data = [
+      {
         :name => 'queue1',
         :size => 42,
-      }
-    }
+      },
+    ]
     
     @sidekiq_queues_data2 = {
       'queue2' => 1764,
     }
     
-    @spy_queues_data2 = {
-      'queue2' => {
+    @spy_queues_data2 = [
+      {
         :name => 'queue2',
         :size => 1764,
-      }
-    }
+      },
+    ]
     
     Sidekiq::Stats.stubs(:new).returns(stub(
       :queues => @sidekiq_queues_data
@@ -39,8 +39,8 @@ describe SidekiqSpy::Spy::Queues do
   end
   
   describe "#initialize" do
-    it "sets data list of queues" do
-      @queues.data.must_equal(@spy_queues_data)
+    it "sets list of queues" do
+      @queues.to_a.must_equal(@spy_queues_data)
     end
   end
   
@@ -48,7 +48,7 @@ describe SidekiqSpy::Spy::Queues do
     it "doesn't refresh if not called" do
       @sidekiq_queues_data.merge!(@sidekiq_queues_data2)
       
-      @queues.data.must_equal(@spy_queues_data)
+      @queues.to_a.must_equal(@spy_queues_data)
     end
     
     it "refreshes if called" do
@@ -56,7 +56,7 @@ describe SidekiqSpy::Spy::Queues do
       
       @queues.refresh
       
-      @queues.data.must_equal(@spy_queues_data.merge(@spy_queues_data2))
+      @queues.to_a.must_equal(@spy_queues_data + @spy_queues_data2)
     end
   end
   

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

@@ -59,8 +59,8 @@ describe SidekiqSpy::Spy::Retries do
   end
   
   describe "#initialize" do
-    it "sets data list of retries" do
-      @retries.data.must_equal(@spy_retries_data)
+    it "sets list of retries" do
+      @retries.to_a.must_equal(@spy_retries_data)
     end
   end
   
@@ -68,7 +68,7 @@ describe SidekiqSpy::Spy::Retries do
     it "doesn't refresh if not called" do
       @sidekiq_retries_data.push(*@sidekiq_retries_data2)
       
-      @retries.data.must_equal(@spy_retries_data)
+      @retries.to_a.must_equal(@spy_retries_data)
     end
     
     it "refreshes if called" do
@@ -76,7 +76,7 @@ describe SidekiqSpy::Spy::Retries do
       
       @retries.refresh
       
-      @retries.data.must_equal(@spy_retries_data + @spy_retries_data2)
+      @retries.to_a.must_equal(@spy_retries_data + @spy_retries_data2)
     end
   end
   

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

@@ -49,8 +49,8 @@ describe SidekiqSpy::Spy::Schedules do
   end
   
   describe "#initialize" do
-    it "sets data list of schedules" do
-      @schedules.data.must_equal(@spy_schedules_data)
+    it "sets list of schedules" do
+      @schedules.to_a.must_equal(@spy_schedules_data)
     end
   end
   
@@ -58,7 +58,7 @@ describe SidekiqSpy::Spy::Schedules do
     it "doesn't refresh if not called" do
       @sidekiq_schedules_data.push(*@sidekiq_schedules_data2)
       
-      @schedules.data.must_equal(@spy_schedules_data)
+      @schedules.to_a.must_equal(@spy_schedules_data)
     end
     
     it "refreshes if called" do
@@ -66,7 +66,7 @@ describe SidekiqSpy::Spy::Schedules do
       
       @schedules.refresh
       
-      @schedules.data.must_equal(@spy_schedules_data + @spy_schedules_data2)
+      @schedules.to_a.must_equal(@spy_schedules_data + @spy_schedules_data2)
     end
   end
   

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

@@ -39,73 +39,73 @@ describe SidekiqSpy::Spy::Stats do
   
   describe "#connection" do
     it "returns stat connection" do
-      @stats.connection.must_equal 'da.example.com:237/42'
+      @stats[:connection].must_equal 'da.example.com:237/42'
     end
   end
   
   describe "#namespace" do
     it "returns stat namespace" do
-      @stats.namespace.must_equal 'resque'
+      @stats[:namespace].must_equal 'resque'
     end
   end
   
   describe "#uptime" do
     it "returns stat uptime" do
-      @stats.uptime.must_equal '7'
+      @stats[:uptime].must_equal '7'
     end
   end
   
   describe "#connections" do
     it "returns stat connections" do
-      @stats.connections.must_equal '8'
+      @stats[:connections].must_equal '8'
     end
   end
   
   describe "#memory" do
     it "returns stat memory" do
-      @stats.memory.must_equal '5.16M'
+      @stats[:memory].must_equal '5.16M'
     end
   end
   
   describe "#memory_peak" do
     it "returns stat memory_peak" do
-      @stats.memory_peak.must_equal '5.14M'
+      @stats[:memory_peak].must_equal '5.14M'
     end
   end
   
   describe "#busy" do
     it "returns stat busy" do
-      @stats.busy.must_equal 162165179294
+      @stats[:busy].must_equal 162165179294
     end
   end
   
   describe "#enqueued" do
     it "returns stat enqueued" do
-      @stats.enqueued.must_equal 16776977673
+      @stats[:enqueued].must_equal 16776977673
     end
   end
   
   describe "#retries" do
     it "returns stat retries" do
-      @stats.retries.must_equal 924984826746
+      @stats[:retries].must_equal 924984826746
     end
   end
   
   describe "#scheduled" do
     it "returns stat scheduled" do
-      @stats.scheduled.must_equal 317321542620
+      @stats[:scheduled].must_equal 317321542620
     end
   end
   
   describe "#processed" do
     it "returns stat processed" do
-      @stats.processed.must_equal 923531545885
+      @stats[:processed].must_equal 923531545885
     end
   end
   
   describe "#failed" do
     it "returns stat failed" do
-      @stats.failed.must_equal 779187529140
+      @stats[:failed].must_equal 779187529140
     end
   end
   

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

@@ -20,15 +20,15 @@ describe SidekiqSpy::Spy::Workers do
       },
     }
     
-    @spy_workers_data = {
-      'worker1' => {
+    @spy_workers_data = [
+      {
         :name       => 'worker1',
         :queue      => 'Q',
         :class      => 'Geometry',
         :args       => ['Euclid', 360],
-        :started_at => Time.parse('2325-01-01 00:03:25 +0000')
-      }
-    }
+        :started_at => Time.parse('2325-01-01 00:03:25 +0000'),
+      },
+    ]
     
     @sidekiq_workers_data2 = {
       'worker2' => {
@@ -41,15 +41,15 @@ describe SidekiqSpy::Spy::Workers do
       },
     }
     
-    @spy_workers_data2 = {
-      'worker2' => {
+    @spy_workers_data2 = [
+      {
         :name       => 'worker2',
         :queue      => 'Queueueue',
         :class      => 'Elements',
         :args       => ['Lehrer', 102],
-        :started_at => Time.parse('1928-04-09 00:00:00 +0000')
-      }
-    }
+        :started_at => Time.parse('1928-04-09 00:00:00 +0000'),
+      },
+    ]
     
     Sidekiq::Workers.stubs(:new).returns(@sidekiq_workers_data)
     
@@ -57,8 +57,8 @@ describe SidekiqSpy::Spy::Workers do
   end
   
   describe "#initialize" do
-    it "sets data list of workers" do
-      @workers.data.must_equal(@spy_workers_data)
+    it "sets list of workers" do
+      @workers.to_a.must_equal(@spy_workers_data)
     end
   end
   
@@ -66,7 +66,7 @@ describe SidekiqSpy::Spy::Workers do
     it "doesn't refresh if not called" do
       @sidekiq_workers_data.merge!(@sidekiq_workers_data2)
       
-      @workers.data.must_equal(@spy_workers_data)
+      @workers.to_a.must_equal(@spy_workers_data)
     end
     
     it "refreshes if called" do
@@ -74,7 +74,7 @@ describe SidekiqSpy::Spy::Workers do
       
       @workers.refresh
       
-      @workers.data.must_equal(@spy_workers_data.merge(@spy_workers_data2))
+      @workers.to_a.must_equal(@spy_workers_data + @spy_workers_data2)
     end
   end
   

metadata

@@ -1,90 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-spy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - tiredpixel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Sidekiq monitoring in the console. A bit like Sidekiq::Web. But without
   the web.
 email:
 - tp@tiredpixel.com
 executables:
 - sidekiq-spy
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/sidekiq-spy
+- ext/mkrf_conf.rb
 - lib/sidekiq-spy.rb
 - lib/sidekiq-spy/app.rb
 - lib/sidekiq-spy/config.rb
@@ -98,6 +120,7 @@ files:
 - lib/sidekiq-spy/display/panels/workers.rb
 - lib/sidekiq-spy/display/screen.rb
 - lib/sidekiq-spy/display/subpanel.rb
+- lib/sidekiq-spy/spy/dataspyable.rb
 - lib/sidekiq-spy/spy/queues.rb
 - lib/sidekiq-spy/spy/retries.rb
 - lib/sidekiq-spy/spy/schedules.rb
@@ -130,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Sidekiq monitoring in the console.