geet 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d12d8a213d135faaf048ab5591329373217d1159ef4796e70f8fcfd4504a64
-  data.tar.gz: 259d6c5267db6d9f8522e33690a6c1cb7455716e43c96cac4ffbee0c22d8fcaf
+  metadata.gz: eeb2fbfeebdf5fad15d266e1c4b30fb5554f0418057b5fe279a4395149e9b4a2
+  data.tar.gz: 78b4a9f2de093f896d494de393991980e9c619d10ce979a9b9b0941fff39381d
 SHA512:
-  metadata.gz: eb69f8b3a197a6ef6646fdea3cfc83510aa0b0a89c739011bc250f136ff4247a9bc33459769499d887cd358a7d3dac75883e08592420ee49884848fea1c77f35
-  data.tar.gz: 7a327f36d1711c6960dcfe32eac43881b5356f9ba1ba96e8f81fe96647b479e1499391c648b0ad7d1cc330e50ccfb9ca0c08eab0ac353e54e5fb6f4afa7621cb
+  metadata.gz: 17409c6c638abc9e27ffbae3af34bec526484c2baf084ddc7adff5beaf91ef3355377cb8bc515afc54fd97b3dc67090a26422891733638cacf3efadd26e4fdf4
+  data.tar.gz: f6498c9223f91625dd85117322bef311a74b3bd027b9e4d51cb3e4bdea076418822e9637e56de9a462713eba218aaba33380509d23ddc115f04c7075ec6f3c3f

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on: [pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_API_TOKEN: foo
+      GITLAB_API_TOKEN: bar
+    strategy:
+      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' }}
+    steps:
+    - uses: actions/checkout@v5
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - run: bundle install
+    - run: bundle exec rspec
+  sorbet:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: ${{ env.REPO_FETCH_DEPTH }}
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Sorbet
+        run: bundle exec srb typecheck

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/bin/tapioca

@@ -8,20 +8,7 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "rubygems"
 require "bundler/setup"

data/geet.gemspec

@@ -1,24 +1,26 @@
 # 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'
   s.version     = Geet::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.2.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2024-08-26'
+  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'
   s.description = 'Commandline interface for performing SCM host operations, eg. create a PR on GitHub, with support for multiple hosts.'
-  s.license     = 'GPL-3.0'
+  s.license     = 'GPL-3.0-only'
 
+  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

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,7 +3,6 @@
 require 'uri'
 require 'net/http'
 require 'json'
-require_relative '../shared/http_error'
 
 module Geet
   module Github

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,9 +2,6 @@
 
 module Geet
   module Github
-    # See AbstractIssue for the circular dependency issue notes.
-    autoload :AbstractIssue, File.expand_path('abstract_issue', __dir__)
-
     class PR < AbstractIssue
       # See https://developer.github.com/v3/pulls/#create-a-pull-request
       #

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,8 +8,20 @@ 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 = `uname`.strip == 'Darwin' ? "open": "xdg-open"
+        open_command = case
+        when ENV["WSL_DISTRO_NAME"]
+          "wslview"
+        when `uname`.strip == 'Darwin'
+          "open"
+        else
+          "xdg-open"
+        end
 
         command = "#{open_command} #{file_or_url.shellescape}"
 
@@ -22,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
 
@@ -38,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
@@ -49,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

data/lib/geet/services/create_pr.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
+# typed: true
 
 require 'io/console' # stdlib
 
-require_relative 'abstract_create_issue'
-require_relative '../shared/repo_permissions'
-require_relative '../shared/selection'
-require_relative 'add_upstream_repo'
-
 module Geet
   module Services
     class CreatePr < AbstractCreateIssue
@@ -87,7 +83,9 @@ module Geet
         selection_manager.select_attributes
       end
 
-      def sync_with_remote_branch
+      # `input` is a Sorbet workaround (error 7001).
+      #
+      def sync_with_remote_branch(input: T.untyped)
         # Fetching doesn't have a real world case when there isn't a remote branch. It's also not generally
         # useful when there is a remote branch, however, since a force push is an option, it's important
         # to be 100% sure of the current diff.

data/lib/geet/services/list_issues.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../utils/attributes_selection_manager'
-require_relative '../shared/selection'
-
 module Geet
   module Services
     class ListIssues

data/lib/geet/services/merge_pr.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../helpers/services_workflow_helper'
-
 module Geet
   module Services
     # Merges the PR for the current branch.

data/lib/geet/services/open_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
     # Open in the browser the PR for the current branch.

data/lib/geet/services/open_repo.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../helpers/os_helper'
-
 module Geet
   module Services
     # Open in the browser the current repository.

data/lib/geet/shared/http_error.rb

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+# typed: strict
+
 module Geet
   module Shared
     class HttpError < RuntimeError
-      # Integer.
+      extend T::Sig
+
+      sig { returns(Integer) }
       attr_reader :code
 
+      sig { params(message: String, code: T.any(Integer, String)).void }
       def initialize(message, code)
         super(message)
-        @code = code.to_i
+        @code = T.let(code.to_i, Integer)
       end
     end
   end

data/lib/geet/shared/repo_permissions.rb

@@ -1,24 +1,29 @@
 # frozen_string_literal: true
+# typed: strict
 
 module Geet
   module Shared
     module RepoPermissions
+      extend T::Sig
+
       PERMISSION_ADMIN = 'admin'
       PERMISSION_WRITE = 'write'
       PERMISSION_READ = 'read'
       PERMISSION_NONE = 'none'
 
+      ALL_PERMISSIONS = T.let(T.unsafe(nil), T::Array[String]) if defined?(T::sig)
       ALL_PERMISSIONS = [
         PERMISSION_ADMIN,
         PERMISSION_WRITE,
         PERMISSION_READ,
         PERMISSION_NONE,
-      ]
+      ].freeze
 
       # Not worth creating a Permission class at this stage.
       #
+      sig { params(subject_permission: String, object_permission: String).returns(T::Boolean) }
       def permission_greater_or_equal_to?(subject_permission, object_permission)
-        ALL_PERMISSIONS.index(subject_permission) <= ALL_PERMISSIONS.index(object_permission)
+        T.must(ALL_PERMISSIONS.index(subject_permission)) <= T.must(ALL_PERMISSIONS.index(object_permission))
       end
     end
   end