git_helper 3.3.5 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d74d094412a3d4f474722dd3c188e029a10087c0b85417e31fa7bcd14d89a08d
-  data.tar.gz: b0e353cb0f8fcae55d82ce858cab7a2e47f933dbf9cd790f738d673e205c88bc
+  metadata.gz: 37d1cb4ca342aac0362a8e7bd6f9726731315aead8c49ee2462d34ccdd6026c8
+  data.tar.gz: d5d4193926ecfc3d37ab4f5289be2364d5cca527aec32fcae7fa1ede7406d9da
 SHA512:
-  metadata.gz: 22cf7cd312ffd1770effc7f1c3b0f128dd917f667a6ad65717a4e78b2d19c2463776eeb2cefd2895c4518eabe6fffd5ff7aef55589505a844e4cb8b7a67f9aab
-  data.tar.gz: 99fb83f4324c82c9110847aae36adceee0823de922721dc733bd698b863ebff71db2e5af1df61d5beace2f311adec5824e80a0448ff4d57bda3417a6ce6adf8b
+  metadata.gz: 7d44f55e02a52b3c419a06b10d99755fb1858270b82e505d134a97b2a61b53378c15fea01f54c9f421bf097a403ba9cdc029f5872529a5db051932e9b036df75
+  data.tar.gz: c31682a0cb41f8ccf74ecf70ec1f302904d209dcdd043730207127f428541a91f4619db9d23e493bfd5d67481d769d2c84fb496f4dee6402c0ce0dee2d5c3357

data/Gemfile.lock

@@ -1,35 +1,48 @@
 PATH
   remote: .
   specs:
-    git_helper (3.3.4)
+    git_helper (3.5.0)
       gitlab (~> 4.16)
       gli (~> 2.13)
-      highline_wrapper (~> 0.1.0)
+      highline_wrapper (~> 1.1)
       octokit (~> 4.18)
+      psych (< 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    faker (2.16.0)
+    faker (2.18.0)
       i18n (>= 1.6, < 2)
-    faraday (1.3.0)
+    faraday (1.5.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    ffi (1.14.2)
-    formatador (0.2.5)
+    faraday-net_http_persistent (1.1.0)
+    faraday-patron (1.0.0)
+    ffi (1.15.3)
+    formatador (0.3.0)
     gitlab (4.17.0)
       httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    gli (2.20.0)
-    guard (2.16.2)
+    gli (2.20.1)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -44,44 +57,44 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     highline (2.0.3)
-    highline_wrapper (0.1.0)
+    highline_wrapper (1.2.2)
       highline (~> 2.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0704)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.20.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (3.3.2)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -95,17 +108,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rubocop (1.18.2)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
     sawyer (0.8.2)
@@ -118,7 +131,7 @@ GEM
     unicode-display_width (1.7.0)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-darwin-19
 
 DEPENDENCIES
   bundler (~> 2.2)
@@ -126,9 +139,8 @@ DEPENDENCIES
   git_helper!
   guard-rspec (~> 4.3)
   pry (~> 0.13)
-  rake (~> 13.0)
   rspec (~> 3.9)
   rubocop (~> 1.10)
 
 BUNDLED WITH
-   2.2.4
+   2.2.21

data/Guardfile

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

data/LICENSE.md

@@ -0,0 +1,29 @@
+BSD 3-Clause "New" or "Revised" License
+
+Copyright (c) 2020 Emma Sax.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions, and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,4 +1,4 @@
-# git_helper [![Main](https://github.com/emmahsax/git_helper/actions/workflows/main.yml/badge.svg)](https://github.com/emmahsax/git_helper/actions/workflows/main.yml)
+# Git Helper [![Main](https://github.com/emmahsax/git_helper/actions/workflows/main.yml/badge.svg)](https://github.com/emmahsax/git_helper/actions/workflows/main.yml)
 
 ## Gem Usage
 
@@ -127,7 +127,7 @@ The command will provide an autogenerated code request title based on your branc
 
 The command will also ask you if the default branch of the repository is the proper base branch to use. You can say 'yes' or 'no'. If you respond 'no', then you can give the command your chosen base base.
 
-If your project uses GitLab, the command will potentially ask you if you'd like to delete the source branch upon merge. If the project defaults to deleting the source branch, then the script will use that selection, and the value can be changed for a specific MR either over the API or in the browser. If the project just provides source branch deletion as on option, then it'll ask the user. It also will probably ask you if you'd like to squash the MR upon merge. If the project requires or prevents squashing, then whatever answer you give will be _*ignored*_. This is unfortunate, but is here due to limited API functionality.
+If your project uses GitLab, the command will potentially ask you if you'd like to delete the source branch upon merge. If the project defaults to deleting the source branch, then the script will use that selection, and the value can be changed for a specific MR either over the API or in the browser. If the project just provides source branch deletion as on option, then it'll ask the user. If the project has allowed squashing, but doesn't default it, then the code will ask the user whether to squash the merge request. If the project has set merge requests to require squashing, prevent squashing, or sets the project to default to squashing, then the code will skip a squash question. If default squashing is set, then the code will set the merge request to squash, and the user can change that over the API or in the browser.
 
 Lastly, it'll ask about code request templates. For GitHub, it'll ask the user to apply any pull request templates found at `.github/pull_request_template.md`, `./pull_request_template.md`, or `.github/PULL_REQUEST_TEMPLATE/*.md`. Applying any template is optional, and a user can make an empty pull request if they desire. For GitLab, it'll ask the user to apply any merge request templates found at any `.gitlab/merge_request_template.md`, `./merge_request_template.md`, or `.gitlab/merge_request_templates/*.md`. Applying any template is optional, and from the command's standpoint, a user can make an empty merge request if they desire (although GitLab may still add a merge request template if the project itself requires one). When searching for templates, the code ignores cases, so the file could be named with all capital letters or all lowercase letters.
 
@@ -176,15 +176,27 @@ git-helper new-branch NEW_BRANCH_NAME
 
 The command either accepts a branch name right away or it will ask you for the name of your new branch. Make sure your input does not contain any spaces or special characters.
 
-## Contributing
+---
 
-To submit a feature request, bug ticket, etc, please submit an official [GitHub Issue](https://github.com/emmahsax/git_helper/issues/new).
+### Contributing
 
-To report any security vulnerabilities, please view this project's [Security Policy](https://github.com/emmahsax/git_helper/security/policy).
+To submit a feature request, bug ticket, etc, please submit an official [GitHub issue](https://github.com/emmahsax/git_helper/issues/new). To copy or make changes, please [fork this repository](https://github.com/emmahsax/git_helper/fork). When/if you'd like to contribute back to this upstream, please create a pull request on this repository.
+
+Please follow included Issue Template(s) and Pull Request Template(s) when creating issues or pull requests.
+
+### Security Policy
+
+To report any security vulnerabilities, please view this repository's [Security Policy](https://github.com/emmahsax/git_helper/security/policy).
+
+### Licensing
+
+For information on licensing, please see [LICENSE.md](https://github.com/emmahsax/git_helper/blob/main/LICENSE.md).
+
+### Code of Conduct
 
 When interacting with this repository, please follow [Contributor Covenant's Code of Conduct](https://contributor-covenant.org).
 
-## Releasing
+### Releasing
 
 To make a new release of this gem:
 

data/lib/git_helper/merge_request.rb

@@ -125,7 +125,16 @@ module GitHelper
     end
 
     private def squash_merge_request
-      @squash_merge_request ||= highline.ask_yes_no('Squash merge request? (y/n)')
+      return @squash_merge_request if @squash_merge_request
+
+      case existing_project.squash_option
+      when 'always', 'default_on'
+        @squash_merge_request = true
+      when 'never'
+        @squash_merge_request = false
+      else # 'default_off' or anything else
+        @squash_merge_request = highline.ask_yes_no('Squash merge request? (y/n)')
+      end
     end
 
     private def remove_source_branch

data/lib/git_helper/new_branch.rb

@@ -4,7 +4,7 @@ module GitHelper
   class NewBranch
     def execute(new_branch_name = nil)
       branch_name = new_branch_name || HighlineWrapper.new.ask('New branch name?', { required: true })
-      puts "Attempting to create a new branch: #{branch_name}\n\n"
+      puts "Attempting to create a new branch: #{branch_name}"
       GitHelper::LocalCode.new.new_branch(branch_name)
     end
   end

data/lib/git_helper/setup.rb

@@ -33,7 +33,7 @@ module GitHelper
 
       create_or_update_plugin_files
       puts "\nNow add this line to your ~/.bash_profile:\n" \
-            '  export PATH=/path/to/computer/home/.git_helper/plugins:$PATH'
+           '  export PATH=/path/to/computer/home/.git_helper/plugins:$PATH'
       puts "\nDone!"
     end
 
@@ -49,6 +49,7 @@ module GitHelper
     end
 
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Layout/LineEndStringConcatenationIndentation
     private def generate_file_contents
       file_contents = ''.dup
 
@@ -75,6 +76,7 @@ module GitHelper
       file_contents.strip
     end
     # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Layout/LineEndStringConcatenationIndentation
 
     private def ask_question(prompt, secret: false)
       highline.ask(prompt, { required: true, secret: secret })

data/lib/git_helper/version.rb

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

data/spec/git_helper/merge_request_spec.rb

@@ -183,12 +183,39 @@ describe GitHelper::GitLabMergeRequest do
   end
 
   describe '#squash_merge_request' do
-    it 'should ask the CLI for the code request ID' do
+    let(:existing_project) { double(squash_option: 'default_off') }
+
+    it 'should return true if the squash is set to always on the project' do
+      allow(subject).to receive(:existing_project).and_return(existing_project)
+      allow(existing_project).to receive(:squash_option).and_return('always')
+      expect(highline_wrapper).not_to receive(:ask_yes_no)
+      expect(subject.send(:squash_merge_request)).to eq(true)
+    end
+
+    it 'should return true if the squash is set to default_on on the project' do
+      allow(subject).to receive(:existing_project).and_return(existing_project)
+      allow(existing_project).to receive(:squash_option).and_return('default_on')
+      expect(highline_wrapper).not_to receive(:ask_yes_no)
+      expect(subject.send(:squash_merge_request)).to eq(true)
+    end
+
+    it 'should return false if the squash is set to never on the project' do
+      allow(subject).to receive(:existing_project).and_return(existing_project)
+      allow(existing_project).to receive(:squash_option).and_return('never')
+      expect(highline_wrapper).not_to receive(:ask_yes_no)
+      expect(subject.send(:squash_merge_request)).to eq(false)
+    end
+
+    it 'should ask the user for their response to the squash question' do
+      allow(subject).to receive(:existing_project).and_return(existing_project)
+      allow(existing_project).to receive(:squash_option).and_return(nil)
       expect(highline_wrapper).to receive(:ask_yes_no).and_return(true)
       subject.send(:squash_merge_request)
     end
 
     it 'should be a boolean' do
+      allow(subject).to receive(:existing_project).and_return(existing_project)
+      allow(existing_project).to receive(:squash_option).and_return(nil)
       expect(highline_wrapper).to receive(:ask_yes_no).and_return(false)
       expect([true, false]).to include(subject.send(:squash_merge_request))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.5.0
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !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
@@ -122,20 +136,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
@@ -175,7 +175,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/git-helper
@@ -213,7 +213,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/emmahsax/git_helper
 licenses:
-- MIT
+- BSD-3-Clause
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -230,10 +230,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 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

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.