geet 0.27.7 → 0.28.0

data/lib/geet/services/list_issues.rb

@@ -23,7 +23,7 @@ module Geet
         params(
           assignee: T.nilable(String)
         )
-        .returns(T.any(T::Array[Github::AbstractIssue], T::Array[Gitlab::Issue]))
+        .returns(T::Array[Github::AbstractIssue])
       }
       def execute(assignee: nil)
         selected_assignee = find_and_select_attributes(assignee) if assignee
@@ -40,14 +40,14 @@ module Geet
       sig {
         params(
           assignee: String
-        ).returns(T.any(Github::User, Gitlab::User))
+        ).returns(Github::User)
       }
       def find_and_select_attributes(assignee)
         selection_manager = Geet::Utils::AttributesSelectionManager.new(@repository, out: @out)
 
         selection_manager.add_attribute(:collaborators, "assignee", assignee, SELECTION_SINGLE, name_method: :username)
 
-        T.cast(selection_manager.select_attributes[0], T.any(Github::User, Gitlab::User))
+        T.cast(selection_manager.select_attributes[0], Github::User)
       end
     end
   end

data/lib/geet/services/list_labels.rb

@@ -13,7 +13,7 @@ module Geet
       end
 
       sig {
-        returns(T::Array[T.any(Github::Label, Gitlab::Label)])
+        returns(T::Array[Github::Label])
       }
       def execute
         labels = @repository.labels

data/lib/geet/services/list_milestones.rb

@@ -18,7 +18,7 @@ module Geet
       end
 
       sig {
-        returns(T::Array[T.any(Github::Milestone, Gitlab::Milestone)])
+        returns(T::Array[Github::Milestone])
       }
       def execute
         milestones = find_milestones
@@ -47,7 +47,7 @@ module Geet
       # are considered formatters, conceptually external to the class.
       sig {
         params(
-          milestone: T.any(Github::Milestone, Gitlab::Milestone)
+          milestone: Github::Milestone
         ).returns(String)
       }
       def milestone_description(milestone)
@@ -57,7 +57,7 @@ module Geet
       end
 
       sig {
-        returns(T::Array[T.any(Github::Milestone, Gitlab::Milestone)])
+        returns(T::Array[Github::Milestone])
       }
       def find_milestones
         @out.puts "Finding milestones..."
@@ -67,13 +67,13 @@ module Geet
 
       sig {
         params(
-          milestones: T::Array[T.any(Github::Milestone, Gitlab::Milestone)]
+          milestones: T::Array[Github::Milestone]
         ).returns(
           T::Hash[
-            T.any(Github::Milestone, Gitlab::Milestone),
+            Github::Milestone,
             {
-              issues: T::Array[T.any(Github::Issue, Gitlab::Issue)],
-              prs: T::Array[T.any(Github::PR, Gitlab::PR)],
+              issues: T::Array[Github::Issue],
+              prs: T::Array[Github::PR],
             }
           ]
         )

data/lib/geet/services/list_prs.rb

@@ -13,7 +13,7 @@ module Geet
       end
 
       sig {
-        returns(T::Array[T.any(Github::PR, Gitlab::PR)])
+        returns(T::Array[Github::PR])
       }
       def execute
         prs = @repository.prs

data/lib/geet/services/merge_pr.rb

@@ -29,7 +29,7 @@ module Geet
           delete_branch: T::Boolean,
           squash: T::Boolean
         )
-        .returns(T.any(Github::PR, Gitlab::PR))
+        .returns(Github::PR)
       }
       def execute(delete_branch: false, squash: false)
         merge_method = "squash" if squash
@@ -75,12 +75,13 @@ module Geet
 
       sig { void }
       def check_no_missing_upstream_commits
-        missing_upstream_commits = @git_client.cherry("HEAD", head: :main_branch)
+        remote_main_branch = "#{Utils::GitClient::ORIGIN_NAME}/#{@git_client.main_branch}"
+        missing_upstream_commits = @git_client.cherry("HEAD", head: remote_main_branch)
 
         raise "Found #{missing_upstream_commits.size} missing upstream commits!" if missing_upstream_commits.any?
       end
 
-      sig { params(pr: T.any(Github::PR, Gitlab::PR), merge_method: T.nilable(String)).void }
+      sig { params(pr: Github::PR, merge_method: T.nilable(String)).void }
       def merge_pr(pr, merge_method: nil)
         @out.puts "Merging PR ##{pr.number}..."
 

data/lib/geet/services/open_pr.rb

@@ -32,7 +32,7 @@ module Geet
         params(
           delete_branch: T::Boolean,
           _: T.untyped,
-        ).returns(T.any(Github::PR, Gitlab::PR))
+        ).returns(Github::PR)
       }
       def execute(delete_branch: false, **_)
         pr = checked_find_branch_pr

data/lib/geet/utils/git_client.rb

@@ -209,17 +209,6 @@ module Geet
         T.must(path.split("/")[0])
       end
 
-      sig { returns(String) }
-      def provider_domain
-        # We assume that it's not possible to have origin and upstream on different providers.
-
-        domain = T.must(remote()[REMOTE_URL_REGEX, 2])
-
-        raise "Can't identify domain in the provider domain string: #{domain}" if domain !~ /\w+\.\w+/
-
-        domain
-      end
-
       # Returns the URL of the remote with the given name.
       # Sanity checks are performed.
       #

data/lib/geet/version.rb

@@ -2,5 +2,5 @@
 # typed: strict
 
 module Geet
-  VERSION = "0.27.7"
+  VERSION = "0.28.0"
 end

data/spec/integration/create_label_spec.rb

@@ -85,25 +85,4 @@ describe Geet::Services::CreateLabel do
     end
   end # context 'with github.com'
 
-  context "with gitlab.com" do
-    it "should create a label" do
-      allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:donaldduck/testproject")
-
-      expected_output = <<~STR
-        Creating label...
-        Created with color #123456
-      STR
-
-      actual_output = StringIO.new
-
-      actual_created_label = VCR.use_cassette("gitlab_com/create_label") do
-        described_class.new(repository, out: actual_output).execute("my_label", color: "123456")
-      end
-
-      expect(actual_output.string).to eql(expected_output)
-
-      expect(actual_created_label.name).to eql("my_label")
-      expect(actual_created_label.color).to eql("123456")
-    end
-  end
 end

data/spec/integration/create_pr_spec.rb

@@ -264,7 +264,6 @@ describe Geet::Services::CreatePr do
         allow(git_client).to receive(:push)
         allow(git_client).to receive(:remote).with(no_args).and_return("git@github.com:donaldduck/testrepo_f")
 
-        # 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)
         )

data/spec/integration/list_issues_spec.rb

@@ -79,50 +79,4 @@ describe Geet::Services::ListIssues do
     end
   end
 
-  context "with gitlab.com" do
-    it "should list the issues" do
-      allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:donaldduck/testproject")
-
-      expected_output = <<~STR
-        2. I like more pizza (https://gitlab.com/donaldduck/testproject/issues/2)
-        1. I like pizza (https://gitlab.com/donaldduck/testproject/issues/1)
-      STR
-      expected_issue_numbers = [2, 1]
-
-      actual_output = StringIO.new
-
-      service_result = VCR.use_cassette("gitlab_com/list_issues") do
-        described_class.new(repository, out: actual_output).execute
-      end
-
-      actual_issue_numbers = service_result.map(&:number)
-
-      expect(actual_output.string).to eql(expected_output)
-      expect(actual_issue_numbers).to eql(expected_issue_numbers)
-    end
-
-    context "with assignee filtering" do
-      it "should list the issues" do
-        allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:donaldduck/testproject")
-
-        expected_output = <<~STR
-          Finding collaborators...
-          3. This is a test issue (https://gitlab.com/donaldduck/testproject/issues/3)
-        STR
-        expected_issue_numbers = [3]
-
-        actual_output = StringIO.new
-
-        service_result = VCR.use_cassette("gitlab_com/list_issues_with_assignee") do
-          described_class.new(repository, out: actual_output).execute(assignee: "donald-fr")
-        end
-
-        actual_issue_numbers = service_result.map(&:number)
-
-        expect(actual_output.string).to eql(expected_output)
-        expect(actual_issue_numbers).to eql(expected_issue_numbers)
-      end
-    end
-
-  end # with gitlab.com
 end

data/spec/integration/list_labels_spec.rb

@@ -55,31 +55,4 @@ describe Geet::Services::ListLabels do
     end
   end
 
-  context "with gitlab.com" do
-    it "should list the labels" do
-      allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:donaldduck/testproject")
-
-      expected_output = <<~STR
-        - bug (#d9534f)
-        - confirmed (#d9534f)
-        - critical (#d9534f)
-        - discussion (#428bca)
-        - documentation (#f0ad4e)
-        - enhancement (#5cb85c)
-        - suggestion (#428bca)
-        - support (#f0ad4e)
-      STR
-      expected_label_names = %w[bug confirmed critical discussion documentation enhancement suggestion support]
-
-      actual_output = StringIO.new
-      actual_labels = VCR.use_cassette("gitlab.com/list_labels") do
-        described_class.new(repository, out: actual_output).execute
-      end
-
-      actual_label_names = actual_labels.map(&:name)
-
-      expect(actual_output.string).to eql(expected_output)
-      expect(actual_label_names).to eql(expected_label_names)
-    end
-  end
 end

data/spec/integration/list_milestones_spec.rb

@@ -78,31 +78,4 @@ describe Geet::Services::ListMilestones do
     end
   end # context 'with github.com'
 
-  context "with gitlab.com" do
-    it "should list the milestones" do
-      allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:donaldduck/testproject")
-
-      expected_output = <<~STR
-        Finding milestones...
-        Finding issues and PRs...
-
-        2. Milestone 2
-        1. Milestone 1
-          3. This is a test issue (https://gitlab.com/donaldduck/testproject/issues/3)
-          1. Merge request 1 (https://gitlab.com/donaldduck/testproject/merge_requests/1)
-      STR
-      expected_milestone_numbers = [2, 1]
-
-      actual_output = StringIO.new
-
-      service_result = VCR.use_cassette("gitlab_com/list_milestones") do
-        described_class.new(repository, out: actual_output).execute
-      end
-
-      actual_milestone_numbers = service_result.map(&:number)
-
-      expect(actual_output.string).to eql(expected_output)
-      expect(actual_milestone_numbers).to eql(expected_milestone_numbers)
-    end
-  end
 end

data/spec/integration/merge_pr_spec.rb

@@ -20,7 +20,7 @@ describe Geet::Services::MergePr do
   before :each do
     expect(git_client).to receive(:fetch).twice
     expect(git_client).to receive(:push)
-    expect(git_client).to receive(:cherry).with("HEAD", head: :main_branch).and_return([])
+    expect(git_client).to receive(:cherry).with("HEAD", head: "origin/#{main_branch}").and_return([])
     expect(git_client).to receive(:remote_branch_gone?).and_return(true)
     expect(git_client).to receive(:checkout).with(main_branch)
     expect(git_client).to receive(:rebase)
@@ -86,34 +86,4 @@ describe Geet::Services::MergePr do
     end
   end # context 'with github.com'
 
-  context "with gitlab.com" do
-    let(:repository_name) { "testproject" }
-
-    it "should merge the PR for the current branch" do
-      allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:main_branch).and_return(main_branch)
-      allow(git_client).to receive(:remote).with(no_args).and_return("git@gitlab.com:#{owner}/#{repository_name}")
-
-      expected_pr_number = 4
-      expected_output = <<~STR
-        Finding PR with head (#{owner}:#{branch})...
-        Merging PR ##{expected_pr_number}...
-        Fetching repository...
-        Checking out #{main_branch}...
-        Rebasing...
-        Deleting local branch mybranch...
-      STR
-
-      actual_output = StringIO.new
-
-      service_result = VCR.use_cassette("gitlab_com/merge_pr") do
-        described_class.new(repository, out: actual_output, git_client: git_client).execute
-      end
-
-      actual_pr_number = service_result.number
-
-      expect(actual_output.string).to eql(expected_output)
-      expect(actual_pr_number).to eql(expected_pr_number)
-    end
-  end # context 'with gitlab.com'
 end

data/spec/spec_helper.rb

@@ -23,9 +23,6 @@ VCR.configure do |config|
     Base64.strict_encode64("#{user}:#{api_token}")
   end
 
-  config.filter_sensitive_data("<GITLAB_CREDENTIALS>") do
-    ENV.fetch("GITLAB_API_TOKEN")
-  end
 end
 
 Geet::Utils::AttributesSelectionManager.serialize_requests = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.27.7
+  version: 0.28.0
 platform: ruby
 authors:
 - Saverio Miroddi
 bindir: bin
 cert_chain: []
-date: 2026-02-08 00:00:00.000000000 Z
+date: 2026-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -145,20 +145,12 @@ files:
 - lib/geet/github/label.rb
 - lib/geet/github/milestone.rb
 - lib/geet/github/pr.rb
-- lib/geet/github/remote_repository.rb
 - lib/geet/github/user.rb
-- lib/geet/gitlab/api_interface.rb
-- lib/geet/gitlab/issue.rb
-- lib/geet/gitlab/label.rb
-- lib/geet/gitlab/milestone.rb
-- lib/geet/gitlab/pr.rb
-- lib/geet/gitlab/user.rb
 - lib/geet/helpers/json_helper.rb
 - lib/geet/helpers/os_helper.rb
 - lib/geet/helpers/services_workflow_helper.rb
 - lib/geet/helpers/summary_helper.rb
 - lib/geet/resources/templates/edit_summary.md
-- lib/geet/services/abstract_create_issue.rb
 - lib/geet/services/add_upstream_repo.rb
 - lib/geet/services/close_milestones.rb
 - lib/geet/services/comment_pr.rb
@@ -283,12 +275,6 @@ files:
 - spec/vcr_cassettes/github_com/merge_pr.yml
 - spec/vcr_cassettes/github_com/merge_pr_with_branch_deletion.yml
 - spec/vcr_cassettes/github_com/open_pr.yml
-- spec/vcr_cassettes/gitlab_com/create_label.yml
-- spec/vcr_cassettes/gitlab_com/list_issues.yml
-- spec/vcr_cassettes/gitlab_com/list_issues_with_assignee.yml
-- spec/vcr_cassettes/gitlab_com/list_labels.yml
-- spec/vcr_cassettes/gitlab_com/list_milestones.yml
-- spec/vcr_cassettes/gitlab_com/merge_pr.yml
 - spec/vcr_cassettes/list_milestones_upstream.yml
 - spec/vcr_cassettes/list_prs.yml
 - spec/vcr_cassettes/list_prs_upstream.yml
@@ -310,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR
   on GitHub

data/lib/geet/github/remote_repository.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-# typed: strict
-
-module Geet
-  module Github
-    # A remote repository. Currently only provides the parent path.
-    #
-    # It's a difficult choice whether to independently use the repository path, or relying on the one
-    # stored in the ApiInterface.
-    # The former design is conceptually cleaner, but it practically (as of the current design) introduces
-    # duplication. All in all, for simplicity, the latter design is chosen, but is subject to redesign.
-    #
-    class RemoteRepository
-      extend T::Sig
-
-      # Nil if the repository is not a fork.
-      #
-      sig { returns(T.nilable(String)) }
-      attr_reader :parent_path
-
-      sig {
-        params(
-          api_interface: Geet::Github::ApiInterface,
-          parent_path: T.nilable(String)
-        ).void
-      }
-      def initialize(api_interface, parent_path: nil)
-        @api_interface = api_interface
-        @parent_path = parent_path
-      end
-
-      # Get the repository parent path.
-      #
-      # https://docs.github.com/en/rest/reference/repos#get-a-repository
-      #
-      sig {
-        params(
-          api_interface: Geet::Github::ApiInterface
-        ).returns(Geet::Github::RemoteRepository)
-      }
-      def self.find(api_interface)
-        api_path = "/repos/#{api_interface.repository_path}"
-
-        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_path = T.cast(parent_hash&.fetch("full_name"), T.nilable(String))
-
-        new(api_interface, parent_path:)
-      end
-    end # module RemoteRepository
-  end # module GitHub
-end # module Geet

data/lib/geet/gitlab/api_interface.rb

@@ -1,212 +0,0 @@
-# frozen_string_literal: true
-# typed: strict
-
-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"
-
-      sig { returns(T.nilable(String)) }
-      attr_reader :repository_path
-
-      # repo_path: "path/namespace"; required for the current GitLab operations.
-      # upstream:  boolean; required for the current GitLab operations.
-      #
-      sig {
-        params(
-          api_token: String,
-          repo_path: String,
-          upstream: T::Boolean
-        ).void
-      }
-      def initialize(api_token, repo_path:, upstream:)
-        @api_token = api_token
-        @path_with_namespace = repo_path
-        @upstream = upstream
-        @repository_path = T.let(nil, T.nilable(String))
-      end
-
-      sig { returns(T::Boolean) }
-      def upstream?
-        @upstream
-      end
-
-      sig {
-        params(
-          encoded: T::Boolean
-        ).returns(String)
-      }
-      def path_with_namespace(encoded: false)
-        encoded ? CGI.escape(@path_with_namespace) : @path_with_namespace
-      end
-
-      # Send a request.
-      #
-      sig {
-        params(
-          # Appended to the API URL.
-          # for root path, prepend a `/`:
-          # - use `/gists` for `https://api.github.com/gists`
-          # when owner/project/repos is included, don't prepend `/`:
-          # - use `issues` for `https://api.github.com/myowner/myproject/repos/issues`
-          api_path: String,
-          params: T.nilable(T::Hash[Symbol, T.untyped]),
-          # If present, will generate a POST request, otherwise, a GET
-          data: T.nilable(T.any(T::Hash[Symbol, T.untyped], T::Array[T.untyped])),
-          # Set true for paged Github responses (eg. issues); it will make the method
-          multipage: T::Boolean,
-          # Method (:get, :patch, :post, :put and :delete)
-          # :get and :post are automatically inferred by the presence of :data; the other cases must be specified.
-          http_method: T.nilable(Symbol)
-        # Returns the parsed response, or an Array, in case of multipage.
-        # Where no body is present in the response, nil is returned.
-        ).returns(T.nilable(T.any(T::Hash[String, T.untyped], T::Array[T::Hash[String, T.untyped]])))
-      }
-      def send_request(api_path, params: nil, data: nil, multipage: false, http_method: nil)
-        address = T.let(api_url(api_path), T.nilable(String))
-        # filled only on :multipage
-        parsed_responses = []
-
-        loop do
-          response = send_http_request(T.must(address), params:, data:, http_method:)
-
-          if response_body = response.body
-            parsed_response = JSON.parse(response_body)
-          end
-
-          if error?(response)
-            formatted_error = decode_and_format_error(T.cast(parsed_response, T::Hash[String, T.untyped]))
-            raise(formatted_error)
-          end
-
-          return parsed_response if !multipage
-
-          parsed_responses.concat(T.cast(parsed_response, T::Array[T::Hash[String, T.untyped]]))
-
-          address = link_next_page(response.to_hash)
-
-          return parsed_responses if address.nil?
-
-          # Gitlab's next link address already includes all the params, so we remove
-          # the passed ones (if there's any).
-          params = nil
-        end
-      end
-
-      private
-
-      sig {
-        params(
-          api_path: String
-        ).returns(String)
-      }
-      def api_url(api_path)
-        "#{API_BASE_URL}/#{api_path}"
-      end
-
-      sig {
-        params(
-          address: String,
-          params: T.nilable(T::Hash[Symbol, T.untyped]),
-          data: T.nilable(T.any(T::Hash[Symbol, T.untyped], T::Array[T.untyped])),
-          http_method: T.nilable(Symbol)
-        ).returns(Net::HTTPResponse)
-      }
-      def send_http_request(address, params: nil, data: nil, http_method: nil)
-        uri = encode_uri(address, params)
-        http_class = find_http_class(http_method, data)
-
-        Net::HTTP.start(uri.host, use_ssl: true) do |http|
-          request = http_class.new(uri)
-
-          request["Private-Token"] = @api_token
-          request.body = URI.encode_www_form(data) if data
-
-          http.request(request)
-        end
-      end
-
-      sig {
-        params(
-          address: String,
-          params: T.nilable(T::Hash[Symbol, T.untyped])
-        ).returns(URI::Generic)
-      }
-      def encode_uri(address, params)
-        address += "?" + URI.encode_www_form(params) if params
-
-        URI(address)
-      end
-
-      sig {
-        params(
-          response: Net::HTTPResponse
-        ).returns(T::Boolean)
-      }
-      def error?(response)
-        !response.code.start_with?("2")
-      end
-
-      sig {
-        params(
-          parsed_response: T::Hash[String, T.untyped]
-        ).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")
-        else
-          "Unrecognized response: #{parsed_response}"
-        end
-      end
-
-      sig {
-        params(
-          response_headers: T::Hash[String, T.untyped]
-        ).returns(T.nilable(String))
-      }
-      def link_next_page(response_headers)
-        # An array (or nil) is returned.
-        link_header = Array(response_headers["link"])
-
-        return nil if link_header.empty?
-
-        link_header[0][/<(\S+)>; rel="next"/, 1]
-      end
-
-      sig {
-        params(
-          http_method: T.nilable(Symbol),
-          data: T.nilable(Object)
-        ).returns(T.class_of(Net::HTTPRequest))
-      }
-      def find_http_class(http_method, data)
-        http_method ||= data ? :post : :get
-
-        case http_method
-        when :get
-          Net::HTTP::Get
-        when :delete
-          Net::HTTP::Delete
-        when :patch
-          Net::HTTP::Patch
-        when :post
-          Net::HTTP::Post
-        when :put
-          Net::HTTP::Put
-        else
-          raise "Unsupported HTTP method: #{http_method.inspect}"
-        end
-      end
-    end
-  end
-end