git_helper 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9274d7a8c49375a44027dc69e8edbdc0e10ba9f3cc292feb62af0ef7bbd862
-  data.tar.gz: 8f22422ba8dfb69137eacca33cead4681ce48f9bd87c5e2428c8fbf0a4f3d874
+  metadata.gz: 64c4ad9b8acf74b29b341f534243721f4bf168d1d15c524e052a201b867e9c6d
+  data.tar.gz: '01228b5f41daa653e47e11a33f5cde747edfc795759ab5b7c0b474d655538431'
 SHA512:
-  metadata.gz: 1252ef15165f44e88dda2043278c42bf89fba68db1bc88e77388687fe235495e4290cce17564bfe399795e4037bc229fed1f1ac636fd16b7636e90dc09e1a057
-  data.tar.gz: f16b88584257d417545eaa3bfaa073a8b6776b8ad1e77678ed48bea70e57193fc1d427127172aed0c5a6df201980e63b3bf5dbd9465521db0db317d7841dd7bd
+  metadata.gz: 90f31e2053f842aaa9a536de4a79c9e2e066fd08c8703367520b2728e39a3b9aa88374230fbc2211993c709077cc573272e2e79dc996d5009dbdd864986c0541
+  data.tar.gz: e683017056105ba89126467da7cea039ee7c0d88350f8971ed0e130d85fcc0e2ea383600e7e88c01806d68540e2183bb5e30f6a8130d9fbabdce4bcbba545ab8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_helper (3.6.1)
+    git_helper (3.6.1.pre.test)
       gli (~> 2.13)
       highline_wrapper (~> 1.1)
 
@@ -10,13 +10,13 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    faker (2.19.0)
-      i18n (>= 1.6, < 2)
-    ffi (1.15.4)
-    formatador (0.3.0)
-    gli (2.20.1)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    faker (3.0.0)
+      i18n (>= 1.8.11, < 2)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    gli (2.21.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -32,11 +32,12 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     highline (2.0.3)
-    highline_wrapper (1.3.0)
+    highline_wrapper (1.3.1)
       highline (~> 2.0)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    listen (3.7.0)
+    json (2.6.3)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
@@ -45,53 +46,55 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.21.0)
-    parser (3.0.3.1)
+    parallel (1.22.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
-    rb-fsevent (0.11.0)
+    rainbow (3.1.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.23.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.40.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.24.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    thor (1.1.0)
-    unicode-display_width (2.1.0)
+    thor (1.2.1)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
-  x86_64-darwin-19
+  arm64-darwin-21
+  arm64-darwin-22
 
 DEPENDENCIES
   bundler (~> 2.2)
-  faker (~> 2.15)
+  faker (~> 3.0)
   git_helper!
   guard-rspec (~> 4.3)
   pry (~> 0.13)
@@ -99,4 +102,4 @@ DEPENDENCIES
   rubocop (~> 1.10)
 
 BUNDLED WITH
-   2.2.31
+   2.3.26

data/Guardfile

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

data/lib/git_helper/local_code.rb

@@ -108,7 +108,7 @@ module GitHelper
     # rubocop:enable Metrics/AbcSize
 
     def read_template(file_name)
-      File.open(file_name).read
+      File.read(file_name)
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -122,14 +122,14 @@ module GitHelper
         branch_arr.first.capitalize
       elsif branch_arr[0].scan(/(\w+)/).any? && branch_arr[1].scan(/(\d+)/).any? # branch includes jira_123 at beginning
         issue = "#{branch_arr[0].upcase}-#{branch_arr[1]}"
-        description = branch_arr[2..-1].join(' ')
+        description = branch_arr[2..].join(' ')
         "#{issue} #{description.capitalize}"
       elsif branch_arr[0].scan(/(\w+-\d+)/).any? # branch includes string jira-123 at beginning
         issue = branch_arr[0].upcase
-        description = branch_arr[1..-1].join(' ')
+        description = branch_arr[1..].join(' ')
         "#{issue} #{description.capitalize}"
       else # plain words
-        branch_arr[0..-1].join(' ').capitalize
+        branch_arr[0..].join(' ').capitalize
       end
     end
     # rubocop:enable Metrics/MethodLength

data/lib/git_helper/merge_request.rb

@@ -29,21 +29,16 @@ module GitHelper
       puts "Creating merge request: #{new_mr_title}"
       mr = gitlab_client.create_merge_request(local_project, options)
 
-      raise StandardError, mr.message if mr.diff_refs.nil? || mr.web_url.nil?
-
-      if mr.diff_refs['base_sha'] == mr.diff_refs['head_sha']
+      if mr.web_url && mr.diff_refs && (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
+      elsif mr.web_url
         puts "Merge request successfully created: #{mr.web_url}"
+      else
+        raise StandardError, (mr.message.instance_of?(Array) ? mr.message.first : mr.message)
       end
     rescue StandardError => e
       puts 'Could not create merge request:'
-
-      if e.message.include?('Another open merge request already exists')
-        puts '  A merge request already exists for this branch'
-      else
-        puts "  #{e.message}"
-      end
+      puts "  #{e.message}"
     end
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength

data/lib/git_helper/setup.rb

@@ -32,8 +32,8 @@ module GitHelper
       return unless answer
 
       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'
+      puts "\nNow add this line to your ~/.bash_profile:\n  " \
+           'export PATH=/path/to/computer/home/.git_helper/plugins:$PATH'
       puts "\nDone!"
     end
 
@@ -66,8 +66,8 @@ module GitHelper
         file_contents << ":gitlab_user:  #{ask_question('GitLab username?')}\n"
         file_contents << ':gitlab_token: ' \
           "#{ask_question(
-            'GitLab personal access token? (Navigate to https://gitlab.com/-/profile/personal_access_tokens' \
-            ' to create a new personal access token)',
+            'GitLab personal access token? (Navigate to https://gitlab.com/-/profile/personal_access_tokens ' \
+            'to create a new personal access token)',
             secret: true
           )}\n"
       end
@@ -81,7 +81,6 @@ module GitHelper
     end
 
     # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/AbcSize
     private def create_or_update_plugin_files
       plugins_dir = "#{Dir.pwd.scan(%r{\A/\w*/\w*/}).first}.git_helper/plugins"
       plugins_url = 'https://api.github.com/repos/emmahsax/git_helper/contents/plugins'
@@ -89,7 +88,7 @@ module GitHelper
       token = git_config_reader.github_token
       user = git_config_reader.github_user
 
-      Dir.mkdir(plugins_dir) unless File.exist?(plugins_dir)
+      FileUtils.mkdir_p(plugins_dir)
 
       all_plugins = JSON.parse(`curl -s -u #{user}:#{token} -H "#{header}" -L "#{plugins_url}"`)
 
@@ -99,7 +98,6 @@ module GitHelper
       end
     end
     # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
 
     private def config_file
       git_config_reader.git_config_file_path

data/lib/git_helper/version.rb

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

data/lib/git_helper.rb

@@ -6,7 +6,7 @@ require 'highline_wrapper'
 
 files = "#{File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), 'git_helper'))}/**/*.rb"
 
-Dir[files].each do |file|
+Dir[files].sort.each do |file|
   require_relative file
 end
 

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -154,21 +154,7 @@ files:
 - lib/git_helper/setup.rb
 - lib/git_helper/version.rb
 - plugins.zip
-- spec/git_helper/change_remote_spec.rb
-- spec/git_helper/checkout_default_spec.rb
-- spec/git_helper/clean_branches_spec.rb
-- spec/git_helper/code_request_spec.rb
-- 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/pull_request_spec.rb
-- spec/git_helper/setup_spec.rb
-- spec/spec_helper.rb
+- renovate.json
 homepage: https://github.com/emmahsax/git_helper
 licenses:
 - BSD-3-Clause
@@ -189,23 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A set of GitHub and GitLab workflow scripts
-test_files:
-- spec/spec_helper.rb
-- spec/git_helper/change_remote_spec.rb
-- spec/git_helper/checkout_default_spec.rb
-- spec/git_helper/clean_branches_spec.rb
-- spec/git_helper/code_request_spec.rb
-- 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/pull_request_spec.rb
-- spec/git_helper/setup_spec.rb
+test_files: []

data/spec/git_helper/change_remote_spec.rb

@@ -1,176 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'git_helper'
-
-describe GitHelper::ChangeRemote do
-  let(:remote1) { "git@github.com:#{old_owner}/#{project}.git" }
-  let(:project) { Faker::Lorem.word }
-  let(:highline_wrapper) { double(:highline_wrapper, 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(: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)
-  end
-
-  subject { GitHelper::ChangeRemote.new(old_owner, new_owner) }
-
-  before do
-    allow(HighlineWrapper).to receive(:new).and_return(highline_wrapper)
-    allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    allow(subject).to receive(:puts)
-  end
-
-  describe '#execute' do
-    before do
-      allow(Dir).to receive(:pwd).and_return("/Users/#{Faker::Name.first_name}/#{project}")
-      allow(Dir).to receive(:entries).and_return(directory_entries)
-      allow(File).to receive(:join).and_return("/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
-      allow(File).to receive(:directory?).and_return(true)
-      allow(subject).to receive(:process_dir)
-    end
-
-    it 'should call to process at least one directory' do
-      expect(subject).to receive(:process_dir).at_least(:once)
-      subject.execute
-    end
-
-    it 'should definitely look in the file structure' do
-      expect(Dir).to receive(:pwd)
-      expect(Dir).to receive(:entries)
-      expect(File).to receive(:join)
-      expect(File).to receive(:directory?)
-      subject.execute
-    end
-  end
-
-  describe '#process_dir' do
-    before do
-      allow(Dir).to receive(:chdir).and_return(nil)
-      allow(File).to receive(:exist?).and_return(true)
-      allow(subject).to receive(:process_git_repository)
-    end
-
-    it 'should definitely look in the file structure' do
-      expect(Dir).to receive(:chdir)
-      expect(File).to receive(:exist?)
-      subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
-    end
-
-    context 'when the user says to process the directory' do
-      it 'should call to process the git repository at least once' do
-        expect(subject).to receive(:process_git_repository).at_least(:once)
-        subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
-      end
-    end
-
-    context 'when the user says not to process the directory' do
-      let(:highline_wrapper) { double(:highline_wrapper, ask_yes_no: false) }
-
-      it 'should not call to process the directory' do
-        expect(subject).not_to receive(:process_git_repository)
-        subject.send(:process_dir, "/Users/#{Faker::Name.first_name}/#{project}", "/Users/#{Faker::Name.first_name}/#{project}/#{Faker::Lorem.word}")
-      end
-    end
-  end
-
-  describe '#process_git_repository' do
-    before do
-      allow(subject).to receive(:process_remote).and_return(nil)
-    end
-
-    it 'should call local_code' do
-      expect(GitHelper::LocalCode).to receive(:new)
-      subject.send(:process_git_repository)
-    end
-
-    context 'when the remote includes the old owner' do
-      it 'should call to process the remote' do
-        expect(subject).to receive(:process_remote)
-        subject.send(:process_git_repository)
-      end
-    end
-
-    context 'when the remote does not include the old owner' do
-      let(:remote1) { "git@github.com:#{new_owner}/#{project}.git" }
-
-      it 'should not call to process the remote' do
-        expect(subject).not_to receive(:process_remote)
-        subject.send(:process_git_repository)
-      end
-    end
-  end
-
-  describe '#process_remote' do
-    it 'should always get the remote name' do
-      expect(local_code).to receive(:remote_name)
-      subject.send(:process_remote, remote1)
-    end
-
-    it 'should always attempt to change the remote' do
-      expect(local_code).to receive(:change_remote)
-      subject.send(:process_remote, remote1)
-    end
-
-    it 'should attempt to get the remote repo exactly once' do
-      expect(local_code).to receive(:remote_project).exactly(:once)
-      subject.send(:process_remote, remote1)
-    end
-
-    it 'should attempt to get the remote source exactly once' do
-      expect(local_code).to receive(:remote_source).exactly(:once)
-      subject.send(:process_remote, remote1)
-    end
-
-    it 'should ask if the remote is SSH' do
-      expect(local_code).to receive(:ssh_remote?)
-      subject.send(:process_remote, remote1)
-    end
-
-    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)
-      end
-
-      it 'should ask if the remote is SSH' do
-        expect(local_code).to receive(:ssh_remote?)
-        subject.send(:process_remote, remote1)
-      end
-
-      it 'should ask if the remote is https' do
-        expect(local_code).to receive(:https_remote?)
-        subject.send(:process_remote, remote1)
-      end
-    end
-  end
-
-  describe '#local_code' do
-    it 'should create a new local code instance' do
-      expect(GitHelper::LocalCode).to receive(:new)
-      subject.send(:local_code)
-    end
-  end
-
-  describe '#highline' do
-    it 'should create a new highline_wrapper instance' do
-      expect(HighlineWrapper).to receive(:new)
-      subject.send(:highline)
-    end
-  end
-end

data/spec/git_helper/checkout_default_spec.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'git_helper'
-
-describe GitHelper::CheckoutDefault do
-  let(:local_code) { double(:local_code, checkout_default: :done) }
-
-  subject { GitHelper::CheckoutDefault.new }
-
-  it 'should call GitHelper::LocalCode' do
-    expect(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    subject.execute
-  end
-
-  it 'should call the checkout_default method from the local code class' do
-    allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    expect(local_code).to receive(:checkout_default)
-    subject.execute
-  end
-end

data/spec/git_helper/clean_branches_spec.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'git_helper'
-
-describe GitHelper::CleanBranches do
-  let(:local_code) { double(:local_code, clean_branches: :commit) }
-
-  subject { GitHelper::CleanBranches.new }
-
-  it 'should call GitHelper::LocalCode' do
-    expect(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    subject.execute
-  end
-
-  it 'should call the clean_branches method from the local code class' do
-    allow(GitHelper::LocalCode).to receive(:new).and_return(local_code)
-    expect(local_code).to receive(:clean_branches)
-    subject.execute
-  end
-end