git_helper 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffcb2655eb57e6b7a6ea293fa815ecfcc4d4eb52bfdd8eb4a003ce5f7e0ed5a2
-  data.tar.gz: c3d0bbc2018ecf87cd486331e7d7643409c57b083d2b41ecfdc96bdf3bb9fcd8
+  metadata.gz: e4cab8515ee7c8c8e345b477178e3352c600ff5db7bab81e8c3479c7db13bc7a
+  data.tar.gz: 53d031494e6e52826f7911c8f06337e82853f069e3cbfc18275d5f918886a443
 SHA512:
-  metadata.gz: acc45c11fb46082119da17cfbf66d5baddd4c45e5c9d0757abc9cf2537f3b0a5067b025da48c4a34bd5dee5b137bb241245b6d2a746aa4d263d29e4fc852a79c
-  data.tar.gz: 2daef5b537909e00ab2c978e42367ab00c49c400bfe044caa1d0a940a8c2c790d14b3832033119b34c3006d919fea85dee810d216d1149f1815fb19bca1e7094
+  metadata.gz: 446213efbe6058b0ab790750b390a05dfb7b47793554667ceb20a1c2720a9140c10e2aa9368d2127b62dce538b60b19826c9a9b6380ca88ff7046194e4cf20b9
+  data.tar.gz: 9db27ee02e2cc0a5f343b4c0f32b022cc9cbab48e152bb03c38ce8c8360258d9ff68be8154955653fd14b5d3f0c2184ea778ce0fe820b955a3e0b16f00bb78ca

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    git_helper (3.5.1.pre.test)
-      gitlab (~> 4.16)
-      gli (~> 2.13)
-      highline_wrapper (~> 1.1)
-      octokit (~> 4.18)
+    git_helper (3.5.1)
+      gitlab
+      gli
+      highline_wrapper
+      octokit
 
 GEM
   remote: https://rubygems.org/
@@ -16,9 +16,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    faker (2.18.0)
+    faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (1.7.1)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -37,7 +37,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    ffi (1.15.3)
+    ffi (1.15.4)
     formatador (0.3.0)
     gitlab (4.17.0)
       httparty (~> 0.18)
@@ -60,12 +60,12 @@ GEM
     highline (2.0.3)
     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.6.0)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
@@ -82,7 +82,7 @@ GEM
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
@@ -108,16 +108,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.18.4)
+    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.8.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.9.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -125,22 +125,21 @@ GEM
       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)
-  rspec (~> 3.9)
-  rubocop (~> 1.10)
+  guard-rspec
+  pry
+  rspec
+  rubocop
 
 BUNDLED WITH
-   2.2.25
+   2.2.29

data/README.md

@@ -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:
 

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,7 +124,7 @@ 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
@@ -154,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/version.rb

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

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.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-10-09 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,20 +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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -173,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
@@ -189,11 +161,11 @@ 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
@@ -229,10 +201,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