kettle-jem 7.1.3 → 7.1.5

data/lib/kettle/jem.rb

@@ -20,9 +20,11 @@ require "ast/crispr/markdown/markly"
 require "kettle/ndjson"
 require "rbs"
 require "kettle/dev"
+require "kettle/changelog"
 require "kettle/rb/compat_matrix"
 require_relative "jem/version"
 require_relative "jem/license_txt_migrator"
+require_relative "jem/maintenance_changelog"
 
 begin
   require "kettle/drift"
@@ -1405,6 +1407,63 @@ module Kettle
       "🖇osc-sponsors-img",
       "🖇osc-sponsors-bottom-img"
     ].freeze
+    FUNDING_YML_PLATFORMS = %w[
+      buy_me_a_coffee
+      community_bridge
+      github
+      issuehunt
+      ko_fi
+      liberapay
+      open_collective
+      patreon
+      polar
+      thanks_dev
+      tidelift
+    ].freeze
+    FUNDING_README_PLATFORMS = (FUNDING_YML_PLATFORMS + ["paypal"]).freeze
+    FUNDING_DEFAULT_DISABLED_PLATFORMS = %w[issuehunt patreon polar].freeze
+    README_FUNDING_BADGE_POLICIES = {
+      "github" => {
+        badges: [
+          "[![Sponsor Me on Github][🖇sponsor-img]][🖇sponsor]",
+          "[![Sponsor me on GitHub Sponsors][🖇sponsor-bottom-img]][🖇sponsor]"
+        ],
+        labels: ["🖇sponsor", "🖇sponsor-img", "🖇sponsor-bottom-img"]
+      },
+      "liberapay" => {
+        badges: [
+          "[![Liberapay Goal Progress][⛳liberapay-img]][⛳liberapay]",
+          "[![Sponsor me on Liberapay][⛳liberapay-bottom-img]][⛳liberapay]"
+        ],
+        labels: ["⛳liberapay", "⛳liberapay-img", "⛳liberapay-bottom-img"]
+      },
+      "paypal" => {
+        badges: [
+          "[![Donate on PayPal][🖇paypal-img]][🖇paypal]",
+          "[![Donate on PayPal][🖇paypal-bottom-img]][🖇paypal]"
+        ],
+        labels: ["🖇paypal", "🖇paypal-img", "🖇paypal-bottom-img"]
+      },
+      "buy_me_a_coffee" => {
+        badges: [
+          "[![Buy me a coffee][🖇buyme-small-img]][🖇buyme]"
+        ],
+        labels: ["🖇buyme", "🖇buyme-small-img", "🖇buyme-img"]
+      },
+      "ko_fi" => {
+        badges: [
+          "[![Donate at ko-fi.com][🖇kofi-img]][🖇kofi]",
+          "[![Donate to my FLOSS efforts at ko-fi.com][🖇kofi-img]][🖇kofi]"
+        ],
+        labels: ["🖇kofi", "🖇kofi-img"]
+      },
+      "tidelift" => {
+        badges: [
+          "[![Get help from me on Tidelift][🏙️entsup-tidelift-img]][🏙️entsup-tidelift]"
+        ],
+        labels: ["🏙️entsup-tidelift", "🏙️entsup-tidelift-img"]
+      }
+    }.freeze
     README_INTEGRATIONS = %w[codecov coveralls qlty codeql skywalking-eyes].freeze
     README_STAR_HISTORY_MIN_STARS = 150
     README_DISCOVERED_INTEGRATIONS = (README_INTEGRATIONS - [SKYWALKING_EYES_INTEGRATION]).freeze
@@ -3159,6 +3218,7 @@ module Kettle
       facts[:ruby_style] = ruby_style_facts(project_root)
       opencollective_policy = opencollective_policy(kettle_config, env)
       opencollective_disabled = opencollective_policy.fetch(:disabled)
+      funding_platforms = funding_platform_policies(kettle_config, env)
       detected_open_collective_org = opencollective_org(project_root, kettle_config, env, opencollective_disabled: opencollective_disabled)
       detected_open_collective_org ||= fallback_opencollective_org unless opencollective_disabled
       funding = compact_hash(
@@ -3166,9 +3226,11 @@ module Kettle
           project_root,
           package_name,
           opencollective_disabled: opencollective_disabled,
-          open_collective_org: detected_open_collective_org && detected_open_collective_org.fetch(:org)
+          open_collective_org: detected_open_collective_org && detected_open_collective_org.fetch(:org),
+          enabled_platforms: funding_platforms
         ),
-        platform_tokens: funding_platform_token_facts(kettle_config, env)
+        platform_tokens: funding_platform_token_facts(kettle_config, env),
+        platforms: funding_platforms
       )
       funding[:open_collective_disabled] = true if opencollective_disabled
       funding[:open_collective_disabled_source] = opencollective_policy[:source] if opencollective_disabled
@@ -3408,6 +3470,7 @@ module Kettle
       facts[:social] = social unless social.empty?
       opencollective_policy = opencollective_policy(kettle_config, env)
       opencollective_disabled = opencollective_policy.fetch(:disabled)
+      funding_platforms = funding_platform_policies(kettle_config, env)
       open_collective_org = opencollective_org(project_root, kettle_config, env, opencollective_disabled: opencollective_disabled)
       open_collective_org ||= fallback_opencollective_org unless opencollective_disabled
       funding = compact_hash(
@@ -3416,8 +3479,10 @@ module Kettle
           name,
           funding_uri: metadata_value(gemspec_metadata, :funding_uri),
           opencollective_disabled: opencollective_disabled,
-          open_collective_org: open_collective_org && open_collective_org.fetch(:org)
-        )
+          open_collective_org: open_collective_org && open_collective_org.fetch(:org),
+          enabled_platforms: funding_platforms
+        ),
+        platforms: funding_platforms
       )
       funding_tokens = funding_platform_token_facts(kettle_config, env)
       funding[:platform_tokens] = funding_tokens unless funding_tokens.empty?
@@ -5318,15 +5383,15 @@ module Kettle
       [
         {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.2"\n)},
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.0"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.10"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.12"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.44"\n)},
-        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.1"\n)},
-        {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.19"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.58"\n)},
+        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.4"\n)},
+        {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.20"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
         {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)},
         {name: "stone_checksums", source: %(gem "stone_checksums", "~> 1.0", ">= 1.0.8"\n)},
-        {name: "turbo_tests2", source: %(gem "turbo_tests2", "~> 3.2", ">= 3.2.5"\n)}
+        {name: "turbo_tests2", source: %(gem "turbo_tests2", "~> 3.2", ">= 3.2.6"\n)}
       ].freeze
     end
 
@@ -6390,37 +6455,11 @@ module Kettle
     end
 
     def apply_changelog_transfer_entries(content, entries, excluded_keys: [])
-      transfer_entries = Array(entries).select do |entry|
-        entry.is_a?(Hash) && entry[:key].to_s != "" && Array(entry[:lines]).any?
-      end
-
-      normalized = normalize_changelog(content, {})
-      normalized = remove_excluded_changelog_transfer_entries(normalized, excluded_keys)
-      existing_keys = changelog_transfer_keys(normalized)
-      missing = transfer_entries.reject { |entry| existing_keys.include?(entry.fetch(:key)) }
-      return ensure_trailing_newline(normalized) if missing.empty?
-
-      lines = markdown_source_lines(normalized)
-      unreleased = changelog_unreleased_line_index(lines)
-      return ensure_trailing_newline(normalized) unless unreleased
-
-      destination_end = changelog_unreleased_end_index(lines, unreleased)
-      destination_body = lines[(unreleased + 1)...destination_end] || []
-      items = changelog_unreleased_items(destination_body)
-      missing.group_by { |entry| entry.fetch(:section, "### Changed") }.each do |section, section_entries|
-        section = CHANGELOG_STANDARD_HEADINGS.include?(section) ? section : "### Changed"
-        items[section] ||= []
-        items[section].pop while items[section].any? && items[section].last.to_s.strip.empty?
-        items[section] << "" if items[section].any?
-        section_entries.each do |entry|
-          items[section].concat(Array(entry.fetch(:lines)).map(&:rstrip))
-        end
-      end
-
-      merged_lines = lines[0...unreleased] +
-        build_changelog_unreleased_section(lines.fetch(unreleased), items) +
-        lines[destination_end..].to_a
-      ensure_trailing_newline(merged_lines.join("\n").gsub(/\n{3,}/, "\n\n"))
+      Kettle::Changelog::TransferMerger.apply(
+        content: normalize_changelog(content, {}),
+        entries: entries,
+        excluded_keys: excluded_keys
+      )
     end
 
     def remove_excluded_changelog_transfer_entries(content, excluded_keys)
@@ -7042,6 +7081,8 @@ module Kettle
         merged = preserve_mise_project_settings(recipe, merged, original, project_root: project_root, facts: facts) if template_file_type(recipe) == :toml
         return finalize_template_source_content(recipe, sync_kettle_config_env_overrides(merged, env)) if recipe.fetch(:target_path) == KETTLE_CONFIG_PATH
 
+        merged = postprocess_funding_markdown_content(merged, facts) if recipe.fetch(:target_path) == "FUNDING.md"
+
         if github_workflow_template_recipe?(recipe)
           merged = preserve_github_workflow_project_settings(recipe, merged, original, project_root: project_root)
           merged = finalize_github_workflow_template(merged, facts)
@@ -7054,6 +7095,7 @@ module Kettle
         accepted = finalize_accepted_template_source(recipe, resolved, original, facts: facts, project_root: project_root)
         accepted = preserve_github_workflow_project_settings(recipe, accepted, original, project_root: project_root) if github_workflow_template_recipe?(recipe)
         accepted = sync_kettle_config_env_overrides(accepted, env) if recipe.fetch(:target_path) == KETTLE_CONFIG_PATH
+        accepted = postprocess_funding_markdown_content(accepted, facts) if recipe.fetch(:target_path) == "FUNDING.md"
         if github_workflow_template_recipe?(recipe)
           accepted = finalize_github_workflow_template(accepted, facts)
           accepted = preserve_newer_github_workflow_action_pins(accepted, original)
@@ -7071,6 +7113,7 @@ module Kettle
       end
 
       resolved = finalize_github_workflow_template(resolved, facts) if github_workflow_template_recipe?(recipe)
+      resolved = postprocess_funding_markdown_content(resolved, facts) if recipe.fetch(:target_path) == "FUNDING.md"
       if recipe.fetch(:target_path) == "README.md"
         return postprocess_readme_content(
           resolved,
@@ -7390,6 +7433,11 @@ module Kettle
       open_collective_enabled = !facts.dig(:funding, :open_collective_disabled)
       processed = apply_markdown_conditional_block(content, "OPEN_COLLECTIVE", keep: open_collective_enabled)
       processed = apply_markdown_conditional_block(processed, "NO_OPEN_COLLECTIVE", keep: !open_collective_enabled)
+      processed = apply_markdown_conditional_block(
+        processed,
+        "FUNDING_TIDELIFT",
+        keep: funding_platform_enabled?(facts.dig(:funding, :platforms), "tidelift")
+      )
       star_history_enabled = facts.dig(:repository, :star_history, :enabled) == true
       return processed if star_history_enabled
 
@@ -7402,6 +7450,28 @@ module Kettle
       )
     end
 
+    def postprocess_funding_markdown_content(content, facts)
+      open_collective_enabled = !facts.dig(:funding, :open_collective_disabled)
+      processed = apply_markdown_conditional_block(content, "OPEN_COLLECTIVE", keep: open_collective_enabled)
+      processed = apply_markdown_conditional_block(processed, "NO_OPEN_COLLECTIVE", keep: !open_collective_enabled)
+      funding_platforms = facts.dig(:funding, :platforms)
+      if facts.dig(:funding, :open_collective_disabled)
+        processed = remove_readme_badge_and_refs(
+          processed,
+          README_OPEN_COLLECTIVE_FUNDING_BADGES,
+          README_OPEN_COLLECTIVE_LINK_LABELS
+        )
+      end
+      README_FUNDING_BADGE_POLICIES.each do |platform, policy|
+        next if funding_platform_enabled?(funding_platforms, platform)
+
+        processed = policy.fetch(:badges).reduce(processed) do |badge_content, badge|
+          remove_readme_badge_and_refs(badge_content, badge, policy.fetch(:labels))
+        end
+      end
+      processed
+    end
+
     def apply_readme_badge_policy(content, facts)
       processed = with_readme_timing("badge_policy.codetriage") do
         remove_readme_badge_and_refs(content, README_CODETRIAGE_BADGE, README_CODETRIAGE_LINK_LABELS)
@@ -7429,6 +7499,16 @@ module Kettle
           )
         end
       end
+      funding_platforms = facts.dig(:funding, :platforms)
+      README_FUNDING_BADGE_POLICIES.each do |platform, policy|
+        next if funding_platform_enabled?(funding_platforms, platform)
+
+        processed = with_readme_timing("badge_policy.#{platform}") do
+          policy.fetch(:badges).reduce(processed) do |badge_content, badge|
+            remove_readme_badge_and_refs(badge_content, badge, policy.fetch(:labels))
+          end
+        end
+      end
       Array(facts.dig(:readme_style, :disabled_integrations)).each do |integration|
         patterns = README_INTEGRATION_BADGE_PATTERNS.fetch(integration.to_s, [])
         labels = README_INTEGRATION_LINK_LABELS.fetch(integration.to_s, [])
@@ -13125,24 +13205,38 @@ module Kettle
       engines.map { |engine| engine.to_s.strip.downcase }.reject(&:empty?).uniq
     end
 
-    def funding_urls(project_root, package_name, funding_uri: nil, opencollective_disabled: false, open_collective_org: nil)
+    def funding_urls(project_root, package_name, funding_uri: nil, opencollective_disabled: false, open_collective_org: nil, enabled_platforms: nil)
       urls = [funding_uri]
       path = File.join(project_root, ".github", "FUNDING.yml")
-      urls.concat(github_funding_urls(path, opencollective_disabled: opencollective_disabled)) if File.exist?(path)
-      urls << github_funding_platform_urls("open_collective", [open_collective_org]).first unless opencollective_disabled
-      urls << github_funding_platform_urls("tidelift", ["rubygems/#{package_name}"]).first
+      if File.exist?(path)
+        urls.concat(
+          github_funding_urls(
+            path,
+            opencollective_disabled: opencollective_disabled,
+            enabled_platforms: enabled_platforms
+          )
+        )
+      end
+      if !opencollective_disabled && funding_platform_enabled?(enabled_platforms, "open_collective")
+        urls << github_funding_platform_urls("open_collective", [open_collective_org]).first
+      end
+      if funding_platform_enabled?(enabled_platforms, "tidelift")
+        urls << github_funding_platform_urls("tidelift", ["rubygems/#{package_name}"]).first
+      end
 
       urls.compact.uniq.sort
     end
 
-    def github_funding_urls(path, opencollective_disabled: false)
+    def github_funding_urls(path, opencollective_disabled: false, enabled_platforms: nil)
       funding = YAML.safe_load_file(path, permitted_classes: [], aliases: false) || {}
       return [] unless funding.is_a?(Hash)
 
       funding.flat_map do |platform, value|
-        next [] if opencollective_disabled && platform.to_s == "open_collective"
+        normalized_platform = platform.to_s
+        next [] if opencollective_disabled && normalized_platform == "open_collective"
+        next [] unless funding_platform_enabled?(enabled_platforms, normalized_platform)
 
-        github_funding_platform_urls(platform.to_s, Array(value).compact)
+        github_funding_platform_urls(normalized_platform, Array(value).compact)
       end
     end
 
@@ -13767,6 +13861,27 @@ module Kettle
       opencollective_policy(config, env).fetch(:disabled)
     end
 
+    def funding_platform_policies(config, env)
+      funding = config["funding"]
+      configured = funding.is_a?(Hash) ? funding : {}
+      FUNDING_README_PLATFORMS.to_h do |platform|
+        value = if platform == "open_collective"
+          !opencollective_policy(config, env).fetch(:disabled)
+        elsif configured.key?(platform)
+          !falsey_config?(configured.fetch(platform))
+        else
+          !FUNDING_DEFAULT_DISABLED_PLATFORMS.include?(platform)
+        end
+        [platform, value]
+      end
+    end
+
+    def funding_platform_enabled?(enabled_platforms, platform)
+      return true unless enabled_platforms.is_a?(Hash)
+
+      enabled_platforms.fetch(platform.to_s, true) == true
+    end
+
     def opencollective_policy(config, env)
       funding = config["funding"]
       if funding.is_a?(Hash) && funding.key?("open_collective")
@@ -13946,19 +14061,23 @@ module Kettle
       return "" if package_name == "kettle-changelog"
 
       <<~RUBY.chomp
+        # Release lockfile/build commands set this dependency-specific switch so
+        # the development tool cannot pull unpublished family gems into resolution.
+        kettle_changelog_skip = ENV.fetch("KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY", "false").downcase
+        kettle_changelog_skip = %w[true 1 yes on].include?(kettle_changelog_skip)
         kettle_changelog_local = ENV.fetch("KETTLE_DEV_DEV", "false").downcase
         kettle_changelog_local = !%w[false 0 no off].include?(kettle_changelog_local)
-        if kettle_changelog_local
-          require "nomono/bundler"
-          eval_nomono_gems(
-            gems: ["kettle-changelog"],
-            prefix: "KETTLE_DEV",
-            path_env: "KETTLE_DEV_DEV",
-            root: ["src", "my", "kettle-dev"]
-          )
-        else
-          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("4.0.0")
-            gem "kettle-changelog", "~> 1.0", ">= 1.0.0"
+        unless kettle_changelog_skip
+          if kettle_changelog_local
+            require "nomono/bundler"
+            eval_nomono_gems(
+              gems: ["kettle-changelog"],
+              prefix: "KETTLE_DEV",
+              path_env: "KETTLE_DEV_DEV",
+              root: ["src", "my", "kettle-dev"]
+            )
+          elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("4.0.0")
+            gem "kettle-changelog", "~> 1.0", ">= 1.0.2"
           end
         end
       RUBY
@@ -14909,7 +15028,7 @@ module Kettle
     end
 
     def kettle_dev_local_gems(config)
-      gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover]
+      gems = %w[kettle-dev kettle-family kettle-test kettle-soup-cover kettle-changelog]
       plugin_names = PluginLoader.normalize_plugin_names(plugin_names_from_config(config))
       gems.concat(plugin_names.select { |plugin_name| plugin_name.start_with?("kettle-") })
       gems.uniq.join(" ")
@@ -14918,7 +15037,7 @@ module Kettle
     def main_gemfile_kettle_family_gem(package_name)
       return "" if package_name.to_s == "kettle-family"
 
-      %(gem "kettle-family", "~> 1.2", ">= 1.2.44"\n)
+      %(gem "kettle-family", "~> 1.2", ">= 1.2.58"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)
@@ -18545,9 +18664,15 @@ module Kettle
 
     def synchronize_github_funding_yml(content, facts)
       output = content.to_s
-      output = remove_top_level_yaml_key_lines(output, "open_collective") if facts.fetch(:funding, {})[:open_collective_disabled]
+      enabled_platforms = facts.fetch(:funding, {}).fetch(:platforms, {})
+      enabled_platforms = enabled_platforms.merge("open_collective" => false) if facts.fetch(:funding, {})[:open_collective_disabled]
+      FUNDING_YML_PLATFORMS.each do |platform|
+        next if funding_platform_enabled?(enabled_platforms, platform)
+
+        output = remove_top_level_yaml_key_lines(output, platform)
+      end
       tidelift_value = "rubygems/#{facts.fetch(:package).fetch(:name)}"
-      unless yaml_top_level_key_lines(output).key?("tidelift")
+      if funding_platform_enabled?(enabled_platforms, "tidelift") && !yaml_top_level_key_lines(output).key?("tidelift")
         lines = output.lines
         lines << "\n" unless lines.empty? || lines.last.to_s.strip.empty?
         lines << "tidelift: #{tidelift_value}\n"
@@ -19429,9 +19554,9 @@ module Kettle
         "actions/upload-artifact" => "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1",
         "amancevice/setup-code-climate" => "amancevice/setup-code-climate@0daf2985a225e8ac15975b4d233010e94d65b76a # v2",
         "actions/dependency-review-action" => "actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0",
-        "github/codeql-action/init" => "github/codeql-action/init@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4",
-        "github/codeql-action/autobuild" => "github/codeql-action/autobuild@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4",
-        "github/codeql-action/analyze" => "github/codeql-action/analyze@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4",
+        "github/codeql-action/init" => "github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8",
+        "github/codeql-action/autobuild" => "github/codeql-action/autobuild@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8",
+        "github/codeql-action/analyze" => "github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8",
         "pozil/auto-assign-issue" => "pozil/auto-assign-issue@af6beea6bdf1e8eb373f061c5bc168681fc6d011 # v4.0.1",
         "apache/skywalking-eyes/dependency" => "apache/skywalking-eyes/dependency@61275cc80d0798a405cb070f7d3a8aaf7cf2c2c1 # v0.8.0",
         "sarisia/actions-status-discord" => "sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0"