sidekiq_status 1.0.1 → 1.0.2

data/.gitignore

@@ -9,9 +9,8 @@ _yardoc
 coverage
 doc/
 lib/bundler/man
+log/*.log
 pkg
 rdoc
 spec/reports
-test/tmp
-test/version_tmp
 tmp

data/.rvmrc

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

data/README.md

@@ -144,16 +144,38 @@ and clean status containers.
    1. Setup Sidekiq web interface according to Sidekiq documentation
    2. Add "require 'sidekiq_status/web'" beneath "require 'sidekiq/web'"
 
+## Changelog
+
+### 1.0.2
+
+   * sidekiq 2.7.0 support
+   * sidekiq integration tests
+   * Display progress bar and last message in sidekiq-web tab (leandrocg)
+
+### 1.0.1
+
+   * sidekiq 2.6.x support
+
+### 1.0.0
+
+   * First release
+
+## Roadmap
+
+   * Add some sidekiq-web specs
+
+
+
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
+3. Don't forget to write specs. Make sure rake spec passes
+4. Commit your changes (`git commit -am 'Added some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request
 
 ## Copyright
 
-SidekiqStatus © 2012 by Artem Ignatyev. SidekiqStatus is licensed under the MIT license
+SidekiqStatus © 2012-2013 by Artem Ignatyev. SidekiqStatus is licensed under the MIT license
 

data/lib/sidekiq_status/version.rb

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

data/sidekiq_status.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SidekiqStatus::VERSION
 
-  gem.add_runtime_dependency("sidekiq", "~> 2.6.1")
+  gem.add_runtime_dependency("sidekiq", ">= 2.6", "<= 2.8")
 
+  gem.add_development_dependency("activesupport")
   gem.add_development_dependency("rspec")
   gem.add_development_dependency("simplecov")
   gem.add_development_dependency("rake")

data/spec/dummy/app/workers/test_worker1.rb

@@ -0,0 +1,8 @@
+class TestWorker1
+  include SidekiqStatus::Worker
+
+  def perform(arg1)
+    self.payload = arg1
+    self.total   = 200
+  end
+end

data/spec/dummy/app/workers/test_worker2.rb

@@ -0,0 +1,13 @@
+class TestWorker2
+  include SidekiqStatus::Worker
+
+  def perform(redis_key)
+    signal = nil
+    while signal != 'stop'
+      signal = Sidekiq.redis{ |conn| conn.get(redis_key) }
+      i = signal.to_i
+      self.at(i, "Some message at #{i}")
+      sleep(0.1)
+    end
+  end
+end

data/spec/dummy/boot.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+require 'active_support/dependencies'
+
+DUMMY_APP_ROOT = Pathname.new(File.expand_path('../', __FILE__))
+Sidekiq.redis = {:url => "redis://localhost/15", :size => 5}
+
+ActiveSupport::Dependencies.autoload_paths += Dir.glob(DUMMY_APP_ROOT.join('app/*'))
+
+
+
+
+

data/spec/integration/sidekiq_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe SidekiqStatus::Worker do
+  def run_sidekiq(show_sidekiq_output = ENV['SHOW_SIDEKIQ'])
+    log_to = show_sidekiq_output ? STDOUT : GEM_ROOT.join('log/spawned_sidekiq.log').to_s
+    command = 'bundle exec sidekiq -r ./boot.rb --concurrency 1'
+
+    Process.spawn(
+      command,
+      :chdir => DUMMY_APP_ROOT,
+      :err => :out,
+      :out => log_to
+    )
+  end
+
+  def with_sidekiq_running
+    pid = run_sidekiq
+
+    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
+    end
+  end
+
+  context "integrates seamlessly with sidekiq and" do
+    it "allows to query for complete job status and request payload" do
+      some_value = 'some_value'
+      jid = TestWorker1.perform_async(some_value)
+      container = SidekiqStatus::Container.load(jid)
+      container.should be_waiting
+
+      with_sidekiq_running do
+        wait{ container.reload.complete? }
+
+        container.total.should == 200
+        container.payload.should == some_value
+      end
+    end
+
+    it "allows to query for working job status and request payload" do
+      redis_key = 'SomeRedisKey'
+
+      jid = TestWorker2.perform_async(redis_key)
+      container = SidekiqStatus::Container.load(jid)
+      container.should be_waiting
+
+      with_sidekiq_running do
+        wait{ container.reload.working? }
+
+        Sidekiq.redis{ |conn| conn.set(redis_key, 10) }
+        wait{  container.reload.at == 10 }
+        container.message.should == 'Some message at 10'
+
+        Sidekiq.redis{ |conn| conn.set(redis_key, 50) }
+        wait{ container.reload.at == 50 }
+        container.message.should == 'Some message at 50'
+
+        Sidekiq.redis{ |conn| conn.set(redis_key, 'stop') }
+        wait{ container.reload.complete? }
+        container.should be_complete
+        container.message.should be_nil
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
 # -*- encoding : utf-8 -*-
 require 'bundler'
 Bundler.setup
-
 ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
+GEM_ROOT = Pathname.new(File.expand_path('../..', __FILE__))
 
-require 'simplecov'
-SimpleCov.start
 
-#require 'sidekiq'
+require 'simplecov'
+SimpleCov.start do
+  root GEM_ROOT
+end
 
 require 'sidekiq_status'
 require 'sidekiq/util'
@@ -16,12 +17,11 @@ require 'timecop'
 
 Sidekiq.logger.level = Logger::ERROR
 
-require 'sidekiq/redis_connection'
-REDIS = Sidekiq::RedisConnection.create(:url => "redis://localhost/15", :namespace => 'test', :size => 1)
+
+require GEM_ROOT.join('spec/dummy/boot.rb')
 
 RSpec.configure do |c|
   c.before do
-    Sidekiq.redis = REDIS
     Sidekiq.redis{ |conn| conn.flushdb }
   end
 

data/web/views/statuses.slim

@@ -16,22 +16,26 @@ table class="table table-striped table-bordered"
     th Last Updated ↆ
     th Progress
     th Message
+    th Actions
   - @statuses.each do |container|
     tr
       td
         a href="#{to(:statuses)}/#{container.jid}" = container.jid
       td= container.status
       td= container.last_updated_at
+      td
+        .progress.progress-striped style="margin-bottom: 0"
+          .bar style='width: #{container.pct_complete}%; text-shadow: 1px 1px 1px black'
+            = "#{container.pct_complete}%"
+
+      td= container.message
       td
         - if container.killable?
           a.kill href="#{to(:statuses)}/#{container.jid}/kill" onclick="return confirm('Are you sure?');" Kill
         - elsif container.kill_requested?
           |Kill requested
-      td= container.message
   - if @statuses.empty?
     tr
       td colspan="5"
 
 == slim :_paging, :locals => { :url => "#{root_path}statuses" }
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_status
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,8 +167,13 @@ files:
 - lib/sidekiq_status/version.rb
 - lib/sidekiq_status/web.rb
 - lib/sidekiq_status/worker.rb
+- log/.gitkeep
 - sidekiq_status.gemspec
 - spec/container_spec.rb
+- spec/dummy/app/workers/test_worker1.rb
+- spec/dummy/app/workers/test_worker2.rb
+- spec/dummy/boot.rb
+- spec/integration/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 - web/views/status.slim
@@ -171,13 +198,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Sidekiq extension to track job execution statuses and return job results
   back to the client in a convenient manner
 test_files:
 - spec/container_spec.rb
+- spec/dummy/app/workers/test_worker1.rb
+- spec/dummy/app/workers/test_worker2.rb
+- spec/dummy/boot.rb
+- spec/integration/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 has_rdoc: