git_helper 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b64f4dd497458fd54078d7b1db018ba01273e432e6c0923d1cedad7613631b3
-  data.tar.gz: a6aace888903ea6d61846e8910b24c01e6c2b68a3370da904e89e2ca463118cb
+  metadata.gz: b3f63c9e4283a7e005a3f6ca7f29e7721e474ec06ebebecd1dcda8f63f841450
+  data.tar.gz: 2ec89ecd8513c12f9434aa9c03f7568522b84d3c282e62e09670aa15a63fef95
 SHA512:
-  metadata.gz: 6f696668e2a8e9180d4df1018c36b94cd8bdb288b73c31181dc6a3a9c92150849505a5363c02e862a13e8f239e51ca177c7bd678576d940e9ecd621e154e2de1
-  data.tar.gz: 91c19361c88d9f8b3bc8840f660ea23b14cbf56fe878317f57ab5964a124d5b6150bc97c082a1fcd343a8a5e99f4f65efbcb6858c75e19dddd6a7ee59f67dc41
+  metadata.gz: bce1b9c25dc1ad30c8434a0e252bdc95f8864fcd29e2c02e712dffb4fe63aaa063fa6a72d9cc27a91c06784758fd6499f9aaa21f62ea57d7b7b81522558112a4
+  data.tar.gz: 572c484112dbdcfbb2da9ad8c25add8fd56baa3c652931715a46d9355780e3535e226afc3a83d2f57a6815f78df6fba7c8f47e97990801608bb9653ef3c961c2

data/Gemfile.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: .
+  specs:
+    git_helper (3.2.0)
+      gitlab (~> 4.16)
+      gli (~> 2.13)
+      highline (~> 2.0)
+      octokit (~> 4.18)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    faker (2.15.1)
+      i18n (>= 1.6, < 2)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.0)
+    ffi (1.14.2)
+    formatador (0.2.5)
+    gitlab (4.17.0)
+      httparty (~> 0.18)
+      terminal-table (~> 1.5, >= 1.5.1)
+    gli (2.19.2)
+    guard (2.16.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    highline (2.0.3)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.8.7)
+      concurrent-ruby (~> 1.0)
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.1104)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (4.20.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    ruby2_keywords (0.0.2)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    shellany (0.0.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (1.0.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  x86_64-darwin-19
+
+DEPENDENCIES
+  bundler (~> 2.2)
+  faker (~> 2.15)
+  git_helper!
+  guard-rspec (~> 4.3)
+  rake (~> 13.0)
+  rspec (~> 3.9)
+
+BUNDLED WITH
+   2.2.4

data/lib/git_helper/change_remote.rb

@@ -23,7 +23,7 @@ module GitHelper
       Dir.chdir(current_dir)
 
       if File.exist?('.git')
-        process_git_repository if cli.process_directory_remotes?(current_dir)
+        process_git_repository if cli.ask_yes_no("Found git directory: #{current_dir}. Do you wish to proceed in updating #{current_dir}'s remote URLs? (y/n)")
       end
 
       Dir.chdir(original_dir)

data/lib/git_helper/code_request.rb

@@ -24,7 +24,7 @@ module GitHelper
     end
 
     private def ask_for_clarification
-      resp = cli.conflicting_remote_clarification
+      resp = cli.ask('Found git remotes for both GitHub and GitLab. Would you like to proceed with GitLab or GitHub? (github/gitlab)').downcase
       if resp.include?('hub')
         github_pull_request
       elsif resp.include?('lab')
@@ -61,10 +61,10 @@ module GitHelper
     end
 
     private def base_branch
-      @base_branch ||= if cli.base_branch_default?(default_branch)
+      @base_branch ||= if cli.ask_yes_no("Is '#{default_branch}' the correct base branch for your new code request? (y/n)")
                          default_branch
                        else
-                         cli.base_branch
+                         cli.ask('Base branch?')
                        end
     end
 
@@ -77,10 +77,11 @@ module GitHelper
     end
 
     private def new_code_request_title
-      @new_code_request_title ||= if cli.accept_autogenerated_title?(autogenerated_title)
+      @new_code_request_title ||= if autogenerated_title &&
+                                     cli.ask_yes_no("Accept the autogenerated code request title '#{autogenerated_title}'? (y/n)")
                                     autogenerated_title
                                   else
-                                    cli.title
+                                    cli.ask('Title?')
                                   end
     end
 

data/lib/git_helper/highline_cli.rb

@@ -1,85 +1,29 @@
 module GitHelper
   class HighlineCli
-    def new_branch_name
-      ask('New branch name?')
-    end
-
-    def process_directory_remotes?(directory)
-      answer = ask("Found git directory: #{directory}. Do you wish to proceed in updating #{directory}'s remote URLs? (y/n)")
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def conflicting_remote_clarification
-      ask('Found git remotes for both GitHub and GitLab. Would you like to proceed with GitLab or GitHub? (github/gitlab)').downcase
-    end
-
-    def title
-      ask('Title?')
-    end
-
-    def base_branch
-      ask('Base branch?')
-    end
-
-    def code_request_id(request_type)
-      ask("#{request_type} Request ID?")
-    end
-
-    def accept_autogenerated_title?(autogenerated_title)
-      return false unless autogenerated_title
-      answer = ask("Accept the autogenerated code request title '#{autogenerated_title}'? (y/n)")
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def base_branch_default?(default_branch)
-      answer = ask("Is '#{default_branch}' the correct base branch for your new code request? (y/n)")
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def squash_merge_request?
-      answer = ask('Squash merge request? (y/n)')
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def remove_source_branch?
-      answer = ask('Remove source branch after merging? (y/n)')
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def merge_method(merge_options)
-      index = ask_options("Merge method?", merge_options)
-      merge_options[index]
-    end
-
-    def apply_template?(template_file_name, request_type)
-      answer = ask("Apply the #{request_type} request template from #{template_file_name}? (y/n)")
-      answer.empty? ? true : !!(answer =~ /^y/i)
-    end
-
-    def template_to_apply(template_options, request_type)
-      complete_options = template_options << 'None'
-      index = ask_options("Which #{request_type} request template should be applied?", complete_options)
-      complete_options[index]
+    def ask(prompt)
+      highline_client.ask(prompt) do |conf|
+        conf.readline = true
+      end.to_s
     end
 
-    #######################
-    ### GENERAL METHODS ###
-    #######################
-
-    private def ask(prompt)
-      highline_client.ask(prompt) do |conf|
+    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
 
-    private def ask_options(prompt, choices)
+    def ask_options(prompt, choices)
       choices_as_string_options = ''
       choices.each { |choice| choices_as_string_options << "#{choices.index(choice) + 1}. #{choice}\n" }
       compiled_prompt = "#{prompt}\n#{choices_as_string_options.strip}"
 
-      highline_client.ask(compiled_prompt) do |conf|
+      index = highline_client.ask(compiled_prompt) do |conf|
         conf.readline = true
       end.to_i - 1
+
+      choices[index]
     end
 
     private def highline_client

data/lib/git_helper/merge_request.rb

@@ -84,10 +84,10 @@ module GitHelper
 
       unless mr_template_options.empty?
         if mr_template_options.count == 1
-          apply_single_template = cli.apply_template?(mr_template_options.first, 'merge')
+          apply_single_template = cli.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.template_to_apply(mr_template_options, 'merge')
+          response = cli.ask_options("Which merge request template should be applied?", mr_template_options << 'None')
           @template_name_to_apply = response unless response == 'None'
         end
       end
@@ -104,15 +104,15 @@ module GitHelper
     end
 
     private def mr_id
-      @mr_id ||= cli.code_request_id('Merge')
+      @mr_id ||= cli.ask('Merge Request ID?')
     end
 
     private def squash_merge_request
-      @squash_merge_request ||= cli.squash_merge_request?
+      @squash_merge_request ||= cli.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.remove_source_branch?
+      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.ask_yes_no('Remove source branch after merging? (y/n)')
     end
 
     private def existing_project

data/lib/git_helper/new_branch.rb

@@ -1,7 +1,7 @@
 module GitHelper
   class NewBranch
     def execute(new_branch_name = nil)
-      branch_name = new_branch_name || GitHelper::HighlineCli.new.new_branch_name
+      branch_name = new_branch_name || GitHelper::HighlineCli.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

@@ -81,10 +81,10 @@ module GitHelper
 
       unless pr_template_options.empty?
         if pr_template_options.count == 1
-          apply_single_template = cli.apply_template?(pr_template_options.first, 'pull')
+          apply_single_template = cli.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.template_to_apply(pr_template_options, 'pull')
+          response = cli.ask_options("Which pull request template should be applied?", pr_template_options << 'None')
           @template_name_to_apply = response unless response == 'None'
         end
       end
@@ -101,11 +101,11 @@ module GitHelper
     end
 
     private def pr_id
-      @pr_id ||= cli.code_request_id('Pull')
+      @pr_id ||= cli.ask('Pull Request ID?')
     end
 
     private def merge_method
-      @merge_method ||= merge_options.length == 1 ? merge_options.first : cli.merge_method(merge_options)
+      @merge_method ||= merge_options.length == 1 ? merge_options.first : cli.ask_options('Merge method?', merge_options)
     end
 
     private def merge_options

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -4,7 +4,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, process_directory_remotes?: true) }
+  let(:cli) { double(:highline_cli, 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 ] }
@@ -73,7 +73,7 @@ describe GitHelper::ChangeRemote do
     end
 
     context 'when the user says not to process the directory' do
-      let(:cli) { double(:highline_cli, process_directory_remotes?: false) }
+      let(:cli) { double(:highline_cli, ask_yes_no: false) }
 
       it 'should not call to process the directory' do
         expect(subject).not_to receive(:process_git_repository)

data/spec/git_helper/code_request_spec.rb

@@ -101,19 +101,19 @@ describe GitHelper::CodeRequest do
 
   describe '#ask_for_clarification' do
     it 'should ask the CLI' do
-      expect(highline_cli).to receive(:conflicting_remote_clarification).and_return('github')
+      expect(highline_cli).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(:conflicting_remote_clarification).and_return('github')
+        allow(highline_cli).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(:conflicting_remote_clarification).and_return('Github')
+        allow(highline_cli).to receive(:ask).and_return('Github')
         expect(subject).to receive(:github_pull_request)
         subject.send(:ask_for_clarification)
       end
@@ -121,13 +121,13 @@ describe GitHelper::CodeRequest do
 
     context 'when response is gitlab' do
       it 'should return gitlab_merge_request' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return('gitlab')
+        allow(highline_cli).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(:conflicting_remote_clarification).and_return('Gitlab')
+        allow(highline_cli).to receive(:ask).and_return('Gitlab')
         expect(subject).to receive(:gitlab_merge_request)
         subject.send(:ask_for_clarification)
       end
@@ -135,7 +135,7 @@ describe GitHelper::CodeRequest do
 
     context 'when response is neither' do
       it 'should raise an error' do
-        allow(highline_cli).to receive(:conflicting_remote_clarification).and_return(Faker::Lorem.word)
+        allow(highline_cli).to receive(:ask).and_return(Faker::Lorem.word)
         expect(subject).to receive(:exit)
         subject.send(:ask_for_clarification)
       end
@@ -173,23 +173,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(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_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)
       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(:base_branch_default?).at_least(:once)
-      allow(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_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)
       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(:base_branch_default?).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:base_branch).at_least(:once).and_return(base_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)
         subject.send(:base_branch)
       end
     end
@@ -197,7 +197,7 @@ 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(:base_branch_default?).at_least(:once).and_return(true)
+        expect(highline_cli).to receive(:ask_yes_no).at_least(:once).and_return(true)
         expect(highline_cli).not_to receive(:base_branch)
         subject.send(:base_branch)
       end
@@ -215,32 +215,32 @@ 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(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return(title)
+      allow(highline_cli).to receive(:ask_yes_no).at_least(:once)
+      allow(highline_cli).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)
-      expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once)
-      allow(highline_cli).to receive(:title).at_least(:once).and_return(title)
+      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)
       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)
-        expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once).and_return(false)
-        expect(highline_cli).to receive(:title).at_least(:once).and_return(title)
+        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)
         subject.send(:new_code_request_title)
       end
     end
 
     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)
-        expect(highline_cli).to receive(:accept_autogenerated_title?).at_least(:once).and_return(true)
-        expect(highline_cli).not_to receive(:title)
+        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)
         subject.send(:new_code_request_title)
       end
     end

data/spec/git_helper/highline_cli_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'git_helper'
 
 describe GitHelper::HighlineCli do
-  let(:response) { double(:response, readline: true, to_i: 5) }
+  let(:response) { double(:response, readline: true, to_i: 3) }
   let(:highline_client) { double(:highline_cli, ask: response) }
 
   subject { GitHelper::HighlineCli.new }
@@ -11,207 +11,41 @@ describe GitHelper::HighlineCli do
     allow(HighLine).to receive(:new).and_return(highline_client)
   end
 
-  describe '#new_branch_name' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('New branch name?')
-      subject.new_branch_name
-    end
-
-    it 'should come out a string' do
-      expect(subject.new_branch_name).to be_a(String)
-    end
-  end
-
-  describe '#process_directory_remotes' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).and_return('y')
-      subject.process_directory_remotes?(Faker::Lorem.word)
-    end
-
-    it 'should be a boolean at the end' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.process_directory_remotes?(Faker::Lorem.word))
-    end
-
-    it 'should come out as a true boolean if somebody responds y' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect(subject.process_directory_remotes?(Faker::Lorem.word)).to eq(true)
-    end
-
-    it 'should come out as a false boolean if somebody responds n' do
-      allow(subject).to receive(:ask).and_return('n')
-      expect(subject.process_directory_remotes?(Faker::Lorem.word)).to eq(false)
-    end
-
-    it 'should come out as true if somebody presses enter' do
-      allow(subject).to receive(:ask).and_return('')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.word)).to eq(true)
-    end
-  end
-
-  describe '#conflicting_remote_clarification' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('Found git remotes for both GitHub and GitLab. Would you like to proceed with GitLab or GitHub? (github/gitlab)').and_return('gitlab')
-      subject.conflicting_remote_clarification
-    end
-
-    it 'should come out a string' do
-      expect(subject.conflicting_remote_clarification).to be_a(String)
-    end
-  end
-
-  describe '#title' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('Title?')
-      subject.title
-    end
-
-    it 'should come out a string' do
-      expect(subject.title).to be_a(String)
-    end
-  end
-
-  describe '#base_branch' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with('Base branch?')
-      subject.base_branch
-    end
-
-    it 'should come out a string' do
-      expect(subject.base_branch).to be_a(String)
-    end
-  end
-
-  describe '#code_request_id' do
-    let(:phrase) { Faker::Lorem.sentence }
-
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).with("#{phrase} Request ID?")
-      subject.code_request_id(phrase)
-    end
-
-    it 'should come out a string' do
-      expect(subject.code_request_id(phrase)).to be_a(String)
-    end
-  end
-
-  describe '#accept_autogenerated_title' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).and_return('y')
-      subject.accept_autogenerated_title?(Faker::Lorem.sentence)
-    end
-
-    it 'should be a boolean at the end' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.accept_autogenerated_title?(Faker::Lorem.sentence))
-    end
-
-    it 'should come out as a true boolean if somebody responds y' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
-    end
-
-    it 'should come out as a true boolean if somebody responds n' do
-      allow(subject).to receive(:ask).and_return('n')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(false)
-    end
-
-    it 'should come out as a true boolean if somebody responds yes' do
-      allow(subject).to receive(:ask).and_return('yes')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
-    end
-
-    it 'should come out as a false boolean if somebody responds no' do
-      allow(subject).to receive(:ask).and_return('no')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(false)
-    end
-
-    it 'should come out as true if somebody presses enter' do
-      allow(subject).to receive(:ask).and_return('')
-      expect(subject.accept_autogenerated_title?(Faker::Lorem.sentence)).to eq(true)
-    end
-  end
-
-  describe '#base_branch_default' do
-    it 'should ask the subjects ask method' do
-      expect(subject).to receive(:ask).and_return('y')
-      subject.base_branch_default?(Faker::Lorem.word)
-    end
-
-    it 'should be a boolean at the end' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect([true, false]).to include(subject.base_branch_default?(Faker::Lorem.word))
-    end
-
-    it 'should come out as a true boolean if somebody responds y' do
-      allow(subject).to receive(:ask).and_return('y')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
-    end
-
-    it 'should come out as a true boolean if somebody responds n' do
-      allow(subject).to receive(:ask).and_return('n')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(false)
-    end
-
-    it 'should come out as a true boolean if somebody responds yes' do
-      allow(subject).to receive(:ask).and_return('yes')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
-    end
-
-    it 'should come out as a false boolean if somebody responds no' do
-      allow(subject).to receive(:ask).and_return('no')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(false)
-    end
-
-    it 'should come out as true if somebody presses enter' do
-      allow(subject).to receive(:ask).and_return('')
-      expect(subject.base_branch_default?(Faker::Lorem.word)).to eq(true)
-    end
-  end
-
-  describe '#merge_method' do
-    it 'should ask the subjects ask_options method' do
-      expect(subject).to receive(:ask_options).and_return(3)
-      subject.merge_method(['1', '2', '3'])
-    end
-
-    it 'should return a string' do
-      allow(subject).to receive(:ask_options).and_return(2)
-      expect(subject.merge_method(['1', '2', '3'])).to be_a(String)
-    end
-  end
-
-  describe '#template_to_apply' do
-    it 'should ask the subjects ask_options method' do
-      expect(subject).to receive(:ask_options).and_return(3)
-      subject.template_to_apply(['option1', 'option2', 'option3'], 'example type')
+  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
-      allow(subject).to receive(:ask_options).and_return(3)
-      expect(subject.template_to_apply(['option1', 'option2', 'option3'], 'example type')).to eq('None')
+      expect(subject.ask(Faker::Lorem.sentence)).to be_a(String)
     end
   end
 
-  describe '#ask' do
+  describe '#ask_yes_no' do
     it 'should ask the highline client ask'do
       expect(highline_client).to receive(:ask)
-      subject.send(:ask, Faker::Lorem.sentence)
+      subject.ask_yes_no(Faker::Lorem.sentence)
     end
 
-    it 'should return a string' do
-      expect(subject.send(:ask, Faker::Lorem.sentence)).to be_a(String)
+    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.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])
+      subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])
     end
 
-    it 'should return an integer' do
-      expect(subject.send(:ask_options, Faker::Lorem.sentence, ['1', '2', '3'])).to be_a(Integer)
+    it 'should return a string from the options' do
+      expect(subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])).to be_a(String)
     end
   end
 end

data/spec/git_helper/merge_request_spec.rb

@@ -120,19 +120,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(:apply_template?).and_return(true)
+        expect(highline_cli).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(:apply_template?).and_return(true)
+        allow(highline_cli).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(:apply_template?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -143,19 +143,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(:template_to_apply).and_return(template1)
+        expect(highline_cli).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(:template_to_apply).and_return(template1)
+        allow(highline_cli).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(:template_to_apply).and_return('None')
+        allow(highline_cli).to receive(:ask_options).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -170,25 +170,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(:code_request_id).and_return(Faker::Number.number)
+      expect(highline_cli).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(:code_request_id).and_return(pr_id)
+      expect(highline_cli).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(:squash_merge_request?).and_return(true)
+      expect(highline_cli).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(:squash_merge_request?).and_return(false)
+      expect(highline_cli).to receive(:ask_yes_no).and_return(false)
       expect([true, false]).to include(subject.send(:squash_merge_request))
     end
   end
@@ -200,12 +200,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(:remove_source_branch?).and_return(true)
+        expect(highline_cli).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(:remove_source_branch?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect([true, false]).to include(subject.send(:remove_source_branch))
       end
     end
@@ -222,7 +222,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(:remove_source_branch?).and_return(true)
+      allow(highline_cli).to receive(:ask_yes_no).and_return(true)
       expect(subject.send(:remove_source_branch)).to eq(true)
     end
   end
@@ -236,7 +236,7 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#existing_mr' do
     it 'should call the gitlab client' do
-      allow(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
+      allow(highline_cli).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

@@ -4,7 +4,7 @@ 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, new_branch_name: new_branch_name) }
+  let(:cli) { double(:highline_cli, ask: new_branch_name) }
 
   subject { GitHelper::NewBranch.new }
 
@@ -31,7 +31,7 @@ describe GitHelper::NewBranch do
     end
 
     it 'should ask the highline cli what the new branch name should be' do
-      expect(cli).to receive(:new_branch_name)
+      expect(cli).to receive(:ask)
       subject.execute
     end
   end

data/spec/git_helper/pull_request_spec.rb

@@ -101,19 +101,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(:apply_template?).and_return(true)
+        expect(highline_cli).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(:apply_template?).and_return(true)
+        allow(highline_cli).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(:apply_template?).and_return(false)
+        allow(highline_cli).to receive(:ask_yes_no).and_return(false)
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -124,19 +124,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(:template_to_apply).and_return(template1)
+        expect(highline_cli).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(:template_to_apply).and_return(template1)
+        allow(highline_cli).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(:template_to_apply).and_return('None')
+        allow(highline_cli).to receive(:ask_options).and_return('None')
         expect(subject.send(:template_name_to_apply)).to eq(nil)
       end
     end
@@ -151,13 +151,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(:code_request_id).and_return(Faker::Number.number)
+      expect(highline_cli).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(:code_request_id).and_return(pr_id)
+      expect(highline_cli).to receive(:ask).and_return(pr_id)
       expect(subject.send(:pr_id)).to eq(pr_id)
     end
   end
@@ -167,16 +167,16 @@ describe GitHelper::GitHubPullRequest do
 
     before do
       allow(subject).to receive(:existing_project).and_return(project)
-      allow(highline_cli).to receive(:merge_method)
+      allow(highline_cli).to receive(:ask_options)
     end
 
     it 'should ask the CLI for the merge_method' do
-      expect(highline_cli).to receive(:merge_method).and_return('merge')
+      expect(highline_cli).to receive(:ask_options).and_return('merge')
       subject.send(:merge_method)
     end
 
     it 'should be a string' do
-      allow(highline_cli).to receive(:merge_method).and_return('merge')
+      allow(highline_cli).to receive(:ask_options).and_return('merge')
       expect(subject.send(:merge_method)).to be_a(String)
     end
 
@@ -239,7 +239,7 @@ describe GitHelper::GitHubPullRequest do
 
   describe '#existing_pr' do
     it 'should call the octokit client' do
-      allow(highline_cli).to receive(:code_request_id).and_return(Faker::Number.number)
+      allow(highline_cli).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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -139,13 +139,13 @@ dependencies:
 description: A set of GitHub and GitLab workflow scripts to provide a smoother development
   process for your git projects.
 email:
-- emma.sax4@gmail.com
 executables:
 - git-helper
 extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md