git_helper 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f54fe4752a8c63fd35e668a15b6d0ed4c17e6646f1058de2d66056550305050
-  data.tar.gz: 4dd91a7a425990aceb3012064bb64ad55d2501f2975d5e75668e9540722c8121
+  metadata.gz: e4cab8515ee7c8c8e345b477178e3352c600ff5db7bab81e8c3479c7db13bc7a
+  data.tar.gz: 53d031494e6e52826f7911c8f06337e82853f069e3cbfc18275d5f918886a443
 SHA512:
-  metadata.gz: 8d618c4758a4f4f9387e58a2d5a41b85d052ae61afd8253ca2c3c718bba85791a03f85332a5ecb104ab49dee35e7a406ea3e25984301b0db4f18d8c51140c233
-  data.tar.gz: 19ee42210fc4a308e927ef5bbf40512c73cfd5513be8d68a3b3754510b78a76701768eec2a8fd4ad9f2d48cfe168a1f817f9ab465040349068c7e7980322fba8
+  metadata.gz: 446213efbe6058b0ab790750b390a05dfb7b47793554667ceb20a1c2720a9140c10e2aa9368d2127b62dce538b60b19826c9a9b6380ca88ff7046194e4cf20b9
+  data.tar.gz: 9db27ee02e2cc0a5f343b4c0f32b022cc9cbab48e152bb03c38ce8c8360258d9ff68be8154955653fd14b5d3f0c2184ea778ce0fe820b955a3e0b16f00bb78ca

data/Gemfile.lock

@@ -1,46 +1,55 @@
 PATH
   remote: .
   specs:
-    git_helper (3.4.0)
-      gitlab (~> 4.16)
-      gli (~> 2.13)
-      highline_wrapper (~> 1.1)
-      octokit (~> 4.18)
-      psych (< 4)
+    git_helper (3.5.1)
+      gitlab
+      gli
+      highline_wrapper
+      octokit
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    faker (2.17.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (1.4.1)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    ffi (1.15.0)
-    formatador (0.2.5)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
+    formatador (0.3.0)
     gitlab (4.17.0)
       httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    gli (2.20.0)
-    guard (2.16.2)
+    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.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -49,21 +58,21 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     highline (2.0.3)
-    highline_wrapper (1.2.0)
+    highline_wrapper (1.3.0)
       highline (~> 2.0)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.5.1)
+    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)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0901)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
@@ -73,17 +82,15 @@ GEM
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (3.3.2)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.1.1)
@@ -101,40 +108,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.14.0)
+    rubocop (1.22.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     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)
+    terminal-table (1.6.0)
     thor (1.1.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   x86_64-darwin-19
 
 DEPENDENCIES
-  bundler (~> 2.2)
-  faker (~> 2.15)
+  bundler
+  faker
   git_helper!
-  guard-rspec (~> 4.3)
-  pry (~> 0.13)
-  rake (~> 13.0)
-  rspec (~> 3.9)
-  rubocop (~> 1.10)
+  guard-rspec
+  pry
+  rspec
+  rubocop
 
 BUNDLED WITH
-   2.2.17
+   2.2.29

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

@@ -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 [![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:
 
@@ -176,15 +176,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
+---
 
-To submit a feature request, bug ticket, etc, please submit an official [GitHub Issue](https://github.com/emmahsax/git_helper/issues/new).
+### Contributing
 
-To report any security vulnerabilities, please view this project's [Security Policy](https://github.com/emmahsax/git_helper/security/policy).
+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
+
+For information on licensing, please see [LICENSE.md](https://github.com/emmahsax/git_helper/blob/main/LICENSE.md).
+
+### 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/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.0'
+  VERSION = '3.6.0'
 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"