git_helper 3.4.1 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 295a48c82962b1acd95510653a2c7430ef50c3773d0cd2da78d55d0f428e6dd0
-  data.tar.gz: 72d909f998d63f307487d278f365fd14d6380d213f10fe11f6cf1b0f7f07ba64
+  metadata.gz: 9d9274d7a8c49375a44027dc69e8edbdc0e10ba9f3cc292feb62af0ef7bbd862
+  data.tar.gz: 8f22422ba8dfb69137eacca33cead4681ce48f9bd87c5e2428c8fbf0a4f3d874
 SHA512:
-  metadata.gz: aafbbfdda563a9a5c3086c1d393564993c8856900e32b3444ba9ddef8ff01f4ef5d919f4108f3a4fceebb94de3f963d5f98e7aa02c66d9157643ce91f1c3ead4
-  data.tar.gz: 50b732f26e32581cf9a33de9398a00c54e75aa8eebb600d73e59f07218dc26e5aa3cf5e9339830b9fefe876180bc86f2eca877cf7fe238397c0a84764514b3ba
+  metadata.gz: 1252ef15165f44e88dda2043278c42bf89fba68db1bc88e77388687fe235495e4290cce17564bfe399795e4037bc229fed1f1ac636fd16b7636e90dc09e1a057
+  data.tar.gz: f16b88584257d417545eaa3bfaa073a8b6776b8ad1e77678ed48bea70e57193fc1d427127172aed0c5a6df201980e63b3bf5dbd9465521db0db317d7841dd7bd

data/Gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: .
+  specs:
+    git_helper (3.6.1)
+      gli (~> 2.13)
+      highline_wrapper (~> 1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    faker (2.19.0)
+      i18n (>= 1.6, < 2)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    gli (2.20.1)
+    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.13.0)
+      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)
+    highline_wrapper (1.3.0)
+      highline (~> 2.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (1.21.0)
+    parser (3.0.3.1)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    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.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.13.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    shellany (0.0.1)
+    thor (1.1.0)
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  x86_64-darwin-19
+
+DEPENDENCIES
+  bundler (~> 2.2)
+  faker (~> 2.15)
+  git_helper!
+  guard-rspec (~> 4.3)
+  pry (~> 0.13)
+  rspec (~> 3.9)
+  rubocop (~> 1.10)
+
+BUNDLED WITH
+   2.2.31

data/Guardfile

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

data/LICENSE.md

@@ -1,11 +1,29 @@
-Copyright (c) 2020 Emma Sax. All rights reserved.
+BSD 3-Clause "New" or "Revised" License
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Copyright (c) 2020 Emma Sax.
+All rights reserved.
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-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.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions, and the following disclaimer.
 
-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.
+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.
 
-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.
+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 [![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
 
@@ -115,7 +115,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:
 
@@ -149,7 +149,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:
 
@@ -180,7 +180,9 @@ The command either accepts a branch name right away or it will ask you for the n
 
 ### Contributing
 
-To submit a feature request, bug ticket, etc, please submit an official [GitHub Issue](https://github.com/emmahsax/git_helper/issues/new).
+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
 

data/lib/git_helper/github_client.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module GitHelper
+  class GitHubClient
+    def repository(repo_name)
+      run(repo_name.split('/').first, nil, "/repos/#{repo_name}")
+    end
+
+    def pull_request(repo_name, pull_request_id)
+      run(repo_name.split('/').first, nil, "/repos/#{repo_name}/pulls/#{pull_request_id}")
+    end
+
+    def create_pull_request(repo_name, options)
+      opts_as_string = format_options(options)
+      run(
+        repo_name.split('/').first,
+        'POST',
+        "/repos/#{repo_name}/pulls",
+        opts_as_string
+      )
+    end
+
+    def merge_pull_request(repo_name, pull_request_id, options)
+      opts_as_string = format_options(options)
+      run(
+        repo_name.split('/').first,
+        'PUT',
+        "/repos/#{repo_name}/pulls/#{pull_request_id}/merge",
+        opts_as_string
+      )
+    end
+
+    private def format_options(options)
+      opts_as_string = ''.dup
+      options.each do |key, value|
+        next if value == ''
+
+        opts_as_string << "#{key.to_json}:#{value.to_json.gsub("'", "'\\\\''")},"
+      end
+      opts_as_string = opts_as_string.reverse.sub(',', '').reverse
+      opts_as_string.empty? ? '' : "{#{opts_as_string}}"
+    end
+
+    # rubocop:disable Layout/LineLength
+    private def run(username, request_type, curl_url, options = '')
+      OpenStruct.new(
+        JSON.parse(
+          if request_type
+            `curl -s -u #{username}:#{github_token} -H "Accept: application/vnd.github.v3+json" -X #{request_type} -d '#{options}' "#{github_endpoint}#{curl_url}"`
+          else
+            `curl -s -u #{username}:#{github_token} -H "Accept: application/vnd.github.v3+json" "#{github_endpoint}#{curl_url}"`
+          end
+        )
+      )
+    end
+    # rubocop:enable Layout/LineLength
+
+    private def github_token
+      git_config_reader.github_token
+    end
+
+    private def git_config_reader
+      @git_config_reader ||= GitHelper::GitConfigReader.new
+    end
+
+    private def github_endpoint
+      'https://api.github.com'
+    end
+  end
+end

data/lib/git_helper/gitlab_client.rb

@@ -2,8 +2,52 @@
 
 module GitHelper
   class GitLabClient
-    def client
-      Gitlab.client(endpoint: gitlab_endpoint, private_token: git_config_reader.gitlab_token)
+    def project(project_name)
+      run('GET', "/projects/#{url_encode(project_name)}")
+    end
+
+    def merge_request(project_name, merge_request_id)
+      run('GET', "/projects/#{url_encode(project_name)}/merge_requests/#{merge_request_id}")
+    end
+
+    def create_merge_request(project_name, options)
+      opts_as_string = format_options(options)
+      run('POST', "/projects/#{url_encode(project_name)}/merge_requests#{opts_as_string}")
+    end
+
+    def accept_merge_request(project_name, merge_request_id, options)
+      opts_as_string = format_options(options)
+      run(
+        'PUT',
+        "/projects/#{url_encode(project_name)}/merge_requests/#{merge_request_id}/merge#{opts_as_string}"
+      )
+    end
+
+    private def format_options(options)
+      opts_as_string = ''.dup
+      options.each do |key, value|
+        next if value == ''
+
+        opts_as_string << "#{key}=#{url_encode(value.to_s)}&"
+      end
+      opts_as_string = opts_as_string.reverse.sub('&', '').reverse
+      opts_as_string.empty? ? '' : "?#{opts_as_string}"
+    end
+
+    private def run(request_type, curl_url)
+      OpenStruct.new(
+        JSON.parse(
+          `curl -s -X #{request_type} -H "PRIVATE-TOKEN: #{gitlab_token}" "#{gitlab_endpoint}#{curl_url}"`
+        )
+      )
+    end
+
+    private def url_encode(string)
+      string.b.gsub(/[^a-zA-Z0-9_\-.~]/n) { |m| format('%%%<val>02X', val: m.unpack1('C')) }
+    end
+
+    private def gitlab_token
+      git_config_reader.gitlab_token
     end
 
     private def git_config_reader

data/lib/git_helper/merge_request.rb

@@ -22,23 +22,28 @@ module GitHelper
         target_branch: base_branch,
         squash: squash_merge_request,
         remove_source_branch: remove_source_branch,
-        description: new_mr_body
+        description: new_mr_body,
+        title: new_mr_title
       }
 
       puts "Creating merge request: #{new_mr_title}"
-      mr = gitlab_client.create_merge_request(local_project, new_mr_title, options)
+      mr = gitlab_client.create_merge_request(local_project, options)
 
-      if mr.diff_refs.base_sha == mr.diff_refs.head_sha
+      raise StandardError, mr.message if mr.diff_refs.nil? || mr.web_url.nil?
+
+      if mr.diff_refs['base_sha'] == mr.diff_refs['head_sha']
         puts "Merge request was created, but no commits have been pushed to GitLab: #{mr.web_url}"
       else
         puts "Merge request successfully created: #{mr.web_url}"
       end
-    rescue Gitlab::Error::Conflict
-      puts 'Could not create merge request:'
-      puts '  A merge request already exists for this branch'
     rescue StandardError => e
       puts 'Could not create merge request:'
-      puts e.message
+
+      if e.message.include?('Another open merge request already exists')
+        puts '  A merge request already exists for this branch'
+      else
+        puts "  #{e.message}"
+      end
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
@@ -61,21 +66,19 @@ module GitHelper
         merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
       end
 
-      if merge.merge_commit_sha.nil?
-        puts 'Could not merge merge request:'
-        puts "  #{merge.merge_error}"
-      else
-        puts "Merge request successfully merged: #{merge.merge_commit_sha}"
-      end
-    rescue Gitlab::Error::MethodNotAllowed
-      puts 'Could not merge merge request:'
-      puts '  The merge request is not mergeable'
-    rescue Gitlab::Error::NotFound
-      puts 'Could not merge merge request:'
-      puts "  Could not a locate a merge request to merge with ID #{mr_id}"
+      raise StandardError, merge.message if merge.merge_commit_sha.nil?
+
+      puts "Merge request successfully merged: #{merge.merge_commit_sha}"
     rescue StandardError => e
       puts 'Could not merge merge request:'
-      puts e.message
+
+      if e.message.include?('404 Not found')
+        puts '  Could not a locate a merge request to merge with given ID'
+      elsif e.message.include?('405 Method Not Allowed')
+        puts '  The merge request is not mergeable'
+      else
+        puts "  #{e.message}"
+      end
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
@@ -121,20 +124,21 @@ module GitHelper
     end
 
     private def mr_id
-      @mr_id ||= highline.ask('Merge Request ID?')
+      @mr_id ||= highline.ask('Merge Request ID?', { required: true })
     end
 
     private def squash_merge_request
       return @squash_merge_request if @squash_merge_request
 
-      case existing_project.squash_option
-      when 'always', 'default_on'
-        @squash_merge_request = true
-      when 'never'
-        @squash_merge_request = false
-      else # 'default_off' or anything else
-        @squash_merge_request = highline.ask_yes_no('Squash merge request? (y/n)')
-      end
+      @squash_merge_request =
+        case existing_project.squash_option
+        when 'always', 'default_on'
+          true
+        when 'never'
+          false
+        else # 'default_off' or anything else
+          highline.ask_yes_no('Squash merge request? (y/n)')
+        end
     end
 
     private def remove_source_branch
@@ -153,7 +157,7 @@ module GitHelper
     end
 
     private def gitlab_client
-      @gitlab_client ||= GitHelper::GitLabClient.new.client
+      @gitlab_client ||= GitHelper::GitLabClient.new
     end
   end
 end

data/lib/git_helper/pull_request.rb

@@ -17,29 +17,29 @@ module GitHelper
       @base_branch = options[:base_branch]
       @new_pr_title = options[:new_title]
 
-      new_pr_body
+      options = {
+        head: local_branch,
+        base: base_branch,
+        body: new_pr_body,
+        title: new_pr_title
+      }
 
       puts "Creating pull request: #{new_pr_title}"
-      pr = octokit_client.create_pull_request(
-        local_repo,
-        base_branch,
-        local_branch,
-        new_pr_title,
-        new_pr_body
-      )
+      pr = github_client.create_pull_request(local_repo, options)
+
+      raise StandardError, pr.errors.first['message'] if pr.html_url.nil?
+
       puts "Pull request successfully created: #{pr.html_url}"
-    rescue Octokit::UnprocessableEntity => e
+    rescue StandardError => e
       puts 'Could not create pull request:'
-      if e.message.include?('pull request already exists')
+
+      if e.message.include?('A pull request already exists')
         puts '  A pull request already exists for this branch'
       elsif e.message.include?('No commits between')
         puts '  No commits have been pushed to GitHub'
       else
-        puts e.message
+        puts "  #{e.message}"
       end
-    rescue StandardError => e
-      puts 'Could not create pull request:'
-      puts e.message
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
@@ -48,39 +48,26 @@ module GitHelper
     # rubocop:disable Metrics/AbcSize
     def merge
       pr_id
-      merge_method
+
+      options = {
+        merge_method: merge_method,
+        commit_title: existing_pr.title
+      }
 
       puts "Merging pull request: #{pr_id}"
-      merge = octokit_client.merge_pull_request(
-        local_repo,
-        pr_id,
-        existing_pr.title,
-        { merge_method: merge_method }
-      )
+      merge = github_client.merge_pull_request(local_repo, pr_id, options)
+
+      raise StandardError, merge.message if merge.sha.nil?
+
       puts "Pull request successfully merged: #{merge.sha}"
-    rescue Octokit::NotFound
-      puts 'Could not merge pull request:'
-      puts "  Could not a locate a pull request to merge with ID #{pr_id}"
-    rescue Octokit::MethodNotAllowed => e
+    rescue StandardError => e
       puts 'Could not merge pull request:'
-      if e.message.include?('405 - Required status check')
-        puts '  A required status check has not passed'
-      elsif e.message.include?('405 - Base branch was modified')
-        puts '  The base branch has been modified'
-      elsif e.message.include?('405 - Pull Request is not mergeable')
-        puts '  The pull request is not mergeable'
-      elsif e.message.include?('405 - Rebase merges are not allowed on this repository')
-        puts '  Rebase merges are not allowed on this repository'
-      elsif e.message.include?('405 - Merge commits are not allowed on this repository')
-        puts '  Merge commits are not allowed on this repository'
-      elsif e.message.include?('405 - Squash commits are not allowed on this repository')
-        puts '  Squash merges are not allowed on this repository'
+
+      if e.message.include?('Not found')
+        puts '  Could not a locate a pull request to merge with given ID'
       else
-        puts e.message
+        puts "  #{e.message}"
       end
-    rescue StandardError => e
-      puts 'Could not merge pull request:'
-      puts e.message
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
@@ -126,7 +113,7 @@ module GitHelper
     end
 
     private def pr_id
-      @pr_id ||= highline.ask('Pull Request ID?')
+      @pr_id ||= highline.ask('Pull Request ID?', { required: true })
     end
 
     private def merge_method
@@ -149,15 +136,15 @@ module GitHelper
     end
 
     private def existing_project
-      @existing_project ||= octokit_client.repository(local_repo)
+      @existing_project ||= github_client.repository(local_repo)
     end
 
     private def existing_pr
-      @existing_pr ||= octokit_client.pull_request(local_repo, pr_id)
+      @existing_pr ||= github_client.pull_request(local_repo, pr_id)
     end
 
-    private def octokit_client
-      @octokit_client ||= GitHelper::OctokitClient.new.client
+    private def github_client
+      @github_client ||= GitHelper::GitHubClient.new
     end
   end
 end

data/lib/git_helper/setup.rb

@@ -33,7 +33,7 @@ module GitHelper
 
       create_or_update_plugin_files
       puts "\nNow add this line to your ~/.bash_profile:\n" \
-            '  export PATH=/path/to/computer/home/.git_helper/plugins:$PATH'
+           '  export PATH=/path/to/computer/home/.git_helper/plugins:$PATH'
       puts "\nDone!"
     end
 

data/lib/git_helper/version.rb

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

data/lib/git_helper.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require 'gitlab'
+require 'json'
 require 'highline_wrapper'
-require 'octokit'
 
 files = "#{File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), 'git_helper'))}/**/*.rb"
 

data/spec/git_helper/code_request_spec.rb

@@ -250,7 +250,7 @@ describe GitHelper::CodeRequest do
   end
 
   describe '#local_code' do
-    it 'should call the octokit client' do
+    it 'should call the GitHub client' do
       expect(GitHelper::LocalCode).to receive(:new).and_return(local_code)
       subject.send(:local_code)
     end

data/spec/git_helper/github_client_spec.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'git_helper'
+
+describe GitHelper::GitHubClient do
+  let(:git_config_reader) { double(:git_config_reader, github_token: :token) }
+
+  subject { GitHelper::GitHubClient.new }
+
+  before do
+    allow(GitHelper::GitConfigReader).to receive(:new).and_return(git_config_reader)
+  end
+
+  describe '#repository' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.repository(Faker::Lorem.word)
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.repository(Faker::Lorem.word)).to eq(:command_complete)
+    end
+  end
+
+  describe '#pull_request' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.pull_request(Faker::Lorem.word, Faker::Number.number)
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.pull_request(Faker::Lorem.word, Faker::Number.number)).to eq(:command_complete)
+    end
+  end
+
+  describe '#create_pull_request' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.create_pull_request(Faker::Lorem.word, {})
+    end
+
+    it 'should generate a string list of options' do
+      expect(subject).to receive(:format_options).with({})
+      subject.create_pull_request(Faker::Lorem.word, {})
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.create_pull_request(Faker::Lorem.word, {})).to eq(:command_complete)
+    end
+  end
+
+  describe '#merge_pull_request' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.merge_pull_request(Faker::Lorem.word, Faker::Number.number, {})
+    end
+
+    it 'should generate a string list of options' do
+      expect(subject).to receive(:format_options).with({})
+      subject.merge_pull_request(Faker::Lorem.word, Faker::Number.number, {})
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.merge_pull_request(Faker::Lorem.word, Faker::Number.number, {})).to eq(:command_complete)
+    end
+  end
+
+  describe '#format_options' do
+    it 'will make a list of hash options into a JSON parsed chunk of key/value pairs as string' do
+      options = {
+        key1: 'value1',
+        key2: true,
+        key3: '',
+        key4: false,
+        key5: 'value5'
+      }
+      # rubocop:disable Style/StringLiterals
+      result = "{\"key1\":\"value1\",\"key2\":true,\"key4\":false,\"key5\":\"value5\"}"
+      # rubocop:enable Style/StringLiterals
+      expect(subject.send(:format_options, options)).to eq(result)
+    end
+
+    it 'will return an empty string if an empty hash is given' do
+      expect(subject.send(:format_options, {})).to eq('')
+    end
+
+    it 'will return an empty string if all values are empty strings' do
+      options = {
+        key1: '',
+        key2: '',
+        key3: ''
+      }
+      expect(subject.send(:format_options, options)).to eq('')
+    end
+  end
+
+  describe '#run' do
+    it 'should call CURL' do
+      expect(subject).to receive(:`).and_return('{}')
+      subject.send(:run, Faker::Lorem.word, 'GET', "/projects/#{Faker::Lorem.word}")
+    end
+
+    it 'should use JSON to parse the response' do
+      expect(JSON).to receive(:parse).and_return({})
+      subject.send(:run, Faker::Lorem.word, 'GET', "/projects/#{Faker::Lorem.word}")
+    end
+
+    it 'should use OpenStruct to turn the hash into an object' do
+      expect(OpenStruct).to receive(:new).and_return(OpenStruct.new)
+      subject.send(:run, Faker::Lorem.word, 'GET', "/projects/#{Faker::Lorem.word}")
+    end
+  end
+
+  describe '#github_token' do
+    it 'should return a token' do
+      expect(subject.send(:github_token)).to eq(:token)
+    end
+  end
+
+  describe '#git_config_reader' do
+    it 'should make a new git config reader' do
+      expect(GitHelper::GitConfigReader).to receive(:new)
+      subject.send(:git_config_reader)
+    end
+  end
+end

data/spec/git_helper/gitlab_client_spec.rb

@@ -12,10 +12,126 @@ describe GitHelper::GitLabClient do
     allow(GitHelper::GitConfigReader).to receive(:new).and_return(git_config_reader)
   end
 
-  describe '#client' do
-    it 'should call the GitLab client to make a new client' do
-      expect(Gitlab).to receive(:client)
-      subject.client
+  describe '#project' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.project(Faker::Lorem.word)
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.project(Faker::Lorem.word)).to eq(:command_complete)
+    end
+  end
+
+  describe '#merge_request' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.merge_request(Faker::Lorem.word, Faker::Number.number)
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.merge_request(Faker::Lorem.word, Faker::Number.number)).to eq(:command_complete)
+    end
+  end
+
+  describe '#create_merge_request' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.create_merge_request(Faker::Lorem.word, {})
+    end
+
+    it 'should generate a string list of options' do
+      expect(subject).to receive(:format_options).with({})
+      subject.create_merge_request(Faker::Lorem.word, {})
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.create_merge_request(Faker::Lorem.word, {})).to eq(:command_complete)
+    end
+  end
+
+  describe '#accept_merge_request' do
+    it 'should call to run a query' do
+      expect(subject).to receive(:run)
+      subject.accept_merge_request(Faker::Lorem.word, Faker::Number.number, {})
+    end
+
+    it 'should generate a string list of options' do
+      expect(subject).to receive(:format_options).with({})
+      subject.accept_merge_request(Faker::Lorem.word, Faker::Number.number, {})
+    end
+
+    it "should return the run command's answer" do
+      expect(subject).to receive(:run).and_return(:command_complete)
+      expect(subject.accept_merge_request(Faker::Lorem.word, Faker::Number.number, {})).to eq(:command_complete)
+    end
+  end
+
+  describe '#format_options' do
+    it 'will make a list of hash options into a URL string' do
+      options = {
+        key1: 'value1',
+        key2: true,
+        key3: '',
+        key4: false,
+        key5: 'value5'
+      }
+      result = '?key1=value1&key2=true&key4=false&key5=value5'
+      expect(subject.send(:format_options, options)).to eq(result)
+    end
+
+    it 'will return an empty string if an empty hash is given' do
+      expect(subject.send(:format_options, {})).to eq('')
+    end
+
+    it 'will return an empty string if all values are empty strings' do
+      options = {
+        key1: '',
+        key2: '',
+        key3: ''
+      }
+      expect(subject.send(:format_options, options)).to eq('')
+    end
+  end
+
+  describe '#run' do
+    it 'should call CURL' do
+      expect(subject).to receive(:`).and_return('{}')
+      subject.send(:run, 'GET', "/projects/#{Faker::Lorem.word}")
+    end
+
+    it 'should use JSON to parse the response' do
+      expect(JSON).to receive(:parse).and_return({})
+      subject.send(:run, 'GET', "/projects/#{Faker::Lorem.word}")
+    end
+
+    it 'should use OpenStruct to turn the hash into an object' do
+      expect(OpenStruct).to receive(:new).and_return(OpenStruct.new)
+      subject.send(:run, 'GET', "/projects/#{Faker::Lorem.word}")
+    end
+  end
+
+  describe '#url_encode' do
+    let(:group_name) { Faker::Lorem.word }
+    let(:project_name) { Faker::Lorem.word }
+
+    it 'should return the same string as passed in but with no spaces' do
+      expect(subject.send(:url_encode, "#{group_name}/#{project_name}")).to eq("#{group_name}%2F#{project_name}")
+    end
+
+    it 'should never include a space or a slash' do
+      resp = subject.send(:url_encode, "#{group_name} #{Faker::Lorem.word}/#{project_name}")
+      expect(resp).not_to include(' ')
+      expect(resp).not_to include('/')
+    end
+  end
+
+  describe '#gitlab_token' do
+    it 'should return a token' do
+      expect(subject.send(:gitlab_token)).to eq(:token)
     end
   end
 

data/spec/git_helper/merge_request_spec.rb

@@ -6,13 +6,12 @@ require 'git_helper'
 describe GitHelper::GitLabMergeRequest do
   let(:local_code) { double(:local_code, read_template: Faker::Lorem.word) }
   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) }
+  let(:gitlab_client) { double(:gitlab_client) }
 
   let(:merge_request) do
     double(:merge_request,
-           diff_refs: diff_refs,
+           message: Faker::Lorem.sentence,
+           diff_refs: { base_sha: Faker::Lorem.word, head_sha: Faker::Lorem.word },
            web_url: Faker::Internet.url,
            merge_commit_sha: Faker::Internet.password)
   end
@@ -38,7 +37,7 @@ describe GitHelper::GitLabMergeRequest do
       allow(subject).to receive(:squash_merge_request).and_return(true)
       allow(subject).to receive(:remove_source_branch).and_return(false)
       allow(subject).to receive(:new_mr_body).and_return('')
-      expect(gitlab_client_client).to receive(:create_merge_request).and_return(merge_request)
+      expect(gitlab_client).to receive(:create_merge_request).and_return(merge_request)
       subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })
     end
 
@@ -46,7 +45,7 @@ describe GitHelper::GitLabMergeRequest do
       expect(subject).to receive(:squash_merge_request).and_return(true)
       expect(subject).to receive(:remove_source_branch).and_return(false)
       expect(subject).to receive(:new_mr_body).and_return('')
-      allow(gitlab_client_client).to receive(:create_merge_request).and_return(merge_request)
+      allow(gitlab_client).to receive(:create_merge_request).and_return(merge_request)
       subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })
     end
 
@@ -54,7 +53,7 @@ describe GitHelper::GitLabMergeRequest do
       allow(subject).to receive(:squash_merge_request).and_return(true)
       allow(subject).to receive(:remove_source_branch).and_return(false)
       allow(subject).to receive(:new_mr_body).and_return('')
-      allow(gitlab_client_client).to receive(:create_merge_request).and_raise(StandardError)
+      allow(gitlab_client).to receive(:create_merge_request).and_raise(StandardError)
       expect(subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })).to eq(nil)
     end
   end
@@ -63,28 +62,28 @@ describe GitHelper::GitLabMergeRequest do
     it 'should call the gitlab client to merge' do
       allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
       allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
-      expect(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
+      expect(gitlab_client).to receive(:accept_merge_request).and_return(merge_request)
       subject.merge
     end
 
     it 'should call various other methods' do
       expect(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title')).at_least(:once)
       expect(subject).to receive(:mr_id).and_return(Faker::Number.number).at_least(:once)
-      allow(gitlab_client_client).to receive(:accept_merge_request).and_return(merge_request)
+      allow(gitlab_client).to receive(:accept_merge_request).and_return(merge_request)
       subject.merge
     end
 
     it 'should catch the raised error if the merge does not work' do
       allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
       allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
-      allow(gitlab_client_client).to receive(:accept_merge_request).and_raise(StandardError)
+      allow(gitlab_client).to receive(:accept_merge_request).and_raise(StandardError)
       expect(subject.merge).to eq(nil)
     end
 
     it 'should try to merge multiple times if the first merge errors' do
       allow(subject).to receive(:existing_mr).and_return(double(should_remove_source_branch: true, squash: false, title: 'title'))
       allow(subject).to receive(:mr_id).and_return(Faker::Number.number)
-      expect(gitlab_client_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil, merge_error: Faker::Lorem.word)).exactly(2).times
+      expect(gitlab_client).to receive(:accept_merge_request).and_return(double(merge_commit_sha: nil, merge_error: Faker::Lorem.word, message: Faker::Lorem.sentence)).exactly(2).times
       expect(subject.merge).to eq(nil)
     end
   end
@@ -257,7 +256,7 @@ describe GitHelper::GitLabMergeRequest do
 
   describe '#existing_project' do
     it 'should call the gitlab client' do
-      expect(gitlab_client_client).to receive(:project).and_return(:project)
+      expect(gitlab_client).to receive(:project).and_return(:project)
       subject.send(:existing_project)
     end
   end
@@ -265,7 +264,7 @@ describe GitHelper::GitLabMergeRequest do
   describe '#existing_mr' do
     it 'should call the gitlab client' do
       allow(highline_wrapper).to receive(:ask).and_return(Faker::Number.number)
-      expect(gitlab_client_client).to receive(:merge_request).and_return(:merge_request)
+      expect(gitlab_client).to receive(:merge_request).and_return(:merge_request)
       subject.send(:existing_mr)
     end
   end

data/spec/git_helper/pull_request_spec.rb

@@ -6,8 +6,7 @@ require 'git_helper'
 describe GitHelper::GitHubPullRequest do
   let(:local_code) { double(:local_code, read_template: Faker::Lorem.word) }
   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) }
+  let(:github_client) { double(:github_client) }
 
   let(:options) do
     {
@@ -21,36 +20,36 @@ describe GitHelper::GitHubPullRequest do
   subject { GitHelper::GitHubPullRequest.new(options) }
 
   before do
-    allow(GitHelper::OctokitClient).to receive(:new).and_return(octokit_client)
+    allow(GitHelper::GitHubClient).to receive(:new).and_return(github_client)
     allow(subject).to receive(:puts)
   end
 
   describe '#create' do
-    it 'should call the octokit client to create' do
+    it 'should call the GitHub client to create' do
       allow(subject).to receive(:new_pr_body).and_return('')
-      expect(octokit_client_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
+      expect(github_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
       subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })
     end
 
     it 'should call various other methods' do
       expect(subject).to receive(:new_pr_body).and_return('').at_least(:once)
-      allow(octokit_client_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
+      allow(github_client).to receive(:create_pull_request).and_return(double(html_url: Faker::Internet.url))
       subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })
     end
 
     it 'should catch the raised error if the creation does not work' do
       allow(subject).to receive(:new_pr_body).and_return('')
-      allow(octokit_client_client).to receive(:create_pull_request).and_raise(StandardError)
+      allow(github_client).to receive(:create_pull_request).and_raise(StandardError)
       expect(subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })).to eq(nil)
     end
   end
 
   describe '#merge' do
-    it 'should call the octokit client to merge' do
+    it 'should call the GitHub client to merge' do
       allow(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word))
       allow(subject).to receive(:merge_method).and_return('rebase')
       allow(subject).to receive(:pr_id).and_return(Faker::Number.number)
-      expect(octokit_client_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
+      expect(github_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
       subject.merge
     end
 
@@ -58,7 +57,7 @@ describe GitHelper::GitHubPullRequest do
       expect(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word)).at_least(:once)
       expect(subject).to receive(:merge_method).and_return('rebase').at_least(:once)
       expect(subject).to receive(:pr_id).and_return(Faker::Number.number).at_least(:once)
-      allow(octokit_client_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
+      allow(github_client).to receive(:merge_pull_request).and_return(double(sha: Faker::Internet.password))
       subject.merge
     end
 
@@ -66,7 +65,7 @@ describe GitHelper::GitHubPullRequest do
       allow(subject).to receive(:existing_pr).and_return(double(title: Faker::Lorem.word))
       allow(subject).to receive(:merge_method).and_return('rebase')
       allow(subject).to receive(:pr_id).and_return(Faker::Number.number)
-      allow(octokit_client_client).to receive(:merge_pull_request).and_raise(StandardError)
+      allow(github_client).to receive(:merge_pull_request).and_raise(StandardError)
       expect(subject.merge).to eq(nil)
     end
   end
@@ -233,24 +232,24 @@ describe GitHelper::GitHubPullRequest do
   end
 
   describe '#existing_project' do
-    it 'should call the octokit client' do
-      expect(octokit_client_client).to receive(:repository).and_return(:repository)
+    it 'should call the GitHub client' do
+      expect(github_client).to receive(:repository).and_return(:repository)
       subject.send(:existing_project)
     end
   end
 
   describe '#existing_pr' do
-    it 'should call the octokit client' do
+    it 'should call the GitHub client' do
       allow(highline_wrapper).to receive(:ask).and_return(Faker::Number.number)
-      expect(octokit_client_client).to receive(:pull_request).and_return(:pull_request)
+      expect(github_client).to receive(:pull_request).and_return(:pull_request)
       subject.send(:existing_pr)
     end
   end
 
-  describe '#octokit_client' do
-    it 'should call the octokit client' do
-      expect(GitHelper::OctokitClient).to receive(:new).and_return(octokit_client)
-      subject.send(:octokit_client)
+  describe '#github_client' do
+    it 'should call the GitHub client' do
+      expect(GitHelper::GitHubClient).to receive(:new).and_return(github_client)
+      subject.send(:github_client)
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.6.1
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gitlab
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.16'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.18'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.18'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.md
 - README.md
@@ -200,11 +145,11 @@ files:
 - lib/git_helper/empty_commit.rb
 - lib/git_helper/forget_local_commits.rb
 - lib/git_helper/git_config_reader.rb
+- lib/git_helper/github_client.rb
 - lib/git_helper/gitlab_client.rb
 - lib/git_helper/local_code.rb
 - lib/git_helper/merge_request.rb
 - lib/git_helper/new_branch.rb
-- lib/git_helper/octokit_client.rb
 - lib/git_helper/pull_request.rb
 - lib/git_helper/setup.rb
 - lib/git_helper/version.rb
@@ -216,18 +161,19 @@ files:
 - spec/git_helper/empty_commit_spec.rb
 - spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
+- spec/git_helper/github_client_spec.rb
 - spec/git_helper/gitlab_client_spec.rb
 - spec/git_helper/local_code_spec.rb
 - spec/git_helper/merge_request_spec.rb
 - spec/git_helper/new_branch_spec.rb
-- spec/git_helper/octokit_client_spec.rb
 - spec/git_helper/pull_request_spec.rb
 - spec/git_helper/setup_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/emmahsax/git_helper
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -243,10 +189,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: A set of GitHub and GitLab workflow scripts.
+summary: A set of GitHub and GitLab workflow scripts
 test_files:
 - spec/spec_helper.rb
 - spec/git_helper/change_remote_spec.rb
@@ -256,10 +202,10 @@ test_files:
 - spec/git_helper/empty_commit_spec.rb
 - spec/git_helper/forget_local_commits_spec.rb
 - spec/git_helper/git_config_reader_spec.rb
+- spec/git_helper/github_client_spec.rb
 - spec/git_helper/gitlab_client_spec.rb
 - spec/git_helper/local_code_spec.rb
 - spec/git_helper/merge_request_spec.rb
 - spec/git_helper/new_branch_spec.rb
-- spec/git_helper/octokit_client_spec.rb
 - spec/git_helper/pull_request_spec.rb
 - spec/git_helper/setup_spec.rb

data/lib/git_helper/octokit_client.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module GitHelper
-  class OctokitClient
-    def client
-      Octokit::Client.new(access_token: git_config_reader.github_token)
-    end
-
-    private def git_config_reader
-      @git_config_reader ||= GitHelper::GitConfigReader.new
-    end
-  end
-end

data/spec/git_helper/octokit_client_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'git_helper'
-
-describe GitHelper::OctokitClient do
-  let(:git_config_reader) { double(:git_config_reader, github_token: :token) }
-
-  subject { GitHelper::OctokitClient.new }
-
-  before do
-    allow(GitHelper::GitConfigReader).to receive(:new).and_return(git_config_reader)
-  end
-
-  describe '#client' do
-    it 'should call the GitLab client to make a new client' do
-      expect(Octokit::Client).to receive(:new)
-      subject.client
-    end
-  end
-
-  describe '#git_config_reader' do
-    it 'should make a new git config reader' do
-      expect(GitHelper::GitConfigReader).to receive(:new)
-      subject.send(:git_config_reader)
-    end
-  end
-end