geet 0.27.1 → 0.27.3

data/lib/geet/github/pr.rb

@@ -36,21 +36,21 @@ module Geet
         ).returns(Geet::Github::PR)
       }
       def self.create(title, description, head, api_interface, base, draft: false)
-        api_path = 'pulls'
+        api_path = "pulls"
 
         if api_interface.upstream?
           authenticated_user = Geet::Github::User.authenticated(api_interface).username
           head = "#{authenticated_user}:#{head}"
         end
 
-        request_data = { title:, body: description, head:, base:, draft: }
+        request_data = {title:, body: description, head:, base:, draft:}
 
         response = T.cast(api_interface.send_request(api_path, data: request_data), T::Hash[String, T.untyped])
 
-        number = T.cast(response.fetch('number'), Integer)
-        title = T.cast(response.fetch('title'), String)
-        link = T.cast(response.fetch('html_url'), String)
-        node_id = T.cast(response['node_id'], T.nilable(String))
+        number = T.cast(response.fetch("number"), Integer)
+        title = T.cast(response.fetch("title"), String)
+        link = T.cast(response.fetch("html_url"), String)
+        node_id = T.cast(response["node_id"], T.nilable(String))
 
         new(number, api_interface, title, link, node_id:)
       end
@@ -74,7 +74,7 @@ module Geet
         check_list_params!(milestone, assignee, head)
 
         if head
-          api_path = 'pulls'
+          api_path = "pulls"
 
           # Technically, the upstream approach could be used for both, but it's actually good to have
           # both of them as reference.
@@ -96,13 +96,13 @@ module Geet
             # For this reason, we can't use that param, and have to filter manually.
             #
             unfiltered_response.select do |pr_data|
-              pr_head = T.cast(pr_data.fetch('head'), T::Hash[String, T.untyped])
-              label = T.cast(pr_head.fetch('label'), String)
+              pr_head = T.cast(pr_data.fetch("head"), T::Hash[String, T.untyped])
+              label = T.cast(pr_head.fetch("label"), String)
 
               label == "#{owner}:#{head}"
             end
           else
-            request_params = { head: "#{owner}:#{head}" }
+            request_params = {head: "#{owner}:#{head}"}
 
             T.cast(
               api_interface.send_request(api_path, params: request_params, multipage: true),
@@ -111,15 +111,15 @@ module Geet
           end
 
           response.map do |pr_data|
-            number = T.cast(pr_data.fetch('number'), Integer)
-            title = T.cast(pr_data.fetch('title'), String)
-            link = T.cast(pr_data.fetch('html_url'), String)
+            number = T.cast(pr_data.fetch("number"), Integer)
+            title = T.cast(pr_data.fetch("title"), String)
+            link = T.cast(pr_data.fetch("html_url"), String)
 
             new(number, api_interface, title, link)
           end
         else
           result = super(api_interface, milestone:, assignee:) do |issue_data|
-            issue_data.key?('pull_request')
+            issue_data.key?("pull_request")
           end
 
           T.cast(result, T::Array[Geet::Github::PR])
@@ -135,7 +135,7 @@ module Geet
       }
       def merge(merge_method: nil)
         api_path = "pulls/#{number}/merge"
-        request_data = { merge_method: } if merge_method
+        request_data = {merge_method:} if merge_method
 
         @api_interface.send_request(api_path, http_method: :put, data: request_data)
       end
@@ -147,7 +147,7 @@ module Geet
       }
       def request_review(reviewers)
         api_path = "pulls/#{number}/requested_reviewers"
-        request_data = { reviewers: }
+        request_data = {reviewers:}
 
         @api_interface.send_request(api_path, data: request_data)
       end
@@ -175,7 +175,7 @@ module Geet
           }
         GRAPHQL
 
-        variables = { pullRequestId: @node_id, mergeMethod: merge_method }
+        variables = {pullRequestId: @node_id, mergeMethod: merge_method}
 
         @api_interface.send_graphql_request(query, variables:)
 
@@ -207,22 +207,22 @@ module Geet
           }
         GRAPHQL
 
-        owner, name = T.must(@api_interface.repository_path).split('/')
+        owner, name = T.must(@api_interface.repository_path).split("/")
 
         response = @api_interface.send_graphql_request(query, variables: {owner:, name:, number:})
-        repo_data = response['repository'].transform_keys(&:to_sym)
-        commit_count = repo_data[:pullRequest]['commits']['totalCount']
+        repo_data = response["repository"].transform_keys(&:to_sym)
+        commit_count = repo_data[:pullRequest]["commits"]["totalCount"]
 
         if commit_count == 1 && repo_data[:squashMergeAllowed]
-          'SQUASH'
+          "SQUASH"
         elsif repo_data[:mergeCommitAllowed]
-          'MERGE'
+          "MERGE"
         elsif repo_data[:squashMergeAllowed]
-          'SQUASH'
+          "SQUASH"
         elsif repo_data[:rebaseMergeAllowed]
-          'REBASE'
+          "REBASE"
         else
-          raise 'No merge methods are allowed on this repository'
+          raise "No merge methods are allowed on this repository"
         end
       end
 

data/lib/geet/github/remote_repository.rb

@@ -43,7 +43,7 @@ module Geet
 
         response = T.cast(api_interface.send_request(api_path), T::Hash[String, T.untyped])
 
-        parent_hash = T.cast(response['parent'], T.nilable(T::Hash[String, T.untyped]))
+        parent_hash = T.cast(response["parent"], T.nilable(T::Hash[String, T.untyped]))
         parent_path = T.cast(parent_hash&.fetch("full_name)"), T.nilable(String))
 
         new(api_interface, parent_path:)

data/lib/geet/github/user.rb

@@ -63,11 +63,11 @@ module Geet
         ).returns(Geet::Github::User)
       }
       def self.authenticated(api_interface)
-        api_path = '/user'
+        api_path = "/user"
 
         response = T.cast(api_interface.send_request(api_path), T::Hash[String, T.untyped])
 
-        login = T.cast(response.fetch('login'), String)
+        login = T.cast(response.fetch("login"), String)
 
         new(login, api_interface)
       end
@@ -78,11 +78,11 @@ module Geet
         ).returns(T::Array[Geet::Github::User])
       }
       def self.list_collaborators(api_interface)
-        api_path = 'collaborators'
+        api_path = "collaborators"
         response = T.cast(api_interface.send_request(api_path, multipage: true), T::Array[T::Hash[String, T.untyped]])
 
         response.map do |user_entry|
-          login = T.cast(user_entry.fetch('login'), String)
+          login = T.cast(user_entry.fetch("login"), String)
           new(login, api_interface)
         end
       end
@@ -100,7 +100,7 @@ module Geet
 
         response = T.cast(api_interface.send_request(api_path), T::Hash[String, T.untyped])
 
-        permission = T.cast(response.fetch('permission'), String)
+        permission = T.cast(response.fetch("permission"), String)
 
         check_permission!(permission)
 

data/lib/geet/gitlab/api_interface.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 # typed: strict
 
-require 'cgi'
-require 'uri'
-require 'net/http'
-require 'json'
+require "cgi"
+require "uri"
+require "net/http"
+require "json"
 
 module Geet
   module Gitlab
     class ApiInterface
       extend T::Sig
 
-      API_BASE_URL = 'https://gitlab.com/api/v4'
+      API_BASE_URL = "https://gitlab.com/api/v4"
 
       sig { returns(T.nilable(String)) }
       attr_reader :repository_path
@@ -126,7 +126,7 @@ module Geet
         Net::HTTP.start(uri.host, use_ssl: true) do |http|
           request = http_class.new(uri)
 
-          request['Private-Token'] = @api_token
+          request["Private-Token"] = @api_token
           request.body = URI.encode_www_form(data) if data
 
           http.request(request)
@@ -140,7 +140,7 @@ module Geet
         ).returns(URI::Generic)
       }
       def encode_uri(address, params)
-        address += '?' + URI.encode_www_form(params) if params
+        address += "?" + URI.encode_www_form(params) if params
 
         URI(address)
       end
@@ -151,7 +151,7 @@ module Geet
         ).returns(T::Boolean)
       }
       def error?(response)
-        !response.code.start_with?('2')
+        !response.code.start_with?("2")
       end
 
       sig {
@@ -160,10 +160,10 @@ module Geet
         ).returns(String)
       }
       def decode_and_format_error(parsed_response)
-        if parsed_response.key?('error')
-          parsed_response.fetch('error')
-        elsif parsed_response.key?('message')
-          parsed_response.fetch('message')
+        if parsed_response.key?("error")
+          parsed_response.fetch("error")
+        elsif parsed_response.key?("message")
+          parsed_response.fetch("message")
         else
           "Unrecognized response: #{parsed_response}"
         end
@@ -176,7 +176,7 @@ module Geet
       }
       def link_next_page(response_headers)
         # An array (or nil) is returned.
-        link_header = Array(response_headers['link'])
+        link_header = Array(response_headers["link"])
 
         return nil if link_header.empty?
 

data/lib/geet/gitlab/issue.rb

@@ -50,9 +50,9 @@ module Geet
         )
 
         response.map do |issue_data, result|
-          number = T.cast(issue_data.fetch('iid'), Integer)
-          title = T.cast(issue_data.fetch('title'), String)
-          link = T.cast(issue_data.fetch('web_url'), String)
+          number = T.cast(issue_data.fetch("iid"), Integer)
+          title = T.cast(issue_data.fetch("title"), String)
+          link = T.cast(issue_data.fetch("web_url"), String)
 
           new(number, title, link)
         end

data/lib/geet/gitlab/label.rb

@@ -36,10 +36,10 @@ module Geet
         )
 
         response.map do |label_entry|
-          name = T.cast(label_entry.fetch('name'), String)
-          color = T.cast(label_entry.fetch('color'), String)
+          name = T.cast(label_entry.fetch("name"), String)
+          color = T.cast(label_entry.fetch("color"), String)
 
-          color = color.sub('#', '') # normalize
+          color = color.sub("#", "") # normalize
 
           new(name, color)
         end
@@ -55,7 +55,7 @@ module Geet
       }
       def self.create(name, color, api_interface)
         api_path = "projects/#{api_interface.path_with_namespace(encoded: true)}/labels"
-        request_data = { name:, color: "##{color}" }
+        request_data = {name:, color: "##{color}"}
 
         api_interface.send_request(api_path, data: request_data)
 

data/lib/geet/gitlab/milestone.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # typed: strict
 
-require 'date'
+require "date"
 
 module Geet
   module Gitlab
@@ -49,10 +49,10 @@ module Geet
         )
 
         response.map do |milestone_data|
-          number = T.cast(milestone_data.fetch('iid'), Integer)
-          title = T.cast(milestone_data.fetch('title'), String)
+          number = T.cast(milestone_data.fetch("iid"), Integer)
+          title = T.cast(milestone_data.fetch("title"), String)
           due_on = parse_due_date(
-            T.cast(milestone_data.fetch('due_date'), T.nilable(String))
+            T.cast(milestone_data.fetch("due_date"), T.nilable(String))
           )
 
           new(number, title, due_on, api_interface)

data/lib/geet/gitlab/pr.rb

@@ -59,9 +59,9 @@ module Geet
         )
 
         response.map do |issue_data, result|
-          number = T.cast(issue_data.fetch('iid'), Integer)
-          title = T.cast(issue_data.fetch('title'), String)
-          link = T.cast(issue_data.fetch('web_url'), String)
+          number = T.cast(issue_data.fetch("iid"), Integer)
+          title = T.cast(issue_data.fetch("title"), String)
+          link = T.cast(issue_data.fetch("web_url"), String)
 
           new(number, api_interface, title, link)
         end
@@ -72,7 +72,7 @@ module Geet
       sig { params(comment: String).void }
       def comment(comment)
         api_path = "projects/#{@api_interface.path_with_namespace(encoded: true)}/merge_requests/#{number}/notes"
-        request_data = { body: comment }
+        request_data = {body: comment}
 
         @api_interface.send_request(api_path, data: request_data)
       end

data/lib/geet/gitlab/user.rb

@@ -41,8 +41,8 @@ module Geet
         )
 
         response.map do |user_entry|
-          id = T.cast(user_entry.fetch('id'), Integer)
-          username = T.cast(user_entry.fetch('username'), String)
+          id = T.cast(user_entry.fetch("id"), Integer)
+          username = T.cast(user_entry.fetch("username"), String)
 
           new(id, username, api_interface)
         end

data/lib/geet/helpers/json_helper.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-require 'time'
+require "time"
 
 module Geet
   module Helpers

data/lib/geet/helpers/os_helper.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 # typed: true
 
-require 'English'
-require 'open3'
-require 'shellwords'
+require "English"
+require "open3"
+require "shellwords"
 
 module Geet
   module Helpers
@@ -17,7 +17,7 @@ module Geet
         open_command = case
         when ENV["WSL_DISTRO_NAME"]
           "wslview"
-        when `uname`.strip == 'Darwin'
+        when `uname`.strip == "Darwin"
           "open"
         else
           "xdg-open"
@@ -61,7 +61,7 @@ module Geet
             stdout_content = stdout.read
             stderr_content = stderr.read
 
-            puts stderr_content if stderr_content != '' && !silent_stderr
+            puts stderr_content if stderr_content != "" && !silent_stderr
 
             if !wait_thread.value.success? && !allow_error
               error_message = stderr_content.lines.first&.strip || "Error running command #{command.inspect}"

data/lib/geet/helpers/services_workflow_helper.rb

@@ -1,9 +1,9 @@
 # typed: strict
 # frozen_string_literal: true
 
-require 'English'
-require 'open3'
-require 'shellwords'
+require "English"
+require "open3"
+require "shellwords"
 
 module Geet
   module Helpers
@@ -40,7 +40,7 @@ module Geet
 
         raise "Expected to find only one PR for the current branch; found: #{prs.size}" if prs.size != 1
 
-        prs[0]
+        T.must(prs[0])
       end
     end
   end

data/lib/geet/services/abstract_create_issue.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 # typed: strict
 
-require 'stringio'
-require 'tmpdir'
+require "stringio"
+require "tmpdir"
 
 module Geet
   module Services
@@ -11,7 +11,7 @@ module Geet
 
       include Geet::Helpers::OsHelper
 
-      sig { params(repository: T.untyped, out: T.any(IO, StringIO)).void }
+      sig { params(repository: Git::Repository, out: T.any(IO, StringIO)).void }
       def initialize(repository, out: $stdout)
         @repository = repository
         @out = out

data/lib/geet/services/add_upstream_repo.rb

@@ -10,7 +10,7 @@ module Geet
 
       DEFAULT_GIT_CLIENT = Utils::GitClient.new
 
-      sig { params(repository: T.untyped, out: T.any(IO, StringIO), git_client: T.untyped).void }
+      sig { params(repository: Git::Repository, out: T.any(IO, StringIO), git_client: Utils::GitClient).void }
       def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
         @repository = repository
         @out = out

data/lib/geet/services/close_milestones.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
+# typed: strict
 
 module Geet
   module Services
     class CloseMilestones
+      extend T::Sig
+
       include Geet::Shared::Selection
 
+      sig { params(repository: Git::Repository, out: T.any(IO, StringIO)).void }
       def initialize(repository, out: $stdout)
         @repository = repository
         @out = out
       end
 
+      sig { params(numbers: T.nilable(String)).void }
       def execute(numbers: nil)
         numbers = find_and_select_milestone_numbers(numbers)
 
@@ -20,16 +25,18 @@ module Geet
 
       private
 
+      sig { params(numbers: T.nilable(String)).returns(T::Array[Integer]) }
       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)
+        selection_manager.add_attribute(:milestones, "milestone", numbers, SELECTION_MULTIPLE, name_method: :title)
 
-        milestones = selection_manager.select_attributes[0]
+        milestones = T.cast(selection_manager.select_attributes[0], T::Array[T.any(Github::Milestone, Gitlab::Milestone)])
 
         milestones.map(&:number)
       end
 
+      sig { params(numbers: T::Array[Integer]).returns(T::Array[Thread]) }
       def close_milestones(numbers)
         @out.puts "Closing milestones #{numbers.join(', ')}..."
 

data/lib/geet/services/comment_pr.rb

@@ -1,21 +1,32 @@
 # frozen_string_literal: true
+# typed: strict
 
 module Geet
   module Services
     # Add a comment to the PR for the current branch.
     #
     class CommentPr
+      extend T::Sig
+
       include Geet::Helpers::OsHelper
       include Geet::Helpers::ServicesWorkflowHelper
 
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
+      sig { params(repository: Git::Repository, out: T.any(IO, StringIO), git_client: Utils::GitClient).void }
       def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
         @repository = repository
         @out = out
         @git_client = git_client
       end
 
+      sig {
+        params(
+          comment: String,
+          open_browser: T::Boolean
+        )
+        .returns(T.any(Github::PR, Gitlab::PR))
+      }
       def execute(comment, open_browser: false)
         pr = checked_find_branch_pr
         pr.comment(comment)

data/lib/geet/services/create_gist.rb

@@ -1,18 +1,22 @@
 # frozen_string_literal: true
+# typed: strict
 
 module Geet
   module Services
     class CreateGist
+      extend T::Sig
+
       include Geet::Helpers::OsHelper
 
-      API_TOKEN_KEY = 'GITHUB_API_TOKEN'
+      API_TOKEN_KEY = "GITHUB_API_TOKEN"
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
+      sig { params(out: T.any(IO, StringIO)).void }
       def initialize(out: $stdout)
-        @out = out
+        @out = T.let(out, T.any(IO, StringIO))
 
         api_token = extract_env_api_token
-        @api_interface = Geet::Github::ApiInterface.new(api_token)
+        @api_interface = T.let(Geet::Github::ApiInterface.new(api_token), Geet::Github::ApiInterface)
       end
 
       # options:
@@ -20,10 +24,19 @@ module Geet
       #   :publik:      defaults to false
       #   :open_browser defaults to true
       #
+      sig {
+        params(
+          full_filename: String,
+          stdin: T::Boolean,
+          description: T.nilable(String),
+          publik: T::Boolean,
+          open_browser: T::Boolean
+        ).void
+      }
       def execute(full_filename, stdin: false, description: nil, publik: false, open_browser: false)
         content = stdin ? $stdin.read : IO.read(full_filename)
 
-        gist_access = publik ? 'public' : 'private'
+        gist_access = publik ? "public" : "private"
         @out.puts "Creating a #{gist_access} gist..."
 
         filename = File.basename(full_filename)
@@ -38,6 +51,7 @@ module Geet
 
       private
 
+      sig { returns(String) }
       def extract_env_api_token
         ENV[API_TOKEN_KEY] || raise("#{API_TOKEN_KEY} not set!")
       end

data/lib/geet/services/create_issue.rb

@@ -62,17 +62,23 @@ module Geet
         ).returns([
           T.nilable(T::Array[T.any(Github::Label, Gitlab::Label)]),
           T.nilable(T.any(Github::Milestone, Gitlab::Milestone)),
-          T.nilable(T::Array[T.any(Github::User, Gitlab::User)])
+          T.nilable(T::Array[T.any(Github::User, Gitlab::User)]),
         ])
       }
       def find_and_select_attributes(labels, milestone, assignees)
         selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
-        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.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
+        selected_attributes = selection_manager.select_attributes
+
+        selected_labels = T.cast(selected_attributes.shift, T.nilable(T::Array[T.any(Github::Label, Gitlab::Label)])) if labels
+        selected_milestone = T.cast(selected_attributes.shift, T.nilable(T.any(Github::Milestone, Gitlab::Milestone))) if milestone
+        selected_assignees = T.cast(selected_attributes.shift, T.nilable(T::Array[T.any(Github::User, Gitlab::User)])) if assignees
+
+        [selected_labels, selected_milestone, selected_assignees]
       end
 
       sig {
@@ -82,7 +88,7 @@ module Geet
         ).returns(T.any(Github::Issue, Gitlab::Issue))
       }
       def create_issue(title, description)
-        @out.puts 'Creating the issue...'
+        @out.puts "Creating the issue..."
 
         issue = @repository.create_issue(title, description)
       end
@@ -122,7 +128,7 @@ module Geet
       def add_labels(issue, selected_labels)
         raise "Functionality unsupported on GitLab!" if issue.is_a?(Gitlab::Issue)
 
-        labels_list = selected_labels.map(&:name).join(', ')
+        labels_list = selected_labels.map(&:name).join(", ")
 
         @out.puts "Adding labels #{labels_list}..."
 
@@ -173,7 +179,7 @@ module Geet
       def assign_authenticated_user(issue)
         raise "Functionality unsupported on GitLab!" if issue.is_a?(Gitlab::Issue)
 
-        @out.puts 'Assigning authenticated user...'
+        @out.puts "Assigning authenticated user..."
 
         Thread.new do
           issue.assign_users(@repository.authenticated_user.username)