git_helper 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02607381872b87e3390ddfe00db3a66da5b72698943abfc7af1fb556b69bc5fd'
-  data.tar.gz: 85ef4555a8f0be75248dc20895a62d3e7660276154c4cee638faceb7f0ff701a
+  metadata.gz: e7e2fb7b1199964740a0d73091815fb81469b492a3de04adc16aea30ba794e79
+  data.tar.gz: 80abd21099775a4829c1e72accb74f7f91ae6e9f5e536cfd0468879065de06ff
 SHA512:
-  metadata.gz: 354f303f75c86aefa64b8af4378e0006aab40b322ad5fa5b3f18018e45625d5f0e2d57c5a2f6ff8eb5e38d60863f995ac55fdecfe995d922dfff0d5dc3db4a52
-  data.tar.gz: 2a946bf13c0b36ebe71ca352623aeb6c509a3a3ee2c565ed1e433380713afacd08fddfd69626ca22a88225a65f0f7f5d093f5bf25b58c3cbc2121ebf70d9529b
+  metadata.gz: 5fdabeaa00c72c8f58e00bce3f054949ad1061dbbb132661d06caf788ca827b486d44c20d57213582c2eb7b9c8db28ac88636b5e4562366010c33cc6056c526c
+  data.tar.gz: '08eee4e6e95562f500c93df42f72a713b43ece4d39c96013d5313612f13bf33dc4b7dcd5ca6de243d3bba360af8d8bc183d6c5f2a8600d9692de2afa3bf7c675'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    git_helper (3.3.1)
+    git_helper (3.3.2)
       gitlab (~> 4.16)
       gli (~> 2.13)
-      highline (~> 2.0)
+      highline_wrapper (~> 0.1.0)
       octokit (~> 4.18)
 
 GEM
@@ -28,7 +28,7 @@ GEM
     gitlab (4.17.0)
       httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    gli (2.19.2)
+    gli (2.20.0)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -44,6 +44,8 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     highline (2.0.3)
+    highline_wrapper (0.1.0)
+      highline (~> 2.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -56,7 +58,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
@@ -123,9 +125,10 @@ DEPENDENCIES
   faker (~> 2.15)
   git_helper!
   guard-rspec (~> 4.3)
+  pry (~> 0.13)
   rake (~> 13.0)
   rspec (~> 3.9)
-  rubocop
+  rubocop (~> 1.10)
 
 BUNDLED WITH
    2.2.9

data/lib/git_helper.rb

@@ -2,7 +2,7 @@
 
 require 'yaml'
 require 'gitlab'
-require 'highline'
+require 'highline_wrapper'
 require 'octokit'
 
 files = "#{File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), 'git_helper'))}/**/*.rb"

data/lib/git_helper/change_remote.rb

@@ -24,7 +24,7 @@ module GitHelper
     private def process_dir(current_dir, original_dir)
       Dir.chdir(current_dir)
 
-      if File.exist?('.git') && cli.ask_yes_no(
+      if File.exist?('.git') && highline.ask_yes_no(
         "Found git directory: #{current_dir}. Do you wish to proceed in updating #{current_dir}'s remote URLs? (y/n)"
       )
         process_git_repository
@@ -69,8 +69,8 @@ module GitHelper
       @local_code ||= GitHelper::LocalCode.new
     end
 
-    private def cli
-      @cli ||= GitHelper::HighlineCli.new
+    private def highline
+      @highline ||= HighlineWrapper.new
     end
   end
 end

data/lib/git_helper/code_request.rb

@@ -29,7 +29,7 @@ module GitHelper
 
     # rubocop:disable Metrics/MethodLength
     private def ask_for_clarification
-      resp = cli.ask(
+      resp = highline.ask(
         'Found git remotes for both GitHub and GitLab. Would you like to proceed ' \
         'with GitLab or GitHub? (github/gitlab)'
       ).downcase
@@ -58,7 +58,7 @@ module GitHelper
         local_project: local_project,
         local_branch: local_branch,
         local_code: local_code,
-        cli: cli
+        highline: highline
       }
     end
 
@@ -72,10 +72,10 @@ module GitHelper
 
     private def base_branch
       @base_branch ||=
-        if cli.ask_yes_no("Is '#{default_branch}' the correct base branch for your new code request? (y/n)")
+        if highline.ask_yes_no("Is '#{default_branch}' the correct base branch for your new code request? (y/n)")
           default_branch
         else
-          cli.ask('Base branch?')
+          highline.ask('Base branch?')
         end
     end
 
@@ -89,17 +89,17 @@ module GitHelper
 
     private def new_code_request_title
       @new_code_request_title ||=
-        if autogenerated_title && cli.ask_yes_no(
+        if autogenerated_title && highline.ask_yes_no(
           "Accept the autogenerated code request title '#{autogenerated_title}'? (y/n)"
         )
           autogenerated_title
         else
-          cli.ask('Title?')
+          highline.ask('Title?')
         end
     end
 
-    private def cli
-      @cli ||= GitHelper::HighlineCli.new
+    private def highline
+      @highline ||= HighlineWrapper.new
     end
 
     private def local_code

data/lib/git_helper/merge_request.rb

@@ -2,13 +2,13 @@
 
 module GitHelper
   class GitLabMergeRequest
-    attr_accessor :local_project, :local_branch, :local_code, :cli, :base_branch, :new_mr_title
+    attr_accessor :local_project, :local_branch, :local_code, :highline, :base_branch, :new_mr_title
 
     def initialize(options)
       @local_project = options[:local_project]
       @local_branch = options[:local_branch]
       @local_code = options[:local_code]
-      @cli = options[:cli]
+      @highline = options[:highline]
     end
 
     # rubocop:disable Metrics/MethodLength
@@ -97,12 +97,12 @@ module GitHelper
     # rubocop:disable Metrics/MethodLength
     private def determine_template
       if mr_template_options.count == 1
-        apply_single_template = cli.ask_yes_no(
+        apply_single_template = highline.ask_yes_no(
           "Apply the merge request template from #{mr_template_options.first}? (y/n)"
         )
         @template_name_to_apply = mr_template_options.first if apply_single_template
       else
-        response = cli.ask_options(
+        response = highline.ask_options(
           'Which merge request template should be applied?', mr_template_options << 'None'
         )
         @template_name_to_apply = response unless response == 'None'
@@ -121,16 +121,16 @@ module GitHelper
     end
 
     private def mr_id
-      @mr_id ||= cli.ask('Merge Request ID?')
+      @mr_id ||= highline.ask('Merge Request ID?')
     end
 
     private def squash_merge_request
-      @squash_merge_request ||= cli.ask_yes_no('Squash merge request? (y/n)')
+      @squash_merge_request ||= highline.ask_yes_no('Squash merge request? (y/n)')
     end
 
     private def remove_source_branch
       @remove_source_branch ||=
-        existing_project.remove_source_branch_after_merge || cli.ask_yes_no(
+        existing_project.remove_source_branch_after_merge || highline.ask_yes_no(
           'Remove source branch after merging? (y/n)'
         )
     end

data/lib/git_helper/new_branch.rb

@@ -3,7 +3,7 @@
 module GitHelper
   class NewBranch
     def execute(new_branch_name = nil)
-      branch_name = new_branch_name || GitHelper::HighlineCli.new.ask('New branch name?')
+      branch_name = new_branch_name || HighlineWrapper.new.ask('New branch name?')
       puts "Attempting to create a new branch: #{branch_name}"
       GitHelper::LocalCode.new.new_branch(branch_name)
     end

data/lib/git_helper/pull_request.rb

@@ -2,13 +2,13 @@
 
 module GitHelper
   class GitHubPullRequest
-    attr_accessor :local_repo, :local_branch, :local_code, :cli, :base_branch, :new_pr_title
+    attr_accessor :local_repo, :local_branch, :local_code, :highline, :base_branch, :new_pr_title
 
     def initialize(options)
       @local_repo = options[:local_project]
       @local_branch = options[:local_branch]
       @local_code = options[:local_code]
-      @cli = options[:cli]
+      @highline = options[:highline]
     end
 
     # rubocop:disable Metrics/MethodLength
@@ -102,12 +102,12 @@ module GitHelper
     # rubocop:disable Metrics/MethodLength
     private def determine_template
       if pr_template_options.count == 1
-        apply_single_template = cli.ask_yes_no(
+        apply_single_template = highline.ask_yes_no(
           "Apply the pull request template from #{pr_template_options.first}? (y/n)"
         )
         @template_name_to_apply = pr_template_options.first if apply_single_template
       else
-        response = cli.ask_options(
+        response = highline.ask_options(
           'Which pull request template should be applied?', pr_template_options << 'None'
         )
         @template_name_to_apply = response unless response == 'None'
@@ -126,7 +126,7 @@ module GitHelper
     end
 
     private def pr_id
-      @pr_id ||= cli.ask('Pull Request ID?')
+      @pr_id ||= highline.ask('Pull Request ID?')
     end
 
     private def merge_method
@@ -134,7 +134,7 @@ module GitHelper
         if merge_options.length == 1
           merge_options.first
         else
-          cli.ask_options('Merge method?', merge_options)
+          highline.ask_options('Merge method?', merge_options)
         end
     end
 

data/lib/git_helper/setup.rb

@@ -110,7 +110,7 @@ module GitHelper
     end
 
     private def highline
-      @highline ||= GitHelper::HighlineCli.new
+      @highline ||= HighlineWrapper.new
     end
   end
 end

data/lib/git_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHelper
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 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

data/spec/git_helper/setup_spec.rb

@@ -4,11 +4,10 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::Setup do
-  let(:response) { double(:response, readline: true, to_s: Faker::Lorem.sentence) }
-  let(:highline_cli) { double(:highline_cli, ask: response, ask_yes_no: true) }
+  let(:highline_wrapper) { double(:highline_wrapper, ask: Faker::Lorem.word, ask_yes_no: true) }
 
   before do
-    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
 
@@ -17,9 +16,19 @@ describe GitHelper::Setup do
   end
 
   describe '#execute' do
-    it 'should ask a question if the config file exists' do
+    it 'only asks the user one question if the config file does not exist' do
+      allow(subject).to receive(:config_file_exists?).and_return(false)
       allow(File).to receive(:exists?).and_return(true)
-      expect(highline_cli).to receive(:ask_yes_no).and_return(true)
+      expect(highline_wrapper).to receive(:ask_yes_no).and_return(true).exactly(:once)
+      allow(subject).to receive(:create_or_update_config_file).and_return(true)
+      allow(subject).to receive(:create_or_update_plugin_files)
+      subject.execute
+    end
+
+    it 'should ask two questions if the config file exists' do
+      allow(subject).to receive(:config_file_exists?).and_return(true)
+      allow(File).to receive(:exists?).and_return(true)
+      expect(highline_wrapper).to receive(:ask_yes_no).and_return(true).at_least(:twice)
       allow(subject).to receive(:create_or_update_config_file).and_return(true)
       allow(subject).to receive(:create_or_update_plugin_files)
       subject.execute
@@ -27,7 +36,7 @@ describe GitHelper::Setup do
 
     it 'should call to create or update the config file' do
       allow(File).to receive(:exists?).and_return(true)
-      allow(highline_cli).to receive(:ask_yes_no).and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).and_return(true)
       expect(subject).to receive(:create_or_update_config_file).and_return(true)
       allow(subject).to receive(:create_or_update_plugin_files)
       subject.execute
@@ -36,7 +45,7 @@ describe GitHelper::Setup do
     it 'should skip if the user opts not to continue' do
       allow(File).to receive(:exists?).and_return(true)
       allow(subject).to receive(:config_file_exists?).and_return(true)
-      allow(highline_cli).to receive(:ask_yes_no).and_return(false)
+      allow(highline_wrapper).to receive(:ask_yes_no).and_return(false)
       expect(subject).not_to receive(:create_or_update_config_file)
       expect(subject).not_to receive(:create_or_update_plugin_files)
       subject.execute
@@ -71,43 +80,43 @@ describe GitHelper::Setup do
 
   describe '#ask_question' do
     it 'should use highline to ask a question' do
-      expect(highline_cli).to receive(:ask).and_return(Faker::Lorem.word)
+      expect(highline_wrapper).to receive(:ask).and_return(Faker::Lorem.word)
       subject.send(:ask_question, Faker::Lorem.sentence)
     end
 
     it 'should recurse if the highline client gets an empty string' 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(:ask_question).at_least(:twice).and_call_original
       subject.send(:ask_question, Faker::Lorem.sentence)
     end
 
     it 'should return the answer if it is given' do
       answer = Faker::Lorem.sentence
-      allow(highline_cli).to receive(:ask).and_return(answer)
+      allow(highline_wrapper).to receive(:ask).and_return(answer)
       expect(subject.send(:ask_question, Faker::Lorem.sentence)).to be(answer)
     end
   end
 
   describe '#generate_file_contents' do
     it 'should ask two yes/no questions' do
-      expect(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(false)
+      expect(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(false)
       subject.send(:generate_file_contents)
     end
 
     it 'should ask two additional questions for each time the user says yes' do
-      allow(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(true, false)
+      allow(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(true, false)
       expect(subject).to receive(:ask_question).exactly(2).times.and_return(Faker::Lorem.word)
       subject.send(:generate_file_contents)
     end
 
     it 'should ask four additional questions for each time the user says yes' do
-      allow(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(true)
       expect(subject).to receive(:ask_question).exactly(4).times.and_return(Faker::Lorem.word)
       subject.send(:generate_file_contents)
     end
 
     it 'should return a string no matter what' do
-      allow(highline_cli).to receive(:ask_yes_no).exactly(2).times.and_return(true)
+      allow(highline_wrapper).to receive(:ask_yes_no).exactly(2).times.and_return(true)
       allow(subject).to receive(:ask_question).exactly(4).times.and_return(Faker::Lorem.word)
       expect(subject.send(:generate_file_contents)).to be_a(String)
     end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'faker'
+require 'pry'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: highline_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +154,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 description: A set of GitHub and GitLab workflow scripts to provide a smoother development
   process for your git projects.
 email:
@@ -174,7 +188,6 @@ files:
 - lib/git_helper/forget_local_commits.rb
 - lib/git_helper/git_config_reader.rb
 - lib/git_helper/gitlab_client.rb
-- lib/git_helper/highline_cli.rb
 - lib/git_helper/local_code.rb
 - lib/git_helper/merge_request.rb
 - lib/git_helper/new_branch.rb
@@ -191,7 +204,6 @@ files:
 - spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
 - spec/git_helper/gitlab_client_spec.rb
-- spec/git_helper/highline_cli_spec.rb
 - spec/git_helper/local_code_spec.rb
 - spec/git_helper/merge_request_spec.rb
 - spec/git_helper/new_branch_spec.rb
@@ -232,7 +244,6 @@ test_files:
 - spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
 - spec/git_helper/gitlab_client_spec.rb
-- spec/git_helper/highline_cli_spec.rb
 - spec/git_helper/local_code_spec.rb
 - spec/git_helper/merge_request_spec.rb
 - spec/git_helper/new_branch_spec.rb

data/lib/git_helper/highline_cli.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module GitHelper
-  class HighlineCli
-    def ask(prompt)
-      highline_client.ask(prompt) do |conf|
-        conf.readline = true
-      end.to_s
-    end
-
-    def ask_yes_no(prompt)
-      answer = highline_client.ask(prompt) do |conf|
-        conf.readline = true
-      end.to_s
-
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def ask_options(prompt, choices)
-      choices_as_string_options = ''.dup
-      choices.each { |choice| choices_as_string_options << "#{choices.index(choice) + 1}. #{choice}\n" }
-      compiled_prompt = "#{prompt}\n#{choices_as_string_options.strip}"
-
-      index = highline_client.ask(compiled_prompt) do |conf|
-        conf.readline = true
-      end.to_i - 1
-
-      choices[index]
-    end
-
-    private def highline_client
-      @highline_client ||= HighLine.new
-    end
-  end
-end

data/spec/git_helper/highline_cli_spec.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'git_helper'
-
-describe GitHelper::HighlineCli do
-  let(:response) { double(:response, readline: true, to_i: 3) }
-  let(:highline_client) { double(:highline_cli, ask: response) }
-
-  subject { GitHelper::HighlineCli.new }
-
-  before do
-    allow(HighLine).to receive(:new).and_return(highline_client)
-  end
-
-  describe '#ask' do
-    it 'should ask the highline client ask' do
-      expect(highline_client).to receive(:ask)
-      subject.ask(Faker::Lorem.sentence)
-    end
-
-    it 'should return a string' do
-      expect(subject.ask(Faker::Lorem.sentence)).to be_a(String)
-    end
-  end
-
-  describe '#ask_yes_no' do
-    it 'should ask the highline client ask' do
-      expect(highline_client).to receive(:ask)
-      subject.ask_yes_no(Faker::Lorem.sentence)
-    end
-
-    it 'should return a boolean' do
-      expect(subject.ask_yes_no(Faker::Lorem.sentence)).to be_falsey
-    end
-
-    it 'should return true if we say yes' do
-      allow(response).to receive(:to_s).and_return('y')
-      expect(subject.ask_yes_no(Faker::Lorem.sentence)).to be_truthy
-    end
-  end
-
-  describe '#ask_options' do
-    it 'should ask the highline client ask' do
-      expect(highline_client).to receive(:ask)
-      subject.ask_options(Faker::Lorem.sentence, %w[one two three])
-    end
-
-    it 'should return a string from the options' do
-      expect(subject.ask_options(Faker::Lorem.sentence, %w[one two three])).to be_a(String)
-    end
-  end
-end