geet 0.23.0 → 0.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +16 -2
  3. data/.gitignore +0 -1
  4. data/.ruby-version +1 -0
  5. data/Gemfile +3 -6
  6. data/bin/geet +2 -8
  7. data/geet.gemspec +4 -4
  8. data/lib/geet/commandline/configuration.rb +0 -1
  9. data/lib/geet/commandline/editor.rb +0 -2
  10. data/lib/geet/git/repository.rb +12 -21
  11. data/lib/geet/github/abstract_issue.rb +0 -6
  12. data/lib/geet/github/api_interface.rb +0 -1
  13. data/lib/geet/github/issue.rb +0 -3
  14. data/lib/geet/github/milestone.rb +0 -2
  15. data/lib/geet/github/pr.rb +0 -3
  16. data/lib/geet/github/user.rb +0 -3
  17. data/lib/geet/gitlab/pr.rb +3 -1
  18. data/lib/geet/helpers/json_helper.rb +4 -0
  19. data/lib/geet/helpers/os_helper.rb +21 -7
  20. data/lib/geet/helpers/services_workflow_helper.rb +12 -0
  21. data/lib/geet/helpers/summary_helper.rb +7 -0
  22. data/lib/geet/services/abstract_create_issue.rb +5 -5
  23. data/lib/geet/services/add_upstream_repo.rb +6 -0
  24. data/lib/geet/services/close_milestones.rb +0 -2
  25. data/lib/geet/services/comment_pr.rb +0 -3
  26. data/lib/geet/services/create_gist.rb +0 -4
  27. data/lib/geet/services/create_issue.rb +0 -4
  28. data/lib/geet/services/create_pr.rb +4 -6
  29. data/lib/geet/services/list_issues.rb +0 -3
  30. data/lib/geet/services/merge_pr.rb +0 -2
  31. data/lib/geet/services/open_pr.rb +0 -3
  32. data/lib/geet/services/open_repo.rb +0 -2
  33. data/lib/geet/shared/http_error.rb +8 -2
  34. data/lib/geet/shared/repo_permissions.rb +7 -2
  35. data/lib/geet/shared/selection.rb +3 -2
  36. data/lib/geet/utils/attributes_selection_manager.rb +15 -4
  37. data/lib/geet/utils/git_client.rb +4 -1
  38. data/lib/geet/utils/manual_list_selection.rb +39 -14
  39. data/lib/geet/utils/string_matching_selection.rb +5 -0
  40. data/lib/geet/version.rb +1 -1
  41. data/lib/geet.rb +11 -0
  42. data/sorbet/config +3 -1
  43. data/sorbet/rbi/gems/{rbs@3.9.5.rbi → rbs@4.0.0.dev.5.rbi} +2013 -680
  44. data/sorbet/rbi/gems/require-hooks@0.2.2.rbi +110 -0
  45. data/sorbet/rbi/gems/{spoom@1.6.3.rbi → spoom@1.7.11.rbi} +1139 -2246
  46. data/sorbet/rbi/gems/{tapioca@0.16.11.rbi → tapioca@0.17.10.rbi} +721 -835
  47. data/sorbet/rbi/gems/tsort@0.2.0.rbi +393 -0
  48. data/sorbet/rbi/gems/tty-prompt@0.23.1.rbi +3300 -2
  49. data/sorbet/rbi/gems/zeitwerk@2.7.4.rbi +1196 -0
  50. data/sorbet/rbi/shims/unresolved_gem_constants.rbi +4 -0
  51. data/spec/integration/create_pr_spec.rb +157 -147
  52. data/spec/integration/merge_pr_spec.rb +84 -85
  53. data/spec/spec_helper.rb +1 -1
  54. metadata +40 -6
@@ -1,8 +1,5 @@
1
1
  # frozen_string_literal: true
2
-
3
- require_relative 'manual_list_selection'
4
- require_relative 'string_matching_selection'
5
- require_relative '../shared/selection'
2
+ # typed: true
6
3
 
7
4
  module Geet
8
5
  module Utils
@@ -14,6 +11,8 @@ module Geet
14
11
  # multiple attributes are required (typically, three).
15
12
  #
16
13
  class AttributesSelectionManager
14
+ extend T::Sig
15
+
17
16
  include Geet::Shared::Selection
18
17
 
19
18
  # Workaround for VCR not supporting multithreading; see https://github.com/vcr/vcr/issues/200.
@@ -24,6 +23,7 @@ module Geet
24
23
 
25
24
  # Initialize the instance, and starts the background threads.
26
25
  #
26
+ sig { params(repository: T.untyped, out: T.any(IO, StringIO)).void }
27
27
  def initialize(repository, out: $stdout)
28
28
  @repository = repository
29
29
  @out = out
@@ -32,6 +32,16 @@ module Geet
32
32
 
33
33
  # selection_type: SELECTION_SINGLE or SELECTION_MULTIPLE
34
34
  #
35
+ sig {
36
+ params(
37
+ repository_call: T.untyped,
38
+ description: T.untyped,
39
+ pattern: T.untyped,
40
+ selection_type: T.untyped,
41
+ name_method: T.untyped,
42
+ pre_selection_hook: T.nilable(T.proc.params(all_reviewers: T::Array[T.untyped]).void)
43
+ ).void
44
+ }
35
45
  def add_attribute(repository_call, description, pattern, selection_type, name_method: nil, &pre_selection_hook)
36
46
  raise "Unrecognized selection type #{selection_type.inspect}" if ![SELECTION_SINGLE, SELECTION_MULTIPLE].include?(selection_type)
37
47
 
@@ -42,6 +52,7 @@ module Geet
42
52
 
43
53
  # Select and return the attributes, in the same order they've been added.
44
54
  #
55
+ sig { returns(T.untyped) }
45
56
  def select_attributes
46
57
  @selections_data.map do |finder_thread, description, pattern, selection_type, name_method, pre_selection_hook|
47
58
  entries = finder_thread.value
@@ -1,14 +1,16 @@
1
1
  # frozen_string_literal: true
2
+ # typed: true
2
3
 
3
4
  require 'English'
4
5
  require 'shellwords'
5
- require_relative '../helpers/os_helper'
6
6
 
7
7
  module Geet
8
8
  module Utils
9
9
  # Represents the git program interface; used for performing git operations.
10
10
  #
11
11
  class GitClient
12
+ extend T::Sig
13
+
12
14
  include Geet::Helpers::OsHelper
13
15
 
14
16
  ORIGIN_NAME = 'origin'
@@ -40,6 +42,7 @@ module Geet
40
42
 
41
43
  CLEAN_TREE_MESSAGE_REGEX = /^nothing to commit, working tree clean$/
42
44
 
45
+ sig { params(location: T.untyped ).void }
43
46
  def initialize(location: nil)
44
47
  @location = location
45
48
  end
@@ -1,27 +1,28 @@
1
1
  # frozen_string_literal: true
2
+ # typed: strict
2
3
 
3
4
  require 'tty-prompt'
4
5
 
5
6
  module Geet
6
7
  module Utils
7
8
  class ManualListSelection
9
+ extend T::Sig
10
+
8
11
  NO_SELECTION_KEY = '(none)'
9
12
 
10
13
  PAGER_SIZE = 16
11
14
 
12
15
  # Shows a prompt for selecting an entry from a list.
13
16
  #
14
- # Returns nil, without showing the prompt, if there are no entries.
15
- #
16
- # entry_type: description of the entries type.
17
- # entries: array of objects; if they're not strings, must also pass :name_method.
18
- # this value must not be empty.
19
- # name_method: required when non-string objects are passed as entries; its invocation on
20
- # each object must return a string, which is used as key.
21
- #
22
- # returns: the selected entry. if the null entry (NO_SELECTION_KEY) is selected, nil is
23
- # returned.
24
- #
17
+ sig {
18
+ type_parameters(:T).params(
19
+ entry_type: String, # description of the entries type.
20
+ entries: T::Array[T.type_parameter(:T)], # array of objects; if they're not strings, must also pass :name_method.
21
+ name_method: T.nilable(Symbol) # required when non-string objects are passed as entries; its invocation
22
+ # on each object must return a string, which is used as key.
23
+ ).returns(T.nilable(T.type_parameter(:T))) # selected entry. nil is returned if the null entry (NO_SELECTION_KEY) is
24
+ # selected, or if there are no entries.
25
+ }
25
26
  def select_entry(entry_type, entries, name_method: nil)
26
27
  return nil if entries.empty?
27
28
 
@@ -37,12 +38,17 @@ module Geet
37
38
 
38
39
  # Shows a prompt for selecting an entry from a list.
39
40
  #
40
- # Returns an empty array, without showing the prompt, if there are no entries.
41
- #
42
41
  # See #select_entry for the parameters.
43
42
  #
44
43
  # returns: array of entries.
45
44
  #
45
+ sig {
46
+ type_parameters(:T).params(
47
+ entry_type: String,
48
+ entries: T::Array[T.type_parameter(:T)],
49
+ name_method: T.nilable(Symbol)
50
+ ).returns(T::Array[T.type_parameter(:T)]) # empty array, without showing the prompt, if there are no entries.
51
+ }
46
52
  def select_entries(entry_type, entries, name_method: nil)
47
53
  return [] if entries.empty?
48
54
 
@@ -55,10 +61,17 @@ module Geet
55
61
 
56
62
  private
57
63
 
64
+ sig { params(entries: T::Array[T.untyped], entry_type: String).void }
58
65
  def check_entries(entries, entry_type)
59
66
  raise "No #{entry_type} provided!" if entries.empty?
60
67
  end
61
68
 
69
+ sig {
70
+ params(
71
+ entries: T::Array[T.untyped],
72
+ name_method: T.nilable(Symbol)
73
+ ).returns(T::Hash[String, T.untyped])
74
+ }
62
75
  def create_entries_map(entries, name_method)
63
76
  entries.each_with_object({}) do |entry, current_map|
64
77
  key = name_method ? entry.send(name_method) : entry
@@ -66,17 +79,29 @@ module Geet
66
79
  end
67
80
  end
68
81
 
82
+ sig {
83
+ type_parameters(:T).params(entries: T::Hash[String, T.type_parameter(:T)]
84
+ ).returns(T::Hash[String, T.type_parameter(:T)])
85
+ }
69
86
  def add_no_selection_entry(entries)
70
87
  {NO_SELECTION_KEY => nil}.merge(entries)
71
88
  end
72
89
 
90
+ sig {
91
+ type_parameters(:T).params(
92
+ invocation_method: Symbol,
93
+ entry_type: String,
94
+ entries: T::Hash[String, T.type_parameter(:T)]
95
+ ).returns(T.type_parameter(:T))
96
+ }
73
97
  def show_prompt(invocation_method, entry_type, entries)
74
98
  # Arguably inexact phrasing for avoiding language complexities.
75
99
  prompt_title = "Please select the #{entry_type}(s):"
76
100
 
77
- TTY::Prompt.new.send(invocation_method, prompt_title, entries, filter: true, per_page: PAGER_SIZE)
101
+ ::TTY::Prompt.new.send(invocation_method, prompt_title, entries, filter: true, per_page: PAGER_SIZE)
78
102
  end
79
103
 
104
+ sig { params(entry: T.untyped).returns(T::Boolean) }
80
105
  def no_selection?(entry)
81
106
  entry == NO_SELECTION_KEY
82
107
  end
@@ -1,8 +1,12 @@
1
1
  # frozen_string_literal: true
2
+ # typed: strict
2
3
 
3
4
  module Geet
4
5
  module Utils
5
6
  class StringMatchingSelection
7
+ extend T::Sig
8
+
9
+ sig { params(entry_type: String, entries: T::Array[T.untyped], pattern: String, name_method: T.nilable(Symbol)).returns(T.untyped) }
6
10
  def select_entry(entry_type, entries, pattern, name_method: nil)
7
11
  entries_found = entries.select do |entry|
8
12
  entry = entry.send(name_method) if name_method
@@ -19,6 +23,7 @@ module Geet
19
23
  end
20
24
  end
21
25
 
26
+ sig { params(entry_type: String, entries: T::Array[T.untyped], raw_patterns: String, name_method: T.nilable(Symbol)).returns(T::Array[T.untyped]) }
22
27
  def select_entries(entry_type, entries, raw_patterns, name_method: nil)
23
28
  patterns = raw_patterns.split(',')
24
29
 
data/lib/geet/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Geet
4
- VERSION = '0.23.0'
4
+ VERSION = '0.24.0'
5
5
  end
data/lib/geet.rb ADDED
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'sorbet-runtime'
4
+ require 'zeitwerk'
5
+
6
+ loader = Zeitwerk::Loader.for_gem
7
+ loader.inflector.inflect("pr" => "PR")
8
+ loader.setup
9
+
10
+ module Geet
11
+ end
data/sorbet/config CHANGED
@@ -1,5 +1,7 @@
1
1
  --disable-watchman
2
2
  --suppress-payload-superclass-redefinition-for=Reline::ANSI
3
3
  --dir=.
4
- --ignore=lib
5
4
  --ignore=spec
5
+ # Without a Bundler lockfile, we need to ignore gems vendored in CI, to avoid typechecking gem sources
6
+ # that may clash with those in the repo.
7
+ --ignore=vendor/bundle