Merge branch 'v2.x-stable' into merging-v2.x-stable

Conflicts:
	lib/resque_scheduler/server.rb
	test/resque-web_test.rb

lib/resque_scheduler/server.rb

@@ -99,6 +99,11 @@ def scheduler_template(name)
               File.expand_path("../server/views/#{name}.erb", __FILE__)
             )
           end
+
+          def scheduled_in_this_env?(name)
+            return true if Resque.schedule[name]['rails_env'].nil?
+            Resque.schedule[name]['rails_env'] == Resque::Scheduler.env
+          end
         end
 
         get '/schedule' do

lib/resque_scheduler/server/views/scheduler.erb

@@ -16,7 +16,7 @@
     <th>Queue</th>
     <th>Arguments</th>
   </tr>
-  <% Resque.schedule.keys.sort.each do |name| %>
+  <% Resque.schedule.keys.sort.select { |n| scheduled_in_this_env?(n) }.each do |name| %>
     <% config = Resque.schedule[name] %>
     <tr>
       <td style="padding-top: 12px; padding-bottom: 2px; width: 10px">

test/resque-web_test.rb

@@ -11,7 +11,7 @@
 
 context 'on GET to /schedule with scheduled jobs' do
   setup do
-    ENV['RAILS_ENV'] = 'production'
+    Resque::Scheduler.env = 'production'
     Resque.schedule = {
       'some_ivar_job' => {
         'cron' => '* * * * *',
@@ -26,6 +26,13 @@
         'args' => {
           'b' => 'blah'
         }
+      },
+      'some_fancy_job' => {
+        'every' => ['1m'],
+        'queue' => 'fancy',
+        'class' => 'SomeFancyJob',
+        'args' => 'sparkles',
+        'rails_env' => 'fancy'
       }
     }
     Resque::Scheduler.load_schedule!
@@ -37,6 +44,10 @@
   test 'see the scheduled job' do
     assert last_response.body.include?('SomeIvarJob')
   end
+
+  test 'excludes jobs for other envs' do
+    assert !last_response.body.include?('SomeFancyJob')
+  end
 end
 
 context 'on GET to /delayed' do

test/test_helper.rb

@@ -72,6 +72,12 @@ class SomeIvarJob < SomeJob
   @queue = :ivar
 end
 
+class SomeFancyJob < SomeJob
+  def self.queue
+    :fancy
+  end
+end
+
 class SomeQuickJob < SomeJob
   @queue = :quick
 end