geet 0.3.1 → 0.3.2

data/lib/geet/services/create_label.rb

@@ -3,22 +3,23 @@
 module Geet
   module Services
     class CreateLabel
-      def initialize(repository)
+      def initialize(repository, out: $stdout)
         @repository = repository
+        @out = out
       end
 
-      def execute(name, color: generate_random_color, output: $stdout)
-        label = create_label(name, color, output)
+      def execute(name, color: generate_random_color)
+        label = create_label(name, color)
 
-        output.puts "Created with color ##{label.color}"
+        @out.puts "Created with color ##{label.color}"
 
         label
       end
 
       private
 
-      def create_label(name, color, output)
-        output.puts 'Creating label...'
+      def create_label(name, color)
+        @out.puts 'Creating label...'
 
         @repository.create_label(name, color)
       end

data/lib/geet/services/create_pr.rb

@@ -1,60 +1,46 @@
 # frozen_string_literal: true
 
-require 'tmpdir'
-require_relative '../helpers/os_helper.rb'
-require_relative '../utils/manual_list_selection.rb'
-require_relative '../utils/pattern_matching_selection.rb'
+require_relative 'abstract_create_issue'
 
 module Geet
   module Services
-    class CreatePr
-      include Geet::Helpers::OsHelper
-
+    class CreatePr < AbstractCreateIssue
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
-      MANUAL_LIST_SELECTION_FLAG = '-'.freeze
-
-      SUMMARY_BACKUP_FILENAME = File.join(Dir.tmpdir, 'last_geet_edited_summary.md')
-
-      def initialize(repository, git_client: DEFAULT_GIT_CLIENT)
-        @repository = repository
+      def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
+        super(repository)
         @git_client = git_client
+        @out = out
       end
 
       # options:
-      #   :label_patterns
-      #   :reviewer_patterns
+      #   :labels
+      #   :reviewers
       #   :no_open_pr
       #
       def execute(
-        title, description, label_patterns: nil, milestone_pattern: nil, reviewer_patterns: nil,
-        no_open_pr: nil, automated_mode: false, output: $stdout, **
+        title, description, labels: nil, milestone: nil, reviewers: nil,
+        no_open_pr: nil, automated_mode: false, **
       )
         ensure_clean_tree if automated_mode
 
-        all_labels, all_milestones, all_collaborators = find_all_attribute_entries(
-          label_patterns, milestone_pattern, reviewer_patterns, output
-        )
+        selected_labels, selected_milestone, selected_reviewers = find_and_select_attributes(labels, milestone, reviewers)
 
-        labels = select_entries('label', all_labels, label_patterns, :multiple, :name) if label_patterns
-        milestone, _ = select_entries('milestone', all_milestones, milestone_pattern, :single, :title) if milestone_pattern
-        reviewers = select_entries('reviewer', all_collaborators, reviewer_patterns, :multiple, nil) if reviewer_patterns
+        sync_with_upstream_branch if automated_mode
 
-        sync_with_upstream_branch(output) if automated_mode
+        pr = create_pr(title, description)
 
-        pr = create_pr(title, description, output)
-
-        edit_pr(pr, labels, milestone, reviewers, output)
+        edit_pr(pr, selected_labels, selected_milestone, selected_reviewers)
 
         if no_open_pr
-          output.puts "PR address: #{pr.link}"
+          @out.puts "PR address: #{pr.link}"
         else
           open_file_with_default_application(pr.link)
         end
 
         pr
       rescue => error
-        save_summary(title, description, output) if title
+        save_summary(title, description) if title
         raise
       end
 
@@ -66,61 +52,49 @@ module Geet
         raise 'The working tree is not clean!' if !@git_client.working_tree_clean?
       end
 
-      def find_all_attribute_entries(label_patterns, milestone_pattern, reviewer_patterns, output)
-        if label_patterns
-          output.puts 'Finding labels...'
-          labels_thread = Thread.new { @repository.labels }
-        end
+      def find_and_select_attributes(labels, milestone, reviewers)
+        selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
-        if milestone_pattern
-          output.puts 'Finding milestone...'
-          milestone_thread = Thread.new { @repository.milestones }
-        end
+        selection_manager.add_attribute(:labels, 'label', labels, :multiple, name_method: :name) if labels
+        selection_manager.add_attribute(:milestones, 'milestone', milestone, :single, name_method: :title) if milestone
 
-        if reviewer_patterns
-          output.puts 'Finding collaborators...'
-          reviewers_thread = Thread.new { @repository.collaborators }
+        if reviewers
+          selection_manager.add_attribute(:collaborators, 'reviewer', reviewers, :multiple) do |all_reviewers|
+            all_reviewers - [@repository.authenticated_user]
+          end
         end
 
-        labels = labels_thread&.value
-        milestones = milestone_thread&.value
-        reviewers = reviewers_thread&.value
-
-        raise "No labels found!" if label_patterns && labels.empty?
-        raise "No milestones found!" if milestone_pattern && milestones.empty?
-        raise "No collaborators found!" if reviewer_patterns && reviewers.empty?
-
-        [labels, milestones, reviewers]
+        selection_manager.select_attributes
       end
 
-      def sync_with_upstream_branch(output)
+      def sync_with_upstream_branch
         if @git_client.upstream_branch
-          output.puts "Pushing to upstream branch..."
+          @out.puts "Pushing to upstream branch..."
 
           @git_client.push
         else
           upstream_branch = @git_client.current_branch
 
-          output.puts "Creating upstream branch #{upstream_branch.inspect}..."
+          @out.puts "Creating upstream branch #{upstream_branch.inspect}..."
 
           @git_client.push(upstream_branch: upstream_branch)
         end
       end
 
-      def create_pr(title, description, output)
-        output.puts 'Creating PR...'
+      def create_pr(title, description)
+        @out.puts 'Creating PR...'
 
         @repository.create_pr(title, description, @git_client.current_branch)
       end
 
-      def edit_pr(pr, labels, milestone, reviewers, output)
-        assign_user_thread = assign_authenticated_user(pr, output)
+      def edit_pr(pr, labels, milestone, reviewers)
+        assign_user_thread = assign_authenticated_user(pr)
 
         # labels/reviewers can be nil (parameter not passed) or empty array (parameter passed, but
         # nothing selected)
-        add_labels_thread = add_labels(pr, labels, output) if labels && !labels.empty?
-        set_milestone_thread = set_milestone(pr, milestone, output) if milestone
-        request_review_thread = request_review(pr, reviewers, output) if reviewers && !reviewers.empty?
+        add_labels_thread = add_labels(pr, labels) if labels && !labels.empty?
+        set_milestone_thread = set_milestone(pr, milestone) if milestone
+        request_review_thread = request_review(pr, reviewers) if reviewers && !reviewers.empty?
 
         assign_user_thread.join
         add_labels_thread&.join
@@ -128,57 +102,39 @@ module Geet
         request_review_thread&.join
       end
 
-      def assign_authenticated_user(pr, output)
-        output.puts 'Assigning authenticated user...'
+      def assign_authenticated_user(pr)
+        @out.puts 'Assigning authenticated user...'
 
         Thread.new do
           pr.assign_users(@repository.authenticated_user)
         end
       end
 
-      def add_labels(pr, selected_labels, output)
+      def add_labels(pr, selected_labels)
         labels_list = selected_labels.map(&:name).join(', ')
 
-        output.puts "Adding labels #{labels_list}..."
+        @out.puts "Adding labels #{labels_list}..."
 
         Thread.new do
           pr.add_labels(selected_labels.map(&:name))
         end
       end
 
-      def set_milestone(pr, milestone, output)
-        output.puts "Setting milestone #{milestone.title}..."
+      def set_milestone(pr, milestone)
+        @out.puts "Setting milestone #{milestone.title}..."
 
         Thread.new do
           pr.edit(milestone: milestone.number)
         end
       end
 
-      def request_review(pr, reviewers, output)
-        output.puts "Requesting review from #{reviewers.join(', ')}..."
+      def request_review(pr, reviewers)
+        @out.puts "Requesting review from #{reviewers.join(', ')}..."
 
         Thread.new do
           pr.request_review(reviewers)
         end
       end
-
-      def save_summary(title, description, output)
-        summary = "#{title}\n\n#{description}".strip + "\n"
-
-        IO.write(SUMMARY_BACKUP_FILENAME, summary)
-
-        output.puts "Error! Saved summary to #{SUMMARY_BACKUP_FILENAME}"
-      end
-
-      # Generic helpers
-
-      def select_entries(entry_type, entries, raw_patterns, selection_type, instance_method)
-        if raw_patterns == MANUAL_LIST_SELECTION_FLAG
-          Geet::Utils::ManualListSelection.new.select(entry_type, entries, selection_type, instance_method: instance_method)
-        else
-          Geet::Utils::PatternMatchingSelection.new.select(entry_type, entries, raw_patterns, instance_method: instance_method)
-        end
-      end
     end
   end
 end

data/lib/geet/services/list_issues.rb

@@ -1,34 +1,33 @@
 # frozen_string_literal: true
 
+require_relative '../utils/attributes_selection_manager'
+
 module Geet
   module Services
     class ListIssues
-      def initialize(repository)
+      def initialize(repository, out: $stdout)
         @repository = repository
+        @out = out
       end
 
-      def execute(assignee_pattern: nil, output: $stdout, **)
-        assignee_thread = find_assignee(assignee_pattern, output) if assignee_pattern
-
-        assignee = assignee_thread&.join&.value
+      def execute(assignee: nil, **)
+        selected_assignee = find_and_select_attributes(assignee) if assignee
 
-        issues = @repository.issues(assignee: assignee)
+        issues = @repository.issues(assignee: selected_assignee)
 
         issues.each do |issue|
-          output.puts "#{issue.number}. #{issue.title} (#{issue.link})"
+          @out.puts "#{issue.number}. #{issue.title} (#{issue.link})"
         end
       end
 
       private
 
-      def find_assignee(assignee_pattern, output)
-        output.puts 'Finding assignee...'
+      def find_and_select_attributes(assignee)
+        selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
-        Thread.new do
-          collaborators = @repository.collaborators
-          collaborator = collaborators.find { |collaborator| collaborator =~ /#{assignee_pattern}/i }
-          collaborator || raise("No collaborator found for pattern: #{assignee_pattern.inspect}")
-        end
+        selection_manager.add_attribute(:collaborators, 'assignee', assignee, :single)
+
+        selection_manager.select_attributes
       end
     end
   end

data/lib/geet/services/list_labels.rb

@@ -3,15 +3,16 @@
 module Geet
   module Services
     class ListLabels
-      def initialize(repository)
+      def initialize(repository, out: $stdout)
         @repository = repository
+        @out = out
       end
 
-      def execute(output: $stdout)
+      def execute
         labels = @repository.labels
 
         labels.each do |label|
-          output.puts "- #{label.name} (##{label.color})"
+          @out.puts "- #{label.name} (##{label.color})"
         end
       end
     end

data/lib/geet/services/list_milestones.rb

@@ -3,23 +3,24 @@
 module Geet
   module Services
     class ListMilestones
-      def initialize(repository)
+      def initialize(repository, out: $output)
         @repository = repository
+        @out = out
       end
 
-      def execute(output: $stdout)
-        milestones = find_milestones(output)
-        issues_by_milestone_number = find_milestone_issues(milestones, output)
+      def execute
+        milestones = find_milestones
+        issues_by_milestone_number = find_milestone_issues(milestones)
 
-        output.puts
+        @out.puts
 
         milestones.each do |milestone|
-          output.puts milestone_description(milestone)
+          @out.puts milestone_description(milestone)
 
           milestone_issues = issues_by_milestone_number[milestone.number]
 
           milestone_issues.each do |issue|
-            output.puts "  #{issue.number}. #{issue.title} (#{issue.link})"
+            @out.puts "  #{issue.number}. #{issue.title} (#{issue.link})"
           end
         end
       end
@@ -34,14 +35,14 @@ module Geet
         description
       end
 
-      def find_milestones(output)
-        output.puts 'Finding milestones...'
+      def find_milestones
+        @out.puts 'Finding milestones...'
 
         @repository.milestones
       end
 
-      def find_milestone_issues(milestones, output)
-        output.puts 'Finding issues...'
+      def find_milestone_issues(milestones)
+        @out.puts 'Finding issues...'
 
         # Interestingly, on MRI, concurrent hash access is not a problem without mutex,
         # since due to the GIL, only one thread at a time will actually access it.

data/lib/geet/services/list_prs.rb

@@ -3,15 +3,16 @@
 module Geet
   module Services
     class ListPrs
-      def initialize(repository)
+      def initialize(repository, out: $stdout)
         @repository = repository
+        @out = out
       end
 
-      def execute(output: $stdout)
+      def execute
         prs = @repository.prs
 
         prs.each do |pr|
-          output.puts "#{pr.number}. #{pr.title} (#{pr.link})"
+          @out.puts "#{pr.number}. #{pr.title} (#{pr.link})"
         end
       end
     end

data/lib/geet/services/merge_pr.rb

@@ -5,16 +5,17 @@ module Geet
     class MergePr
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
-      def initialize(repository, git_client: DEFAULT_GIT_CLIENT)
+      def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
         @repository = repository
+        @out = out
         @git_client = git_client
       end
 
-      def execute(delete_branch: false, output: $stdout)
+      def execute(delete_branch: false)
         merge_head = find_merge_head
-        pr = checked_find_branch_pr(merge_head, output)
-        merge_pr(pr, output)
-        do_delete_branch(output) if delete_branch
+        pr = checked_find_branch_pr(merge_head)
+        merge_pr(pr)
+        do_delete_branch if delete_branch
         pr
       end
 
@@ -25,8 +26,8 @@ module Geet
       end
 
       # Expect to find only one.
-      def checked_find_branch_pr(head, output)
-        output.puts "Finding PR with head (#{head})..."
+      def checked_find_branch_pr(head)
+        @out.puts "Finding PR with head (#{head})..."
 
         prs = @repository.prs(head: head)
 
@@ -35,14 +36,14 @@ module Geet
         prs[0]
       end
 
-      def merge_pr(pr, output)
-        output.puts "Merging PR ##{pr.number}..."
+      def merge_pr(pr)
+        @out.puts "Merging PR ##{pr.number}..."
 
         pr.merge
       end
 
-      def do_delete_branch(output)
-        output.puts "Deleting branch #{@git_client.current_branch}..."
+      def do_delete_branch
+        @out.puts "Deleting branch #{@git_client.current_branch}..."
 
         @repository.delete_branch(@git_client.current_branch)
       end

data/lib/geet/shared/constants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Geet
+  module Shared
+    module Constants
+      MANUAL_LIST_SELECTION_FLAG = '-'.freeze
+    end
+  end
+end