git_helper 3.4.0 → 3.6.0

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.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 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,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
@@ -189,7 +133,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/git-helper
@@ -201,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
@@ -217,17 +161,17 @@ 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:
-- MIT
+- BSD-3-Clause
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -244,10 +188,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
@@ -257,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/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright 2020 Emma Sax
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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