git_helper 3.3.1 → 3.3.2

data/lib/git_helper/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

data/spec/git_helper/change_remote_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -7,18 +9,17 @@ describe GitHelper::ChangeRemote do
   let(:cli) { double(:highline_cli, ask_yes_no: true) }
   let(:old_owner) { Faker::Internet.username }
   let(:new_owner) { Faker::Internet.username }
-  let(:directory_entries) { [ '.', '..', project, Faker::Lorem.word, Faker::Lorem.word ] }
+  let(:directory_entries) { ['.', '..', project, Faker::Lorem.word, Faker::Lorem.word] }
 
   let(:local_code) do
     double(:local_code,
-      remotes: [remote1],
-      remote_name: Faker::Lorem.word,
-      ssh_remote?: true,
-      https_remote?: false,
-      remote_project: project,
-      remote_source: 'github.com',
-      change_remote: true
-    )
+           remotes: [remote1],
+           remote_name: Faker::Lorem.word,
+           ssh_remote?: true,
+           https_remote?: false,
+           remote_project: project,
+           remote_source: 'github.com',
+           change_remote: true)
   end
 
   subject { GitHelper::ChangeRemote.new(old_owner, new_owner) }
@@ -138,14 +139,13 @@ describe GitHelper::ChangeRemote do
     context 'https remote' do
       let(:local_code) do
         double(:local_code,
-          remotes: [remote1],
-          remote_name: Faker::Lorem.word,
-          ssh_remote?: false,
-          https_remote?: false,
-          remote_project: project,
-          remote_source: 'github.com',
-          change_remote: true
-        )
+               remotes: [remote1],
+               remote_name: Faker::Lorem.word,
+               ssh_remote?: false,
+               https_remote?: false,
+               remote_project: project,
+               remote_source: 'github.com',
+               change_remote: true)
       end
 
       it 'should ask if the remote is SSH' do

data/spec/git_helper/checkout_default_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/clean_branches_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/code_request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/empty_commit_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/forget_local_commits_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/git_config_reader_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -7,14 +9,14 @@ describe GitHelper::GitConfigReader do
   let(:gitlab_user) { Faker::Internet.username }
   let(:gitlab_token) { Faker::Internet.password(max_length: 10) }
 
-  let(:config_file) {
+  let(:config_file) do
     {
       github_user: github_user,
       github_token: github_token,
       gitlab_user: gitlab_user,
       gitlab_token: gitlab_token
     }
-  }
+  end
 
   subject { GitHelper::GitConfigReader.new }
 

data/spec/git_helper/gitlab_client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/highline_cli_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -12,7 +14,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#ask' do
-    it 'should ask the highline client ask'do
+    it 'should ask the highline client ask' do
       expect(highline_client).to receive(:ask)
       subject.ask(Faker::Lorem.sentence)
     end
@@ -23,7 +25,7 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#ask_yes_no' do
-    it 'should ask the highline client ask'do
+    it 'should ask the highline client ask' do
       expect(highline_client).to receive(:ask)
       subject.ask_yes_no(Faker::Lorem.sentence)
     end
@@ -39,13 +41,13 @@ describe GitHelper::HighlineCli do
   end
 
   describe '#ask_options' do
-    it 'should ask the highline client ask'do
+    it 'should ask the highline client ask' do
       expect(highline_client).to receive(:ask)
-      subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])
+      subject.ask_options(Faker::Lorem.sentence, %w[one two three])
     end
 
     it 'should return a string from the options' do
-      expect(subject.ask_options(Faker::Lorem.sentence, ['one', 'two', 'three'])).to be_a(String)
+      expect(subject.ask_options(Faker::Lorem.sentence, %w[one two three])).to be_a(String)
     end
   end
 end

data/spec/git_helper/local_code_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/merge_request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -10,10 +12,9 @@ describe GitHelper::GitLabMergeRequest do
 
   let(:merge_request) do
     double(:merge_request,
-      diff_refs: diff_refs,
-      web_url: Faker::Internet.url,
-      merge_commit_sha: Faker::Internet.password
-    )
+           diff_refs: diff_refs,
+           web_url: Faker::Internet.url,
+           merge_commit_sha: Faker::Internet.password)
   end
 
   let(:options) do
@@ -38,7 +39,7 @@ describe GitHelper::GitLabMergeRequest do
       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)
-      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
+      subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })
     end
 
     it 'should call various other methods' do
@@ -46,7 +47,7 @@ describe GitHelper::GitLabMergeRequest do
       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)
-      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
+      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
@@ -54,7 +55,7 @@ describe GitHelper::GitLabMergeRequest do
       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)
-      expect(subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})).to eq(nil)
+      expect(subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })).to eq(nil)
     end
   end
 

data/spec/git_helper/new_branch_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/octokit_client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 

data/spec/git_helper/pull_request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -27,19 +29,19 @@ describe GitHelper::GitHubPullRequest do
     it 'should call the octokit 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))
-      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
+      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))
-      subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})
+      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)
-      expect(subject.create({base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word})).to eq(nil)
+      expect(subject.create({ base_branch: Faker::Lorem.word, new_title: Faker::Lorem.word })).to eq(nil)
     end
   end
 

data/spec/git_helper/setup_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_helper'
 
@@ -11,7 +13,7 @@ describe GitHelper::Setup do
   end
 
   after do
-    GitHelper::Setup.instance_variable_set("@highline", nil)
+    GitHelper::Setup.instance_variable_set('@highline', nil)
   end
 
   describe '#execute' do
@@ -33,6 +35,7 @@ describe GitHelper::Setup do
 
     it 'should skip if the user opts not to continue' do
       allow(File).to receive(:exists?).and_return(true)
+      allow(subject).to receive(:config_file_exists?).and_return(true)
       allow(highline_cli).to receive(:ask_yes_no).and_return(false)
       expect(subject).not_to receive(:create_or_update_config_file)
       expect(subject).not_to receive(:create_or_update_plugin_files)
@@ -56,12 +59,12 @@ describe GitHelper::Setup do
 
   describe '#config_file_exists?' do
     it 'should return true if the file exists' do
-      allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:exist?).and_return(true)
       expect(subject.send(:config_file_exists?)).to eq(true)
     end
 
     it 'should return false if the file does not exist' do
-      allow(File).to receive(:exists?).and_return(false)
+      allow(File).to receive(:exist?).and_return(false)
       expect(subject.send(:config_file_exists?)).to eq(false)
     end
   end
@@ -114,10 +117,10 @@ describe GitHelper::Setup do
     let(:plugins) do
       [
         {
-          'name': 'plugin-file-one'
+          name: 'plugin-file-one'
         },
         {
-          'name': 'plugin-file-two'
+          name: 'plugin-file-two'
         }
       ]
     end
@@ -139,7 +142,7 @@ describe GitHelper::Setup do
     end
 
     it 'should create the directory if it does not exist' do
-      allow(File).to receive(:exists?).and_return(false)
+      allow(File).to receive(:exist?).and_return(false)
       allow(File).to receive(:open).and_return(nil)
       expect(Dir).to receive(:mkdir)
       allow(subject).to receive(:`).and_return(plugins_json)
@@ -148,7 +151,7 @@ describe GitHelper::Setup do
     end
 
     it 'should not create the directory if it already exists' do
-      allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:exist?).and_return(true)
       allow(File).to receive(:open).and_return(nil)
       expect(Dir).not_to receive(:mkdir)
       allow(subject).to receive(:`).and_return(plugins_json)
@@ -157,6 +160,7 @@ describe GitHelper::Setup do
     end
 
     it 'should curl the GitHub API' do
+      allow(Dir).to receive(:mkdir).and_return(true)
       allow(File).to receive(:exists?).and_return(true)
       allow(File).to receive(:open).and_return(nil)
       allow(subject).to receive(:`).and_return(plugins_json)
@@ -165,6 +169,7 @@ describe GitHelper::Setup do
     end
 
     it 'should go through the loop for each plugin' do
+      allow(Dir).to receive(:mkdir).and_return(true)
       allow(File).to receive(:exists?).and_return(true)
       allow(File).to receive(:open).and_return(nil)
       expect(subject).to receive(:`).exactly(3).times

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faker'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
@@ -33,7 +35,7 @@ RSpec.configure do |config|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 
   # rspec-mocks config goes here. You can use an alternate test double

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A set of GitHub and GitLab workflow scripts to provide a smoother development
   process for your git projects.
 email:
@@ -197,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="