geet 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeb2fbfeebdf5fad15d266e1c4b30fb5554f0418057b5fe279a4395149e9b4a2
-  data.tar.gz: 78b4a9f2de093f896d494de393991980e9c619d10ce979a9b9b0941fff39381d
+  metadata.gz: 8f33191668d757cda4abaccb0524277d39923df81e1c17e7175fd6ccd27e0751
+  data.tar.gz: 0650f891e46a6c108cd59fd91cae1a396214dda38497eefa1cc6712df42b8971
 SHA512:
-  metadata.gz: 17409c6c638abc9e27ffbae3af34bec526484c2baf084ddc7adff5beaf91ef3355377cb8bc515afc54fd97b3dc67090a26422891733638cacf3efadd26e4fdf4
-  data.tar.gz: f6498c9223f91625dd85117322bef311a74b3bd027b9e4d51cb3e4bdea076418822e9637e56de9a462713eba218aaba33380509d23ddc115f04c7075ec6f3c3f
+  metadata.gz: 6748bd9048d5d828bf30e356d134c37f607370102792408535717f97e1a46938e59078c4f331173634e4e694ca05b68b8ae6d19464d02c19493533bc3a52b4fa
+  data.tar.gz: 1c27b254f20de196d7e74de519cc47358b9a0c2daf3fe565e7f593b8af6dae109dbab066015eda103c9599480ad1231b5e9b4318c96a3578bb15b002b7e82d17

data/.github/workflows/ci.yml

@@ -3,7 +3,8 @@ name: CI
 on: [pull_request]
 
 jobs:
-  test:
+  test_suite:
+    name: Test Suite
     runs-on: ubuntu-latest
     env:
       GITHUB_API_TOKEN: foo
@@ -12,9 +13,9 @@ jobs:
       matrix:
         ruby-version: [head, 4.0, 3.4, 3.3, 3.2]
       fail-fast: false
-    continue-on-error: ${{ endsWith(matrix['ruby-version'], 'head') || matrix['ruby-version'] == '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 }}
@@ -22,9 +23,10 @@ jobs:
     - run: bundle install
     - run: bundle exec rspec
   sorbet:
+    name: Sorbet typecheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: ${{ env.REPO_FETCH_DEPTH }}
       - uses: ruby/setup-ruby@v1
@@ -32,3 +34,14 @@ jobs:
           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/lib/geet/commandline/configuration.rb

@@ -66,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/github/api_interface.rb

@@ -9,6 +9,7 @@ module Geet
     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
 
@@ -69,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/pr.rb

@@ -3,6 +3,13 @@
 module Geet
   module Github
     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)
@@ -18,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
@@ -83,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/services/create_pr.rb

@@ -21,10 +21,11 @@ module Geet
       #   :labels
       #   :reviewers
       #   :open_browser
+      #   :automerge
       #
       def execute(
         title, description, labels: nil, milestone: nil, reviewers: nil,
-        base: nil, draft: false, open_browser: false, **
+        base: nil, draft: false, open_browser: false, automerge: false, **
       )
         ensure_clean_tree
 
@@ -50,6 +51,8 @@ module Geet
           edit_pr(pr, selected_labels, selected_milestone, selected_reviewers)
         end
 
+        enable_automerge(pr) if automerge
+
         if open_browser
           open_file_with_default_application(pr.link)
         else
@@ -187,6 +190,22 @@ module Geet
           pr.request_review(reviewer_usernames)
         end
       end
+
+      def enable_automerge(pr)
+        if !pr.respond_to?(:enable_automerge)
+          raise "Automerge is not supported for this repository provider"
+        elsif !pr.respond_to?(:node_id) || pr.node_id.nil?
+          raise "Automerge requires node_id from the API (not available in the response)"
+        end
+
+        @out.puts "Enabling automerge..."
+
+        begin
+          pr.enable_automerge
+        rescue Geet::Shared::HttpError => e
+          @out.puts "Warning: Could not enable automerge: #{e.message}"
+        end
+      end
     end
   end
 end

data/lib/geet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geet
-  VERSION = '0.24.0'
+  VERSION = '0.25.0'
 end

data/spec/integration/create_pr_spec.rb

@@ -194,6 +194,74 @@ describe Geet::Services::CreatePr do
 
         expect(actual_output.string).to eql(expected_output)
       end
+
+      it 'should enable automerge after creating a PR' do
+        allow(git_client).to receive(:working_tree_clean?).and_return(true)
+        allow(git_client).to receive(:current_branch).and_return('mybranch')
+        allow(git_client).to receive(:main_branch).and_return('master')
+        allow(git_client).to receive(:remote_branch).and_return('mybranch')
+        allow(git_client).to receive(:remote_branch_diff_commits).and_return([])
+        allow(git_client).to receive(:fetch)
+        allow(git_client).to receive(:push)
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+
+        actual_output = StringIO.new
+
+        # Mock the repository and PR
+        allow(repository).to receive(:authenticated_user).and_return(
+          double(is_collaborator?: true, has_permission?: true)
+        )
+
+        mock_pr = double(
+          'PR',
+          number: 1,
+          title: 'Title',
+          link: 'https://github.com/donaldduck/testrepo_f/pull/1',
+          node_id: 'PR_test123'
+        )
+        allow(mock_pr).to receive(:enable_automerge)
+
+        allow(repository).to receive(:create_pr).and_return(mock_pr)
+
+        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+        service_instance.execute('Title', 'Description', automerge: true)
+
+        expect(mock_pr).to have_received(:enable_automerge)
+        expect(actual_output.string).to include('Enabling automerge...')
+      end
+
+      it 'should raise an error when automerge is requested but not supported' do
+        allow(git_client).to receive(:working_tree_clean?).and_return(true)
+        allow(git_client).to receive(:current_branch).and_return('mybranch')
+        allow(git_client).to receive(:main_branch).and_return('master')
+        allow(git_client).to receive(:remote_branch).and_return('mybranch')
+        allow(git_client).to receive(:remote_branch_diff_commits).and_return([])
+        allow(git_client).to receive(:fetch)
+        allow(git_client).to receive(:push)
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+
+        actual_output = StringIO.new
+
+        # Mock the repository and PR without enable_automerge method (simulating GitLab)
+        allow(repository).to receive(:authenticated_user).and_return(
+          double(is_collaborator?: true, has_permission?: true)
+        )
+
+        mock_pr = double(
+          'PR',
+          number: 1,
+          title: 'Title',
+          link: 'https://github.com/donaldduck/testrepo_f/pull/1'
+        )
+
+        allow(repository).to receive(:create_pr).and_return(mock_pr)
+
+        service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+
+        expect do
+          service_instance.execute('Title', 'Description', automerge: true)
+        end.to raise_error(RuntimeError, 'Automerge is not supported for this repository provider')
+      end
     end
   end # context 'with github.com'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Saverio Miroddi
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR
   on GitHub