geet 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36daf3a9f93bc19c635672aa0dacd0c661680aff4ab62042c7bb9743d9283c0
-  data.tar.gz: 43eb3b1315136af98b85d828f352ae8b7556cc5049bf2d23e8d4b2396728027e
+  metadata.gz: 8f33191668d757cda4abaccb0524277d39923df81e1c17e7175fd6ccd27e0751
+  data.tar.gz: 0650f891e46a6c108cd59fd91cae1a396214dda38497eefa1cc6712df42b8971
 SHA512:
-  metadata.gz: 10993b5f5d10122cf60ac37de56600bd5ea131b82cfb78e40cd468a56b34eba3b2f101ee1ec8bb8b78c3d419c5a9569006d1bec2be01bbc78e6d2fed80a1eab9
-  data.tar.gz: fedbbf26a35167056c4c1bb0800aa9f233174ab2b850ff8467c27bdec3b5ae79c0c3258983b5e5ea3efb4739516cd97e634c70f35ad0b627e38ed9624b95485f
+  metadata.gz: 6748bd9048d5d828bf30e356d134c37f607370102792408535717f97e1a46938e59078c4f331173634e4e694ca05b68b8ae6d19464d02c19493533bc3a52b4fa
+  data.tar.gz: 1c27b254f20de196d7e74de519cc47358b9a0c2daf3fe565e7f593b8af6dae109dbab066015eda103c9599480ad1231b5e9b4318c96a3578bb15b002b7e82d17

data/.github/workflows/ci.yml

@@ -3,18 +3,45 @@ name: CI
 on: [pull_request]
 
 jobs:
-  test:
+  test_suite:
+    name: Test Suite
     runs-on: ubuntu-latest
+    env:
+      GITHUB_API_TOKEN: foo
+      GITLAB_API_TOKEN: bar
     strategy:
       matrix:
-        ruby-version: [head, 3.4, 3.3, 3.2]
+        ruby-version: [head, 4.0, 3.4, 3.3, 3.2]
       fail-fast: false
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    continue-on-error: ${{ endsWith(matrix['ruby-version'], 'head') }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
     - run: bundle install
     - run: bundle exec rspec
+  sorbet:
+    name: Sorbet typecheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: ${{ env.REPO_FETCH_DEPTH }}
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Sorbet
+        run: bundle exec srb typecheck
+  # Ruby summary job, for branch protection rules
+  # Head ruby failures are ignored due to continue-on-error in the test job.
+  all-tests:
+    name: Ruby (non-head) tests passed
+    runs-on: ubuntu-latest
+    needs: [test_suite]
+    if: always()
+    steps:
+      - name: Check test suite results
+        run: |
+          [[ "${{ needs.test_suite.result }}" == "success" ]] || exit 1

data/.gitignore

@@ -1,4 +1,3 @@
-/.ruby-version
 /.ruby-gemset
 /Gemfile.lock
 /test_repos

data/.ruby-version

@@ -0,0 +1 @@
+3.4.6

data/Gemfile

@@ -4,18 +4,15 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'sorbet-runtime'
-
 group :development do
-  gem 'sorbet'
   gem 'byebug'
-  gem 'rubocop', '~> 1.35.0', require: :false
+  gem 'rubocop', '~> 1.35.0', require: false
   gem 'spoom', require: false
-  gem 'tapioca', require: false
+  gem 'tapioca', '>= 0.17.10', require: false
 end
 
 group :test do
   gem 'rspec', '~> 3.13.0'
-  gem 'vcr', '~> 6.1.0'
+  gem 'vcr', '~> 6.4.0'
   gem 'webmock', '~> 3.1.1'
 end

data/bin/geet

@@ -2,14 +2,8 @@
 # frozen_string_literal: true
 
 require 'simple_scripting/configuration'
-require_relative '../lib/geet/commandline/configuration'
-require_relative '../lib/geet/commandline/commands'
-require_relative '../lib/geet/commandline/editor'
-require_relative '../lib/geet/git/repository'
-require_relative '../lib/geet/helpers/summary_helper'
-require_relative '../lib/geet/shared/selection'
-require_relative '../lib/geet/utils/git_client'
-Dir[File.join(__dir__, '../lib/geet/services/*.rb')].each { |filename| require filename }
+require 'tmpdir'
+require_relative '../lib/geet'
 
 class GeetLauncher
   include Geet

data/geet.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path('lib', __dir__)
-
-require 'geet/version'
+require_relative 'lib/geet/version'
 
 Gem::Specification.new do |s|
   s.name        = 'geet'
@@ -10,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.2.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2025-10-29'
+  s.date        = '2026-01-13'
   s.email       = ['saverio.pub2@gmail.com']
   s.homepage    = 'https://github.com/saveriomiroddi/geet'
   s.summary     = 'Commandline interface for performing SCM host operations, eg. create a PR on GitHub'
@@ -20,7 +18,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'base64', '~> 0.3.0'
   s.add_runtime_dependency 'ostruct', '~> 0.6.3'
   s.add_runtime_dependency 'simple_scripting', '~> 0.14.0'
+  s.add_runtime_dependency 'sorbet-runtime', '= 0.6.12883'
   s.add_runtime_dependency 'tty-prompt', '~> 0.23.1'
+  s.add_runtime_dependency 'zeitwerk', '~> 2.7'
 
   s.add_development_dependency 'rake', '~> 12.3'
 

data/lib/geet/commandline/configuration.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'simple_scripting/argv'
-require_relative 'commands'
 
 module Geet
   module Commandline
@@ -67,6 +66,7 @@ module Geet
       ]
 
       PR_CREATE_OPTIONS = [
+        ['-a', '--automerge',                               "Enable automerge (with default strategy)"],
         ['-o', '--open-browser',                            "Don't open the PR link in the browser after creation"],
         ['-b', '--base develop',                            "Specify the base branch; defaults to the main branch"],
         ['-d', '--draft',                                   "Create as draft"],

data/lib/geet/commandline/editor.rb

@@ -2,8 +2,6 @@
 
 require 'tempfile'
 
-require_relative '../helpers/os_helper'
-
 module Geet
   module Commandline
     class Editor

data/lib/geet/git/repository.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../utils/git_client'
-
 module Geet
   module Git
     # This class represents, for convenience, both the local and the remote repository, but the
@@ -122,31 +120,24 @@ module Geet
       def attempt_provider_call(class_name, meth, *args)
         module_name = provider_name.capitalize
 
-        require_provider_modules
-
         full_class_name = "Geet::#{module_name}::#{class_name}"
 
-        if Kernel.const_defined?(full_class_name)
-          klass = Kernel.const_get(full_class_name)
-
-          if !klass.respond_to?(meth)
-            raise "The functionality invoked (#{class_name}.#{meth}) is not currently supported!"
-          end
-
-          # Can't use ruby2_keywords, because the method definitions use named keyword arguments.
-          #
-          kwargs = args.last.is_a?(Hash) ? args.pop : {}
-
-          klass.send(meth, *args, **kwargs)
-        else
+        # Use const_get directly to trigger Zeitwerk autoloading
+        begin
+          klass = Object.const_get(full_class_name)
+        rescue NameError
           raise "The class referenced (#{full_class_name}) is not currently supported!"
         end
-      end
 
-      def require_provider_modules
-        files_pattern = "#{__dir__}/../#{provider_name}/*.rb"
+        if !klass.respond_to?(meth)
+          raise "The functionality invoked (#{class_name}.#{meth}) is not currently supported!"
+        end
+
+        # Can't use ruby2_keywords, because the method definitions use named keyword arguments.
+        #
+        kwargs = args.last.is_a?(Hash) ? args.pop : {}
 
-        Dir[files_pattern].each { |filename| require filename }
+        klass.send(meth, *args, **kwargs)
       end
 
       # WARNINGS

data/lib/geet/github/abstract_issue.rb

@@ -2,12 +2,6 @@
 
 module Geet
   module Github
-    # It seems that autoloading will be deprecated, but it's currently the cleanest solution
-    # to the legitimate problem of AbstractIssue needing Issue/PR to be loaded (due to :list),
-    # and viceversa (due to class definition).
-    autoload :Issue, File.expand_path('issue', __dir__)
-    autoload :PR, File.expand_path('pr', __dir__)
-
     # For clarity, in this class we keep only the identical logic between the subclasses, but
     # other methods could be moved in here at some complexity cost.
     class AbstractIssue

data/lib/geet/github/api_interface.rb

@@ -3,13 +3,13 @@
 require 'uri'
 require 'net/http'
 require 'json'
-require_relative '../shared/http_error'
 
 module Geet
   module Github
     class ApiInterface
       API_AUTH_USER = '' # We don't need the login, as the API key uniquely identifies the user
       API_BASE_URL = 'https://api.github.com'
+      GRAPHQL_API_URL = 'https://api.github.com/graphql'
 
       attr_reader :repository_path
 
@@ -70,6 +70,42 @@ module Geet
         end
       end
 
+      # Send a GraphQL request.
+      #
+      # Returns the parsed response data.
+      #
+      # params:
+      #   :query:       GraphQL query string
+      #   :variables:   (Hash) GraphQL variables
+      #
+      def send_graphql_request(query, variables: {})
+        uri = URI(GRAPHQL_API_URL)
+
+        Net::HTTP.start(uri.host, use_ssl: true) do |http|
+          request = Net::HTTP::Post.new(uri).tap do
+            it.basic_auth API_AUTH_USER, @api_token
+            it['Accept'] = 'application/vnd.github.v3+json'
+            it.body = {query:, variables:}.to_json
+          end
+
+          response = http.request(request)
+
+          parsed_response = JSON.parse(response.body) if response.body
+
+          if error?(response)
+            error_message = decode_and_format_error(parsed_response)
+            raise Geet::Shared::HttpError.new(error_message, response.code)
+          end
+
+          if parsed_response&.key?('errors')
+            error_messages = parsed_response['errors'].map { |err| err['message'] }.join(', ')
+            raise Geet::Shared::HttpError.new("GraphQL errors: #{error_messages}", response.code)
+          end
+
+          parsed_response&.fetch('data')
+        end
+      end
+
       private
 
       def api_url(api_path)

data/lib/geet/github/issue.rb

@@ -2,9 +2,6 @@
 
 module Geet
   module Github
-    # See AbstractIssue for the circular dependency issue notes.
-    autoload :AbstractIssue, File.expand_path('abstract_issue', __dir__)
-
     class Issue < Geet::Github::AbstractIssue
       def self.create(title, description, api_interface, **)
         api_path = 'issues'

data/lib/geet/github/milestone.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../helpers/json_helper'
-
 module Geet
   module Github
     class Milestone

data/lib/geet/github/pr.rb

@@ -2,10 +2,14 @@
 
 module Geet
   module Github
-    # See AbstractIssue for the circular dependency issue notes.
-    autoload :AbstractIssue, File.expand_path('abstract_issue', __dir__)
-
     class PR < AbstractIssue
+      attr_reader :node_id
+
+      def initialize(number, api_interface, title, link, node_id: nil)
+        super(number, api_interface, title, link)
+        @node_id = node_id
+      end
+
       # See https://developer.github.com/v3/pulls/#create-a-pull-request
       #
       def self.create(title, description, head, api_interface, base, draft: false)
@@ -21,8 +25,9 @@ module Geet
         response = api_interface.send_request(api_path, data: request_data)
 
         number, title, link = response.fetch_values('number', 'title', 'html_url')
+        node_id = response['node_id']
 
-        new(number, api_interface, title, link)
+        new(number, api_interface, title, link, node_id:)
       end
 
       # See https://developer.github.com/v3/pulls/#list-pull-requests
@@ -86,6 +91,28 @@ module Geet
         @api_interface.send_request(api_path, data: request_data)
       end
 
+      # Enable auto-merge for this PR using the repository's default merge method.
+      # See https://docs.github.com/en/graphql/reference/mutations#enablepullrequestautomerge
+      #
+      def enable_automerge
+        query = <<~GRAPHQL
+          mutation($pullRequestId: ID!) {
+            enablePullRequestAutoMerge(input: {pullRequestId: $pullRequestId}) {
+              pullRequest {
+                id
+                autoMergeRequest {
+                  enabledAt
+                }
+              }
+            }
+          }
+        GRAPHQL
+
+        variables = { pullRequestId: @node_id }
+
+        @api_interface.send_graphql_request(query, variables:)
+      end
+
       class << self
         private
 

data/lib/geet/github/user.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../shared/repo_permissions'
-require_relative '../shared/http_error'
-
 module Geet
   module Github
     class User

data/lib/geet/gitlab/pr.rb

@@ -40,7 +40,9 @@ module Geet
 
       # See https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
       #
-      def merge
+      def merge(merge_method: nil)
+        raise ArgumentError, "GitLab does not support the merge_method parameter" if merge_method
+
         api_path = "projects/#{@api_interface.path_with_namespace(encoded: true)}/merge_requests/#{number}/merge"
 
         @api_interface.send_request(api_path, http_method: :put)

data/lib/geet/helpers/json_helper.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require 'time'
@@ -5,10 +6,13 @@ require 'time'
 module Geet
   module Helpers
     module JsonHelper
+      extend T::Sig
+
       # Most common Json time format.
       #
       # Returns nil if nil is passed.
       #
+      sig { params(timestamp: T.nilable(String)).returns(T.nilable(Date)) }
       def parse_iso_8601_timestamp(timestamp)
         Time.iso8601(timestamp).to_date if timestamp
       end

data/lib/geet/helpers/os_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# typed: true
 
 require 'English'
 require 'open3'
@@ -7,6 +8,11 @@ require 'shellwords'
 module Geet
   module Helpers
     module OsHelper
+      extend T::Sig
+
+      include Kernel # for Sorbet compatibility
+
+      sig { params(file_or_url: String).void }
       def open_file_with_default_application(file_or_url)
         open_command = case
         when ENV["WSL_DISTRO_NAME"]
@@ -29,12 +35,16 @@ module Geet
       # On non-interactive runs, the stdout content is returned, stripped of the surrounding
       # whitespaces.
       #
-      # description:   optional string, to make the error clearer.
-      # 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
-      #
+      sig {
+        params(
+          command: String,
+          description: T.nilable(String),   # specify to make the error clearer
+          interactive: T::Boolean,          # set when required; in this case, a different API will be used (`system()`
+                                            # instead of `popen3`)
+          silent_stderr: T::Boolean,        # don't print the stderr output
+          allow_error: T::Boolean           # don't raise error on failure
+        ).returns(T.nilable(String))
+      }
       def execute_command(command, description: nil, interactive: false, silent_stderr: false, allow_error: false)
         description_message = " on #{description}" if description
 
@@ -45,6 +55,8 @@ module Geet
             raise "Error#{description_message} (exit status: #{$CHILD_STATUS.exitstatus})"
           end
         else
+          result = ""
+
           Open3.popen3(command) do |_, stdout, stderr, wait_thread|
             stdout_content = stdout.read
             stderr_content = stderr.read
@@ -56,8 +68,10 @@ module Geet
               raise "Error#{description_message}: #{error_message}"
             end
 
-            stdout_content.strip
+            result = stdout_content.strip
           end
+
+          result
         end
       end
     end

data/lib/geet/helpers/services_workflow_helper.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require 'English'
@@ -9,10 +10,21 @@ module Geet
     # Helper for services common workflow, for example, find the merge head.
     #
     module ServicesWorkflowHelper
+      include Kernel
+      extend T::Sig
+
+      sig { void }
+      def initialize
+        @repository = T.let(T.unsafe(nil), Git::Repository)
+        @git_client = T.let(T.unsafe(nil), Utils::GitClient)
+        @out = T.let(T.unsafe(nil), IO)
+      end
+
       # Expect to find only one.
       #
       # Requires: @out, @repository.
       #
+      sig { returns(T.any(Geet::Github::PR, Geet::Gitlab::PR)) }
       def checked_find_branch_pr
         owner = if @repository.upstream?
           @repository.authenticated_user.username

data/lib/geet/helpers/summary_helper.rb

@@ -1,16 +1,23 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Geet
   module Helpers
     module SummaryHelper
+      include Kernel
+      extend T::Sig
+
       # Split the summary in title and description.
       # The description is optional, but the title mandatory.
       #
+      sig { params(summary: String).returns([String, String]) }
       def split_summary(summary)
         raise "Missing title in summary!" if summary.to_s.strip.empty?
 
         title, description = summary.split(/\r|\n/, 2)
 
+        raise "Title missing" if title.nil?
+
         # The title may have a residual newline char; the description may not be present,
         # or have multiple blank lines.
         [title.strip, description.to_s.strip]

data/lib/geet/services/abstract_create_issue.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
+# typed: strict
 
+require 'stringio'
 require 'tmpdir'
 
-require_relative '../helpers/os_helper'
-require_relative '../utils/attributes_selection_manager'
-require_relative '../utils/manual_list_selection'
-require_relative '../utils/string_matching_selection'
-
 module Geet
   module Services
     class AbstractCreateIssue
+      extend T::Sig
+
       include Geet::Helpers::OsHelper
 
+      sig { params(repository: T.untyped, out: T.any(IO, StringIO)).void }
       def initialize(repository, out: $stdout)
         @repository = repository
         @out = out

data/lib/geet/services/add_upstream_repo.rb

@@ -1,18 +1,23 @@
 # frozen_string_literal: true
+# typed: strict
 
 module Geet
   module Services
     # Add the upstream repository to the current repository (configuration).
     #
     class AddUpstreamRepo
+      extend T::Sig
+
       DEFAULT_GIT_CLIENT = Utils::GitClient.new
 
+      sig { params(repository: T.untyped, out: T.any(IO, StringIO), git_client: T.untyped).void }
       def initialize(repository, out: $stdout, git_client: DEFAULT_GIT_CLIENT)
         @repository = repository
         @out = out
         @git_client = git_client
       end
 
+      sig { void }
       def execute
         raise "Upstream remote already existing!" if @git_client.remote_defined?(Utils::GitClient::UPSTREAM_NAME)
 
@@ -31,6 +36,7 @@ module Geet
 
       # Use the same protocol as the main repository.
       #
+      sig { params(parent_path: String).returns((String)) }
       def compose_parent_url(parent_path)
         protocol, domain, separator, _, suffix = @git_client.remote_components
 

data/lib/geet/services/close_milestones.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../shared/selection'
-
 module Geet
   module Services
     class CloseMilestones

data/lib/geet/services/comment_pr.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../helpers/os_helper'
-require_relative '../helpers/services_workflow_helper'
-
 module Geet
   module Services
     # Add a comment to the PR for the current branch.

data/lib/geet/services/create_gist.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../helpers/os_helper'
-require_relative '../github/api_interface'
-require_relative '../github/gist'
-
 module Geet
   module Services
     class CreateGist

data/lib/geet/services/create_issue.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'abstract_create_issue'
-require_relative '../shared/repo_permissions'
-require_relative '../shared/selection'
-
 module Geet
   module Services
     class CreateIssue < AbstractCreateIssue