geet 0.23.0 → 0.24.0

data/sorbet/rbi/shims/unresolved_gem_constants.rbi

@@ -0,0 +1,4 @@
+# For unclear reasons, these constants are not resolved.
+
+module Geet::Commandline::Configuration::SimpleScripting::Argv; end
+module Geet::Utils::ManualListSelection::TTY::Prompt; end

data/spec/integration/create_pr_spec.rb

@@ -12,105 +12,118 @@ describe Geet::Services::CreatePr do
 
   context 'with github.com' do
     context 'with labels, reviewers and milestones' do
-      it 'should create a PR'
-#       do
-#         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).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
-#
-#         expected_output = <<~STR
-#           Finding labels...
-#           Finding milestones...
-#           Finding collaborators...
-#           Creating PR...
-#           Assigning authenticated user...
-#           Adding labels bug, invalid...
-#           Setting milestone 0.0.1...
-#           Requesting review from donald-fr...
-#           PR address: https://github.com/donaldduck/testrepo_f/pull/1
-#         STR
-#
-#         actual_output = StringIO.new
-#
-#         actual_created_pr = VCR.use_cassette('github_com/create_pr') do
-#           service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-#           service_instance.execute(
-#             'Title', 'Description',
-#             labels: 'bug,invalid', milestone: '0.0.1', reviewers: 'donald-fr',
-#             output: actual_output
-#           )
-#         end
-#
-#         expect(actual_output.string).to eql(expected_output)
-#
-#         expect(actual_created_pr.number).to eql(1)
-#         expect(actual_created_pr.title).to eql('Title')
-#         expect(actual_created_pr.link).to eql('https://github.com/donaldduck/testrepo_f/pull/1')
-#       end
+      it 'should create 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).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote_branch).and_return('mybranch')
+        expect(git_client).to receive(:fetch)
+        allow(git_client).to receive(:remote_branch_diff_commits).and_return([])
+        expect(git_client).to receive(:push)
+
+        expected_output = <<~STR
+          Finding labels...
+          Finding milestones...
+          Finding collaborators...
+          Pushing to remote branch...
+          Creating PR...
+          Adding labels bug, invalid...
+          Setting milestone 0.0.1...
+          Requesting review from donald-fr...
+          PR address: https://github.com/donaldduck/testrepo_f/pull/1
+        STR
+
+        actual_output = StringIO.new
+
+        actual_created_pr = VCR.use_cassette('github_com/create_pr', allow_unused_http_interactions: true) do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute(
+            'Title', 'Description',
+            labels: 'bug,invalid', milestone: '0.0.1', reviewers: 'donald-fr'
+          )
+        end
+
+        expect(actual_output.string).to eql(expected_output)
+
+        expect(actual_created_pr.number).to eql(1)
+        expect(actual_created_pr.title).to eql('Title')
+        expect(actual_created_pr.link).to eql('https://github.com/donaldduck/testrepo_f/pull/1')
+      end
     end
 
     context 'on an upstream repository' do
-      it 'should create an upstream PR'
-#       do
-#         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).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
-#         allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donald-fr/testrepo_u')
-#
-#         expected_output = <<~STR
-#           Creating PR...
-#           Assigning authenticated user...
-#           PR address: https://github.com/donald-fr/testrepo_u/pull/8
-#         STR
-#
-#         actual_output = StringIO.new
-#
-#         actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream') do
-#           service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
-#           service_instance.execute('Title', 'Description', output: actual_output)
-#         end
-#
-#         expect(actual_output.string).to eql(expected_output)
-#
-#         expect(actual_created_pr.number).to eql(8)
-#         expect(actual_created_pr.title).to eql('Title')
-#         expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/8')
-#       end
+      it 'should create an upstream 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).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donald-fr/testrepo_u')
+        allow(git_client).to receive(:remote_defined?).with('upstream').and_return(true)
+        allow(git_client).to receive(:remote_branch).and_return('mybranch')
+        expect(git_client).to receive(:fetch)
+        allow(git_client).to receive(:remote_branch_diff_commits).and_return([])
+        expect(git_client).to receive(:push)
+
+        expected_output = <<~STR
+          Pushing to remote branch...
+          Creating PR...
+          PR address: https://github.com/donald-fr/testrepo_u/pull/8
+        STR
+
+        actual_output = StringIO.new
+
+        actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream', allow_unused_http_interactions: true) do
+          service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description')
+        end
+
+        expect(actual_output.string).to eql(expected_output)
+
+        expect(actual_created_pr.number).to eql(8)
+        expect(actual_created_pr.title).to eql('Title')
+        expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/8')
+      end
 
       # It would be more consistent to have this UT outside of an upstream context, however this use
       # case is actually a typical real-world one
       #
       context 'without write permissions' do
         context 'without labels, reviewers and milestones' do
-          it 'should create a PR'
-#           do
-#             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).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
-#             allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donald-fr/testrepo_u')
-#
-#             expected_output = <<~STR
-#               Creating PR...
-#               PR address: https://github.com/donald-fr/testrepo_u/pull/9
-#             STR
-#
-#             actual_output = StringIO.new
-#
-#             actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream_without_write_permissions') do
-#               service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
-#               service_instance.execute(
-#                 'Title', 'Description',
-#                 labels: '<ignored>',
-#                 output: actual_output
-#               )
-#             end
-#
-#             expect(actual_output.string).to eql(expected_output)
-#
-#             expect(actual_created_pr.number).to eql(9)
-#             expect(actual_created_pr.title).to eql('Title')
-#             expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/9')
-#           end
+          it 'should create 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).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+            allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donald-fr/testrepo_u')
+            allow(git_client).to receive(:remote_defined?).with('upstream').and_return(true)
+            allow(git_client).to receive(:remote_branch).and_return('mybranch')
+            expect(git_client).to receive(:fetch)
+            allow(git_client).to receive(:remote_branch_diff_commits).and_return([])
+            expect(git_client).to receive(:push)
+
+            expected_output = <<~STR
+              Pushing to remote branch...
+              Creating PR...
+              PR address: https://github.com/donald-fr/testrepo_u/pull/9
+            STR
+
+            actual_output = StringIO.new
+
+            actual_created_pr = VCR.use_cassette('github_com/create_pr_upstream_without_write_permissions') do
+              service_instance = described_class.new(upstream_repository, out: actual_output, git_client: git_client)
+              service_instance.execute(
+                'Title', 'Description',
+                labels: '<ignored>'
+              )
+            end
+
+            expect(actual_output.string).to eql(expected_output)
+
+            expect(actual_created_pr.number).to eql(9)
+            expect(actual_created_pr.title).to eql('Title')
+            expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/9')
+          end
         end
       end
     end
@@ -122,68 +135,65 @@ describe Geet::Services::CreatePr do
 
         actual_output = StringIO.new
 
-        operation = -> do
+        expect do
           service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-          service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true)
-        end
+          service_instance.execute('Title', 'Description')
+        end.to raise_error(RuntimeError, 'The working tree is not clean!')
 
-        expect(operation).to raise_error(RuntimeError, 'The working tree is not clean!')
         expect(actual_output.string).to be_empty
       end
 
-      it 'should push to the remote branch'
-#       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')
-#         expect(git_client).to receive(:remote_branch).and_return('mybranch')
-#         expect(git_client).to receive(:push)
-#
-#         allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
-#
-#         expected_output = <<~STR
-#           Pushing to remote branch...
-#           Creating PR...
-#           Assigning authenticated user...
-#           PR address: https://github.com/donaldduck/testrepo_f/pull/2
-#         STR
-#
-#         actual_output = StringIO.new
-#
-#         actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_with_push') do
-#           service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-#           service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true)
-#         end
-#
-#         expect(actual_output.string).to eql(expected_output)
-#       end
-
-      it "should create a remote branch, when there isn't one (is not tracked)"
-#       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')
-#         expect(git_client).to receive(:remote_branch).and_return(nil)
-#         expect(git_client).to receive(:push).with(remote_branch: 'mybranch')
-#
-#         allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
-#
-#         expected_output = <<~STR
-#           Creating remote branch "mybranch"...
-#           Creating PR...
-#           Assigning authenticated user...
-#           PR address: https://github.com/donaldduck/testrepo_f/pull/4
-#         STR
-#
-#         actual_output = StringIO.new
-#
-#         actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_create_upstream') do
-#           service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
-#           service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true)
-#         end
-#
-#         expect(actual_output.string).to eql(expected_output)
-#       end
+      it 'should push to the remote branch' 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')
+        expect(git_client).to receive(:remote_branch).and_return('mybranch')
+        expect(git_client).to receive(:fetch)
+        allow(git_client).to receive(:remote_branch_diff_commits).and_return([])
+        expect(git_client).to receive(:push)
+
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+
+        expected_output = <<~STR
+          Pushing to remote branch...
+          Creating PR...
+          PR address: https://github.com/donaldduck/testrepo_f/pull/2
+        STR
+
+        actual_output = StringIO.new
+
+        actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_with_push', allow_unused_http_interactions: true) do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description')
+        end
+
+        expect(actual_output.string).to eql(expected_output)
+      end
+
+      it "should create a remote branch, when there isn't one (is not tracked)" 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')
+        expect(git_client).to receive(:remote_branch).and_return(nil)
+        expect(git_client).to receive(:push).with(remote_branch: 'mybranch')
+
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
+
+        expected_output = <<~STR
+          Creating remote branch "mybranch"...
+          Creating PR...
+          PR address: https://github.com/donaldduck/testrepo_f/pull/4
+        STR
+
+        actual_output = StringIO.new
+
+        actual_created_pr = VCR.use_cassette('github_com/create_pr_in_auto_mode_create_upstream', allow_unused_http_interactions: true) do
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+          service_instance.execute('Title', 'Description')
+        end
+
+        expect(actual_output.string).to eql(expected_output)
+      end
     end
   end # context 'with github.com'
 end

data/spec/integration/merge_pr_spec.rb

@@ -18,103 +18,102 @@ describe Geet::Services::MergePr do
   let(:main_branch) { 'main' }
 
   before :each do
-    expect(git_client).to receive(:fetch)
+    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(:remote_branch_gone?).and_return(true)
     expect(git_client).to receive(:checkout).with(main_branch)
     expect(git_client).to receive(:rebase)
-    expect(git_client).to receive(:delete_branch).with('mybranch')
+    expect(git_client).to receive(:delete_branch).with('mybranch', force: false)
   end
 
   context 'with github.com' do
     let(:repository_name) { 'testrepo_upstream' }
 
-    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@github.com:#{owner}/#{repository_name}")
-#
-#       expected_pr_number = 1
-#       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('github_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
-
-    it 'should merge the PR for the current branch, with branch deletion'
-#     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@github.com:#{owner}/#{repository_name}")
-#
-#       expected_pr_number = 2
-#       expected_output = <<~STR
-#         Finding PR with head (#{owner}:#{branch})...
-#         Merging PR ##{expected_pr_number}...
-#         Deleting remote branch #{branch}...
-#         Fetching repository...
-#         Checking out #{main_branch}...
-#         Rebasing...
-#         Deleting local branch mybranch...
-#       STR
-#
-#       actual_output = StringIO.new
-#
-#       service_result = VCR.use_cassette('github_com/merge_pr_with_branch_deletion') do
-#         described_class.new(repository, out: actual_output, git_client: git_client).execute(delete_branch: true)
-#       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
+    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@github.com:#{owner}/#{repository_name}")
+
+      expected_pr_number = 1
+      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('github_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
+
+    it 'should merge the PR for the current branch, with branch deletion' 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@github.com:#{owner}/#{repository_name}")
+
+      expected_pr_number = 2
+      expected_output = <<~STR
+        Finding PR with head (#{owner}:#{branch})...
+        Merging PR ##{expected_pr_number}...
+        Deleting remote branch #{branch}...
+        Fetching repository...
+        Checking out #{main_branch}...
+        Rebasing...
+        Deleting local branch mybranch...
+      STR
+
+      actual_output = StringIO.new
+
+      service_result = VCR.use_cassette('github_com/merge_pr_with_branch_deletion') do
+        described_class.new(repository, out: actual_output, git_client: git_client).execute(delete_branch: true)
+      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 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
+    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

@@ -5,7 +5,7 @@
 require 'vcr'
 require 'base64'
 
-require_relative '../lib/geet/utils/attributes_selection_manager'
+require_relative '../lib/geet'
 
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/vcr_cassettes'