kettle-dev 1.0.9 → 1.0.11

data/lib/kettle/dev/template_helpers.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-# :nocov:
+# External stdlibs
 require "find"
-require_relative "ci_helpers"
+# Internal
+require "kettle/dev/input_adapter"
 
 module Kettle
   module Dev
@@ -39,7 +40,7 @@ module Kettle
           return true
         end
         print("#{prompt} #{default ? "[Y/n]" : "[y/N]"}: ")
-        ans = $stdin.gets&.strip
+        ans = Kettle::Dev::InputAdapter.gets&.strip
         ans = "" if ans.nil?
         if default
           ans.empty? || ans =~ /\Ay(es)?\z/i
@@ -176,6 +177,21 @@ module Kettle
                 FileUtils.mkdir_p(target)
               else
                 FileUtils.mkdir_p(File.dirname(target))
+                if File.exist?(target)
+                  # Skip only if contents are identical. If source and target paths are the same,
+                  # avoid FileUtils.cp (which raises) and do an in-place rewrite to satisfy "copy".
+                  begin
+                    if FileUtils.compare_file(path, target)
+                      next
+                    elsif path == target
+                      data = File.binread(path)
+                      File.open(target, "wb") { |f| f.write(data) }
+                      next
+                    end
+                  rescue StandardError
+                    # ignore compare errors; fall through to copy
+                  end
+                end
                 FileUtils.cp(path, target)
               end
             end
@@ -195,6 +211,21 @@ module Kettle
               FileUtils.mkdir_p(target)
             else
               FileUtils.mkdir_p(File.dirname(target))
+              if File.exist?(target)
+                # Skip only if contents are identical. If source and target paths are the same,
+                # avoid FileUtils.cp (which raises) and do an in-place rewrite to satisfy "copy".
+                begin
+                  if FileUtils.compare_file(path, target)
+                    next
+                  elsif path == target
+                    data = File.binread(path)
+                    File.open(target, "wb") { |f| f.write(data) }
+                    next
+                  end
+                rescue StandardError
+                  # ignore compare errors; fall through to copy
+                end
+              end
               FileUtils.cp(path, target)
             end
           end
@@ -205,15 +236,15 @@ module Kettle
 
       # Apply common token replacements used when templating text files
       # @param content [String]
-      # @param gh_org [String, nil]
+      # @param org [String, nil]
       # @param gem_name [String]
       # @param namespace [String]
       # @param namespace_shield [String]
       # @param gem_shield [String]
       # @return [String]
-      def apply_common_replacements(content, gh_org:, gem_name:, namespace:, namespace_shield:, gem_shield:)
+      def apply_common_replacements(content, org:, gem_name:, namespace:, namespace_shield:, gem_shield:)
         c = content.dup
-        c = c.gsub("kettle-rb", gh_org.to_s) if gh_org && !gh_org.empty?
+        c = c.gsub("kettle-rb", org.to_s) if org && !org.empty?
         if gem_name && !gem_name.empty?
           # Replace occurrences of the template gem name in text, including inside
           # markdown reference labels like [🖼️kettle-dev] and identifiers like kettle-dev-i
@@ -249,13 +280,15 @@ module Kettle
           end
         end
         gh_match = homepage_val&.match(%r{github\.com/([^/]+)/([^/]+)}i)
-        gh_org = gh_match && gh_match[1]
+        forge_org = gh_match && gh_match[1]
         gh_repo = gh_match && gh_match[2]&.sub(/\.git\z/, "")
-        if gh_org.nil?
+        if forge_org.nil?
           begin
-            origin_url = IO.popen(["git", "-C", root.to_s, "remote", "get-url", "origin"], &:read).to_s.strip
+            origin_out = IO.popen(["git", "-C", root.to_s, "remote", "get-url", "origin"], &:read)
+            origin_out = origin_out.read if origin_out.respond_to?(:read)
+            origin_url = origin_out.to_s.strip
             if (m = origin_url.match(%r{github\.com[/:]([^/]+)/([^/]+)}i))
-              gh_org = m[1]
+              forge_org = m[1]
               gh_repo = m[2]&.sub(/\.git\z/, "")
             end
           rescue StandardError
@@ -271,12 +304,33 @@ module Kettle
         entrypoint_require = gem_name.to_s.tr("-", "/")
         gem_shield = gem_name.to_s.gsub("-", "--").gsub("_", "__")
 
+        # Determine funding_org independently of forge_org (GitHub org)
+        funding_org = ENV["FUNDING_ORG"].to_s.strip
+        funding_org = ENV["OPENCOLLECTIVE_ORG"].to_s.strip if funding_org.empty?
+        funding_org = ENV["OPENCOLLECTIVE_HANDLE"].to_s.strip if funding_org.empty?
+        if funding_org.empty?
+          begin
+            oc_path = File.join(root.to_s, ".opencollective.yml")
+            if File.file?(oc_path)
+              txt = File.read(oc_path)
+              if (m = txt.match(/\borg:\s*([\w\-]+)/i))
+                funding_org = m[1].to_s
+              end
+            end
+          rescue StandardError
+            # ignore
+          end
+        end
+        funding_org = forge_org.to_s if funding_org.to_s.empty?
+
         {
           gemspec_path: gemspec_path,
           gem_name: gem_name,
           min_ruby: min_ruby,
           homepage: homepage_val,
-          gh_org: gh_org,
+          gh_org: forge_org, # Backward compat: keep old key synonymous with forge_org
+          forge_org: forge_org,
+          funding_org: funding_org,
           gh_repo: gh_repo,
           namespace: namespace,
           namespace_shield: namespace_shield,
@@ -287,4 +341,3 @@ module Kettle
     end
   end
 end
-# :nocov:

data/lib/kettle/dev/version.rb

@@ -6,7 +6,7 @@ module Kettle
     module Version
       # The gem version.
       # @return [String]
-      VERSION = "1.0.9"
+      VERSION = "1.0.11"
     end
   end
 end

data/lib/kettle/dev/versioning.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Kettle
+  module Dev
+    # Shared helpers for version detection and bump classification.
+    module Versioning
+      module_function
+
+      # Detects a unique VERSION constant declared under lib/**/version.rb
+      # @param root [String] project root
+      # @return [String] version string
+      def detect_version(root)
+        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
+      end
+
+      # Classify the bump type from prev -> cur.
+      # EPIC is a MAJOR > 1000.
+      # @param prev [String] previous released version
+      # @param cur [String] current version (from version.rb)
+      # @return [Symbol] one of :epic, :major, :minor, :patch, :same, :downgrade
+      def classify_bump(prev, cur)
+        pv = Gem::Version.new(prev)
+        cv = Gem::Version.new(cur)
+        return :same if cv == pv
+        return :downgrade if cv < pv
+
+        pmaj, pmin, ppatch = (pv.segments + [0, 0, 0])[0, 3]
+        cmaj, cmin, cpatch = (cv.segments + [0, 0, 0])[0, 3]
+
+        if cmaj > pmaj
+          return :epic if cmaj && cmaj > 1000
+          :major
+        elsif cmin > pmin
+          :minor
+        elsif cpatch > ppatch
+          :patch
+        else
+          # Fallback; should be covered by :same above, but in case of weird segment shapes
+          :same
+        end
+      end
+
+      # Whether MAJOR is an EPIC version (strictly > 1000)
+      # @param major [Integer]
+      # @return [Boolean]
+      def epic_major?(major)
+        major && major > 1000
+      end
+
+      # Abort via ExitAdapter if available; otherwise Kernel.abort
+      # @param msg [String]
+      # @return [void]
+      def abort!(msg)
+        Kettle::Dev::ExitAdapter.abort(msg)
+      end
+    end
+  end
+end

data/lib/kettle/dev.rb

@@ -6,7 +6,6 @@
 require "require_bench" if ENV.fetch("REQUIRE_BENCH", "false").casecmp("true").zero?
 # :nocov:
 require "version_gem"
-require_relative "dev/version"
 
 module Kettle
   module Dev
@@ -22,6 +21,11 @@ module Kettle
     # Whether to benchmark requires with require_bench.
     # @return [Boolean]
     REQUIRE_BENCH = ENV.fetch("REQUIRE_BENCH", "false").casecmp("true").zero?
+    # Whether to load rake tasks at the bottom of this file.
+    # Normally they would be loaded in the project's Rakefile,
+    #   but if we do that in this project then we can't get accurate code coverage.
+    # @return [Boolean]
+    RUNNING_AS = File.basename($PROGRAM_NAME)
 
     @defaults = []
 
@@ -103,6 +107,31 @@ module Kettle
   end
 end
 
+# Autoload public CLI/APIs so requiring "kettle-dev" exposes them lazily
+# for tests and executables. Files will be loaded on first constant access.
+module Kettle
+  autoload :EmojiRegex, "kettle/emoji_regex"
+  module Dev
+    autoload :CIHelpers, "kettle/dev/ci_helpers"
+    autoload :CommitMsg, "kettle/dev/commit_msg"
+    autoload :GitCommitFooter, "kettle/dev/git_commit_footer"
+    autoload :ReadmeBackers, "kettle/dev/readme_backers"
+    autoload :ReleaseCLI, "kettle/dev/release_cli"
+    autoload :TemplateHelpers, "kettle/dev/template_helpers"
+    autoload :ExitAdapter, "kettle/dev/exit_adapter"
+    autoload :Version, "kettle/dev/version"
+
+    # Nested tasks namespace with autoloaded task modules
+    module Tasks
+      autoload :TemplateTask, "kettle/dev/tasks/template_task"
+      autoload :InstallTask, "kettle/dev/tasks/install_task"
+      autoload :CITask, "kettle/dev/tasks/ci_task"
+    end
+  end
+end
+
 Kettle::Dev::Version.class_eval do
   extend VersionGem::Basic
 end
+
+Kettle::Dev.install_tasks if Kettle::Dev::RUNNING_AS == "rake"

data/lib/kettle-dev.rb

@@ -15,9 +15,8 @@
 # Hook for other libraries to load this library (e.g. via bundler)
 #
 # @example In your spec/spec_helper.rb
-#   require "kettle-dev"
+#   require "kettle-dev" # or require "kettle/dev"
 # @example In your Rakefile
-#   require "kettle/dev"
-#   Kettle::Dev.install_tasks
+#   require "kettle-dev" # or require "kettle/dev"
 require "kettle/dev"
 # rubocop:enable Naming/FileName

data/sig/kettle/dev/ci_helpers.rbs

@@ -1,14 +1,11 @@
 module Kettle
   module Dev
     module CIHelpers
+      # singleton (module) methods
       def self.project_root: () -> String
-
       def self.repo_info: () -> [String, String]?
-
       def self.current_branch: () -> String?
-
       def self.workflows_list: (?String root) -> Array[String]
-
       def self.exclusions: () -> Array[String]
 
       def self.latest_run: (
@@ -17,32 +14,26 @@ module Kettle
         workflow_file: String,
         ?branch: String?,
         ?token: String?
-      ) -> { "status" => String?, "conclusion" => String?, "html_url" => String?, "id" => untyped }?
-
-      def self.success?: ({ "status" => String?, "conclusion" => String? } | nil run) -> bool
+      ) -> { "status" => String, "conclusion" => String?, "html_url" => String, "id" => Integer }?
 
-      def self.failed?: ({ "status" => String?, "conclusion" => String? } | nil run) -> bool
+      def self.success?: ({ "status" => String, "conclusion" => String? }?) -> bool
+      def self.failed?: ({ "status" => String, "conclusion" => String? }?) -> bool
 
       def self.default_token: () -> String?
 
-      # GitLab support
+      # GitLab
       def self.origin_url: () -> String?
-
       def self.repo_info_gitlab: () -> [String, String]?
-
       def self.default_gitlab_token: () -> String?
-
       def self.gitlab_latest_pipeline: (
         owner: String,
         repo: String,
         ?branch: String?,
         ?host: String,
         ?token: String?
-      ) -> { "status" => String?, "web_url" => String?, "id" => untyped }?
-
-      def self.gitlab_success?: ({ "status" => String? } | nil pipeline) -> bool
-
-      def self.gitlab_failed?: ({ "status" => String? } | nil pipeline) -> bool
+      ) -> { "status" => String, "web_url" => String, "id" => Integer }?
+      def self.gitlab_success?: ({ "status" => String }?) -> bool
+      def self.gitlab_failed?: ({ "status" => String }?) -> bool
     end
   end
 end

data/sig/kettle/dev/commit_msg.rbs

@@ -0,0 +1,8 @@
+module Kettle
+  module Dev
+    module CommitMsg
+      BRANCH_RULES: ::Hash[String, ::Regexp]
+      def self.enforce_branch_rule!: (String path) -> void
+    end
+  end
+end

data/sig/kettle/dev/exit_adapter.rbs

@@ -0,0 +1,8 @@
+module Kettle
+  module Dev
+    module ExitAdapter
+      def self.abort: (String msg) -> void
+      def self.exit: (?Integer status) -> void
+    end
+  end
+end

data/sig/kettle/dev/git_adapter.rbs

@@ -0,0 +1,15 @@
+module Kettle
+  module Dev
+    class GitAdapter
+      def initialize: () -> void
+      def push: (String?, String, force: bool) -> bool
+      def current_branch: () -> String?
+      def remotes: () -> Array[String]
+      def remotes_with_urls: () -> Hash[String, String]
+      def remote_url: (String) -> String?
+      def checkout: (String) -> bool
+      def pull: (String, String) -> bool
+      def fetch: (String, String?) -> bool
+    end
+  end
+end

data/sig/kettle/dev/git_commit_footer.rbs

@@ -0,0 +1,16 @@
+class GitCommitFooter
+  NAME_ASSIGNMENT_REGEX: ::Regexp
+  FOOTER_APPEND: bool
+  SENTINEL: String?
+
+  def self.git_toplevel: () -> String?
+  def self.local_hooks_dir: () -> String?
+  def self.global_hooks_dir: () -> String
+  def self.hooks_path_for: (String filename) -> String
+  def self.commit_goalie_path: () -> String
+  def self.goalie_allows_footer?: (String subject_line) -> bool
+  def self.render: (*Array[String]) -> void
+
+  def initialize: () -> void
+  def render: () -> String
+end

data/sig/kettle/dev/input_adapter.rbs

@@ -0,0 +1,8 @@
+module Kettle
+  module Dev
+    module InputAdapter
+      def self.gets: (*untyped args) -> String?
+      def self.readline: (*untyped args) -> String
+    end
+  end
+end

data/sig/kettle/dev/readme_backers.rbs

@@ -0,0 +1,20 @@
+module Kettle
+  module Dev
+    class ReadmeBackers
+      def initialize: (
+        handle: String?,
+        readme_path: String?,
+        osc_api_base: String?,
+        osc_default_name: String?,
+        osc_empty_message: String?
+      ) -> void
+
+      def run!: () -> void
+
+      # Selected public helpers (kept minimal)
+      def readme_osc_tag: () -> String
+      def tag_strings: () -> [String, String]
+      def resolve_handle: () -> String
+    end
+  end
+end

data/sig/kettle/dev/release_cli.rbs

@@ -0,0 +1,8 @@
+module Kettle
+  module Dev
+    class ReleaseCLI
+      def initialize: () -> void
+      def run: () -> void
+    end
+  end
+end

data/sig/kettle/dev/tasks/ci_task.rbs

@@ -0,0 +1,9 @@
+module Kettle
+  module Dev
+    module Tasks
+      module CITask
+        def self.act: (?String opt) -> void
+      end
+    end
+  end
+end

data/sig/kettle/dev/tasks/install_task.rbs

@@ -0,0 +1,10 @@
+module Kettle
+  module Dev
+    module Tasks
+      module InstallTask
+        # Entrypoint to perform installation steps and project setup.
+        def self.run: () -> void
+      end
+    end
+  end
+end

data/sig/kettle/dev/tasks/template_task.rbs

@@ -0,0 +1,10 @@
+module Kettle
+  module Dev
+    module Tasks
+      module TemplateTask
+        # Entrypoint to copy/update template files into a host project.
+        def self.run: () -> void
+      end
+    end
+  end
+end

data/sig/kettle/dev/template_helpers.rbs

@@ -44,7 +44,7 @@ module Kettle
       # Apply common token replacements used when templating text files
       def self.apply_common_replacements: (
         String content,
-        gh_org: String?,
+        org: String?,
         gem_name: String,
         namespace: String,
         namespace_shield: String,
@@ -59,6 +59,8 @@ module Kettle
         min_ruby: String,
         homepage: String,
         gh_org: String?,
+        forge_org: String?,
+        funding_org: String?,
         gh_repo: String?,
         namespace: String,
         namespace_shield: String,

data/sig/kettle/emoji_regex.rbs

@@ -0,0 +1,5 @@
+module Kettle
+  module EmojiRegex
+    REGEX: ::Regexp
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Peter H. Boling
@@ -35,7 +35,7 @@ cert_chain:
   DVjBtqT23eugOqQ73umLcYDZkc36vnqGxUBSsXrzY9pzV5gGr2I8YUxMqf6ATrZt
   L9nRqA==
   -----END CERTIFICATE-----
-date: 2025-08-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: version_gem
@@ -133,6 +133,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-pending_for
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +168,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,6 +178,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +236,7 @@ files:
 - ".github/workflows/auto-assign.yml"
 - ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/coverage.yml"
+- ".github/workflows/coverage.yml.example"
 - ".github/workflows/current.yml"
 - ".github/workflows/dependency-review.yml"
 - ".github/workflows/discord-notifier.yml"
@@ -230,7 +251,6 @@ files:
 - ".github/workflows/unlocked_deps.yml"
 - ".github/workflows/unsupported.yml"
 - ".gitignore"
-- ".gitlab-ci.yml"
 - ".junie/guidelines-rbs.md"
 - ".junie/guidelines.md"
 - ".opencollective.yml"
@@ -243,6 +263,7 @@ files:
 - ".yardopts"
 - Appraisal.root.gemfile
 - Appraisals
+- Appraisals.example
 - CHANGELOG.md
 - CHANGELOG.md.example
 - CITATION.cff
@@ -251,19 +272,27 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- README.md.example
 - REEK
 - RUBOCOP.md
-- Rakefile
+- Rakefile.example
 - SECURITY.md
+- exe/kettle-changelog
 - exe/kettle-commit-msg
 - exe/kettle-readme-backers
 - exe/kettle-release
 - gemfiles/modular/coverage.gemfile
 - gemfiles/modular/documentation.gemfile
+- gemfiles/modular/optional.gemfile
 - gemfiles/modular/style.gemfile
 - lib/kettle-dev.rb
 - lib/kettle/dev.rb
 - lib/kettle/dev/ci_helpers.rb
+- lib/kettle/dev/commit_msg.rb
+- lib/kettle/dev/exit_adapter.rb
+- lib/kettle/dev/git_adapter.rb
+- lib/kettle/dev/git_commit_footer.rb
+- lib/kettle/dev/input_adapter.rb
 - lib/kettle/dev/rakelib/appraisal.rake
 - lib/kettle/dev/rakelib/bench.rake
 - lib/kettle/dev/rakelib/bundle_audit.rake
@@ -275,24 +304,44 @@ files:
 - lib/kettle/dev/rakelib/spec_test.rake
 - lib/kettle/dev/rakelib/template.rake
 - lib/kettle/dev/rakelib/yard.rake
+- lib/kettle/dev/readme_backers.rb
+- lib/kettle/dev/release_cli.rb
 - lib/kettle/dev/tasks.rb
+- lib/kettle/dev/tasks/ci_task.rb
+- lib/kettle/dev/tasks/install_task.rb
+- lib/kettle/dev/tasks/template_task.rb
 - lib/kettle/dev/template_helpers.rb
 - lib/kettle/dev/version.rb
+- lib/kettle/dev/versioning.rb
 - lib/kettle/emoji_regex.rb
+- sig/kettle-dev.rbs
 - sig/kettle/dev.rbs
 - sig/kettle/dev/ci_helpers.rbs
+- sig/kettle/dev/commit_msg.rbs
+- sig/kettle/dev/exit_adapter.rbs
+- sig/kettle/dev/git_adapter.rbs
+- sig/kettle/dev/git_commit_footer.rbs
+- sig/kettle/dev/input_adapter.rbs
+- sig/kettle/dev/readme_backers.rbs
+- sig/kettle/dev/release_cli.rbs
+- sig/kettle/dev/tasks.rbs
+- sig/kettle/dev/tasks/ci_task.rbs
+- sig/kettle/dev/tasks/install_task.rbs
+- sig/kettle/dev/tasks/template_task.rbs
 - sig/kettle/dev/template_helpers.rbs
-homepage: https://github.com/galtzo-floss/kettle-dev
+- sig/kettle/dev/version.rbs
+- sig/kettle/emoji_regex.rbs
+homepage: https://github.com/kettle-rb/kettle-dev
 licenses:
 - MIT
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com/
-  source_code_uri: https://github.com/galtzo-floss/kettle-dev/tree/v1.0.9
-  changelog_uri: https://github.com/galtzo-floss/kettle-dev/blob/v1.0.9/CHANGELOG.md
-  bug_tracker_uri: https://github.com/galtzo-floss/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.0.9
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.0.11
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.0.11/CHANGELOG.md
+  bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.0.11
   funding_uri: https://github.com/sponsors/pboling
-  wiki_uri: https://github.com/galtzo-floss/kettle-dev/wiki
+  wiki_uri: https://github.com/kettle-rb/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev
   discord_uri: https://discord.gg/3qme4XHNKN
   rubygems_mfa_required: 'true'