kettle-dev 2.0.5 → 2.0.7

data/exe/kettle-commit-msg

@@ -40,7 +40,7 @@ end
 # BRANCH_RULE_TYPE = jira, or another type of branch rule validation, or false to disable
 # FOOTER_APPEND = true/false append commit message footer
 BRANCH_RULES = {
-  "jira" => /^(?<story_type>(hotfix)|(bug)|(feature)|(candy))\/(?<story_id>\d{8,})-.+\Z/,
+  "jira" => /^(?<story_type>hotfix|bug|feature|candy)\/(?<story_id>\d{8,})-.+\Z/
 }
 # Ruby 2.3 compatibility: String#casecmp? is not available; use casecmp.zero?
 BRANCH_RULE_TYPE = (validate = ENV.fetch("GIT_HOOK_BRANCH_VALIDATE", "false")) && !(validate.respond_to?(:casecmp?) ? validate.casecmp?("false") : (validate.casecmp("false").zero?)) && validate
@@ -51,7 +51,7 @@ if (branch_rule = BRANCH_RULES[BRANCH_RULE_TYPE])
   #	<story_type>/<story_id>-explosion-in-the-fudge-factory-spec-suite-fix
   #	where story type is one of "hotfix", "bug", "feature", "candy"
   #
-  branch = %x(git branch 2> /dev/null | grep -e ^* | awk '{print $2}')
+  branch = `git branch 2> /dev/null | grep -e ^* | awk '{print $2}'`
   match_data = branch.match(branch_rule)
   # NOTE: `match` will return nil if match fails, otherwise an instance of MatchData.
   # If not nil then we are assured matches for both regex capture groups
@@ -84,7 +84,7 @@ rescue SystemExit => e
   # Preserve exit status, but ensure at least a newline so shells don't show an empty line only.
   warn("#{script_basename}: exited (status=#{e.status}, msg=#{e.message})") if e.status != 0
   raise
-rescue StandardError => e
+rescue => e
   warn("#{script_basename}: unexpected error: #{e.class}: #{e.message}")
   warn(e.backtrace.join("\n"))
   exit(1)

data/exe/kettle-dev-setup

@@ -3,15 +3,15 @@
 
 # vim: set syntax=ruby
 
-# kettle-dev-setup has been replaced by kettle-jem-setup.
+# kettle-dev-setup has been replaced by kettle-jem setup.
 # All setup and templating functionality has moved to the kettle-jem gem.
 
-$stderr.puts <<~MSG
+warn <<~MSG
   kettle-dev-setup has been removed.
   Setup and templating functionality has moved to the kettle-jem gem.
 
-  Please install kettle-jem and use kettle-jem-setup instead:
+  Please install kettle-jem and use kettle-jem setup instead:
     gem install kettle-jem
-    kettle-jem-setup
+    kettle-jem setup
 MSG
 exit 1

data/exe/kettle-dvcs

@@ -70,7 +70,7 @@ rescue LoadError => e
 rescue SystemExit => e
   warn("#{script_basename}: exited (status=#{e.status}, msg=#{e.message})") if e.status != 0
   raise
-rescue StandardError => e
+rescue => e
   warn("#{script_basename}: unexpected error: #{e.class}: #{e.message}")
   warn(e.backtrace.join("\n"))
   exit(1)

data/exe/kettle-gh-release

@@ -75,7 +75,7 @@ rescue SystemExit => e
   # Preserve exit status, but ensure at least a newline so shells don't show an empty line only.
   warn("#{script_basename}: exited (status=#{e.status}, msg=#{e.message})") if e.status != 0
   raise
-rescue StandardError => e
+rescue => e
   warn("#{script_basename}: unexpected error: #{e.class}: #{e.message}")
   warn(Array(e.backtrace).join("\n"))
   exit(1)

data/exe/kettle-pre-release

@@ -26,7 +26,7 @@ script_basename = File.basename(__FILE__)
 begin
   require "kettle/dev"
   puts "== #{script_basename} v#{Kettle::Dev::Version::VERSION} =="
-rescue StandardError => e
+rescue => e
   warn("#{script_basename}: could not load dependency: #{e.class}: #{e.message}")
   warn("Hint: Ensure the host project has kettle-dev as a dependency and run bundle install.")
   exit(1)
@@ -34,7 +34,7 @@ end
 
 # Option parsing
 options = {
-  check_num: 1,
+  check_num: 1
 }
 
 parser = OptionParser.new do |opts|

data/exe/kettle-readme-backers

@@ -34,7 +34,7 @@ rescue SystemExit => e
   # Preserve exit status, but ensure at least a newline so shells don't show an empty line only.
   warn("#{script_basename}: exited (status=#{e.status}, msg=#{e.message})") if e.status != 0
   raise
-rescue StandardError => e
+rescue => e
   warn("#{script_basename}: unexpected error: #{e.class}: #{e.message}")
   warn(e.backtrace.join("\n"))
   exit(1)

data/exe/kettle-release

@@ -102,7 +102,7 @@ rescue SystemExit => e
   # Preserve exit status, but ensure at least a newline so shells don't show an empty line only.
   warn("#{script_basename}: exited (status=#{e.status}, msg=#{e.message})") if e.status != 0
   raise
-rescue StandardError => e
+rescue => e
   warn("#{script_basename}: unexpected error: #{e.class}: #{e.message}")
   warn(Array(e.backtrace).join("\n"))
   exit(1)

data/lib/kettle/dev/changelog_cli.rb

@@ -17,7 +17,7 @@ module Kettle
       # Matches a Markdown link-reference definition line, e.g. `[key]: https://...`
       LINK_REF_DEF_RE = /^\s*\[[^\]]+\]:\s+\S+/
       # Matches an ATX heading at H4 or deeper (####, #####, ...)
-      DEEP_HEADING_RE = /^[#]{4,}\s/
+      DEEP_HEADING_RE = /^\#{4,}\s/
 
       # Initialize the changelog CLI
       # Sets up paths for CHANGELOG.md and coverage.json
@@ -148,7 +148,7 @@ module Kettle
         begin
           gem_name = detect_gem_name
           latest_overall, latest_for_series = latest_released_versions(gem_name, version)
-        rescue StandardError => e
+        rescue => e
           warn("[kettle-changelog] gem.coop release check failed: #{e.class}: #{e.message}")
           warn("Proceeding without live release info.")
         end
@@ -186,7 +186,7 @@ module Kettle
           latest_overall: latest_overall,
           latest_for_series: latest_for_series,
           latest_target: latest_target,
-          latest_changelog_version: latest_changelog_version,
+          latest_changelog_version: latest_changelog_version
         }
       end
 
@@ -203,7 +203,7 @@ module Kettle
           latest_for_series: nil,
           latest_target: nil,
           latest_changelog_version: prepared_version,
-          explicit: true,
+          explicit: true
         }
       end
 
@@ -273,7 +273,7 @@ module Kettle
         series = cur.segments[0, 2]
         latest_series = gversions.reverse.find { |gv| gv.segments[0, 2] == series }&.to_s
         [latest_overall, latest_series]
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         [nil, nil]
       end
@@ -299,18 +299,7 @@ module Kettle
       end
 
       def detect_version
-        candidates = Dir[File.join(@root, "lib", "**", "version.rb")]
-        abort("Could not find version.rb under lib/**.") if candidates.empty?
-        versions = candidates.map do |path|
-          content = File.read(path)
-          m = content.match(/VERSION\s*=\s*(["'])([^"']+)\1/)
-          next unless m
-
-          m[2]
-        end.compact
-        abort("VERSION constant not found in #{@root}/lib/**/version.rb") if versions.none?
-        abort("Multiple VERSION constants found to be out of sync (#{versions.inspect}) in #{@root}/lib/**/version.rb") unless versions.uniq.length == 1
-        versions.first
+        Kettle::Dev::Versioning.detect_version(@root)
       end
 
       def extract_unreleased(content)
@@ -583,7 +572,7 @@ module Kettle
           warn("Failed to parse coverage: #{e.class}: #{e.message}")
           [nil, nil]
         end
-      rescue StandardError => e
+      rescue => e
         if @strict
           raise "Failed to get coverage data: #{e.class}: #{e.message}"
         else
@@ -598,7 +587,7 @@ module Kettle
           "K_SOUP_COV_FORMATTERS" => "json",
           "K_SOUP_COV_MIN_HARD" => @enforce_coverage_thresholds ? "true" : "false",
           "K_SOUP_COV_MULTI_FORMATTERS" => "true",
-          "K_SOUP_COV_OPEN_BIN" => "",
+          "K_SOUP_COV_OPEN_BIN" => ""
         }
       end
 
@@ -612,7 +601,7 @@ module Kettle
         [
           "Coverage JSON not found at #{Kettle::Dev.display_path(@coverage_path)} after running bundle exec kettle-test.",
           "kettle-test runs specs in parallel and is expected to collate parallel SimpleCov results into this canonical file.",
-          "If it is missing, coverage was not enabled in ENV config or the rake/task hooks did not load the coverage integration.",
+          "If it is missing, coverage was not enabled in ENV config or the rake/task hooks did not load the coverage integration."
         ].join(" ")
       end
 
@@ -644,7 +633,7 @@ module Kettle
             warn("Could not find documented percentage in bin/rake yard output.")
             nil
           end
-        rescue StandardError => e
+        rescue => e
           if @strict
             raise "Failed to run bin/rake yard: #{e.class}: #{e.message}"
           else
@@ -791,7 +780,7 @@ module Kettle
 
       def update_link_refs(content, owner, repo, prev_version, new_version)
         # Convert any GitLab links to GitHub
-        content = content.gsub(%r{https://gitlab\.com/([^/]+)/([^/]+)/-/compare/([^\.]+)\.\.\.([^\s]+)}) do
+        content = content.gsub(%r{https://gitlab\.com/([^/]+)/([^/]+)/-/compare/([^.]+)\.\.\.([^\s]+)}) do
           o = owner || Regexp.last_match(1)
           r = repo || Regexp.last_match(2)
           from = Regexp.last_match(3)
@@ -812,12 +801,8 @@ module Kettle
         # Do NOT assume the first link-ref after the Unreleased heading starts the footer, because
         # some changelogs contain interspersed link-refs within section bodies.
         unreleased_ref_idx = lines.index { |l| l.start_with?(UNRELEASED_SECTION_HEADING) }
-        first_ref = if unreleased_ref_idx
-          unreleased_ref_idx
-        else
-          # If no [Unreleased]: ref is present, consider the reference block to start at EOF
-          lines.length
-        end
+        # If no [Unreleased]: ref is present, consider the reference block to start at EOF
+        first_ref = unreleased_ref_idx || lines.length
 
         # Ensure Unreleased points to GitHub compare from new tag to HEAD
         if owner && repo
@@ -968,7 +953,7 @@ module Kettle
 
         warn(
           "Could not determine initial git root commit; using HEAD^ as compare base. " \
-            "Set KETTLE_CHANGELOG_INITIAL_SHA to override.",
+            "Set KETTLE_CHANGELOG_INITIAL_SHA to override."
         )
         "HEAD^"
       end
@@ -980,7 +965,7 @@ module Kettle
         out, ok = adapter.capture(["rev-list", "--max-parents=0", "HEAD"])
         sha = out.to_s.lines.last&.strip   # take last line in case of multiple root commits
         (ok && sha && !sha.empty?) ? sha : nil
-      rescue StandardError
+      rescue
         nil
       end
     end

data/lib/kettle/dev/ci_helpers.rb

@@ -112,9 +112,9 @@ module Kettle
           "status" => run["status"],
           "conclusion" => run["conclusion"],
           "html_url" => run["html_url"],
-          "id" => run["id"],
+          "id" => run["id"]
         }
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         nil
       end
@@ -205,7 +205,7 @@ module Kettle
               pipe["web_url"] = det["web_url"] if det["web_url"]
             end
           end
-        rescue StandardError => e
+        rescue => e
           Kettle::Dev.debug_error(e, __method__)
           # ignore enrichment errors; fall back to basic fields
         end
@@ -213,9 +213,9 @@ module Kettle
           "status" => pipe["status"],
           "web_url" => pipe["web_url"],
           "id" => pipe["id"],
-          "failure_reason" => pipe["failure_reason"],
+          "failure_reason" => pipe["failure_reason"]
         }
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         nil
       end

data/lib/kettle/dev/ci_monitor.rb

@@ -78,13 +78,13 @@ module Kettle
         begin
           gh = collect_github
           results[:github] = gh if gh
-        rescue StandardError => e
+        rescue => e
           Kettle::Dev.debug_error(e, __method__)
         end
         begin
           gl = collect_gitlab
           results[:gitlab] = gl if gl
-        rescue StandardError => e
+        rescue => e
           Kettle::Dev.debug_error(e, __method__)
         end
         results
@@ -99,12 +99,12 @@ module Kettle
         gh_items = results[:github] || []
         unless gh_items.empty?
           puts "GitHub Actions:"
-          gh_items.each do |it|
-            emoji = status_emoji(it[:status], it[:conclusion])
-            details = [it[:status], it[:conclusion]].compact.join("/")
-            wf = it[:workflow]
-            puts "  - #{wf}: #{emoji} (#{details}) #{"-> #{it[:url]}" if it[:url]}"
-            all_ok &&= (it[:conclusion] == "success")
+          gh_items.each do |item|
+            emoji = status_emoji(item[:status], item[:conclusion])
+            details = [item[:status], item[:conclusion]].compact.join("/")
+            wf = item[:workflow]
+            puts "  - #{wf}: #{emoji} (#{details}) #{"-> #{item[:url]}" if item[:url]}"
+            all_ok &&= (item[:conclusion] == "success")
           end
         end
         gl = results[:gitlab]

data/lib/kettle/dev/commit_msg.rb

@@ -9,7 +9,7 @@ module Kettle
       module_function
 
       BRANCH_RULES = {
-        "jira" => /^(?<story_type>(hotfix)|(bug)|(feature)|(candy))\/(?<story_id>\d{8,})-.+\Z/,
+        "jira" => /^(?<story_type>hotfix|bug|feature|candy)\/(?<story_id>\d{8,})-.+\Z/
       }.freeze
 
       # Enforce branch rule by appending [type][id] to the commit message when missing.
@@ -22,7 +22,7 @@ module Kettle
         branch_rule = BRANCH_RULES[branch_rule_type]
         return unless branch_rule
 
-        branch = %x(git branch 2> /dev/null | grep -e ^* | awk '{print $2}')
+        branch = `git branch 2> /dev/null | grep -e ^* | awk '{print $2}'`
         match_data = branch.match(branch_rule)
         return unless match_data
 

data/lib/kettle/dev/dvcs_cli.rb

@@ -35,12 +35,12 @@ module Kettle
         gl_name: "gl",
         cb_name: "cb",
         force: false,
-        status: false,
+        status: false
       }.freeze
       FORGE_MIGRATION_TOOLS = {
         github: "https://github.com/new/import",
         gitlab: "https://gitlab.com/projects/new#import_project",
-        codeberg: "https://codeberg.org/repo/migrate",
+        codeberg: "https://codeberg.org/repo/migrate"
       }.freeze
 
       # Create the CLI with argv-like arguments
@@ -123,7 +123,7 @@ module Kettle
         {
           github: names[:github],
           gitlab: names[:gitlab],
-          codeberg: names[:codeberg],
+          codeberg: names[:codeberg]
         }.each do |forge, remote|
           next unless remote
           next if remote == names[:origin]
@@ -209,7 +209,7 @@ module Kettle
           github: (@opts[:origin] == "github") ? "origin" : @opts[:gh_name],
           gitlab: (@opts[:origin] == "gitlab") ? "origin" : @opts[:gl_name],
           codeberg: (@opts[:origin] == "codeberg") ? "origin" : @opts[:cb_name],
-          all: "all",
+          all: "all"
         }
       end
 
@@ -219,13 +219,13 @@ module Kettle
           {
             github: "git@github.com:#{org}/#{repo}.git",
             gitlab: "git@gitlab.com:#{org}/#{repo}.git",
-            codeberg: "git@codeberg.org:#{org}/#{repo}.git",
+            codeberg: "git@codeberg.org:#{org}/#{repo}.git"
           }
         else # https
           {
             github: "https://github.com/#{org}/#{repo}.git",
             gitlab: "https://gitlab.com/#{org}/#{repo}.git",
-            codeberg: "https://codeberg.org/#{org}/#{repo}.git",
+            codeberg: "https://codeberg.org/#{org}/#{repo}.git"
           }
         end
       end
@@ -344,7 +344,7 @@ module Kettle
         {
           github: names[:github],
           gitlab: names[:gitlab],
-          codeberg: names[:codeberg],
+          codeberg: names[:codeberg]
         }.each do |forge, remote_name|
           next unless remote_name
 
@@ -388,7 +388,7 @@ module Kettle
             say("  - #{forge.capitalize} import: #{FORGE_MIGRATION_TOOLS[forge]}")
           end
         end
-      rescue StandardError => e
+      rescue => e
         warn("Failed to update README federation status: #{e.message}")
       end
 

data/lib/kettle/dev/gem_spec_reader.rb

@@ -53,7 +53,7 @@ module Kettle
           if gemspec_path && File.file?(gemspec_path)
             begin
               spec = Gem::Specification.load(gemspec_path)
-            rescue StandardError => e
+            rescue => e
               Kettle::Dev.debug_error(e, __method__)
               spec = nil
             end
@@ -62,7 +62,7 @@ module Kettle
           gemspec_source = if gemspec_path && File.file?(gemspec_path)
             begin
               File.read(gemspec_path)
-            rescue StandardError => e
+            rescue => e
               Kettle::Dev.debug_error(e, __method__)
               ""
             end
@@ -91,7 +91,7 @@ module Kettle
                 puts "WARNING: Minimum Ruby not detected"
                 DEFAULT_MINIMUM_RUBY
               end
-            rescue StandardError => e
+            rescue => e
               puts "WARNING: Minimum Ruby detection failed:"
               Kettle::Dev.debug_error(e, __method__)
               # Default to a minimum of Ruby 1.8
@@ -117,7 +117,7 @@ module Kettle
           entrypoint_require = derive_entrypoint_require(
             root: root,
             gem_name: gem_name,
-            gemspec_source: gemspec_source,
+            gemspec_source: gemspec_source
           )
           namespace_source = entrypoint_require.to_s.empty? ? gem_name.to_s.tr("-", "/") : entrypoint_require.to_s
           namespace = namespace_source.split("/").reject(&:empty?).map { |seg| camel.call(seg) }.join("::")
@@ -153,7 +153,7 @@ module Kettle
                 end
               end
             end
-          rescue StandardError => error
+          rescue => error
             Kettle::Dev.debug_error(error, __method__)
             # In an unexpected exception path, escalate to a domain error to aid callers/specs
             raise Kettle::Dev::Error, "Unable to determine funding org: #{error.message}"
@@ -182,7 +182,7 @@ module Kettle
             required_ruby_version: spec&.required_ruby_version, # Gem::Requirement instance
             require_paths: Array(spec&.require_paths),
             bindir: (spec&.bindir || "").to_s,
-            executables: Array(spec&.executables),
+            executables: Array(spec&.executables)
           }
 
           CACHE.mutex.synchronize do
@@ -223,7 +223,7 @@ module Kettle
                 forge_info[:forge_org] = m[1]
                 forge_info[:origin_repo] = m[2].to_s.sub(/\.git\z/, "")
               end
-            rescue StandardError => error
+            rescue => error
               Kettle::Dev.debug_error(error, __method__)
               # be lenient here; actual error raising will occur in caller if required
             end
@@ -255,7 +255,7 @@ module Kettle
           content = source.to_s
           patterns = [
             %r{require_relative\s+["']lib/([^"']+)/version["']},
-            %r{Kernel\.load\(\s*["'][#][{]__dir__[}]/lib/([^"']+)/version\.rb["']},
+            %r{Kernel\.load\(\s*["']\#[{]__dir__[}]/lib/([^"']+)/version\.rb["']}
           ]
 
           patterns.each do |pattern|

data/lib/kettle/dev/git_adapter.rb

@@ -23,7 +23,7 @@ module Kettle
             status = @git.status
             # git gem's Status responds to changed, added, deleted, untracked, etc.
             status.changed.empty? && status.added.empty? && status.deleted.empty? && status.untracked.empty?
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
             false
           end
@@ -31,7 +31,7 @@ module Kettle
           out, st = Open3.capture2("git", "status", "--porcelain")
           st.success? && out.strip.empty?
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         false
       end
@@ -45,7 +45,7 @@ module Kettle
       def capture(args)
         out, status = Open3.capture2("git", *args)
         [out.strip, status.success?]
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         ["", false]
       end
@@ -70,7 +70,7 @@ module Kettle
           Kettle::Dev.debug_error(e, __method__, backtrace: false)
           # Optional dependency: fall back to CLI
           @backend = :cli
-        rescue StandardError => e
+        rescue => e
           raise Kettle::Dev::Error, "Failed to open git repository: #{e.message}"
         end
       end
@@ -90,7 +90,7 @@ module Kettle
               @git.push(nil, branch, force: force)
             end
             true
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
             false
           end
@@ -129,7 +129,7 @@ module Kettle
         else
           system("git", "push", "--tags")
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         false
       end
@@ -142,7 +142,7 @@ module Kettle
           out, status = Open3.capture2("git", "rev-parse", "--abbrev-ref", "HEAD")
           status.success? ? out.strip : nil
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         nil
       end
@@ -154,7 +154,7 @@ module Kettle
         if @backend == :gem
           begin
             @git.ls_files.keys
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
             []
           end
@@ -162,7 +162,7 @@ module Kettle
           out, status = Open3.capture2("git", "ls-files")
           status.success? ? out.split(/\r?\n/).reject(&:empty?) : []
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         []
       end
@@ -178,7 +178,7 @@ module Kettle
       def blame_porcelain(path)
         out, status = Open3.capture2("git", "blame", "--porcelain", path.to_s)
         status.success? ? out : ""
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         ""
       end
@@ -191,7 +191,7 @@ module Kettle
           out, status = Open3.capture2("git", "remote")
           status.success? ? out.split(/\r?\n/).map(&:strip).reject(&:empty?) : []
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         []
       end
@@ -202,7 +202,7 @@ module Kettle
           @git.remotes.each_with_object({}) do |r, h|
             begin
               h[r.name] = r.url
-            rescue StandardError => e
+            rescue => e
               Kettle::Dev.debug_error(e, __method__)
               # ignore
             end
@@ -220,7 +220,7 @@ module Kettle
           end
           urls
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         {}
       end
@@ -235,7 +235,7 @@ module Kettle
           out, status = Open3.capture2("git", "config", "--get", "remote.#{name}.url")
           status.success? ? out.strip : nil
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         nil
       end
@@ -250,7 +250,7 @@ module Kettle
         else
           system("git", "checkout", branch.to_s)
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         false
       end
@@ -266,7 +266,7 @@ module Kettle
         else
           system("git", "pull", remote.to_s, branch.to_s)
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         false
       end
@@ -288,7 +288,7 @@ module Kettle
         else
           system("git", "fetch", remote.to_s)
         end
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         false
       end

data/lib/kettle/dev/git_commit_footer.rb

@@ -20,9 +20,9 @@ module Kettle
         def git_toplevel
           toplevel = nil
           begin
-            out = %x(git rev-parse --show-toplevel 2>/dev/null)
+            out = `git rev-parse --show-toplevel 2>/dev/null`
             toplevel = out.strip unless out.nil? || out.empty?
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
             nil
           end
@@ -114,7 +114,7 @@ module Kettle
           if @name_index
             return $2
           end
-        rescue StandardError => e
+        rescue => e
           Kettle::Dev.debug_error(e, __method__)
         end
         nil

data/lib/kettle/dev/open_collective_config.rb

@@ -56,7 +56,7 @@ module Kettle
               handle = yml["collective"] || yml[:collective] || yml["org"] || yml[:org]
               return handle.to_s unless handle.nil? || handle.to_s.strip.empty? || handle.to_s.match?(/\{KJ\|[^}]+}/)
             end
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__) if Kettle::Dev.respond_to?(:debug_error)
             # fall through to required check
           end