Skip to content

Commit

Permalink
Merge pull request #61 from mhashizume/PA-5722/main/frozen-string
Browse files Browse the repository at this point in the history
(PA-5722) Add frozen string magic comment
  • Loading branch information
tvpartytonight authored Sep 15, 2023
2 parents c938d3d + 6205984 commit 6cebc08
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions lib/puppet/feature/augeas.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'puppet/util/feature'

Puppet.features.add(:augeas, libs: ['augeas'])
11 changes: 5 additions & 6 deletions rakelib/commits.rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
desc "verify that commit messages match CONTRIBUTING.md requirements"
desc "verify that commit summaries are properly formatted"
task(:commits) do
# This rake task looks at the summary from every commit from this branch not
# in the branch targeted for a PR.
Expand All @@ -7,11 +7,10 @@ task(:commits) do
%x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
# This regex tests for the currently supported commit summary tokens.
# The exception tries to explain it in more full.
if /^Release prep|\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil?
raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
"\n\t\t#{commit_summary}\n" \
"\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n" \
"\t\t(MODULES-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
if /^Release prep|\((maint|packaging|doc|docs|modules|pa-\d+)\)|revert/i.match(commit_summary).nil?
raise "\n\n\n\tPlease make sure that your commit summary (i.e. the first line of the commit message) starts with one of the following:\n" \
"\t\t(PA-<digits>)\n" \
"\t\t(MODULES-<digits>)\n" \
"\t\t(docs)\n" \
"\t\t(docs)(DOCUMENT-<digits>)\n" \
"\t\t(packaging)\n"
Expand Down

0 comments on commit 6cebc08

Please sign in to comment.