Merge pull request #404 from Fryguy/github_pr_commenter_to_commit_range

Change GithubPrCommenter to be a commit_range worker
ManageIQ · Feb 6, 2018 · f764857 · f764857
2 parents 40f6f6e + 8fedc58
commit f764857
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/app/workers/commit_monitor.rb b/app/workers/commit_monitor.rb
@@ -22,7 +22,7 @@ def self.commit_handlers
   #   to check the new commits, but as a group, since newer commits may fix
   #   issues in prior commits.
   def self.commit_range_handlers
-    @commit_range_handlers ||= handlers_for(:commit_range)
+    @commit_range_handlers ||= handlers_for(:commit_range).select { |h| !h.respond_to?(:perform_batch_async) }
   end
 
   # branch handlers expect to handle an entire branch at once.
@@ -38,7 +38,7 @@ def self.branch_handlers
   #
   # Example: A general commenter to GitHub for a number of issues
   def self.batch_handlers
-    @batch_handlers ||= handlers_for(:batch)
+    @batch_handlers ||= handlers_for(:commit_range).select { |h| h.respond_to?(:perform_batch_async) }
   end
 
   def perform

diff --git a/...tor_handlers/batch/github_pr_commenter.rb → ...dlers/commit_range/github_pr_commenter.rb b/...tor_handlers/batch/github_pr_commenter.rb → ...dlers/commit_range/github_pr_commenter.rb
@@ -1,4 +1,4 @@
-module CommitMonitorHandlers::Batch
+module CommitMonitorHandlers::CommitRange
   class GithubPrCommenter
     include Sidekiq::Worker
     sidekiq_options :queue => :miq_bot_glacial

diff --git a/...thub_pr_commenter/diff_content_checker.rb → ...thub_pr_commenter/diff_content_checker.rb b/...thub_pr_commenter/diff_content_checker.rb → ...thub_pr_commenter/diff_content_checker.rb
@@ -1,6 +1,6 @@
 require 'rugged'
 
-module CommitMonitorHandlers::Batch
+module CommitMonitorHandlers::CommitRange
   class GithubPrCommenter::DiffContentChecker
     include Sidekiq::Worker
     sidekiq_options :queue => :miq_bot

diff --git a/...hub_pr_commenter/diff_filename_checker.rb → ...hub_pr_commenter/diff_filename_checker.rb b/...hub_pr_commenter/diff_filename_checker.rb → ...hub_pr_commenter/diff_filename_checker.rb
@@ -1,6 +1,6 @@
 require 'rugged'
 
-module CommitMonitorHandlers::Batch
+module CommitMonitorHandlers::CommitRange
   class GithubPrCommenter::DiffFilenameChecker
     include Sidekiq::Worker
     sidekiq_options :queue => :miq_bot_glacial

diff --git a/...pr_commenter/diff_content_checker_spec.rb → ...pr_commenter/diff_content_checker_spec.rb b/...pr_commenter/diff_content_checker_spec.rb → ...pr_commenter/diff_content_checker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CommitMonitorHandlers::Batch::GithubPrCommenter::DiffContentChecker do
+describe CommitMonitorHandlers::CommitRange::GithubPrCommenter::DiffContentChecker do
   let(:batch_entry)        { BatchEntry.create!(:job => BatchJob.create!) }
   let(:branch)             { create(:pr_branch) }
   let(:content_1)          { "def a(variable)" }

diff --git a/...r_commenter/diff_filename_checker_spec.rb → ...r_commenter/diff_filename_checker_spec.rb b/...r_commenter/diff_filename_checker_spec.rb → ...r_commenter/diff_filename_checker_spec.rb
@@ -1,4 +1,4 @@
-describe CommitMonitorHandlers::Batch::GithubPrCommenter::DiffFilenameChecker do
+describe CommitMonitorHandlers::CommitRange::GithubPrCommenter::DiffFilenameChecker do
   let(:batch_entry) { BatchEntry.create!(:job => BatchJob.create!) }
   let(:branch)      { create(:pr_branch) }
   let(:git_service) { double("GitService", :diff => double("RuggedDiff", :new_files => new_files)) }