git_helper 3.3.2 → 3.3.7

data/lib/git_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHelper
-  VERSION = '3.3.2'
+  VERSION = '3.3.7'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -6,7 +6,7 @@ require 'git_helper'
 describe GitHelper::ChangeRemote do
   let(:remote1) { "git@github.com:#{old_owner}/#{project}.git" }
   let(:project) { Faker::Lorem.word }
-  let(:cli) { double(:highline_cli, ask_yes_no: true) }
+  let(:highline_wrapper) { double(:highline_wrapper, ask_yes_no: true) }
   let(:old_owner) { Faker::Internet.username }
   let(:new_owner) { Faker::Internet.username }
   let(:directory_entries) { ['.', '..', project, Faker::Lorem.word, Faker::Lorem.word] }
@@ -25,7 +25,7 @@ describe GitHelper::ChangeRemote do
   subject { GitHelper::ChangeRemote.new(old_owner, new_owner) }
 
   before do
-    allow(GitHelper::HighlineCli).to receive(:new).and_return(cli)
+    allow(HighlineWrapper).to receive(:new).and_return(highline_wrapper)
     allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
     allow(subject).to receive(:puts)
   end
@@ -74,7 +74,7 @@ describe GitHelper::ChangeRemote do
     end
 
     context 'when the user says not to process the directory' do
-      let(:cli) { double(:highline_cli, ask_yes_no: false) }
+      let(:highline_wrapper) { double(:highline_wrapper, ask_yes_no: false) }
 
       it 'should not call to process the directory' do
         expect(subject).not_to receive(:process_git_repository)
@@ -167,10 +167,10 @@ describe GitHelper::ChangeRemote do
     end
   end
 
-  describe '#cli' do
-    it 'should create a new highline CLI instance' do
-      expect(GitHelper::HighlineCli).to receive(:new)
-      subject.send(:cli)
+  describe '#highline' do
+    it 'should create a new highline_wrapper instance' do
+      expect(HighlineWrapper).to receive(:new)
+      subject.send(:highline)
     end
   end
 end

data/spec/git_helper/code_request_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::CodeRequest do
-  let(:highline_cli) { double(:highline_cli) }
+  let(:highline_wrapper) { double(:highline_wrapper) }
   let(:local_code) { double(:local_code, project_name: Faker::Lorem.word, branch: Faker::Lorem.word) }
   let(:process_project) { double(:process_project, create: :created, merge: :merged) }
   let(:base_branch) { Faker::Lorem.word }
@@ -14,7 +14,7 @@ describe GitHelper::CodeRequest do
 
   before do
     allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    allow(GitHelper::HighlineCli).to receive(:new).and_return(highline_cli)
+    allow(HighlineWrapper).to receive(:new).and_return(highline_wrapper)
     allow(subject).to receive(:puts)
   end
 
@@ -103,19 +103,19 @@ describe GitHelper::CodeRequest do
 
   describe '#ask_for_clarification' do
     it 'should ask the CLI' do
-      expect(highline_cli).to receive(:ask).and_return('github')
+      expect(highline_wrapper).to receive(:ask).and_return('github')
       subject.send(:ask_for_clarification)
     end
 
     context 'when response is github' do
       it 'should return github_pull_request' do
-        allow(highline_cli).to receive(:ask).and_return('github')
+        allow(highline_wrapper).to receive(:ask).and_return('github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
 
       it 'should return github_pull_request' do
-        allow(highline_cli).to receive(:ask).and_return('Github')
+        allow(highline_wrapper).to receive(:ask).and_return('Github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
@@ -123,13 +123,13 @@ describe GitHelper::CodeRequest do
 
     context 'when response is gitlab' do
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:ask).and_return('gitlab')
+        allow(highline_wrapper).to receive(:ask).and_return('gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
 
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:ask).and_return('Gitlab')
+        allow(highline_wrapper).to receive(:ask).and_return('Gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
@@ -138,7 +138,7 @@ describe GitHelper::CodeRequest do
     # Unfortunately this test sometimes fails... just rerun the tests if it does
     context 'when response is neither' do
       it 'should raise an error' do
-        allow(highline_cli).to receive(:ask).and_return(Faker::Lorem.word)
+        allow(highline_wrapper).to receive(:ask).and_return(Faker::Lorem.word)
         expect(subject).to receive(:exit)
         subject.send(:ask_for_clarification)
       end
@@ -176,23 +176,23 @@ describe GitHelper::CodeRequest do
   describe '#base_branch' do
     it 'should call the default branch' do
       expect(subject).to receive(:default_branch)
-      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
-      allow(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
+      allow(highline_wrapper).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_wrapper).to receive(:ask).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     it 'should ask the CLI to ask the user' do
       allow(subject).to receive(:default_branch)
-      expect(highline_cli).to receive(:ask_yes_no).at_least(:once)
-      allow(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
+      expect(highline_wrapper).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_wrapper).to receive(:ask).at_least(:once).and_return(base_branch)
       subject.send(:base_branch)
     end
 
     context 'if the user says no' do
       it 'definitely asks for the users base branch' do
         allow(subject).to receive(:default_branch)
-        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:ask).at_least(:once).and_return(base_branch)
+        expect(highline_wrapper).to receive(:ask_yes_no).at_least(:once).and_return(false)
+        expect(highline_wrapper).to receive(:ask).at_least(:once).and_return(base_branch)
         subject.send(:base_branch)
       end
     end
@@ -200,8 +200,8 @@ describe GitHelper::CodeRequest do
     context 'if the user says yes' do
       it 'does not ask for the users base branch' do
         allow(subject).to receive(:default_branch)
-        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(true)
-        expect(highline_cli).not_to receive(:base_branch)
+        expect(highline_wrapper).to receive(:ask_yes_no).at_least(:once).and_return(true)
+        expect(highline_wrapper).not_to receive(:base_branch)
         subject.send(:base_branch)
       end
     end
@@ -218,23 +218,23 @@ describe GitHelper::CodeRequest do
   describe '#new_code_request_title' do
     it 'should call autogenerated title method' do
       expect(subject).to receive(:autogenerated_title)
-      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
-      allow(highline_cli).to receive(:ask).at_least(:once).and_return(title)
+      allow(highline_wrapper).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_wrapper).to receive(:ask).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     it 'should ask the CLI to ask the user' do
       allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
-      expect(highline_cli).to receive(:ask_yes_no).at_least(:once)
-      allow(highline_cli).to receive(:ask).at_least(:once).and_return(title)
+      expect(highline_wrapper).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_wrapper).to receive(:ask).at_least(:once).and_return(title)
       subject.send(:new_code_request_title)
     end
 
     context 'if the user says no' do
       it 'definitely asks for the users title' do
         allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
-        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:ask).at_least(:once).and_return(title)
+        expect(highline_wrapper).to receive(:ask_yes_no).at_least(:once).and_return(false)
+        expect(highline_wrapper).to receive(:ask).at_least(:once).and_return(title)
         subject.send(:new_code_request_title)
       end
     end
@@ -242,8 +242,8 @@ describe GitHelper::CodeRequest do
     context 'if the user says yes to original title' do
       it 'does not ask for the users chosen title' do
         allow(subject).to receive(:autogenerated_title).and_return(Faker::Lorem.sentence)
-        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(true)
-        expect(highline_cli).not_to receive(:ask)
+        expect(highline_wrapper).to receive(:ask_yes_no).at_least(:once).and_return(true)
+        expect(highline_wrapper).not_to receive(:ask)
         subject.send(:new_code_request_title)
       end
     end
@@ -256,10 +256,10 @@ describe GitHelper::CodeRequest do
     end
   end
 
-  describe '#cli' do
-    it 'should call the octokit client' do
-      expect(GitHelper::HighlineCli).to receive(:new).and_return(highline_cli)
-      subject.send(:cli)
+  describe '#highline' do
+    it 'should create a highline_wrapper client' do
+      expect(HighlineWrapper).to receive(:new).and_return(highline_wrapper)
+      subject.send(:highline)
     end
   end
 end

data/spec/git_helper/merge_request_spec.rb

@@ -5,7 +5,7 @@ require 'git_helper'
 
 describe GitHelper::GitLabMergeRequest do
   let(:local_code) { double(:local_code, read_template: Faker::Lorem.word) }
-  let(:highline_cli) { double(:highline_cli) }
+  let(:highline_wrapper) { double(:highline_wrapper) }
   let(:gitlab_client_client) { double(:gitlab_client_client, project: :project, merge_request: :merge_request, create_merge_request: :created) }
   let(:gitlab_client) { double(:gitlab_client, client: gitlab_client_client) }
   let(:diff_refs) { double(:diff_refs, base_sha: :base, head_sha: :head) }
@@ -22,7 +22,7 @@ describe GitHelper::GitLabMergeRequest do
       local_project: Faker::Lorem.word,
       local_branch: Faker::Lorem.word,
       local_code: local_code,
-      cli: highline_cli
+      highline: highline_wrapper
     }
   end
 
@@ -121,19 +121,19 @@ describe GitHelper::GitLabMergeRequest do
 
       it 'should call the CLI to ask about a single template' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
+        expect(highline_wrapper).to receive(:ask_yes_no).and_return(true)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the single template if the user says yes' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        allow(highline_cli).to receive(:ask_yes_no).and_return(true)
+        allow(highline_wrapper).to receive(:ask_yes_no).and_return(true)
         expect(subject.send(:template_name_to_apply)).to eq(template)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:mr_template_options).and_return([template])
-        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
+        allow(highline_wrapper).to receive(:ask_yes_no).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -144,19 +144,19 @@ describe GitHelper::GitLabMergeRequest do
 
       it 'should call the CLI to ask which of multiple templates to apply' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        expect(highline_cli).to receive(:ask_options).and_return(template1)
+        expect(highline_wrapper).to receive(:ask_options).and_return(template1)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the answer template if the user says yes' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:ask_options).and_return(template1)
+        allow(highline_wrapper).to receive(:ask_options).and_return(template1)
         expect(subject.send(:template_name_to_apply)).to eq(template1)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:mr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:ask_options).and_return('None')
+        allow(highline_wrapper).to receive(:ask_options).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -171,25 +171,25 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#mr_id' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:ask).and_return(Faker::Number.number)
+      expect(highline_wrapper).to receive(:ask).and_return(Faker::Number.number)
       subject.send(:mr_id)
     end
 
     it 'should equal an integer' do
       pr_id = Faker::Number.number
-      expect(highline_cli).to receive(:ask).and_return(pr_id)
+      expect(highline_wrapper).to receive(:ask).and_return(pr_id)
       expect(subject.send(:mr_id)).to eq(pr_id)
     end
   end
 
   describe '#squash_merge_request' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:ask_yes_no).and_return(true)
+      expect(highline_wrapper).to receive(:ask_yes_no).and_return(true)
       subject.send(:squash_merge_request)
     end
 
     it 'should be a boolean' do
-      expect(highline_cli).to receive(:ask_yes_no).and_return(false)
+      expect(highline_wrapper).to receive(:ask_yes_no).and_return(false)
       expect([true, false]).to include(subject.send(:squash_merge_request))
     end
   end
@@ -201,12 +201,12 @@ describe GitHelper::GitLabMergeRequest do
 
     context 'when the existing project has no setting' do
       it 'should ask the CLI for the code request ID' do
-        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
+        expect(highline_wrapper).to receive(:ask_yes_no).and_return(true)
         subject.send(:remove_source_branch)
       end
 
       it 'should be a boolean' do
-        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
+        allow(highline_wrapper).to receive(:ask_yes_no).and_return(false)
         expect([true, false]).to include(subject.send(:remove_source_branch))
       end
     end
@@ -223,7 +223,7 @@ describe GitHelper::GitLabMergeRequest do
 
     it 'should return the existing projects setting if it exists' do
       allow(subject).to receive(:existing_project).and_return(double(remove_source_branch_after_merge: false))
-      allow(highline_cli).to receive(:ask_yes_no).and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).and_return(true)
       expect(subject.send(:remove_source_branch)).to eq(true)
     end
   end
@@ -237,7 +237,7 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#existing_mr' do
     it 'should call the gitlab client' do
-      allow(highline_cli).to receive(:ask).and_return(Faker::Number.number)
+      allow(highline_wrapper).to receive(:ask).and_return(Faker::Number.number)
       expect(gitlab_client_client).to receive(:merge_request).and_return(:merge_request)
       subject.send(:existing_mr)
     end

data/spec/git_helper/new_branch_spec.rb

@@ -6,13 +6,13 @@ require 'git_helper'
 describe GitHelper::NewBranch do
   let(:new_branch_name) { 'new-branch-name' }
   let(:local_code) { double(:local_code, new_branch: :commit) }
-  let(:cli) { double(:highline_cli, ask: new_branch_name) }
+  let(:highline) { double(:highline_wrapper, ask: new_branch_name) }
 
   subject { GitHelper::NewBranch.new }
 
   before do
     allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    allow(GitHelper::HighlineCli).to receive(:new).and_return(cli)
+    allow(HighlineWrapper).to receive(:new).and_return(highline)
     allow(subject).to receive(:puts)
   end
 
@@ -27,20 +27,20 @@ describe GitHelper::NewBranch do
   end
 
   context 'when no branch name is passed in' do
-    it 'should call the highline cli' do
-      expect(GitHelper::HighlineCli).to receive(:new).and_return(cli)
+    it 'should call the highline client' do
+      expect(HighlineWrapper).to receive(:new).and_return(highline)
       subject.execute
     end
 
-    it 'should ask the highline cli what the new branch name should be' do
-      expect(cli).to receive(:ask)
+    it 'should ask the highline client what the new branch name should be' do
+      expect(highline).to receive(:ask)
       subject.execute
     end
   end
 
   context 'when there is a branch name passed in' do
-    it 'should not create a highline cli' do
-      expect(GitHelper::HighlineCli).not_to receive(:new)
+    it 'should not create a highline_wrapper client' do
+      expect(HighlineWrapper).not_to receive(:new)
       subject.execute(new_branch_name)
     end
   end

data/spec/git_helper/pull_request_spec.rb

@@ -5,7 +5,7 @@ require 'git_helper'
 
 describe GitHelper::GitHubPullRequest do
   let(:local_code) { double(:local_code, read_template: Faker::Lorem.word) }
-  let(:highline_cli) { double(:highline_cli) }
+  let(:highline_wrapper) { double(:highline_wrapper) }
   let(:octokit_client_client) { double(:octokit_client_client, project: :project, merge_request: :merge_request, create_merge_request: :created) }
   let(:octokit_client) { double(:octokit_client, client: octokit_client_client) }
 
@@ -14,7 +14,7 @@ describe GitHelper::GitHubPullRequest do
       local_project: Faker::Lorem.word,
       local_branch: Faker::Lorem.word,
       local_code: local_code,
-      cli: highline_cli
+      highline: highline_wrapper
     }
   end
 
@@ -103,19 +103,19 @@ describe GitHelper::GitHubPullRequest do
 
       it 'should call the CLI to ask about a single template' do
         allow(subject).to receive(:pr_template_options).and_return([template])
-        expect(highline_cli).to receive(:ask_yes_no).and_return(true)
+        expect(highline_wrapper).to receive(:ask_yes_no).and_return(true)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the single template if the user says yes' do
         allow(subject).to receive(:pr_template_options).and_return([template])
-        allow(highline_cli).to receive(:ask_yes_no).and_return(true)
+        allow(highline_wrapper).to receive(:ask_yes_no).and_return(true)
         expect(subject.send(:template_name_to_apply)).to eq(template)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:pr_template_options).and_return([template])
-        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
+        allow(highline_wrapper).to receive(:ask_yes_no).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -126,19 +126,19 @@ describe GitHelper::GitHubPullRequest do
 
       it 'should call the CLI to ask which of multiple templates to apply' do
         allow(subject).to receive(:pr_template_options).and_return([template1, template2])
-        expect(highline_cli).to receive(:ask_options).and_return(template1)
+        expect(highline_wrapper).to receive(:ask_options).and_return(template1)
         subject.send(:template_name_to_apply)
       end
 
       it 'should return the answer template if the user says yes' do
         allow(subject).to receive(:pr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:ask_options).and_return(template1)
+        allow(highline_wrapper).to receive(:ask_options).and_return(template1)
         expect(subject.send(:template_name_to_apply)).to eq(template1)
       end
 
       it 'should return nil if the user says no' do
         allow(subject).to receive(:pr_template_options).and_return([template1, template2])
-        allow(highline_cli).to receive(:ask_options).and_return('None')
+        allow(highline_wrapper).to receive(:ask_options).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -153,13 +153,13 @@ describe GitHelper::GitHubPullRequest do
 
   describe '#pr_id' do
     it 'should ask the CLI for the code request ID' do
-      expect(highline_cli).to receive(:ask).and_return(Faker::Number.number)
+      expect(highline_wrapper).to receive(:ask).and_return(Faker::Number.number)
       subject.send(:pr_id)
     end
 
     it 'should equal an integer' do
       pr_id = Faker::Number.number
-      expect(highline_cli).to receive(:ask).and_return(pr_id)
+      expect(highline_wrapper).to receive(:ask).and_return(pr_id)
       expect(subject.send(:pr_id)).to eq(pr_id)
     end
   end
@@ -169,16 +169,16 @@ describe GitHelper::GitHubPullRequest do
 
     before do
       allow(subject).to receive(:existing_project).and_return(project)
-      allow(highline_cli).to receive(:ask_options)
+      allow(highline_wrapper).to receive(:ask_options)
     end
 
     it 'should ask the CLI for the merge_method' do
-      expect(highline_cli).to receive(:ask_options).and_return('merge')
+      expect(highline_wrapper).to receive(:ask_options).and_return('merge')
       subject.send(:merge_method)
     end
 
     it 'should be a string' do
-      allow(highline_cli).to receive(:ask_options).and_return('merge')
+      allow(highline_wrapper).to receive(:ask_options).and_return('merge')
       expect(subject.send(:merge_method)).to be_a(String)
     end
 
@@ -186,7 +186,7 @@ describe GitHelper::GitHubPullRequest do
       let(:project) { double(:project, allow_merge_commit: true, allow_squash_merge: false, allow_rebase_merge: false) }
 
       it 'should not ask the CLI anything' do
-        expect(highline_cli).not_to receive(:merge_method)
+        expect(highline_wrapper).not_to receive(:merge_method)
         subject.send(:merge_method)
       end
     end
@@ -241,7 +241,7 @@ describe GitHelper::GitHubPullRequest do
 
   describe '#existing_pr' do
     it 'should call the octokit client' do
-      allow(highline_cli).to receive(:ask).and_return(Faker::Number.number)
+      allow(highline_wrapper).to receive(:ask).and_return(Faker::Number.number)
       expect(octokit_client_client).to receive(:pull_request).and_return(:pull_request)
       subject.send(:existing_pr)
     end