resque-scheduler-web 0.0.1 → 0.0.2

data/spec/features/navigation_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 feature 'the tabs added to the resque web interface work correctly' do
-
   scenario 'the Schedule tab works' do
     visit ResqueWeb::Engine.app.url_helpers.overview_path
     click_link 'Schedule'
@@ -13,4 +12,4 @@ feature 'the tabs added to the resque web interface work correctly' do
     click_link 'Delayed'
     expect(current_path).to eq resque_scheduler_engine_routes.delayed_path
   end
-end
+end

data/spec/features/schedules/requeuing_a_job_with_parameters_spec.rb

@@ -1,12 +1,17 @@
 require 'rails_helper'
 
 feature 'requeuing a job that has defined params' do
-
   before do
     Resque.schedule = Test::RESQUE_SCHEDULE
     Resque::Scheduler.load_schedule!
   end
 
+  after do
+    Resque.reset_delayed_queue
+    Resque.queues.each { |q| Resque.remove_queue q }
+    Resque.schedule = {}
+  end
+
   # Given I have a job which requires params in the schedule
   # When I press the requeue button
   # Then I should be presented with a form that prompts me for the params
@@ -16,7 +21,6 @@ feature 'requeuing a job that has defined params' do
   # When I visit the queue page
   # Then I should see the job on the page with the new params
   scenario 'I am prompted to enter the params required for the requeued job' do
-
     job_name = 'job_with_params'
     queue_name = 'quick'
     job_class = 'JobWithParams'
@@ -28,9 +32,9 @@ feature 'requeuing a job that has defined params' do
     click_button 'Queue now'
 
     expect(current_path).to eq ResqueWeb::Engine.app.url_helpers.overview_path
-    click_link queue_name
+    find('.queues .queue a', text: queue_name).click
 
     expect(page).to have_content job_class
     expect(page).to have_css 'td.args', text: /"log_level"=>"info"/
   end
-end
+end

data/spec/features/schedules/scheduled_jobs_page_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 feature 'Viewing the schedule page and interacting with it' do
-
   def visit_scheduler_page
     visit resque_scheduler_engine_routes.schedules_path
   end
@@ -42,6 +41,13 @@ feature 'Viewing the schedule page and interacting with it' do
     visit_scheduler_page
   end
 
+  after do
+    Resque.reset_delayed_queue
+    Resque.queues.each { |q| Resque.remove_queue q }
+    Resque.schedule = {}
+    Resque::Scheduler.env = 'test'
+  end
+
   it 'Link to Schedule page in navigation works' do
     visit '/resque_web'
     click_link 'Schedule'
@@ -77,4 +83,4 @@ feature 'Viewing the schedule page and interacting with it' do
 
     assert !page.body.include?('Delete')
   end
-end
+end

data/spec/models/job_finder/working_job_finder_spec.rb

@@ -1,7 +1,7 @@
-require_relative '../../../app/models/resque_web/plugins/resque_scheduler/job_finder/working_job_finder'
+require_relative '../../../app/models/resque_web/plugins/'\
+                   'resque_scheduler/job_finder/working_job_finder'
 
 describe ResqueWeb::Plugins::ResqueScheduler::JobFinder::WorkingJobFinder do
-
   before do
     Resque.enqueue(OngoingJob)
     @worker_thread = Thread.new do
@@ -14,25 +14,27 @@ describe ResqueWeb::Plugins::ResqueScheduler::JobFinder::WorkingJobFinder do
 
   after do
     @worker_thread.kill
+    Resque.reset_delayed_queue
+    Resque.queues.each { |q| Resque.remove_queue q }
   end
 
   it 'finds a working job when the search term matches' do
-    finder = ResqueWeb::Plugins::ResqueScheduler::JobFinder::WorkingJobFinder.new('going')
+    finder = described_class.new('going')
     expect(finder.find_jobs.first['class']).to eq 'OngoingJob'
   end
 
   it 'does not find a working job when the search term does not match' do
-    finder = ResqueWeb::Plugins::ResqueScheduler::JobFinder::WorkingJobFinder.new('donkey')
+    finder = described_class.new('donkey')
     expect(finder.find_jobs).to be_empty
   end
 
   it 'adds the queue name to the returned jobs' do
-    finder = ResqueWeb::Plugins::ResqueScheduler::JobFinder::WorkingJobFinder.new('going')
+    finder = described_class.new('going')
     expect(finder.find_jobs.first['queue']).to eq 'quick'
   end
 
   it 'sets the where_at value to "working" for the returned jobs' do
-    finder = ResqueWeb::Plugins::ResqueScheduler::JobFinder::WorkingJobFinder.new('going')
+    finder = described_class.new('going')
     expect(finder.find_jobs.first['where_at']).to eq 'working'
   end
-end
+end

data/spec/models/job_finder_spec.rb

@@ -1,8 +1,10 @@
-require_relative '../../app/models/resque_web/plugins/resque_scheduler/job_finder'
+require_relative '../../app/models/resque_web/plugins/'\
+                    'resque_scheduler/job_finder'
 
 describe ResqueWeb::Plugins::ResqueScheduler::JobFinder do
-
-  let(:non_matching_finder) { ResqueWeb::Plugins::ResqueScheduler::JobFinder.new('donkey') }
+  let(:non_matching_finder) do
+    described_class.new('donkey')
+  end
 
   after do
     Resque.reset_delayed_queue
@@ -10,9 +12,10 @@ describe ResqueWeb::Plugins::ResqueScheduler::JobFinder do
   end
 
   context 'with a scheduled job queued in the future' do
-
     let(:time_in_future) { Time.now + 60 }
-    let(:matching_finder) { ResqueWeb::Plugins::ResqueScheduler::JobFinder.new('ivar') }
+    let(:matching_finder) do
+      described_class.new('ivar')
+    end
 
     before do
       Resque.enqueue_at(time_in_future, SomeIvarJob)
@@ -31,24 +34,25 @@ describe ResqueWeb::Plugins::ResqueScheduler::JobFinder do
     end
 
     it 'sets the timestamp for the delayed scheduled jobs' do
-      expect(matching_finder.find_jobs.first['timestamp']).to eq time_in_future.to_i
+      first_job_timestamp = matching_finder.find_jobs.first['timestamp']
+      expect(first_job_timestamp).to eq time_in_future.to_i
     end
   end
 
   context 'with a job currently in the queue' do
-
-    let(:matching_finder) { ResqueWeb::Plugins::ResqueScheduler::JobFinder.new('quick') }
+    let(:matching_finder) do
+      described_class.new('quick')
+    end
 
     before do
       Resque.enqueue(SomeQuickJob)
     end
 
     it 'returns an empty result set with a nil search term' do
-      finder = ResqueWeb::Plugins::ResqueScheduler::JobFinder.new(nil)
-      expect(finder.find_jobs).to be_empty
+      expect(described_class.new(nil).find_jobs).to be_empty
     end
 
-    it 'should find matching queued job' do
+    it 'finds a matching queued job' do
       expect(matching_finder.find_jobs.first['class']).to eq 'SomeQuickJob'
     end
 
@@ -64,5 +68,4 @@ describe ResqueWeb::Plugins::ResqueScheduler::JobFinder do
       expect(non_matching_finder.find_jobs).to be_empty
     end
   end
-
-end
+end

data/spec/rails_helper.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path(
-                                             '../../test/dummy/db/migrate',
-                                             __FILE__
-                                           )]
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
+ActiveRecord::Migrator.migrations_paths = [
+  File.expand_path(
+    '../../test/dummy/db/migrate',
+    __FILE__
+  )
+]
 ActiveRecord::Migrator.migrations_paths << File.expand_path(
   '../../db/migrate',
   __FILE__
@@ -12,7 +14,6 @@ ActiveRecord::Migrator.migrations_paths << File.expand_path(
 
 require 'rspec/rails'
 
-
 # So we can access the Engine class and its path helpers
 $LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
 
@@ -20,6 +21,8 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
 end
 
-RedisInstance.run!
-
-
+# Travis fails to find Redis without this, although it works locally.
+# No idea why.
+Resque.redis = Redis.new(
+  hostname: '127.0.0.1', port: RedisInstance.port, thread_safe: true
+)

data/spec/routing/delayed_routing_spec.rb

@@ -1,9 +1,11 @@
 require 'rails_helper'
 
-describe ResqueWeb::Plugins::ResqueScheduler::DelayedController, type: :routing do
+describe ResqueWeb::Plugins::ResqueScheduler::DelayedController,
+         type: :routing do
   routes { ResqueWeb::Plugins::ResqueScheduler::Engine.routes }
 
   it 'routes to POST cancel_now' do
-    expect(post 'delayed/cancel_now').to route_to('resque_web/plugins/resque_scheduler/delayed#cancel_now')
+    expected_route = 'resque_web/plugins/resque_scheduler/delayed#cancel_now'
+    expect(post 'delayed/cancel_now').to route_to(expected_route)
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 ENV['RAILS_ENV'] = 'test'
 
 require 'resque'
@@ -41,9 +44,6 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
   # These two settings work together to allow you to limit a spec run
   # to individual examples or groups you care about by tagging them with
   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
@@ -56,11 +56,11 @@ RSpec.configure do |config|
   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
   #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
+  # config.disable_monkey_patching!
 
   # This setting enables warnings. It's recommended, but in some cases may
   # be too noisy due to issues in dependencies.
-  config.warnings = true
+  # config.warnings = true
 
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
@@ -75,7 +75,7 @@ RSpec.configure do |config|
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
   # particularly slow.
-  config.profile_examples = 10
+  # config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -88,7 +88,6 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
-=end
 end
 
 def resque_scheduler_engine_routes

data/spec/support/redis_instance.rb

@@ -3,6 +3,9 @@ require 'socket'
 require 'timeout'
 require 'fileutils'
 
+# This provides a Redis instance for the test environment. It manages bootup and
+# shutdown etc, whilst preventing conflicts with other things that may be
+# running on the same port.
 class RedisInstance
   class << self
     @running = false
@@ -33,22 +36,25 @@ class RedisInstance
       @pid = nil
     end
 
+    def port
+      @port ||= random_port
+    end
+
     private
 
     def post_boot_waiting_and_such
       wait_for_pid
       puts "Booted isolated Redis on #{port} with PID #{pid}."
-
       wait_for_redis_boot
-
-      # Ensure we tear down Redis on Ctrl+C / test failure.
-      at_exit { stop! }
+      at_exit { stop! } # Ensure we tear down Redis on Ctrl+C / test failure.
     end
 
     def ensure_redis_server_present!
-      unless system('redis-server -v')
-        fail "** can't find `redis-server` in your path"
-      end
+      fail "** can't find `redis-server` in your path" unless redis_detected?
+    end
+
+    def redis_detected?
+      system('redis-server -v')
     end
 
     def wait_for_redis_boot
@@ -91,10 +97,6 @@ class RedisInstance
       end
     end
 
-    def port
-      @port ||= random_port
-    end
-
     def pid_file
       '/tmp/redis-scheduler-test.pid'
     end

data/spec/support/test_jobs.rb

@@ -9,25 +9,31 @@ class OngoingJob
   end
 end
 
+# Generic job to use as a base class for the test jobs below.
 class SomeJob
   def self.perform(_repo_id, _path)
   end
 end
 
+# Test job
 class SomeQuickJob < SomeJob
   @queue = :quick
 end
 
+# Test job
 class SomeIvarJob < SomeJob
   @queue = :ivar
 end
 
+# Job for tests where we put it into more than one environment and test that it
+# only shows up for one.
 class SomeSharedEnvJob < SomeJob
   def self.queue
     :shared_job
   end
 end
 
+# Job for tests, where we expect there to be parameters provided.
 class JobWithParams
   @queue = :quick
 
@@ -38,8 +44,9 @@ end
 
 JobWithoutParams = Class.new(JobWithParams)
 
-
+# Test module
 module Foo
+  # Test class
   class Bar
     def self.queue
       'bar'
@@ -47,6 +54,7 @@ module Foo
   end
 end
 
+# This is just a container for a dummy schedule.
 module Test
   RESQUE_SCHEDULE = {
     'job_without_params' => {
@@ -72,6 +80,3 @@ module Test
     }
   }
 end
-
-
-

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler-web
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matt Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: resque-web
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '4.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: resque-web
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: resque-scheduler
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: rubocop
+  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: rubocop-rspec
+  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: sass
   requirement: !ruby/object:Gem::Requirement
@@ -137,8 +179,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 description: Use this if you want to move to the new Resque Web plugin architecture
-  via the resque-web gem, rather than the Sinatra-based approach that is bundled with
-  Resque 1.x
+  for Resque Scheduler via theresque-web gem, rather than the Sinatra-based approach
+  that is bundled with Resque 1.x
 email:
 - downrightlies@gmail.com
 executables: []
@@ -147,10 +189,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/javascripts/resque_web/plugins/resque_scheduler/application.js
+- app/assets/stylesheets/resque_web/plugins/resque_scheduler/application.css
 - app/controllers/resque_web/plugins/resque_scheduler/delayed_controller.rb
 - app/controllers/resque_web/plugins/resque_scheduler/schedules_controller.rb
 - app/helpers/resque_web/plugins/resque_scheduler/delayed_helper.rb
@@ -178,7 +224,6 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
@@ -247,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: This gem provides tabs in Resque Web for managing Resque Scheduler.
@@ -261,7 +306,6 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep