geet 0.3.0 → 0.3.1

data/spec/integration/create_label_spec.rb

@@ -6,11 +6,13 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/create_label'
 
 describe Geet::Services::CreateLabel do
-  let(:repository) { Geet::Git::Repository.new }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   context 'with user-specified color' do
     it 'should create a label' do
-      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
       expected_output = <<~STR
         Creating label...
@@ -20,7 +22,7 @@ describe Geet::Services::CreateLabel do
       actual_output = StringIO.new
 
       actual_created_label = VCR.use_cassette('create_label') do
-        described_class.new.execute(repository, 'my_label', color: 'c64c64', output: actual_output)
+        described_class.new(repository).execute('my_label', color: 'c64c64', output: actual_output)
       end
 
       expect(actual_output.string).to eql(expected_output)
@@ -28,11 +30,34 @@ describe Geet::Services::CreateLabel do
       expect(actual_created_label.name).to eql('my_label')
       expect(actual_created_label.color).to eql('c64c64')
     end
+
+    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')
+
+        expected_output = <<~STR
+          Creating label...
+          Created with color #c64c64
+        STR
+
+        actual_output = StringIO.new
+
+        actual_created_label = VCR.use_cassette('create_label_upstream') do
+          described_class.new(upstream_repository).execute('my_label', color: 'c64c64', output: actual_output)
+        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('c64c64')
+      end
+    end
   end
 
   context 'with auto-generated color' do
     it 'should create a label' do
-      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
       expected_output_template = <<~STR
         Creating label...
@@ -42,7 +67,7 @@ describe Geet::Services::CreateLabel do
       actual_output = StringIO.new
 
       actual_created_label = VCR.use_cassette('create_label_with_random_color') do
-        described_class.new.execute(repository, 'my_label', output: actual_output)
+        described_class.new(repository).execute('my_label', output: actual_output)
       end
 
       expected_output = format(expected_output_template, color: actual_created_label.color)

data/spec/integration/create_pr_spec.rb

@@ -6,13 +6,14 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/create_pr'
 
 describe Geet::Services::CreatePr do
-  let(:repository) { Geet::Git::Repository.new }
-  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true) }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client, warnings: false) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client, warnings: false) }
 
   context 'with labels, reviewers and milestones' do
     it 'should create a PR' do
-      allow(repository).to receive(:current_branch).and_return('mybranch1')
-      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      allow(git_client).to receive(:current_branch).and_return('mybranch1')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
       expected_output = <<~STR
         Finding labels...
@@ -29,8 +30,9 @@ describe Geet::Services::CreatePr do
       actual_output = StringIO.new
 
       actual_created_pr = VCR.use_cassette('create_pr') do
-        described_class.new.execute(
-          repository, 'Title', 'Description',
+        service_instance = described_class.new(repository, git_client: git_client)
+        service_instance.execute(
+          'Title', 'Description',
           label_patterns: '_bug,invalid', milestone_pattern: '0.0.1', reviewer_patterns: 'nald-ts,nald-fr',
           no_open_pr: true, output: actual_output
         )
@@ -45,9 +47,9 @@ describe Geet::Services::CreatePr do
   end
 
   it 'should create an upstream PR' do
-    allow(upstream_repository).to receive(:current_branch).and_return('mybranch')
-    allow(upstream_repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_2f')
-    allow(upstream_repository).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+    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_2f')
+    allow(git_client).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
 
     expected_output = <<~STR
       Creating PR...
@@ -58,7 +60,8 @@ describe Geet::Services::CreatePr do
     actual_output = StringIO.new
 
     actual_created_pr = VCR.use_cassette('create_pr_upstream') do
-      described_class.new.execute(upstream_repository, 'Title', 'Description', no_open_pr: true, output: actual_output)
+      service_instance = described_class.new(upstream_repository, git_client: git_client)
+      service_instance.execute('Title', 'Description', no_open_pr: true, output: actual_output)
     end
 
     expect(actual_output.string).to eql(expected_output)
@@ -67,4 +70,76 @@ describe Geet::Services::CreatePr do
     expect(actual_created_pr.title).to eql('Title')
     expect(actual_created_pr.link).to eql('https://github.com/donald-fr/testrepo_u/pull/4')
   end
+
+  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_2f')
+
+      expected_output = <<~STR
+        Error! Saved summary to /tmp/last_geet_edited_summary.md
+      STR
+
+      actual_output = StringIO.new
+
+      operation = -> do
+        service_instance = described_class.new(repository, git_client: git_client)
+        service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+      end
+
+      expect(operation).to raise_error(RuntimeError, 'The working tree is not clean!')
+
+      expect(actual_output.string).to eql(expected_output)
+    end
+
+    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')
+      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')
+
+      expected_output = <<~STR
+        Pushing to upstream branch...
+        Creating PR...
+        Assigning authenticated user...
+        PR address: https://github.com/donaldduck/testrepo/pull/29
+      STR
+
+      actual_output = StringIO.new
+
+      actual_created_pr = VCR.use_cassette('create_pr_in_auto_mode_with_push') do
+        service_instance = described_class.new(repository, git_client: git_client)
+        service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+      end
+
+      expect(actual_output.string).to eql(expected_output)
+    end
+
+    it "should create an upstream branch, when there isn't one" do
+      allow(git_client).to receive(:working_tree_clean?).and_return(true)
+      allow(git_client).to receive(:current_branch).and_return('mybranch')
+      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')
+
+      expected_output = <<~STR
+        Creating upstream branch "mybranch"...
+        Creating PR...
+        Assigning authenticated user...
+        PR address: https://github.com/donaldduck/testrepo/pull/30
+      STR
+
+      actual_output = StringIO.new
+
+      actual_created_pr = VCR.use_cassette('create_pr_in_auto_mode_create_upstream') do
+        service_instance = described_class.new(repository, git_client: git_client)
+        service_instance.execute('Title', 'Description', output: actual_output, automated_mode: true, no_open_pr: true)
+      end
+
+      expect(actual_output.string).to eql(expected_output)
+    end
+  end
 end

data/spec/integration/list_issues_spec.rb

@@ -6,12 +6,13 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_issues'
 
 describe Geet::Services::ListIssues do
-  let(:repository) { Geet::Git::Repository.new }
-  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true) }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   context 'with github.com' do
     it 'should list the default issues' do
-      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
       expected_output = <<~STR
         5. Title 2 (https://github.com/donaldduck/testrepo/issues/5)
@@ -22,7 +23,7 @@ describe Geet::Services::ListIssues do
       actual_output = StringIO.new
 
       service_result = VCR.use_cassette('github_com/list_issues') do
-        described_class.new.execute(repository, output: actual_output)
+        described_class.new(repository).execute(output: actual_output)
       end
 
       actual_issue_numbers = service_result.map(&:number)
@@ -33,7 +34,7 @@ describe Geet::Services::ListIssues do
 
     context 'with assignee filtering' do
       it 'should list the issues' do
-        allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_gh')
+        allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_gh')
 
         expected_output = <<~STR
           Finding assignee...
@@ -45,7 +46,7 @@ describe Geet::Services::ListIssues do
         actual_output = StringIO.new
 
         service_result = VCR.use_cassette('github_com/list_issues_with_assignee') do
-          described_class.new.execute(repository, assignee_pattern: 'donald-fr', output: actual_output)
+          described_class.new(repository).execute(assignee_pattern: 'donald-fr', output: actual_output)
         end
 
         actual_issue_numbers = service_result.map(&:number)
@@ -56,8 +57,8 @@ describe Geet::Services::ListIssues do
     end
 
     it 'should list the upstream issues' do
-      allow(upstream_repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_2f')
-      allow(upstream_repository).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+      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')
 
       expected_output = <<~STR
         2. Title 2 U (https://github.com/donald-fr/testrepo_u/issues/2)
@@ -68,7 +69,7 @@ describe Geet::Services::ListIssues do
       actual_output = StringIO.new
 
       service_result = VCR.use_cassette('github_com/list_issues_upstream') do
-        described_class.new.execute(upstream_repository, output: actual_output)
+        described_class.new(upstream_repository).execute(output: actual_output)
       end
 
       actual_issue_numbers = service_result.map(&:number)
@@ -80,7 +81,7 @@ describe Geet::Services::ListIssues do
 
   context 'with gitlab.com' do
     it 'should list the issues' do
-      allow(repository).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         2. I like more pizza (https://gitlab.com/donaldduck/testproject/issues/2)
@@ -91,7 +92,7 @@ describe Geet::Services::ListIssues do
       actual_output = StringIO.new
 
       service_result = VCR.use_cassette('gitlab_com/list_issues') do
-        described_class.new.execute(repository, output: actual_output)
+        described_class.new(repository).execute(output: actual_output)
       end
 
       actual_issue_numbers = service_result.map(&:number)

data/spec/integration/list_labels_spec.rb

@@ -6,11 +6,13 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_labels'
 
 describe Geet::Services::ListLabels do
-  let(:repository) { Geet::Git::Repository.new }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   context 'with github.com' do
     it 'should list the labels' do
-      allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
 
       expected_output = <<~STR
         - bug (#ee0701)
@@ -22,7 +24,28 @@ describe Geet::Services::ListLabels do
 
       actual_output = StringIO.new
       actual_labels = VCR.use_cassette('github.com/list_labels') do
-        described_class.new.execute(repository, output: actual_output)
+        described_class.new(repository).execute(output: actual_output)
+      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
+
+    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')
+
+      expected_output = <<~STR
+        - bug (#ee0701)
+        - enhancement (#c2e0c6)
+      STR
+      expected_label_names = %w[bug enhancement]
+
+      actual_output = StringIO.new
+      actual_labels = VCR.use_cassette('github.com/list_labels_upstream') do
+        described_class.new(upstream_repository).execute(output: actual_output)
       end
 
       actual_label_names = actual_labels.map(&:name)
@@ -34,7 +57,7 @@ describe Geet::Services::ListLabels do
 
   context 'with gitlab.com' do
     it 'should list the labels' do
-      allow(repository).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
+      allow(git_client).to receive(:remote).with('origin').and_return('git@gitlab.com:donaldduck/testproject')
 
       expected_output = <<~STR
         - bug (#d9534f)
@@ -50,7 +73,7 @@ describe Geet::Services::ListLabels do
 
       actual_output = StringIO.new
       actual_labels = VCR.use_cassette('gitlab.com/list_labels') do
-        described_class.new.execute(repository, output: actual_output)
+        described_class.new(repository).execute(output: actual_output)
       end
 
       actual_label_names = actual_labels.map(&:name)

data/spec/integration/list_milestones_spec.rb

@@ -6,10 +6,12 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_milestones'
 
 describe Geet::Services::ListMilestones do
-  let(:repository) { Geet::Git::Repository.new }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   it 'should list the milestones' do
-    allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
+    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/geet')
 
     expected_output = <<~STR
       Finding milestones...
@@ -34,7 +36,32 @@ describe Geet::Services::ListMilestones do
     actual_output = StringIO.new
 
     service_result = VCR.use_cassette('list_milestones') do
-      described_class.new.execute(repository, output: actual_output)
+      described_class.new(repository).execute(output: actual_output)
+    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
+
+  it 'should list the upstream milestones' 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:donald-fr/testrepo_u')
+
+    expected_output = <<~STR
+      Finding milestones...
+      Finding issues...
+
+      1. Milestone 1 Up
+        32. t (https://github.com/donald-fr/testrepo_u/issues/32)
+    STR
+    expected_milestone_numbers = [1]
+
+    actual_output = StringIO.new
+
+    service_result = VCR.use_cassette('list_milestones_upstream') do
+      described_class.new(upstream_repository).execute(output: actual_output)
     end
 
     actual_milestone_numbers = service_result.map(&:number)

data/spec/integration/list_prs_spec.rb

@@ -6,11 +6,12 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/list_prs'
 
 describe Geet::Services::ListPrs do
-  let(:repository) { Geet::Git::Repository.new }
-  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true) }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
+  let(:upstream_repository) { Geet::Git::Repository.new(upstream: true, git_client: git_client) }
 
   it 'should list the PRs' do
-    allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
     expected_output = <<~STR
       6. Title 2 (https://github.com/donaldduck/testrepo/pull/6)
@@ -21,7 +22,7 @@ describe Geet::Services::ListPrs do
     actual_output = StringIO.new
 
     service_result = VCR.use_cassette('list_prs') do
-      described_class.new.execute(repository, output: actual_output)
+      described_class.new(repository).execute(output: actual_output)
     end
 
     actual_pr_numbers = service_result.map(&:number)
@@ -31,8 +32,8 @@ describe Geet::Services::ListPrs do
   end
 
   it 'should list the upstream PRs' do
-    allow(upstream_repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo_2f')
-    allow(upstream_repository).to receive(:remote).with('upstream').and_return('git@github.com:donald-fr/testrepo_u')
+    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')
 
     expected_output = <<~STR
       5. Title 2 (https://github.com/donald-fr/testrepo_u/pull/5)
@@ -43,7 +44,7 @@ describe Geet::Services::ListPrs do
     actual_output = StringIO.new
 
     service_result = VCR.use_cassette('list_prs_upstream') do
-      described_class.new.execute(upstream_repository, output: actual_output)
+      described_class.new(upstream_repository).execute(output: actual_output)
     end
 
     actual_pr_numbers = service_result.map(&:number)

data/spec/integration/merge_pr_spec.rb

@@ -6,11 +6,12 @@ require_relative '../../lib/geet/git/repository'
 require_relative '../../lib/geet/services/merge_pr'
 
 describe Geet::Services::MergePr do
-  let(:repository) { Geet::Git::Repository.new }
+  let(:git_client) { Geet::Utils::GitClient.new }
+  let(:repository) { Geet::Git::Repository.new(git_client: git_client) }
 
   it 'should merge the PR for the current branch' do
-    allow(repository).to receive(:current_branch).and_return('mybranch1')
-    allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+    allow(git_client).to receive(:current_branch).and_return('mybranch1')
+    allow(git_client).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
 
     expected_output = <<~STR
       Finding PR with head (mybranch1)...
@@ -21,7 +22,7 @@ describe Geet::Services::MergePr do
     actual_output = StringIO.new
 
     service_result = VCR.use_cassette('merge_pr') do
-      described_class.new.execute(repository, output: actual_output)
+      described_class.new(repository, git_client: git_client).execute(output: actual_output)
     end
 
     actual_pr_number = service_result.number
@@ -31,8 +32,8 @@ describe Geet::Services::MergePr do
   end
 
   it 'should merge the PR for the current branch, with branch deletion' do
-    allow(repository).to receive(:current_branch).and_return('mybranch')
-    allow(repository).to receive(:remote).with('origin').and_return('git@github.com:donaldduck/testrepo')
+    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')
 
     expected_output = <<~STR
       Finding PR with head (mybranch)...
@@ -44,7 +45,7 @@ describe Geet::Services::MergePr do
     actual_output = StringIO.new
 
     service_result = VCR.use_cassette('merge_pr_with_branch_deletion') do
-      described_class.new.execute(repository, delete_branch: true, output: actual_output)
+      described_class.new(repository, git_client: git_client).execute(delete_branch: true, output: actual_output)
     end
 
     actual_pr_number = service_result.number