git-lint 1.1.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbb3f67f04832ff30e770db178902f8d271af160d713ece50c188601d969160
-  data.tar.gz: '0285bce8629da448fb16fcf7fbe69ac0d3d3afcbfb3f10f140c3c35744841cfe'
+  metadata.gz: ba39bef55a904dc640ba7421df9016597bc826faf3263eddb5f3bff2036a00b4
+  data.tar.gz: 4ea42cc58c1cdb23fff6bd0625e23573b0c13831c4a75115a08fc9d751a32088
 SHA512:
-  metadata.gz: 52130792fd09ddb40873b3a3e997ffce167e263c12d01ef07cb14f8818e442776a0f0451fdf02eec478db05b4b034adf7bba22a7f72b971b2570d5b1d27ba331
-  data.tar.gz: 35969feb54089337530739b62e8edb23ab35c68d2ea7ea8cf348fa439a0f864c864157d0f0d0bc343c11e32546907dd89d5b64b6047cc4056fbb82e19b6a2fcf
+  metadata.gz: 86c24491442dc4e817693138a5b0b822137e2c0627a8c5808576bdee1128480d310269852f013eee7b25cb097ea07ffc6f7f211a2e628b2d88dd97e7f8a26f84
+  data.tar.gz: acfebc2a5e4f373304f553af56d01f4c6309726d1ac09b1ec1e0edb4cdf76ea3a63fa4d977f6e974b1ed92a6312a5594e18bcd67116f2fd72fd585621a8f5a5c

data/README.adoc

@@ -8,6 +8,8 @@
 
 [link=http://badge.fury.io/rb/git-lint]
 image::https://badge.fury.io/rb/git-lint.svg[Gem Version]
+[link=https://www.alchemists.io/projects/code_quality]
+image::https://img.shields.io/badge/code_style-alchemists-brightgreen.svg[Alchemists Style Guide]
 [link=https://circleci.com/gh/bkuhlmann/git-lint]
 image::https://circleci.com/gh/bkuhlmann/git-lint.svg?style=svg[Circle CI Status]
 
@@ -19,11 +21,6 @@ image::https://api.netlify.com/api/v1/badges/7e23b422-3412-4e7f-b654-65c0417a0b1
 A command line interface for linting Git commits. Ensures you maintain a clean, easy to read,
 debuggable, and maintainable project history.
 
-*Git Lint is the official port of the original Git Cop project that avoids references to violence or
-violent terminology that might make anyone feel unwelcome. The name change was necessary in order to
-better support the link:https://blacklivesmatter.com[Black Lives Matter] and
-link:https://8cantwait.org[Defund Police] movements.*
-
 toc::[]
 
 == Features
@@ -383,6 +380,36 @@ from `master`.
 Detection and configuration happens automatically by checking the `CIRCLECI` environment variable.
 No additional setup required!
 
+==== link:https://docs.github.com/en/free-pro-team@latest/actions[GitHub Actions]
+
+Detection happens automatically by checking the `GITHUB_ACTIONS` environment variable as supplied by
+the GitHub environment. The only configuration required is to add a `.github/workflows/git_lint.yml`
+to your repository with the following contents:
+
+[source,yaml]
+----
+name: Git Lint
+
+on: pull_request
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    container:
+      image: ruby:latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+          ref: ${{github.head_ref}}
+      - name: Install
+        run: gem install git-lint
+      - name: Analyze
+        run: git-lint --analyze
+----
+
+The above will ensure Git Lint runs as an additional check on each Pull Request.
+
 ==== link:https://www.netlify.com[Netlify CI]
 
 Detection and configuration happens automatically by checking the `NETLIFY` environment variable. No
@@ -883,14 +910,19 @@ configuration disabled.
 * Use small, atomic commits:
 ** Easier to review and provide feedback.
 ** Easier to review implementation and corresponding tests.
-** Easier to document with detailed subject messages (especially when grouped together in a pull
-   request).
+** Easier to document with detailed subjects (especially when grouped together in a pull request).
 ** Easier to reword, edit, squash, fix, or drop when interactively rebasing.
 ** Easier to combine together versus tearing apart a larger commit into smaller commits.
 * Use logically ordered commits:
 ** Each commit should tell a story and be a logical building block to the next commit.
+** Each commit should, ideally, be the implementation plus corresponding test. Avoid committing
+   changes that are a jumble of mixed ideas as they are hard to decipher and a huge insult not only
+   to the reviewer but your future self.
 ** Each commit, when reviewed in order, should be able to explain _how_ the feature or bug fix was
    completed and implemented properly.
+* Keep refactored code separate from behavioral changes. This makes the review process easier
+  because you don't have to sift through all the line and format changes to figure out what is new
+  or changed.
 
 === Branches
 
@@ -924,8 +956,11 @@ configuration disabled.
 
 === Code Reviews
 
-There are two objectives each code review should achieve:
+There are three main objectives each code review should achieve:
 
+. *Joy* - The experience of working with you, receiving feedback, giving feedback, and demonstrating
+   a level of care influences others and encourages a collaborative environment that is fun to work
+   in. Use this time to build and reinforce trust amongst your fellow colleagues.
 . *Quality*: Ensures changes are of highest quality that adhere to team standards while enhancing
    the customer experience and not disrupting their workflow.
 . *Education*: Provides a chance for everyone on the team to learn more about the architecture,
@@ -935,13 +970,22 @@ There are two objectives each code review should achieve:
 In addition to the objectives above, the following guidelines are worth following:
 
 * Keep code reviews short and easy to review:
+** Review your own code first before submitting to others. By ensuring your are confident in the
+   overall implementation and the commits in terms of commit messages and implementation details,
+   you'll encourage higher quality feedback and show appreciation for the reviewer's time.
 ** Provide a high level overview that answers _why_ the code review is necessary.
-** Provide a link to the issue/task that prompted the code review (if any).
+** Provide a link to the issue that prompted the code review (if any) and any additional details
+   worth highlighting to guide the reviewer through the process.
 ** Provide screenshots/screencasts if possible.
-** Ensure commits within the code review are related to the purpose of the code review.
-** Prefer code reviews at about 250 lines in order to keep the quality of the code review and defect
-   detection high.
-** Avoid working on a large issue without getting feedback first in order to not overwhelm/surprise
+** Provide any ancillary notes or points of interest worth highlighting for the reviewer.
+** Ensure commits within the code review are related to the purpose of the code review and avoid
+   mixing in changes that are ancillary to the primary objective of the code view. If you do have
+   changes outside of the scope of the current code review, open those changes up as a separate code
+   review instead.
+** Prefer code reviews at about 300 lines in order to keep the quality of the code review and defect
+   detection high. This also shows you value the reviewers time and attention away from their own
+   work.
+** Avoid working on a large issues without first getting feedback in order to not overwhelm/surprise
    the maintainers. More discussion up front will help ensure your work has a faster chance of
    acceptance.
 * Review and rebase code reviews quickly:
@@ -981,9 +1025,14 @@ In addition to the objectives above, the following guidelines are worth followin
     always meant as a response to helpful feedback.
 ** ✅ (`:white_check_mark:`) - Signifies code review approval. The author can
     rebase onto `master` and delete the feature branch at this point.
+* Use all feedback as a chance to learn, teach, strenghen the bond of trust between you and your
+  fellow colleagues, and avoid being cut by
+  link:https://fs.blog/2017/04/mental-model-hanlons-razor[Hanlon's Razor].
+* Use automation to ensure code reviews are consistent, of high quality, and swift to resolve. Each
+  code review can be an opportunity to identify and automate the process further.
 * Use face-to-face communication if a code review's written discussion gets lengthy/noisy.
-* Create new tasks/actions if additional features are discovered during a code review to avoid
-  delaying code review acceptance. Return to the code review once tasks have been logged.
+* Create follow-up actions if additional features are discovered during a code review to avoid
+  delaying code review acceptance. Return to the code review once the new actions have been logged.
 * The author, not the reviewer, should rebase the feature branch onto `master` upon approval.
 * Avoid reviewing your own code review before rebasing onto `master`. Have another pair of eyes
   review your code first.

data/lib/git/lint.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require "git_plus"
 require "git/lint/identity"
-require "git/kit/repo"
 require "git/lint/refinements/strings"
 require "git/lint/errors/base"
 require "git/lint/errors/severity"
@@ -11,10 +11,9 @@ require "git/lint/validators/email"
 require "git/lint/validators/name"
 require "git/lint/validators/capitalization"
 require "git/lint/parsers/trailers/collaborator"
-require "git/lint/commits/saved"
-require "git/lint/commits/unsaved"
 require "git/lint/branches/environments/local"
 require "git/lint/branches/environments/circle_ci"
+require "git/lint/branches/environments/git_hub_action"
 require "git/lint/branches/environments/netlify_ci"
 require "git/lint/branches/environments/travis_ci"
 require "git/lint/branches/feature"

data/lib/git/lint/analyzers/abstract.rb

@@ -91,10 +91,10 @@ module Git
           end
         end
 
-        def affected_commit_trailer_lines
-          commit.trailer_lines
+        def affected_commit_trailers
+          commit.trailers
                 .each.with_object([])
-                .with_index(commit.trailer_index) do |(line, lines), index|
+                .with_index(commit.trailers_index) do |(line, lines), index|
                   yield if block_given?
                   lines << self.class.build_issue_line(index, line) if invalid_line? line
                 end

data/lib/git/lint/analyzers/commit_author_name.rb

@@ -32,7 +32,7 @@ module Git
         attr_reader :validator
 
         def minimum
-          settings.fetch :minimum
+          settings.fetch __method__
         end
       end
     end

data/lib/git/lint/analyzers/commit_body_leading_line.rb

@@ -12,12 +12,12 @@ module Git
         end
 
         def valid?
-          raw_body = commit.raw_body
-          subject, body = raw_body.split "\n", 2
+          message = commit.message
+          subject, body = message.split "\n", 2
 
           return true if !String(subject).empty? && String(body).strip.empty?
 
-          raw_body.match?(/\A.+(\n\n|\#).+/m)
+          message.match?(/\A.+(\n\n|\#).+/m)
         end
 
         def issue

data/lib/git/lint/analyzers/commit_subject_prefix.rb

@@ -34,7 +34,7 @@ module Git
         private
 
         def fixup_or_squash?
-          commit.is_a?(Git::Lint::Commits::Unsaved) && (commit.fixup? || commit.squash?)
+          commit.fixup? || commit.squash?
         end
       end
     end

data/lib/git/lint/analyzers/commit_trailer_collaborator_capitalization.rb

@@ -23,7 +23,7 @@ module Git
         # rubocop:enable Metrics/ParameterLists
 
         def valid?
-          affected_commit_trailer_lines.empty?
+          affected_commit_trailers.empty?
         end
 
         def issue
@@ -31,7 +31,7 @@ module Git
 
           {
             hint: "Name must be capitalized.",
-            lines: affected_commit_trailer_lines
+            lines: affected_commit_trailers
           }
         end
 

data/lib/git/lint/analyzers/commit_trailer_collaborator_duplication.rb

@@ -20,7 +20,7 @@ module Git
         end
 
         def valid?
-          affected_commit_trailer_lines.empty?
+          affected_commit_trailers.empty?
         end
 
         def issue
@@ -28,7 +28,7 @@ module Git
 
           {
             hint: "Avoid duplication.",
-            lines: affected_commit_trailer_lines
+            lines: affected_commit_trailers
           }
         end
 
@@ -47,7 +47,7 @@ module Git
           zeros = Hash.new { |new_hash, missing_key| new_hash[missing_key] = 0 }
 
           zeros.tap do |collection|
-            commit.trailer_lines.each { |line| collection[line] += 1 if parser.new(line).match? }
+            commit.trailers.each { |line| collection[line] += 1 if parser.new(line).match? }
           end
         end
       end

data/lib/git/lint/analyzers/commit_trailer_collaborator_email.rb

@@ -24,7 +24,7 @@ module Git
         # rubocop:enable Metrics/ParameterLists
 
         def valid?
-          affected_commit_trailer_lines.empty?
+          affected_commit_trailers.empty?
         end
 
         def issue
@@ -32,7 +32,7 @@ module Git
 
           {
             hint: %(Email must follow name and use format: "<name@server.domain>".),
-            lines: affected_commit_trailer_lines
+            lines: affected_commit_trailers
           }
         end
 

data/lib/git/lint/analyzers/commit_trailer_collaborator_key.rb

@@ -20,7 +20,7 @@ module Git
         end
 
         def valid?
-          affected_commit_trailer_lines.empty?
+          affected_commit_trailers.empty?
         end
 
         def issue
@@ -28,7 +28,7 @@ module Git
 
           {
             hint: "Use format: #{filter_list.to_hint}.",
-            lines: affected_commit_trailer_lines
+            lines: affected_commit_trailers
           }
         end
 

data/lib/git/lint/analyzers/commit_trailer_collaborator_name.rb

@@ -25,7 +25,7 @@ module Git
         # rubocop:enable Metrics/ParameterLists
 
         def valid?
-          affected_commit_trailer_lines.empty?
+          affected_commit_trailers.empty?
         end
 
         def issue
@@ -33,7 +33,7 @@ module Git
 
           {
             hint: "Name must follow key and consist of #{minimum} parts (minimum).",
-            lines: affected_commit_trailer_lines
+            lines: affected_commit_trailers
           }
         end
 

data/lib/git/lint/branches/environments/circle_ci.rb

@@ -6,21 +6,21 @@ module Git
       module Environments
         # Provides Circle CI build environment feature branch information.
         class CircleCI
-          def initialize repo: Git::Kit::Repo.new
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new
+            @repository = repository
           end
 
           def name
-            "origin/#{repo.branch_name}"
+            "origin/#{repository.branch_name}"
           end
 
-          def shas
-            repo.shas start: "origin/master", finish: name
+          def commits
+            repository.commits "origin/master..#{name}"
           end
 
           private
 
-          attr_reader :repo
+          attr_reader :repository
         end
       end
     end

data/lib/git/lint/branches/environments/git_hub_action.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Git
+  module Lint
+    module Branches
+      module Environments
+        # Provides GitHub Action build environment feature branch information.
+        class GitHubAction
+          def initialize repository: GitPlus::Repository.new
+            @repository = repository
+          end
+
+          def name
+            "origin/#{repository.branch_name}"
+          end
+
+          def commits
+            repository.commits "origin/master..#{name}"
+          end
+
+          private
+
+          attr_reader :repository
+        end
+      end
+    end
+  end
+end

data/lib/git/lint/branches/environments/local.rb

@@ -6,21 +6,21 @@ module Git
       module Environments
         # Provides local build environment feature branch information.
         class Local
-          def initialize repo: Git::Kit::Repo.new
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new
+            @repository = repository
           end
 
           def name
-            repo.branch_name
+            repository.branch_name
           end
 
-          def shas
-            repo.shas start: "master", finish: name
+          def commits
+            repository.commits "master..#{name}"
           end
 
           private
 
-          attr_reader :repo
+          attr_reader :repository
         end
       end
     end

data/lib/git/lint/branches/environments/netlify_ci.rb

@@ -8,25 +8,25 @@ module Git
       module Environments
         # Provides Netlify CI build environment feature branch information.
         class NetlifyCI
-          def initialize environment: ENV, repo: Git::Kit::Repo.new, shell: Open3
-            @environment = environment
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new, shell: Open3, environment: ENV
+            @repository = repository
             @shell = shell
+            @environment = environment
           end
 
           def name
             environment["HEAD"]
           end
 
-          def shas
-            shell.capture2e "git remote add -f origin #{environment["REPOSITORY_URL"]}"
-            shell.capture2e "git fetch origin #{name}:#{name}"
-            repo.shas start: "origin/master", finish: "origin/#{name}"
+          def commits
+            shell.capture3 "git remote add -f origin #{environment["REPOSITORY_URL"]}"
+            shell.capture3 "git fetch origin #{name}:#{name}"
+            repository.commits "origin/master..origin/#{name}"
           end
 
           private
 
-          attr_reader :environment, :repo, :shell
+          attr_reader :repository, :shell, :environment
         end
       end
     end

data/lib/git/lint/branches/environments/travis_ci.rb

@@ -8,35 +8,35 @@ module Git
       module Environments
         # Provides Travis CI build environment feature branch information.
         class TravisCI
-          def initialize environment: ENV, repo: Git::Kit::Repo.new, shell: Open3
-            @environment = environment
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new, shell: Open3, environment: ENV
+            @repository = repository
             @shell = shell
+            @environment = environment
           end
 
           def name
             pull_request_branch.empty? ? ci_branch : pull_request_branch
           end
 
-          def shas
+          def commits
             prepare_project
-            repo.shas start: "origin/master", finish: name
+            repository.commits "origin/master..#{name}"
           end
 
           private
 
-          attr_reader :environment, :repo, :shell
+          attr_reader :environment, :repository, :shell
 
           def prepare_project
             slug = pull_request_slug
 
             unless slug.empty?
-              shell.capture2e "git remote add -f original_branch https://github.com/#{slug}.git"
-              shell.capture2e "git fetch original_branch #{name}:#{name}"
+              shell.capture3 "git remote add -f original_branch https://github.com/#{slug}.git"
+              shell.capture3 "git fetch original_branch #{name}:#{name}"
             end
 
-            shell.capture2e "git remote set-branches --add origin master"
-            shell.capture2e "git fetch"
+            shell.capture3 "git remote set-branches --add origin master"
+            shell.capture3 "git fetch"
           end
 
           def ci_branch