sidekiq_status 1.0.2 → 1.0.3

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3-p374-perf@sidekiq_status --create
+rvm use 1.9.3-p392-perf@sidekiq_status --create

data/.travis.yml

@@ -4,5 +4,14 @@ rvm:
   - 1.9.3
 #  - jruby-19mode # JRuby in 1.9 mode
 #  - rbx-19mode
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec
+env:
+  global:
+    - SHOW_SIDEKIQ=true
+  matrix:
+    - SIDEKIQ_VERSION="~>2.4.0"
+    - SIDEKIQ_VERSION="~>2.5.4"
+    - SIDEKIQ_VERSION="~>2.6.5"
+    - SIDEKIQ_VERSION="~>2.7.5"
+    - SIDEKIQ_VERSION="~>2.8.0"
+    - SIDEKIQ_VERSION="~>2.9.0"
+script: bundle exec rake

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sidekiq_status.gemspec
 gemspec
+
+gem 'sidekiq', ENV['SIDEKIQ_VERSION'] if ENV['SIDEKIQ_VERSION']
+

data/README.md

@@ -146,6 +146,11 @@ and clean status containers.
 
 ## Changelog
 
+### 1.0.3
+
+   * Include SidekiqStatus::Web app into Sidekiq::Web app unobtrusively (Peter Fern)
+   * sidekiq 2.8.0 and 2.9.0 support
+
 ### 1.0.2
 
    * sidekiq 2.7.0 support

data/lib/sidekiq_status/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module SidekiqStatus
   # SidekiqStatus version
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/sidekiq_status/web.rb

@@ -1,75 +1,67 @@
 module SidekiqStatus
   # Hook into *Sidekiq::Web* Sinatra app which adds a new "/statuses" page
   module Web
-    # A ruby module hook to treat the included code as if it was defined inside Sidekiq::Web.
-    # Thus it extends Sidekiq::Web Sinatra application
-    #
-    # @param [Sidekiq::Web] target
-    def self.extend_object(target)
-      target.class_eval do
+    # Location of SidekiqStatus::Web view templates
+    VIEW_PATH = File.expand_path('../../../web/views', __FILE__)
+
+    # @param [Sidekiq::Web] app
+    def self.registered(app)
+      app.helpers do
         # Calls the given block for every possible template file in views,
         # named name.ext, where ext is registered on engine.
         def find_template(views, name, engine, &block)
-          super(File.expand_path('../../../web/views', __FILE__), name, engine, &block)
+          super(VIEW_PATH, name, engine, &block)
           super
         end
+      end
 
-        case tabs
-          when Hash
-            # Sidekiq >= 2.5.0
-            tabs['Statuses'] = 'statuses'
-          when Array
-            # Sidekiq < 2.5.0
-            tabs << 'Statuses'
-          else
-            raise ScriptError, 'unexpected Sidekiq::Web.tabs format'
-        end
-
-
-        get '/statuses' do
-          @count = (params[:count] || 25).to_i
-
-          @current_page = (params[:page] || 1).to_i
-          @current_page = 1 unless @current_page > 0
+      app.get '/statuses' do
+        @count = (params[:count] || 25).to_i
 
-          @total_size = SidekiqStatus::Container.size
+        @current_page = (params[:page] || 1).to_i
+        @current_page = 1 unless @current_page > 0
 
-          pageidx = @current_page - 1
-          @statuses = SidekiqStatus::Container.statuses(pageidx * @count, (pageidx + 1) * @count)
+        @total_size = SidekiqStatus::Container.size
 
-          slim :statuses
-        end
+        pageidx = @current_page - 1
+        @statuses = SidekiqStatus::Container.statuses(pageidx * @count, (pageidx + 1) * @count)
 
-        get '/statuses/:jid' do
-          @status = SidekiqStatus::Container.load(params[:jid])
-          slim :status
-        end
-
-        get '/statuses/:jid/kill' do
-          SidekiqStatus::Container.load(params[:jid]).request_kill
-          redirect to(:statuses)
-        end
+        render(:slim, :statuses)
+      end
 
-        get '/statuses/delete/all' do
-          SidekiqStatus::Container.delete
-          redirect to(:statuses)
-        end
+      app.get '/statuses/:jid' do
+        @status = SidekiqStatus::Container.load(params[:jid])
+        render(:slim, :status)
+      end
 
-        get '/statuses/delete/complete' do
-          SidekiqStatus::Container.delete('complete')
-          redirect to(:statuses)
-        end
+      app.get '/statuses/:jid/kill' do
+        SidekiqStatus::Container.load(params[:jid]).request_kill
+        redirect to(:statuses)
+      end
 
-        get '/statuses/delete/finished' do
-          SidekiqStatus::Container.delete(SidekiqStatus::Container::FINISHED_STATUS_NAMES)
-          redirect to(:statuses)
-        end
+      app.get '/statuses/delete/all' do
+        SidekiqStatus::Container.delete
+        redirect to(:statuses)
+      end
 
+      app.get '/statuses/delete/complete' do
+        SidekiqStatus::Container.delete('complete')
+        redirect to(:statuses)
+      end
 
+      app.get '/statuses/delete/finished' do
+        SidekiqStatus::Container.delete(SidekiqStatus::Container::FINISHED_STATUS_NAMES)
+        redirect to(:statuses)
       end
     end
   end
 end
 
-require 'sidekiq/web'
-Sidekiq::Web.extend(SidekiqStatus::Web)
+require 'sidekiq/web' unless defined?(Sidekiq::Web)
+Sidekiq::Web.register(SidekiqStatus::Web)
+if Sidekiq::Web.tabs.is_a?(Array)
+  # For sidekiq < 2.5
+  Sidekiq::Web.tabs << "statuses"
+else
+  Sidekiq::Web.tabs["Statuses"] = "statuses"
+end

data/sidekiq_status.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SidekiqStatus::VERSION
 
-  gem.add_runtime_dependency("sidekiq", ">= 2.6", "<= 2.8")
+  gem.add_runtime_dependency("sidekiq", ">= 2.4", "<= 2.9")
 
   gem.add_development_dependency("activesupport")
   gem.add_development_dependency("rspec")

data/spec/integration/sidekiq_spec.rb

@@ -9,7 +9,8 @@ describe SidekiqStatus::Worker do
       command,
       :chdir => DUMMY_APP_ROOT,
       :err => :out,
-      :out => log_to
+      :out => log_to,
+      :pgroup => true
     )
   end
 
@@ -19,14 +20,8 @@ describe SidekiqStatus::Worker do
     begin
       yield(pid)
     ensure
-      Process.kill('USR1', pid)
-      Process.wait(pid, Process::WNOHANG)
-    end
-  end
-
-  def wait(&block)
-    Timeout.timeout(15) do
-      sleep(0.5) while !block.call
+      Process.kill('TERM', -Process.getpgid(pid))
+      Process.wait(pid)
     end
   end
 
@@ -70,4 +65,4 @@ describe SidekiqStatus::Worker do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -30,4 +30,10 @@ RSpec.configure do |c|
       example.call
     end
   end
+
+  def wait(&block)
+    Timeout.timeout(15) do
+      sleep(0.5) while !block.call
+    end
+  end
 end

data/spec/worker_spec.rb

@@ -120,7 +120,6 @@ describe Sidekiq::Worker do
       jid = SomeWorker.perform_async(*args)
       container = SidekiqStatus::Container.load(jid)
 
-      ready = false
       lets_stop = false
 
       worker.extend(Module.new do
@@ -128,17 +127,13 @@ describe Sidekiq::Worker do
           self.total=(200)
           self.at(50, "25% done")
           self.payload = 'some payload'
-          ready = true
-          sleep(0.01) unless lets_stop
+          wait{ lets_stop }
         end
       end)
 
       worker_thread = Thread.new{ worker.perform(jid) }
       checker_thread = Thread.new do
-        sleep(0.01) unless ready
-
-        container.reload
-        container.status.should  == 'working'
+        wait{ container.reload.working? }
         container.at.should      == 50
         container.total.should   == 200
         container.message.should == '25% done'
@@ -147,13 +142,13 @@ describe Sidekiq::Worker do
         lets_stop = true
       end
 
-      worker_thread.join(10)
-      checker_thread.join(10)
+      worker_thread.join(15)
+      checker_thread.join(15)
+
+      wait{ container.reload.complete? }
 
-      container.reload
-      container.status.should  == 'complete'
       container.payload.should == 'some payload'
       container.message.should be_nil
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_status
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -18,10 +18,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.4'
     - - <=
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,10 +29,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.4'
     - - <=
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement