geet 0.3.14 → 0.4.0

data/lib/geet/gitlab/api_interface.rb

@@ -10,6 +10,8 @@ module Geet
     class ApiInterface
       API_BASE_URL = 'https://gitlab.com/api/v4'
 
+      attr_reader :repository_path
+
       # repo_path: "path/namespace"; required for the current GitLab operations.
       # upstream:  boolean; required for the current GitLab operations.
       #

data/lib/geet/gitlab/label.rb

@@ -11,7 +11,7 @@ module Geet
       end
 
       # Returns a flat list of names in string form.
-      def self.list(api_interface)
+      def self.list(api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
         response = api_interface.send_request(api_path, multipage: true)
 
@@ -24,7 +24,7 @@ module Geet
       end
 
       # See https://docs.gitlab.com/ee/api/labels.html#create-a-new-label
-      def self.create(name, color, api_interface)
+      def self.create(name, color, api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
         request_data = { name: name, color: "##{color}" }
 

data/lib/geet/gitlab/milestone.rb

@@ -17,7 +17,7 @@ module Geet
 
       # See https://docs.gitlab.com/ee/api/milestones.html#list-project-milestones
       #
-      def self.list(api_interface)
+      def self.list(api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/milestones"
 
         response = api_interface.send_request(api_path, multipage: true)

data/lib/geet/gitlab/user.rb

@@ -13,7 +13,7 @@ module Geet
 
       # Returns an array of User instances
       #
-      def self.list_collaborators(api_interface)
+      def self.list_collaborators(api_interface, **)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/members"
 
         response = api_interface.send_request(api_path, multipage: true)

data/lib/geet/helpers/os_helper.rb

@@ -26,14 +26,15 @@ module Geet
       # interactive:   set when required; in this case, a different API will be used (`system()`
       #                instead of `popen3`).
       # silent_stderr: don't print the stderr output
+      # allow_error:   don't raise error on failure
       #
-      def execute_command(command, description: nil, interactive: false, silent_stderr: false)
+      def execute_command(command, description: nil, interactive: false, silent_stderr: false, allow_error: false)
         description_message = " on #{description}" if description
 
         if interactive
           system(command)
 
-          if !$CHILD_STATUS.success?
+          if !$CHILD_STATUS.success? && !allow_error
             raise "Error#{description_message} (exit status: #{$CHILD_STATUS.exitstatus})"
           end
         else
@@ -43,7 +44,7 @@ module Geet
 
             puts stderr_content if stderr_content != '' && !silent_stderr
 
-            if !wait_thread.value.success?
+            if !wait_thread.value.success? && !allow_error
               error_message = stderr_content.lines.first&.strip || "Error running command #{command.inspect}"
               raise "Error#{description_message}: #{error_message}"
             end

data/lib/geet/services/add_upstream_repo.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Geet
+  module Services
+    # Add the upstream repository to the current repository (configuration).
+    #
+    class AddUpstreamRepo
+      DEFAULT_GIT_CLIENT = Utils::GitClient.new
+
+      def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
+        @repository = repository
+        @out = out
+        @git_client = git_client
+      end
+
+      def execute
+        raise "Upstream remote already existing!" if @git_client.remote_defined?(Utils::GitClient::UPSTREAM_NAME)
+
+        parent_path = @repository.remote.parent_path
+
+        parent_url = compose_parent_url(parent_path)
+
+        @git_client.add_remote(Utils::GitClient::UPSTREAM_NAME, parent_url)
+      end
+
+      private
+
+      # Use the same protocol as the main repository.
+      #
+      def compose_parent_url(parent_path)
+        protocol, domain, separator, _, suffix = @git_client.remote_components
+
+        "#{protocol}#{domain}#{separator}#{parent_path}#{suffix}"
+      end
+    end
+  end
+end

data/lib/geet/services/close_milestones.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative '../shared/selection'
+
+module Geet
+  module Services
+    class CloseMilestones
+      include Geet::Shared::Selection
+
+      def initialize(repository, out: $stdout)
+        @repository = repository
+        @out = out
+      end
+
+      def execute(numbers: nil)
+        numbers = find_and_select_milestone_numbers(numbers)
+
+        close_milestone_threads = close_milestones(numbers)
+
+        close_milestone_threads.each(&:join)
+      end
+
+      private
+
+      def find_and_select_milestone_numbers(numbers)
+        selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
+
+        selection_manager.add_attribute(:milestones, 'milestone', numbers, SELECTION_MULTIPLE, name_method: :title)
+
+        milestones = selection_manager.select_attributes[0]
+
+        milestones.map(&:number)
+      end
+
+      def close_milestones(numbers)
+        @out.puts "Closing milestones #{numbers.join(', ')}..."
+
+        numbers.map do |number|
+          Thread.new do
+            @repository.close_milestone(number)
+          end
+        end
+      end
+    end # CloseMilestones
+  end # Services
+end # Geet

data/lib/geet/services/comment_pr.rb

@@ -19,11 +19,11 @@ module Geet
         @git_client = git_client
       end
 
-      def execute(comment)
+      def execute(comment, no_open_pr: nil)
         merge_owner, merge_head = find_merge_head
         pr = checked_find_branch_pr(merge_owner, merge_head)
         pr.comment(comment)
-        open_file_with_default_application(pr.link)
+        open_file_with_default_application(pr.link) unless no_open_pr
         pr
       end
     end

data/lib/geet/services/create_issue.rb

@@ -2,11 +2,13 @@
 
 require_relative 'abstract_create_issue'
 require_relative '../shared/repo_permissions'
+require_relative '../shared/selection'
 
 module Geet
   module Services
     class CreateIssue < AbstractCreateIssue
       include Geet::Shared::RepoPermissions
+      include Geet::Shared::Selection
 
       # options:
       #   :labels
@@ -56,9 +58,9 @@ module Geet
       def find_and_select_attributes(labels, milestone, assignees)
         selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
-        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
-        selection_manager.add_attribute(:collaborators, 'assignee', assignees, :multiple, name_method: :username) if assignees
+        selection_manager.add_attribute(:labels, 'label', labels, SELECTION_MULTIPLE, name_method: :name) if labels
+        selection_manager.add_attribute(:milestones, 'milestone', milestone, SELECTION_SINGLE, name_method: :title) if milestone
+        selection_manager.add_attribute(:collaborators, 'assignee', assignees, SELECTION_MULTIPLE, name_method: :username) if assignees
 
         selection_manager.select_attributes
       end

data/lib/geet/services/create_milestone.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Geet
+  module Services
+    class CreateMilestone
+      def initialize(repository, out: $stdout)
+        @repository = repository
+        @out = out
+      end
+
+      def execute(title)
+        create_milestone(title)
+      end
+
+      private
+
+      def create_milestone(title)
+        @out.puts 'Creating milestone...'
+
+        @repository.create_milestone(title)
+      end
+    end # class CreateMilestone
+  end # module Services
+end # module Geet

data/lib/geet/services/create_pr.rb

@@ -2,11 +2,13 @@
 
 require_relative 'abstract_create_issue'
 require_relative '../shared/repo_permissions'
+require_relative '../shared/selection'
 
 module Geet
   module Services
     class CreatePr < AbstractCreateIssue
       include Geet::Shared::RepoPermissions
+      include Geet::Shared::Selection
 
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
@@ -37,7 +39,7 @@ module Geet
 
         sync_with_upstream_branch if automated_mode
 
-        pr = create_pr(title, description, base)
+        pr = create_pr(title, description, base: base)
 
         if user_has_write_permissions
           edit_pr(pr, selected_labels, selected_milestone, selected_reviewers)
@@ -66,11 +68,11 @@ module Geet
       def find_and_select_attributes(labels, milestone, reviewers)
         selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
-        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
+        selection_manager.add_attribute(:labels, 'label', labels, SELECTION_MULTIPLE, name_method: :name) if labels
+        selection_manager.add_attribute(:milestones, 'milestone', milestone, SELECTION_SINGLE, name_method: :title) if milestone
 
         if reviewers
-          selection_manager.add_attribute(:collaborators, 'reviewer', reviewers, :multiple, name_method: :username) do |all_reviewers|
+          selection_manager.add_attribute(:collaborators, 'reviewer', reviewers, SELECTION_MULTIPLE, name_method: :username) do |all_reviewers|
             authenticated_user = @repository.authenticated_user
             all_reviewers.delete_if { |reviewer| reviewer.username == authenticated_user.username }
           end
@@ -93,10 +95,12 @@ module Geet
         end
       end
 
-      def create_pr(title, description, base)
+      def create_pr(title, description, base: nil)
         @out.puts 'Creating PR...'
 
-        @repository.create_pr(title, description, @git_client.current_branch, base: base)
+        base ||= @git_client.main_branch
+
+        @repository.create_pr(title, description, @git_client.current_branch, base)
       end
 
       def edit_pr(pr, labels, milestone, reviewers)

data/lib/geet/services/list_issues.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require_relative '../utils/attributes_selection_manager'
+require_relative '../shared/selection'
 
 module Geet
   module Services
     class ListIssues
+      include Geet::Shared::Selection
+
       def initialize(repository, out: $stdout)
         @repository = repository
         @out = out
@@ -25,7 +28,7 @@ module Geet
       def find_and_select_attributes(assignee)
         selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
-        selection_manager.add_attribute(:collaborators, 'assignee', assignee, :single, name_method: :username)
+        selection_manager.add_attribute(:collaborators, 'assignee', assignee, SELECTION_SINGLE, name_method: :username)
 
         selection_manager.select_attributes[0]
       end

data/lib/geet/services/merge_pr.rb

@@ -12,6 +12,7 @@ module Geet
     #
     class MergePr
       include Geet::Helpers::ServicesWorkflowHelper
+      include Geet::Shared
 
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
@@ -24,8 +25,30 @@ module Geet
       def execute(delete_branch: false)
         merge_owner, merge_head = find_merge_head
         pr = checked_find_branch_pr(merge_owner, merge_head)
+
         merge_pr(pr)
-        do_delete_branch if delete_branch
+
+        if delete_branch
+          branch = @git_client.current_branch
+
+          delete_remote_branch(branch)
+        end
+
+        fetch_repository
+
+        if upstream_branch_gone?
+          pr_branch = @git_client.current_branch
+          main_branch = @git_client.main_branch
+
+          # The rebase could also be placed after the branch deletion. There are pros/cons;
+          # currently, it's not important.
+          #
+          checkout_branch(main_branch)
+          rebase
+
+          delete_local_branch(pr_branch)
+        end
+
         pr
       end
 
@@ -37,10 +60,38 @@ module Geet
         pr.merge
       end
 
-      def do_delete_branch
-        @out.puts "Deleting branch #{@git_client.current_branch}..."
+      def delete_remote_branch(branch)
+        @out.puts "Deleting remote branch #{branch}..."
+
+        @repository.delete_branch(branch)
+      end
+
+      def fetch_repository
+        @out.puts "Fetching repository..."
+
+        @git_client.fetch
+      end
+
+      def upstream_branch_gone?
+        @git_client.upstream_branch_gone?
+      end
+
+      def checkout_branch(branch)
+        @out.puts "Checking out #{branch}..."
+
+        @git_client.checkout(branch)
+      end
+
+      def rebase
+        @out.puts "Rebasing..."
+
+        @git_client.rebase
+      end
+
+      def delete_local_branch(branch)
+        @out.puts "Deleting local branch #{branch}..."
 
-        @repository.delete_branch(@git_client.current_branch)
+        @git_client.delete_branch(branch)
       end
     end
   end

data/lib/geet/services/open_repo.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require_relative '../helpers/os_helper'
+
+module Geet
+  module Services
+    # Open in the browser the current repository.
+    #
+    class OpenRepo
+      include Helpers::OsHelper
+
+      DEFAULT_GIT_CLIENT = Utils::GitClient.new
+
+      def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
+        @repository = repository
+        @out = out
+        @git_client = git_client
+      end
+
+      def execute(upstream: false)
+        remote_options = upstream ? {name: Utils::GitClient::UPSTREAM_NAME} : {}
+
+        repo_url = @git_client.remote(**remote_options)
+        repo_url = convert_repo_url_to_http_protocol(repo_url)
+
+        open_file_with_default_application(repo_url)
+
+        repo_url
+      end
+
+      private
+
+      # The repository URL may be in any of the git/http protocols.
+      #
+      def convert_repo_url_to_http_protocol(repo_url)
+        case repo_url
+        when /https:/
+        when /git@/
+        else
+          # Minimal error, due to match guaranteed by GitClient#remote.
+          raise
+        end
+
+        domain, _, path = repo_url.match(Utils::GitClient::REMOTE_URL_REGEX)[2..4]
+
+        "https://#{domain}/#{path}"
+      end
+    end
+  end
+end

data/lib/geet/shared/selection.rb

@@ -4,6 +4,9 @@ module Geet
   module Shared
     module Selection
       MANUAL_LIST_SELECTION_FLAG = '-'.freeze
+
+      SELECTION_SINGLE = :single
+      SELECTION_MULTIPLE = :multiple
     end
   end
 end