geet 0.3.15 → 0.4.1

data/lib/geet/version.rb

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

data/spec/integration/comment_pr_spec.rb

@@ -17,7 +17,7 @@ describe Geet::Services::CommentPr do
 
     it 'should add a comment to the PR for the current branch' do
       allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      allow(git_client).to receive(:remote).with(no_args).and_return("git@github.com:#{owner}/#{repository_name}")
 
       expected_pr_number = 3
       expected_output = <<~STR

data/spec/integration/create_issue_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::CreateIssue do
 
   context 'with labels, assignees and milestones' do
     it 'should create an issue' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
 
       expected_output = <<~STR
         Finding labels...
@@ -47,8 +47,8 @@ describe Geet::Services::CreateIssue do
     context 'without labels, assignees and milestones' do
       it 'should create an upstream issue' do
         allow(git_client).to receive(:current_branch).and_return('mybranch')
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
-        allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:momcorp/therepo')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo')
+        allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:momcorp/therepo')
 
         expected_output = <<~STR
           Creating the issue...
@@ -59,7 +59,7 @@ describe Geet::Services::CreateIssue do
 
         actual_created_issue = VCR.use_cassette('create_issue_upstream') do
           create_options = { no_open_issue: true, out: actual_output }
-          described_class.new(upstream_repository, out: actual_output).execute('Title', 'Description', create_options)
+          described_class.new(upstream_repository, out: actual_output).execute('Title', 'Description', **create_options)
         end
 
         expect(actual_output.string).to eql(expected_output)

data/spec/integration/create_label_spec.rb

@@ -13,7 +13,7 @@ describe Geet::Services::CreateLabel do
   context 'with github.com' do
     context 'with user-specified color' do
       it 'should create a label' do
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo')
 
         expected_output = <<~STR
           Creating label...
@@ -34,8 +34,8 @@ describe Geet::Services::CreateLabel do
 
       context 'upstream' do
         it 'should create a label' do
-          allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
-          allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck-fr/testrepo_gh')
+          allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo')
+          allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck-fr/testrepo_gh')
 
           expected_output = <<~STR
             Creating label...
@@ -58,7 +58,7 @@ describe Geet::Services::CreateLabel do
 
     context 'with auto-generated color' do
       it 'should create a label' do
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo')
 
         actual_output = StringIO.new
 
@@ -87,7 +87,7 @@ describe Geet::Services::CreateLabel do
 
   context 'with gitlab.com' do
     it 'should create a label' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         Creating label...

data/spec/integration/create_milestone_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::CreateMilestone do
 
   context 'with github.com' do
     it 'should create a milestone' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_upstream')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_upstream')
 
       expected_output = <<~STR
         Creating milestone...

data/spec/integration/create_pr_spec.rb

@@ -14,7 +14,8 @@ describe Geet::Services::CreatePr 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(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        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...
@@ -50,8 +51,9 @@ describe Geet::Services::CreatePr do
     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(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
-        allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+        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...
@@ -80,8 +82,9 @@ describe Geet::Services::CreatePr 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(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
-            allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+            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...
@@ -112,7 +115,7 @@ describe Geet::Services::CreatePr do
     context 'in automated mode' do
       it 'should raise an error when the working tree is dirty' do
         allow(git_client).to receive(:working_tree_clean?).and_return(false)
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
 
         expected_output = <<~STR
           Error! Saved summary to /tmp/last_geet_edited_summary.md
@@ -133,10 +136,11 @@ describe Geet::Services::CreatePr do
       it 'should push to the upstream 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(:upstream_branch).and_return('mybranch')
         expect(git_client).to receive(:push)
 
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
 
         expected_output = <<~STR
           Pushing to upstream branch...
@@ -158,10 +162,11 @@ describe Geet::Services::CreatePr do
       it "should create an upstream 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(:upstream_branch).and_return(nil)
         expect(git_client).to receive(:push).with(upstream_branch: 'mybranch')
 
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_f')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_f')
 
         expected_output = <<~STR
           Creating upstream branch "mybranch"...

data/spec/integration/list_issues_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::ListIssues do
 
   context 'with github.com' do
     it 'should list the default issues' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo')
 
       expected_output = <<~STR
         5. Title 2 (https://github.com/donaldduck/testrepo/issues/5)
@@ -34,7 +34,7 @@ describe Geet::Services::ListIssues do
 
     context 'with assignee filtering' do
       it 'should list the issues' do
-        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_gh')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_gh')
 
         expected_output = <<~STR
           Finding collaborators...
@@ -57,8 +57,8 @@ describe Geet::Services::ListIssues do
     end
 
     it 'should list the upstream issues' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_2f')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/testrepo_2f')
+      allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donald-fr/testrepo_u')
 
       expected_output = <<~STR
         2. Title 2 U (https://github.com/donald-fr/testrepo_u/issues/2)
@@ -81,7 +81,7 @@ describe Geet::Services::ListIssues do
 
   context 'with gitlab.com' do
     it 'should list the issues' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      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)
@@ -103,7 +103,7 @@ describe Geet::Services::ListIssues do
 
     context 'with assignee filtering' do
       it 'should list the issues' do
-        allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+        allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
         expected_output = <<~STR
           Finding collaborators...

data/spec/integration/list_labels_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::ListLabels do
 
   context 'with github.com' do
     it 'should list the labels' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/geet')
 
       expected_output = <<~STR
         - bug (#ee0701)
@@ -34,8 +34,8 @@ describe Geet::Services::ListLabels do
     end
 
     it 'should list the upstream labels' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck-fr/testrepo_u')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck-fr/testrepo_u')
 
       expected_output = <<~STR
         - bug (#ee0701)
@@ -57,7 +57,7 @@ describe Geet::Services::ListLabels do
 
   context 'with gitlab.com' do
     it 'should list the labels' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         - bug (#d9534f)

data/spec/integration/list_milestones_spec.rb

@@ -12,7 +12,7 @@ describe Geet::Services::ListMilestones do
 
   context 'with github.com' do
     it 'should list the milestones' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donaldduck/geet')
 
       expected_output = <<~STR
         Finding milestones...
@@ -50,8 +50,8 @@ describe Geet::Services::ListMilestones do
     end
 
     it 'should list the upstream milestones' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donald-fr/testrepo_downstream')
-      allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donald-fr/testrepo_downstream')
+      allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
 
       expected_output = <<~STR
         Finding milestones...
@@ -80,7 +80,7 @@ describe Geet::Services::ListMilestones do
 
   context 'with gitlab.com' do
     it 'should list the milestones' do
-      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with(no_args).and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         Finding milestones...

data/spec/integration/list_prs_spec.rb

@@ -11,7 +11,7 @@ describe Geet::Services::ListPrs do
   let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   it 'should list the PRs' do
-    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donald-fr/testrepo_downstream')
+    allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donald-fr/testrepo_downstream')
 
     expected_output = <<~STR
       2. Add testfile3 (downstream) (https://github.com/donald-fr/testrepo_downstream/pull/2)
@@ -32,8 +32,8 @@ describe Geet::Services::ListPrs do
   end
 
   it 'should list the upstream PRs' do
-    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donald-fr/testrepo_downstream')
-    allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
+    allow(git_client).to receive(:remote).with(no_args).and_return('git@github.com:donald-fr/testrepo_downstream')
+    allow(git_client).to receive(:remote).with(name: 'upstream').and_return('git@github.com:donaldduck/testrepo_upstream')
 
     expected_output = <<~STR
       2. Add testfile3 (upstream) (https://github.com/donaldduck/testrepo_upstream/pull/2)

data/spec/integration/merge_pr_spec.rb

@@ -5,23 +5,42 @@ require 'spec_helper'
 require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/merge_pr'
 
+# Currently disabled: it requires updates following the addition of the automatic removal of the local
+# branch.
+# Specifically, `GitClient#upstream_branch_gone?` needs to be handled, since it returns the current
+# branch, while it's supposed to return
+#
 describe Geet::Services::MergePr do
   let(:git_client) { Geet::Utils::GitClient.new }
   let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
   let(:owner) { 'donaldduck' }
   let(:branch) { 'mybranch' }
+  let(:main_branch) { 'main' }
+
+  before :each do
+    expect(git_client).to receive(:fetch)
+    expect(git_client).to receive(:upstream_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')
+  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(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      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
@@ -38,13 +57,18 @@ describe Geet::Services::MergePr do
 
     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(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      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 branch #{branch}...
+        Deleting remote branch #{branch}...
+        Fetching repository...
+        Checking out #{main_branch}...
+        Rebasing...
+        Deleting local branch mybranch...
       STR
 
       actual_output = StringIO.new
@@ -65,12 +89,17 @@ describe Geet::Services::MergePr do
 
     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(:remote).with('origin').and_return("git@gitlab.com:#{owner}/#{repository_name}")
+      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

data/spec/integration/open_pr_spec.rb

@@ -16,7 +16,7 @@ describe Geet::Services::OpenPr do
 
     it 'should open the PR for the current branch' do
       allow(git_client).to receive(:current_branch).and_return(branch)
-      allow(git_client).to receive(:remote).with('origin').and_return("git@github.com:#{owner}/#{repository_name}")
+      allow(git_client).to receive(:remote).with(no_args).and_return("git@github.com:#{owner}/#{repository_name}")
 
       expected_pr_number = 3
       expected_output = <<~STR

data/spec/integration/open_repo_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require_relative '../../lib/geet/git/repository'
+require_relative '../../lib/geet/services/open_repo'
+
+module Geet
+  describe Services::OpenRepo do
+    let(:git_client) { Utils::GitClient.new }
+    let(:repository) { Git::Repository.new(git_client: git_client) }
+
+    OWNER = 'donaldduck'
+    REPOSITORY_NAME = 'testrepo'
+
+    REMOTE_URLS = {
+      'git' => "git@github.com:#{OWNER}/#{REPOSITORY_NAME}",
+      'https' => "https://github.com/#{OWNER}/#{REPOSITORY_NAME}",
+    }
+
+    context 'should open the PR for the current branch' do
+      REMOTE_URLS.each do |protocol, remote_url|
+        it "with #{protocol} protocol" do
+          allow(git_client).to receive(:remote).with(no_args).and_return(remote_url)
+
+          expected_url = "https://github.com/#{OWNER}/#{REPOSITORY_NAME}"
+          expected_output = ""
+
+          actual_output = StringIO.new
+          service_instance = described_class.new(repository, out: actual_output, git_client: git_client)
+
+          expect(service_instance).to receive(:open_file_with_default_application).with(expected_url) do
+            # do nothing; just don't open the browser
+          end
+
+          execution_result = VCR.use_cassette('github_com/open_repo') do
+            service_instance.execute
+          end
+
+          expect(actual_output.string).to eql(expected_output)
+          expect(execution_result).to eql(expected_url)
+        end
+      end
+    end # context 'should open the PR for the current branch'
+  end # describe Services::OpenRepo
+end # module Geet

data/spec/vcr_cassettes/create_issue.yml

@@ -608,7 +608,7 @@ http_interactions:
     uri: https://api.github.com/repos/donaldduck/testrepo_f/issues
     body:
       encoding: UTF-8
-      string: '{"title":"Title","body":"Description","base":"master"}'
+      string: '{"title":"Title","body":"Description"}'
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3

data/spec/vcr_cassettes/create_issue_upstream.yml

@@ -152,7 +152,7 @@ http_interactions:
     uri: https://api.github.com/repos/momcorp/therepo/issues
     body:
       encoding: UTF-8
-      string: '{"title":"Title","body":"Description","base":"master"}'
+      string: '{"title":"Title","body":"Description"}'
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3