reviewlette 0.0.6 → 0.0.7

data/lib/reviewlette.rb

@@ -1,202 +1,53 @@
 require 'reviewlette/trello_connection'
 require 'reviewlette/github_connection'
-require 'reviewlette/database'
-require 'reviewlette/graph_gen'
 require 'reviewlette/vacations'
 require 'yaml'
-require 'octokit'
-require 'trello'
 
-class Trello::Card
+VERSION = '0.0.7'
+MEMBERS_CONFIG = YAML.load_file("#{File.dirname(__FILE__)}/../config/members.yml")
 
-  def assignees
-    @trello_connection = Reviewlette::TrelloConnection.new
-    member_ids.map{|id| @trello_connection.find_member_by_id(id)}
-  end
-end
-
-module Reviewlette
-
-  attr_accessor :trello_connection, :github_connection, :repo, :board, :db
-
-  TRELLO_CONFIG1 = YAML.load_file("#{File.dirname(__FILE__)}/../config/.trello.yml")
-
-  class << self
-
-    # Execute logic.
-    def spin
-      setup
-      get_available_repos.each do |repo|
-        @repo = repo
-        get_unassigned_github_issues.each do |issue|
-          @number = issue[:number]
-          @title = issue[:title]
-          @body = issue[:body]
-          update_vacations
-          
-          if find_card(@title.to_s) and find_id
-            if set_reviewer
-              transform_name
-              add_reviewer_on_github
-              comment_on_github
-              # add_to_trello_card
-              comment_on_trello
-              move_to_list
-              @db.add_pr_to_db(@title, @reviewer.username)
-              @reviewer = nil
-              Reviewlette::Graphgenerator.new.write_to_graphs('graph.html',Reviewlette::Graphgenerator.new.model_graphs(Reviewlette::Database.new.conscruct_line_data.to_json, Reviewlette::Database.new.conscruct_graph_struct.to_json, 'Donut'))
-            else
-              comment_on_error
-            end
-          end
-          puts 'No new issues.' unless @issues.present?
-        end
-      end
-    end
-
-    def get_available_repos
-      @repos = Reviewlette::GithubConnection::GITHUB_CONFIG['repo']
-    end
-
-    # Finds card based on title of Github Issue.
-    # Or by branch name if title does not include the trello number.
-    # Happens if the pullrequest consists of only one commit.
-    def find_card(title)
-      begin
-        match_pr_id_with_issue_id
-        @id = title.split('_').last.to_i
-        @id = fetch_branch if @id == 0 && !(@pullreq_ids.values.index(@number)).nil?
-        raise NoTrelloCardException, "Could not find a Trello card. Found #{title.split('_').last} instead, maybe the naming of your pullrequest is wrong? And/or you dont have a branch?" if @id == 0
-        true
-      rescue NoTrelloCardException => e
-        @logger.error e.message
-        puts (e.message)
-        false
-      end
-    end
+class Reviewlette
 
-    def update_vacations
-      @db.get_users_tel_entries.each do |name|
-        @vacations = Reviewlette::Vacations.find_vacations(name) #tel_name
-        evaluate_vacations(name)
-      end
-    end
+  def initialize
+    @github = GithubConnection.new
+    @trello = TrelloConnection.new
+  end
 
-    def evaluate_vacations(reviewer)
-      parse_vacations.each do |check|
-        check[1] = check[0] unless check[1] # Rewrite if statement with catch to prevent this error?
-        if (check[0]..check[1]).cover?(Date.today)
-          @db.set_vacation_flag(reviewer, 'true')
-          break
+  def run
+    @github.unassigned_pull_requests.each do |issue|
+      issue_id = issue[:number]
+      issue_title = issue[:title]
+      puts "*** Checking unassigned github pull request: #{issue_title}"
+      card_id = issue_title.split(/[_ -#\.]/).last.to_i
+      if card = @trello.find_card_by_id(card_id)
+        puts "Found matching trello card: #{card.name}"
+        reviewer = select_reviewer(issue, card)
+        if reviewer
+          @github.add_assignee(issue_id, reviewer['github_username'])
+          @github.reviewer_comment(issue_id, reviewer['github_username'], card)
+          comment = "@#{reviewer['trello_username']} will review https://github.com/#{@github.repo}/issues/#{issue_id}"
+          @trello.comment_on_card(comment, card)
+          @trello.move_card_to_list(card, 'In review')
         else
-          @db.set_vacation_flag(reviewer, 'false') # hopefully not to_bool?
+          puts "Could not find a reviewer for card: #{card.name}"
         end
-      end
-    end
-
-    def parse_vacations
-      split = @vacations.map { |x| x.split(' - ') }
-      split.map { |x| x.map { |b| Date.parse(b) } }
-    end
-
-    # gets the branchname from github pullrequest
-    def fetch_branch
-      pr_id = @pullreq_ids.values.index(@number)
-      branch_name = @github_connection.get_branch_name(pr_id, @repo)
-      branch_name.split('_').last.to_i
-    end
-
-    # Matches Pull Request IDs with the respective Order of PullRequests
-    # to call them and get the branch name.
-    def match_pr_id_with_issue_id
-      @pullreq_ids = {}
-      @counter = 0
-      @github_connection.list_pulls(@repo).each do |x|
-        @pullreq_ids[@counter] = x.number
-        @counter +=1
-      end
-    end
-
-    # TODO: Generic Error message.
-    def comment_on_error
-      @trello_connection.comment_on_card("Skipped Issue #{@number} because everyone on the team is assigned to the card", @card)
-    end
-
-    # Gets [Array(String, String)] all GitHub Issues that are not assigned to someone.
-    def get_unassigned_github_issues
-      @issues = @github_connection.list_issues(@repo).select{|issue| !issue[:assignee]}
-    end
-
-    # Sets instance variables.
-    def setup
-      @logger = Logger.new('review.log')
-      @db = Reviewlette::Database.new
-      @github_connection = Reviewlette::GithubConnection.new
-      @trello_connection = Reviewlette::TrelloConnection.new
-      @board = Trello::Board.find(TRELLO_CONFIG1['board_id'])
-    end
-
-    # Finds a sets card.
-    def find_id
-      if @id != 0
-        @card = @trello_connection.find_card_by_id(@id)
-        true
       else
-        @logger.warn("Id not found, skipping Issue #{@title} with number #{@number}")
-        false
-      end
-    end
-
-    # Selects and sets reviewer.
-    def set_reviewer
-      begin
-        while !(@reviewer)
-          @reviewer = @trello_connection.determine_reviewer(@card) if @card
-        end
-        @trelloname = @reviewer.username
-        puts "Selected #{@reviewer.username}"
-        return true
-      rescue AlreadyAssignedException => e
-        @logger.warn("Skipped Issue #{@card.short_id} because #{e.message}")
-        puts ("Skipped Issue #{@card.short_id} because #{e.message}")
-        return false
+        puts "No matching card found (id #{card_id})"
       end
     end
 
-    # Get Trelloname from configfile.
-    def transform_name
-      @githubname = @db.find_gh_name_by_trello_name(@trelloname)
-    end
-
-    # Adds Assignee on GitHub.
-    def add_reviewer_on_github
-      @github_connection.add_assignee(@repo, @number, @title, @body, @githubname) if @number && @githubname
-    end
-
-    # Comments on GitHub.
-    def comment_on_github
-      @github_connection.comment_on_issue(@repo, @number, @githubname, @card.url) if @number && @githubname
-    end
-    # Adds Reviewer on Trello Card.
-    def add_to_trello_card
-      @trello_connection.add_reviewer_to_card(@reviewer, @card)
-    end
-
-    # Comments on Trello Card.
-    def comment_on_trello
-      @full_comment = '@' + @trelloname + ' will review ' + 'https://github.com/'+ @repo+'/issues/'+@number.to_s
-      @trello_connection.comment_on_card(@full_comment, @card) if @full_comment
-    end
+  end
 
-    # TODO: More generic 'Done' and 'in Review' are not present everywhere
-    def move_to_list
-      if @github_connection.pull_merged?(@repo, @id)
-        @column = @trello_connection.find_column('Done')
-        @trello_connection.move_card_to_list(@card, @column)
-      else
-        @column = @trello_connection.find_column('In review')
-        @trello_connection.move_card_to_list(@card, @column)
-      end
-    end
+  def select_reviewer(issue, card)
+    reviewers = MEMBERS_CONFIG['members']
+    # remove people on vacation
+    members_on_vacation = Vacations.members_on_vacation
+    reviewers = reviewers.reject{|r| members_on_vacation.include? r['suse_username'] }
+    # remove trello card owner
+    reviewers = reviewers.reject{|r| card.members.map(&:username).include? r['trello_username'] }
+    reviewer = reviewers.sample
+    puts "Selected reviewer: #{reviewer['name']} from pool #{reviewers.map{|r| r['name']}}" if reviewer
+    reviewer
   end
+
 end

data/reviewlette.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'reviewlette/version'
+require 'reviewlette'
 
 Gem::Specification.new do |spec|
   spec.name          = "reviewlette"
-  spec.version       = Reviewlette::VERSION
+  spec.version       = VERSION
   spec.authors       = ["jschmid1"]
   spec.email         = ["jschmid@suse.de"]
   spec.summary       = %q{Randomly assignes a reviewer to your Pullrequest and corresponding Trello Card.}

data/spec/github_connection_spec.rb

@@ -1,96 +1,41 @@
 require 'spec_helper'
 
-describe Reviewlette::GithubConnection do
+describe GithubConnection do
 
-  subject { Reviewlette::GithubConnection }
+  GITHUB_CONFIG = { token: '661', repo: 'SUSE/reviewlette' }
+  subject { GithubConnection }
+  let( :connection ) { subject.new }
 
   describe '.new' do
 
-    it 'sets up Github connection' do
-      config = Reviewlette::GithubConnection::GITHUB_CONFIG
-      expect(Octokit::Client).to receive(:new).with(:access_token => config['token'])
-      subject.new
-    end
-  end
-
-  describe '#pull_merged?' do
-    let( :connection ) { subject.new }
-
-    it 'checks if the pull is merged' do
-      allow(connection.client).to receive(:pull_merged?).with('true', 6).and_return true
-      expect(connection.pull_merged?('true', 6)).to be true
-    end
-
-    it 'checks if the pull is not merged' do
-      allow(connection.client).to receive(:pull_merged?).with('false', 5).and_return false
-      expect(connection.pull_merged?('false', 5)).to be false
+    it 'initializes octokit client and repo' do
+      expect(Octokit::Client).to receive(:new).with(:access_token => GITHUB_CONFIG['token'])
+      connection = subject.new
+      expect(connection.repo).to eq(GITHUB_CONFIG['repo'])
     end
   end
 
   describe '#add_assignee' do
-    let( :connection ) { subject.new }
-
     it 'adds an assignee to the gh issue' do
-      params = [connection.repo, 4, 'title', 'body', 'name']
-      params2 = [connection.repo, 4, 'title', 'body',  :assignee => 'name']
-      allow(connection.client).to receive(:update_issue).with(*params2).and_return true
-      expect(connection.add_assignee(*params)).to eq true
-    end
-
-    it 'fails to add an assignee to the gh issue' do
-      params = [connection.repo, 4, 'title', 'body', 'name']
-      params2 = [connection.repo, 4, 'title', 'body',  :assignee => 'name']
-      allow(connection.client).to receive(:update_issue).with(*params2).and_return false
-      expect(connection.add_assignee(*params)).to eq false
+      expect(connection.client).to receive(:update_issue).with(connection.repo, 11, :assignee => 'test')
+      connection.add_assignee(11, 'test')
     end
   end
 
-  describe '#comment_on_issue' do
-    let( :connection ) { subject.new }
-
+  describe '#reviewer_comment' do
     it 'comments on a given issue' do
-      params = [connection.repo, 4, '@name is your reviewer :thumbsup: check url']
-      params2 = [connection.repo, 4, 'name', 'url']
-      allow(connection.client).to receive(:add_comment).with(*params).and_return true
-      expect(connection.comment_on_issue(*params2)).to eq true
-    end
-
-    it 'fails to comment on a given issue and fails' do
-      params = [connection.repo, 4, '@name is your reviewer :thumbsup: check url']
-      params2 = [connection.repo, 4, 'name', 'url']
-      allow(connection.client).to receive(:add_comment).with(*params).and_return false
-      expect(connection.comment_on_issue(*params2)).to eq false
-    end
-  end
-
-  describe '#list_issues' do
-    let( :connection ) { subject.new }
-
-    it 'fails to determine if an assignee is set' do
-      allow(connection.client).to receive_message_chain(:list_issues)
-      connection.list_issues(connection.repo)
+      card = Trello::Card.new
+      allow(card).to receive(:url).and_return('url')
+      expect(connection.client).to receive(:add_comment).with(connection.repo, 11, anything)
+      connection.reviewer_comment(11, 'test', card)
     end
   end
 
   describe '#list_pulls' do
-    let( :connection ) { subject.new }
-
-    it 'lists a pullrequests for a given repository' do
-      expect(connection.client).to receive(:pull_requests)
-      connection.list_pulls(connection.repo)
+    it 'lists all pullrequests for a given repository' do
+      expect(connection.client).to receive(:pull_requests).with(connection.repo)
+      connection.list_pulls
     end
   end
 
-  describe '#get_branch_name' do
-    let( :connection ) { subject.new }
-
-    it 'get branch name based on a repo and a pullrequest id' do
-      pulls = [double({ 'head' => double({ 'ref' => 'number'})})]
-      pr = pulls.first
-      expect(connection.client).to receive(:pull_requests).with(connection.repo).and_return pulls
-      expect(pulls).to receive(:[]).with(3).and_return pr
-      expect(pr).to receive(:head).and_return pr.head
-      connection.get_branch_name(3, connection.repo)
-    end
-  end
 end