git_helper 3.3.0 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c80aa14abd85f6ebcff1a7c6592e71e4222273c8239c14c45ef905c4a3e549
-  data.tar.gz: 973f3831d8587d46d5e37c7738b50b5f8bab12bab9b2ec3d8ef34379b61917ea
+  metadata.gz: 787737eda759eb8586dfc74869c4d3aa37d983c886d39ea5bdc6cbd84aec1c3c
+  data.tar.gz: 1620a4c05ab9e1d22faddbf35f3399873ee2fa331a9e432e15c60c055f8a5d0d
 SHA512:
-  metadata.gz: 4515350964ec6a6e998a912d5b53cc49c8f90bd6d9cf9acfa5a3d499ffbad71638068266716971924efd76d6692a7aa1a1523cbcefc5c20eaeaf8e99805689aa
-  data.tar.gz: bfee7c84bc7d5a9a54172779bccbdbb56e0ad22f3776f8dc2d00228149ffcdf5de4dc5f3b5182aa92c6add8eec30cb0a70b7f8184fb5e1a8c8a2da2bf621007b
+  metadata.gz: fed4f42c02f1868d01f814b2a688063a0c0d5ea133db7a89ae480fb0f4534f6101e788e54fef1ea2284726b846cfb52ab18d2d6fa58dd5dd5b993a646b415099
+  data.tar.gz: f578749f192739180569eba8725dab7f853eef9e150f903e87716ab94443333a493272c286b24fdd87ee82b4946a9184b79397548c9b0fca0af027080775f739

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,40 +1,29 @@
 PATH
   remote: .
   specs:
-    git_helper (3.3.0)
-      gitlab (~> 4.16)
+    git_helper (3.6.5)
       gli (~> 2.13)
-      highline (~> 2.0)
-      octokit (~> 4.18)
+      highline_wrapper (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    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.1)
-    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)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    faker (3.2.0)
+      i18n (>= 1.8.11, < 2)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    gli (2.21.0)
+    guard (2.18.0)
       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)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -42,70 +31,75 @@ GEM
       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.8)
+    highline (2.1.0)
+    highline_wrapper (1.3.1)
+      highline (~> 2.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    json (2.6.3)
+    listen (3.8.0)
       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.14.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
+      ast (~> 2.4.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rainbow (3.1.1)
+    rb-fsevent (0.11.2)
     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)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     shellany (0.0.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.1.0)
-    unicode-display_width (1.7.0)
+    thor (1.2.1)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
-  x86_64-darwin-19
+  arm64-darwin-21
+  arm64-darwin-22
 
 DEPENDENCIES
   bundler (~> 2.2)
-  faker (~> 2.15)
+  faker (~> 3.0)
   git_helper!
   guard-rspec (~> 4.3)
-  rake (~> 13.0)
+  pry (~> 0.13)
   rspec (~> 3.9)
+  rubocop (~> 1.10)
 
 BUNDLED WITH
-   2.2.9
+   2.4.8

data/Guardfile

@@ -1,5 +1,7 @@
-guard :rspec, cmd: 'bundle exec rspec', all_on_start: true  do
+# frozen_string_literal: true
+
+guard :rspec, cmd: 'bundle exec rspec', all_on_start: true do
+  watch('spec/spec_helper.rb') { 'spec' }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/LICENSE.md

@@ -0,0 +1,29 @@
+BSD 3-Clause "New" or "Revised" License
+
+Copyright (c) 2020 Emma Sax.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions, and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,4 +1,4 @@
-# git_helper [![Maintainability](https://api.codeclimate.com/v1/badges/bf27d608257c202930c4/maintainability)](https://codeclimate.com/github/emmahsax/git_helper/maintainability) [![Main](https://github.com/emmahsax/git_helper/actions/workflows/main.yml/badge.svg)](https://github.com/emmahsax/git_helper/actions/workflows/main.yml)
+# Git Helper
 
 ## Gem Usage
 
@@ -6,32 +6,37 @@
 gem install git_helper
 ```
 
-Some of the commands in this gem can be used without any additional configuration. However, others utilize special GitHub or GitLab configuration. To provide access tokens for this, create a `~/.git_helper/config.yml` file. The contents should look like this:
-
-```
-:github_user:  GITHUB-USERNAME
-:github_token: GITHUB-TOKEN
-:gitlab_user:  GITLAB-USERNAME
-:gitlab_token: GITLAB-TOKEN
-```
-
-To create or see what access tokens you have, look [here for GitHub personal access tokens](https://github.com/settings/tokens) and [here for GitLab access tokens](https://gitlab.com/profile/personal_access_tokens). You could either have one set of tokens for each computer you use, or just have one set of tokens for all computers that you rotate periodically.
-
 Once the gem is installed, run this to view the help screen:
+
 ```bash
 git-helper --help
 ```
 
-To see what version of git_helper you're running, run:
+To see what version of Git Helper you're running, run:
+
 ```bash
 git-helper --version
 ```
 
-To help you create the `~/.git_helper/config.yml` file and set up the plugins (see below), run this command and allow the command to walk you through the prompts:
+Some of the commands in this gem can be used without any additional configuration. However, others utilize special GitHub or GitLab configuration. To set up access with GitHub/GitLab, run:
+
 ```bash
 git-helper setup
 ```
 
+This will give you the option to set up credentials at GitHub and/or GitLab, as well as give you the choice to set up Git Helper as a plugin or not (see below).
+
+The final result will be a `~/.git_helper/config.yml` file with the contents in this form:
+
+```
+:github_user:  GITHUB-USERNAME
+:github_token: GITHUB-TOKEN
+:gitlab_user:  GITLAB-USERNAME
+:gitlab_token: GITLAB-TOKEN
+```
+
+To create or see what access tokens you have, look [here for GitHub personal access tokens](https://github.com/settings/tokens) and [here for GitLab access tokens](https://gitlab.com/profile/personal_access_tokens). You could either have one set of tokens for each computer you use, or just have one set of tokens for all computers that you rotate periodically.
+
 ## Plugin Usage
 
 As an additional option, you can set each of the following commands to be a git plugin, meaning you can call them in a way that feels even more git-native:
@@ -42,21 +47,12 @@ git-helper clean-branches             git clean-branches
 git-helper code-request               git code-request
 ```
 
-To do this, download the `plugins.zip` file in the root of this directory. Unzip and place the contents in the appropriate location:
-
-```bash
-mkdir ~/.git_helper
-unzip path/to/downloaded/plugins.zip -d ~/.git_helper
-```
-
-Now, the plugins will live in `~/.git_helper/plugins/*`. Add the following line to your `~/.bash_profile`:
+Running the `setup` command will give you the option to set this up:
 
 ```bash
-export PATH=/path/to/computer/home/.git_helper/plugins:$PATH
+git-helper setup
 ```
 
-And then run `source ~/.bash_profile`.
-
 ## Alias Usage
 
 To make the commands even shorter, I recommend setting aliases. You can either set aliases through git itself, like this (only possible if you also use the plugin option):
@@ -67,7 +63,7 @@ git config --global alias.nb new-branch
 
 And then running `git nb` maps to `git new-branch`, which through the plugin, maps to `git-helper new-branch`.
 
-Or you can set the alias through your `~/.bashrc` (which is my preferred method because it can make the command even shorter, and doesn't require the plugin usage). To do this, add lines like this to the `~/.bashrc` file and run `source ~/.bashrc`:
+Or you can set the alias through your `~/.zshrc` (which is my preferred method because it can make the command even shorter, and doesn't require the plugin usage). To do this, add lines like this to the `~/.zshrc` file and run `source ~/.zshrc`:
 
 ```bash
 alias gnb="git new-branch"
@@ -115,7 +111,7 @@ git-helper clean-branches
 
 ### `code-request`
 
-This command can be used to handily make new GitHub/GitLab pull/merge requests from the command line. The command uses either the [`Octokit::Client`](https://octokit.github.io/octokit.rb/Octokit/Client.html) or [`Gitlab` client](https://github.com/NARKOZ/gitlab) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage).
+This command can be used to handily make new GitHub/GitLab pull/merge requests from the command-line. The command uses either the [GitHub REST API](https://docs.github.com/en/rest) or [GitLab API](https://docs.gitlab.com/ee/api/) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage). Furthermore, this project will use [JSON](https://www.npmjs.com/package/json), [YAML](https://www.cloudbees.com/blog/yaml-tutorial-everything-you-need-get-started), and [cURL](https://developer.zendesk.com/documentation/developer-tools/getting-started/installing-and-using-curl/).
 
 After setup is complete, you can call the command like this:
 
@@ -127,7 +123,7 @@ The command will provide an autogenerated code request title based on your branc
 
 The command will also ask you if the default branch of the repository is the proper base branch to use. You can say 'yes' or 'no'. If you respond 'no', then you can give the command your chosen base base.
 
-If your project uses GitLab, the command will potentially ask you if you'd like to delete the source branch upon merge. If the project defaults to deleting the source branch, then the script will use that selection, and the value can be changed for a specific MR either over the API or in the browser. If the project just provides source branch deletion as on option, then it'll ask the user. It also will probably ask you if you'd like to squash the MR upon merge. If the project requires or prevents squashing, then whatever answer you give will be _*ignored*_. This is unfortunate, but is here due to limited API functionality.
+If your project uses GitLab, the command will potentially ask you if you'd like to delete the source branch upon merge. If the project defaults to deleting the source branch, then the script will use that selection, and the value can be changed for a specific MR either over the API or in the browser. If the project just provides source branch deletion as on option, then it'll ask the user. If the project has allowed squashing, but doesn't default it, then the code will ask the user whether to squash the merge request. If the project has set merge requests to require squashing, prevent squashing, or sets the project to default to squashing, then the code will skip a squash question. If default squashing is set, then the code will set the merge request to squash, and the user can change that over the API or in the browser.
 
 Lastly, it'll ask about code request templates. For GitHub, it'll ask the user to apply any pull request templates found at `.github/pull_request_template.md`, `./pull_request_template.md`, or `.github/PULL_REQUEST_TEMPLATE/*.md`. Applying any template is optional, and a user can make an empty pull request if they desire. For GitLab, it'll ask the user to apply any merge request templates found at any `.gitlab/merge_request_template.md`, `./merge_request_template.md`, or `.gitlab/merge_request_templates/*.md`. Applying any template is optional, and from the command's standpoint, a user can make an empty merge request if they desire (although GitLab may still add a merge request template if the project itself requires one). When searching for templates, the code ignores cases, so the file could be named with all capital letters or all lowercase letters.
 
@@ -149,7 +145,7 @@ git-helper forget-local-commits
 
 ### `merge-code-request`
 
-This command can be used to merge pull/merge requests from the command line. The command uses either the [`Octokit::Client`](https://octokit.github.io/octokit.rb/Octokit/Client.html) or [`Gitlab` client](https://github.com/NARKOZ/gitlab) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage).
+This command can be used to merge pull/merge requests from the command-line. The command uses either the [GitHub REST API](https://docs.github.com/en/rest) or [GitLab API](https://docs.gitlab.com/ee/api/) to do this, so make sure you have a `~/.git_helper/config.yml` file set up in the home directory of your computer. For instructions on how to do that, see [Gem Usage](#gem-usage). Furthermore, this project will use [JSON](https://www.npmjs.com/package/json), [YAML](https://www.cloudbees.com/blog/yaml-tutorial-everything-you-need-get-started), and [cURL](https://developer.zendesk.com/documentation/developer-tools/getting-started/installing-and-using-curl/).
 
 After setup is complete, you can call the proper command like this:
 
@@ -166,7 +162,7 @@ For GitLab, the command will use whatever squash/source branch deletion/etc sett
 
 ### `new-branch`
 
-This command is useful for making new branches in a repository on the command line. To run the command, run:
+This command is useful for making new branches in a repository on the command-line. To run the command, run:
 
 ```bash
 git-helper new-branch
@@ -176,15 +172,27 @@ git-helper new-branch NEW_BRANCH_NAME
 
 The command either accepts a branch name right away or it will ask you for the name of your new branch. Make sure your input does not contain any spaces or special characters.
 
-## Contributing
+---
+
+### Contributing
+
+To submit a feature request, bug ticket, etc, please submit an official [GitHub issue](https://github.com/emmahsax/git_helper/issues/new). To copy or make changes, please [fork this repository](https://github.com/emmahsax/git_helper/fork). When/if you'd like to contribute back to this upstream, please create a pull request on this repository.
+
+Please follow included Issue Template(s) and Pull Request Template(s) when creating issues or pull requests.
+
+### Security Policy
+
+To report any security vulnerabilities, please view this repository's [Security Policy](https://github.com/emmahsax/git_helper/security/policy).
+
+### Licensing
 
-To submit a feature request, bug ticket, etc, please submit an official [GitHub Issue](https://github.com/emmahsax/git_helper/issues/new).
+For information on licensing, please see [LICENSE.md](https://github.com/emmahsax/git_helper/blob/main/LICENSE.md).
 
-To report any security vulnerabilities, please view this project's [Security Policy](https://github.com/emmahsax/git_helper/security/policy).
+### Code of Conduct
 
 When interacting with this repository, please follow [Contributor Covenant's Code of Conduct](https://contributor-covenant.org).
 
-## Releasing
+### Releasing
 
 To make a new release of this gem:
 

data/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'

data/bin/git-helper

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'gli'
 require_relative '../lib/git_helper'
@@ -11,15 +13,15 @@ version GitHelper::VERSION
 autocomplete_commands false
 wrap_help_text :verbatim
 
-program_long_desc """
+program_long_desc "
 DOCUMENTATION
     For documentation and help in setting up your Git configuration files,
     see Git Helper's GitHub repo: https://github.com/emmahsax/git_helper
-"""
+"
 
 desc 'Sets up Git Helper configs at ~/.git_helper/*'
 command 'setup' do |c|
-  c.action do ||
+  c.action do
     GitHelper::Setup.new.execute
   end
 end
@@ -28,36 +30,37 @@ arg :old_owner
 arg :new_owner
 desc "Update a repository's remote URLs from an old GitHub owner to a new owner."
 command 'change-remote' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, args|
     raise ArgumentError, 'You must specify an old owner and a new owner' unless args.count == 2
+
     GitHelper::ChangeRemote.new(args[0], args[1]).execute
   end
 end
 
 desc 'Checks out the default branch of a repo based on the local remote branches.'
 command 'checkout-default' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     GitHelper::CheckoutDefault.new.execute
   end
 end
 
 desc "Clean a repository's git branches."
 command 'clean-branches' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     GitHelper::CleanBranches.new.execute
   end
 end
 
 desc 'Creates an empty commit with a basic commit message.'
 command 'empty-commit' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     GitHelper::EmptyCommit.new.execute
   end
 end
 
 desc 'Reset your local git commits to origin/HEAD.'
 command 'forget-local-commits' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     GitHelper::ForgetLocalCommits.new.execute
   end
 end
@@ -65,21 +68,23 @@ end
 arg :new_branch_name, optional: true
 desc 'Create a new branch for features, bug fixes, or experimentation.'
 command 'new-branch' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, args|
     GitHelper::NewBranch.new.execute(args[0])
   end
 end
 
-desc 'Merge a GitHub/GitLab pull/merge request. The command will figure out whether your code project belongs to GitHub or GitLab.'
+desc 'Merge a GitHub/GitLab pull/merge request. The command will figure out whether your ' \
+     'code project belongs to GitHub or GitLab.'
 command 'merge-code-request' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     GitHelper::CodeRequest.new.merge
   end
 end
 
-desc 'Create a GitHub/GitLab pull/merge request from the current branch. The command will figure out whether your code project belongs to GitHub or GitLab.'
+desc 'Create a GitHub/GitLab pull/merge request from the current branch. The command will figure ' \
+     'out whether your code project belongs to GitHub or GitLab.'
 command 'code-request' do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     GitHelper::CodeRequest.new.create
   end
 end

data/lib/git_helper/change_remote.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class ChangeRemote
     attr_accessor :old_owner, :new_owner
@@ -11,7 +13,7 @@ module GitHelper
       original_dir = Dir.pwd
       nested_dirs = Dir.entries(original_dir).select do |entry|
         entry_dir = File.join(original_dir, entry)
-        File.directory?(entry_dir) && !(entry == '.' || entry == '..')
+        File.directory?(entry_dir) && !['.', '..'].include?(entry)
       end
 
       nested_dirs.each do |nested_dir|
@@ -22,8 +24,11 @@ module GitHelper
     private def process_dir(current_dir, original_dir)
       Dir.chdir(current_dir)
 
-      if File.exist?('.git')
-        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)")
+      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)",
+        { required: true }
+      )
+        process_git_repository
       end
 
       Dir.chdir(original_dir)
@@ -37,9 +42,11 @@ module GitHelper
           puts "  Found remote is not pointing to #{old_owner}."
         end
       end
-      puts "\n"
+      puts
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     private def process_remote(remote)
       remote_name = local_code.remote_name(remote)
 
@@ -56,13 +63,15 @@ module GitHelper
       puts "  Changing the remote URL #{remote_name} to be '#{remote_url}'."
       local_code.change_remote(remote_name, remote_url)
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
 
     private def local_code
       @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/checkout_default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class CheckoutDefault
     def execute

data/lib/git_helper/clean_branches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   class CleanBranches
     def execute