kettle-dev 1.1.10 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6cf7cc8f6c3a0d1dfc5f0dbc6da851e122abdad9a284c5835eb7f910214dbe7
-  data.tar.gz: 6ff4d986c36a7eb18e5413e29707c7a78fcfdb048852a16ecc403010963d67d3
+  metadata.gz: 28d4d222b4d85b17a9392755d884f8f0bf0e2193140bc4a5264f54fbf55448e0
+  data.tar.gz: 1495e5a4b252b2b6537727725165dfdb67211c70f078d5b293a3ce912038983c
 SHA512:
-  metadata.gz: 640a7db16fab1bb407eca866f68209f5c354f8ed54fd40b20723ec0a8e3860018b4509891bb9875a2a268a082149c7013bfe0c1426dfe08cdd857c3e057dee8a
-  data.tar.gz: a32860690a84df178fbffddc65ffb14eb257f9481d1efd9cbcb177eb53452ce34493d370a9430c3dc2bdb3a295bd1fc55c584f7b174fcc379e102084166811dd
+  metadata.gz: 5861e1d242db51b88b9625e4dfcd09bb598b57ae25b505f3e3674d0a250b325133b2cae2644e111d9db649f690d5f94a31cebfc098a19bfd0d4aeba5f9efebbe
+  data.tar.gz: 78c1003a70069e48e768dbec76298b50a8a2207419a27d398b0ab8fef89e31cfb64d9564ed9fa3c52ca4840c982298885ce1ead3426db4e50e82e251865010c8

data/.envrc

@@ -21,7 +21,7 @@ export K_SOUP_COV_DO=true # Means you want code coverage
 export K_SOUP_COV_COMMAND_NAME="Test Coverage"
 # Available formats are html, xml, rcov, lcov, json, tty
 export K_SOUP_COV_FORMATTERS="html,xml,rcov,lcov,json,tty"
-export K_SOUP_COV_MIN_BRANCH=81 # Means you want to enforce X% branch coverage
+export K_SOUP_COV_MIN_BRANCH=80 # Means you want to enforce X% branch coverage
 export K_SOUP_COV_MIN_LINE=96 # Means you want to enforce X% line coverage
 export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
 export K_SOUP_COV_MULTI_FORMATTERS=true

data/CHANGELOG.md

@@ -24,6 +24,25 @@ Please file a bug if you notice a violation of semantic versioning.
 ### Fixed
 ### Security
 
+## [1.1.12] - 2025-09-09
+- TAG: [v1.1.12][1.1.12t]
+- COVERAGE: 94.84% -- 3422/3608 lines in 25 files
+- BRANCH COVERAGE: 78.97% -- 1386/1755 branches in 25 files
+- 76.88% documented
+### Changed
+- improve Gemfile updates during kettle-dev-setup
+- git origin-based funding_org derivation during setup
+
+## [1.1.11] - 2025-09-08
+- TAG: [v1.1.11][1.1.11t]
+- COVERAGE: 96.56% -- 3396/3517 lines in 24 files
+- BRANCH COVERAGE: 81.33% -- 1385/1703 branches in 24 files
+- 77.06% documented
+### Changed
+- move kettle-dev-setup logic into Kettle::Dev::SetupCLI
+### Fixed
+- gem dependency detection in kettle-dev-setup to prevent duplication
+
 ## [1.1.10] - 2025-09-08
 - TAG: [v1.1.10][1.1.10t]
 - COVERAGE: 97.14% -- 3256/3352 lines in 23 files
@@ -571,7 +590,11 @@ Please file a bug if you notice a violation of semantic versioning.
   - Selecting will run the selected workflow via `act`
   - This may move to its own gem in the future.
 
-[Unreleased]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.10...HEAD
+[Unreleased]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.12...HEAD
+[1.1.12]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.11...v1.1.12
+[1.1.12t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.1.12
+[1.1.11]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.10...v1.1.11
+[1.1.11t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.1.11
 [1.1.10]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.9...v1.1.10
 [1.1.10t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.1.10
 [1.1.9]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.8...v1.1.9

data/README.md

@@ -907,7 +907,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]:https://gitmoji.dev
 [📌gitmoji-img]:https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.352-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.608-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/README.md.example

@@ -507,7 +507,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]:https://gitmoji.dev
 [📌gitmoji-img]:https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.352-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.608-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/Rakefile.example

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# kettle-dev Rakefile v1.1.10 - 2025-09-08
+# kettle-dev Rakefile v1.1.12 - 2025-09-09
 # Ruby 2.3 (Safe Navigation) or higher required
 #
 # MIT License (see License.txt)

data/exe/kettle-dev-setup

@@ -19,7 +19,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 script_basename = File.basename(__FILE__)
-running_as_script = File.basename($PROGRAM_NAME)
+File.basename($PROGRAM_NAME)
 
 begin
   require "kettle/dev"
@@ -31,273 +31,37 @@ rescue StandardError => e
   warn("[kettle-dev-setup] Warning: could not fully load kettle/dev (#{e.class}: #{e.message}). Proceeding with limited features.")
 end
 
-module Kettle
-  module Dev
-    class SetupCLI
-      def initialize(argv)
-        debug("initialize(argv=#{argv.inspect})")
-        @argv = argv
-        @passthrough = []
-        @options = {}
-        parse!
-      end
+# Always execute when this file is loaded (e.g., via a Bundler binstub).
+# Do not guard with __FILE__ == $PROGRAM_NAME because binstubs use Kernel.load.
+if ARGV.include?("-h") || ARGV.include?("--help")
+  puts <<~USAGE
+    Usage: kettle-dev-setup [options]
 
-      def run!
-        debug("run!")
-        say("Starting kettle-dev setup…")
-        prechecks!
-        ensure_dev_deps!
-        ensure_bin_setup!
-        ensure_rakefile!
-        run_bin_setup!
-        run_bundle_binstubs!
-        commit_bootstrap_changes!
-        run_kettle_install!
-        say("kettle-dev setup complete.")
-      end
+    Bootstraps a host gem repository to use kettle-dev tooling.
 
-      private
+    Options (passed through to rake kettle:dev:install):
+      --allowed=VAL
+      --force
+      --hook_templates=VAL
+      --only=VAL
 
-      def debug(msg)
-        return unless ENV.fetch("DEBUG", "false").casecmp("true").zero?
-        $stderr.puts("[kettle-dev-setup] DEBUG: #{msg}")
-      end
-
-      def parse!
-        debug("parse! argv_before=#{@argv.inspect}")
-        parser = OptionParser.new do |opts|
-          opts.banner = "Usage: kettle-dev-setup [options]"
-          # Map CLI flags to environment-style assignments for Rake (key=value)
-          opts.on("--allowed=VAL", "Pass through to kettle:dev:install") { |v| @passthrough << "allowed=#{v}" }
-          opts.on("--force", "Pass through to kettle:dev:install") { @passthrough << "force=true" }
-          opts.on("--hook_templates=VAL", "Pass through to kettle:dev:install") { |v| @passthrough << "hook_templates=#{v}" }
-          opts.on("--only=VAL", "Pass through to kettle:dev:install") { |v| @passthrough << "only=#{v}" }
-          opts.on("-h", "--help", "Show help") do
-            puts opts
-            exit(0)
-          end
-        end
-        begin
-          parser.parse!(@argv)
-        rescue OptionParser::ParseError => e
-          warn("[kettle-dev-setup] #{e.class}: #{e.message}")
-          puts parser
-          exit(2)
-        end
-        # Any remaining args pass through as-is
-        @passthrough.concat(@argv)
-        debug("parse! argv_after=#{@argv.inspect} passthrough=#{@passthrough.inspect}")
-      end
-
-      def say(msg)
-        puts "[kettle-dev-setup] #{msg}"
-      end
-
-      def abort!(msg)
-        debug("abort!(msg=#{msg.inspect})")
-        raise SystemExit, "[kettle-dev-setup] ERROR: #{msg}"
-      end
-
-      def sh!(cmd, env: {})
-        debug("sh!(cmd=#{cmd.inspect}, env_keys=#{env.keys.inspect})")
-        say("exec: #{cmd}")
-        stdout_str, stderr_str, status = Open3.capture3(env, cmd)
-        $stdout.print(stdout_str) unless stdout_str.empty?
-        $stderr.print(stderr_str) unless stderr_str.empty?
-        abort!("Command failed: #{cmd}") unless status.success?
-      end
-
-      # 1. Prechecks
-      def prechecks!
-        debug("prechecks!")
-        abort!("Not inside a git repository (missing .git).") unless Dir.exist?(".git")
-
-        # 1a. git clean
-        begin
-          # Use GitAdapter if available; otherwise shell out
-          if defined?(Kettle::Dev::GitAdapter)
-            ga = Kettle::Dev::GitAdapter.new
-            dirty = !ga.clean?
-          else
-            stdout, _stderr, _status = Open3.capture3("git status --porcelain")
-            dirty = !stdout.strip.empty?
-          end
-          abort!("Git working tree is not clean. Please commit/stash changes and try again.") if dirty
-        rescue StandardError
-          # Fallback if anything goes wrong: be conservative and require clean tree via shell
-          stdout, _stderr, _status = Open3.capture3("git status --porcelain")
-          abort!("Git working tree is not clean. Please commit/stash changes and try again.") unless stdout.strip.empty?
-        end
-
-        # 1b. target is a gem (has *.gemspec)
-        gemspecs = Dir["*.gemspec"]
-        abort!("No gemspec found in current directory.") if gemspecs.empty?
-        @gemspec_path = gemspecs.first
-
-        # 1c. target uses bundler (Gemfile)
-        abort!("No Gemfile found; bundler is required.") unless File.exist?("Gemfile")
-      end
-
-      # 3. Sync dev dependencies from this gem's example gemspec into target gemspec
-      def ensure_dev_deps!
-        debug("ensure_dev_deps!")
-        source_example = installed_path("kettle-dev.gemspec.example")
-        abort!("Internal error: kettle-dev.gemspec.example not found within the installed gem.") unless source_example && File.exist?(source_example)
-
-        example = File.read(source_example)
-        example = example.gsub("{KETTLE|DEV|GEM}", "kettle-dev")
-
-        wanted_lines = example.each_line.map(&:rstrip).select do |line|
-          line =~ /add_development_dependency\s*\(/
-        end
-
-        return if wanted_lines.empty?
-
-        target = File.read(@gemspec_path)
-
-        # Build a map from gem name to the desired line
-        wanted = {}
-        wanted_lines.each do |line|
-          if (m = line.match(/add_development_dependency\s*\(\s*["']([^"']+)["']/))
-            wanted[m[1]] = line
-          end
-        end
-
-        modified = target.dup
-        wanted.each do |gem_name, desired_line|
-          # Replace existing add_development_dependency for this gem, else append near the end
-          if /add_development_dependency\s*\(\s*["']#{Regexp.escape(gem_name)}["']/ =~ modified
-            modified = modified.gsub(/^[^\n]*add_development_dependency\s*\(\s*["']#{Regexp.escape(gem_name)}["'][^\n]*\)$/) do |_|
-              desired_line
-            end
-          elsif (idx = modified.rindex(/\nend\s*\z/))
-            # Insert before the last end, if present, otherwise append
-            before = modified[0...idx]
-            after = modified[idx..-1]
-            insertion = "\n  #{desired_line.strip}\n"
-            modified = before + insertion + after
-          else
-            modified << "\n#{desired_line}\n"
-          end
-        end
-
-        if modified != target
-          File.write(@gemspec_path, modified)
-          say("Updated development dependencies in #{@gemspec_path}.")
-        else
-          say("Development dependencies already up to date.")
-        end
-      end
-
-      # 4. Ensure bin/setup present (copy from gem if missing)
-      def ensure_bin_setup!
-        debug("ensure_bin_setup!")
-        target = File.join("bin", "setup")
-        return say("bin/setup present.") if File.exist?(target)
-
-        source = installed_path(File.join("bin", "setup"))
-        abort!("Internal error: source bin/setup not found within installed gem.") unless source && File.exist?(source)
-        FileUtils.mkdir_p("bin")
-        FileUtils.cp(source, target)
-        FileUtils.chmod("+x", target)
-        say("Copied bin/setup.")
-      end
-
-      # 5. Ensure Rakefile matches example (replace or create)
-      def ensure_rakefile!
-        debug("ensure_rakefile!")
-        source = installed_path("Rakefile.example")
-        abort!("Internal error: Rakefile.example not found within installed gem.") unless source && File.exist?(source)
-
-        content = File.read(source)
-        if File.exist?("Rakefile")
-          say("Replacing existing Rakefile with kettle-dev Rakefile.example.")
-        else
-          say("Creating Rakefile from kettle-dev Rakefile.example.")
-        end
-        File.write("Rakefile", content)
-      end
-
-      # 6. Run bin/setup
-      def run_bin_setup!
-        debug("run_bin_setup!")
-        sh!(Shellwords.join([File.join("bin", "setup")]))
-      end
-
-      # 7. Run bundle binstubs --all
-      def run_bundle_binstubs!
-        debug("run_bundle_binstubs!")
-        sh!("bundle exec bundle binstubs --all")
-      end
-
-      # 8. Stage and commit any changes made by the setup before install
-      def commit_bootstrap_changes!
-        debug("commit_bootstrap_changes!")
-        # Only operate if we are inside a git repo (prechecked earlier), and if dirty
-        dirty = begin
-          if defined?(Kettle::Dev::GitAdapter)
-            !Kettle::Dev::GitAdapter.new.clean?
-          else
-            out, _st = Open3.capture2("git", "status", "--porcelain")
-            !out.strip.empty?
-          end
-        rescue StandardError
-          out, _st = Open3.capture2("git", "status", "--porcelain")
-          !out.strip.empty?
-        end
-        unless dirty
-          say("No changes to commit from template bootstrap.")
-          return
-        end
-        # Stage all changes
-        sh!(Shellwords.join(["git", "add", "-A"]))
-        # Compose commit message exactly as required
-        script_name = File.basename(__FILE__)
-        msg = "🎨 Template bootstrap by #{script_name} v#{Kettle::Dev::Version::VERSION}"
-        # Commit; allow empty to be false (we already detected dirty)
-        sh!(Shellwords.join(["git", "commit", "-m", msg]))
-        say("Committed template bootstrap changes.")
-      end
-
-      # 9. Run rake kettle:dev:install with passthrough args
-      def run_kettle_install!
-        debug("run_kettle_install! passthrough=#{@passthrough.inspect}")
-        cmd = ["bin/rake", "kettle:dev:install"] + @passthrough
-        sh!(Shellwords.join(cmd))
-      end
-
-      # Locate files shipped with this gem installation. Handles execution under a checkout as well.
-      def installed_path(rel)
-        debug("installed_path(rel=#{rel.inspect})")
-        # Prefer real gem installation location
-        if defined?(Gem) && (spec = Gem.loaded_specs["kettle-dev"])
-          path = File.join(spec.full_gem_path, rel)
-          return path if File.exist?(path)
-        end
-        # Fallback: relative to this file (useful when running from repo)
-        here = File.expand_path(File.join(__dir__, "..")) # move from exe/ to project root
-        path = File.join(here, rel)
-        return path if File.exist?(path)
-        nil
-      end
-    end
-  end
+    Environment:
+      DEBUG=true                    # print backtraces on errors
+  USAGE
+  exit 0
 end
 
-if running_as_script == script_basename
-  begin
-    puts "== Kettle::Dev::SetupCLI.new => run! =="
-    Kettle::Dev::SetupCLI.new(ARGV).run!
-  rescue SystemExit => e
-    warn(e.message)
-    exit(e.status || 1)
-  rescue Exception => e
-    warn("[kettle-dev-setup] FATAL: #{e.class}: #{e.message}")
-    if ENV.fetch("DEBUG", "false").casecmp("true").zero?
-      warn(e.backtrace.join("\n"))
-    end
-    exit(1)
-  end
-else
-  puts "== #{script_basename} v#{Kettle::Dev::Version::VERSION} fin (#{running_as_script}) == (#{script_basename}) =="
+begin
+  Kettle::Dev::SetupCLI.new(ARGV).run!
+rescue LoadError => e
+  warn("#{script_basename}: could not load dependency: #{e.class}: #{e.message}")
+  warn(e.backtrace.join("\n")) if ENV["DEBUG"]
+  exit(1)
+rescue SystemExit => e
+  warn("#{script_basename}: exited (status=#{e.status}, msg=#{e.message})") if e.status != 0
+  raise
+rescue StandardError => e
+  warn("#{script_basename}: unexpected error: #{e.class}: #{e.message}")
+  warn(e.backtrace.join("\n")) if ENV["DEBUG"]
+  exit(1)
 end

data/gemfiles/modular/injected.gemfile

@@ -2,7 +2,7 @@
 #       visibility and discoverability on RubyGems.org.
 #       However, this gem sits underneath all my other gems, and also "depends on" many of them.
 #       So instead of depending on them directly it injects them into the other gem's gemspec on install.
-#       This gem its injected dev dependencies, will install on Ruby down to 2.3.x.
+#       This gem, and its injected dev dependencies, will install on Ruby down to 2.3.x.
 #       This gem does not inject runtime dependencies.
 #       Thus, dev dependencies injected into gemspecs must have
 #

data/lib/kettle/dev/modular_gemfiles.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Kettle
+  module Dev
+    # Utilities for copying modular Gemfiles and related directories
+    # in a DRY fashion. Used by both the template rake task and the
+    # setup CLI to ensure gemfiles/modular/* are present before use.
+    module ModularGemfiles
+      MODULAR_GEMFILE_DIR = "gemfiles/modular"
+
+      module_function
+
+      # Copy the modular gemfiles and nested directories from the gem
+      # checkout into the target project, prompting where appropriate
+      # via the provided helpers.
+      #
+      # @param helpers [Kettle::Dev::TemplateHelpers] helper API
+      # @param project_root [String] destination project root
+      # @param gem_checkout_root [String] kettle-dev checkout root (source)
+      # @param min_ruby [Gem::Version, nil] minimum Ruby version (for style.gemfile tuning)
+      # @return [void]
+      def sync!(helpers:, project_root:, gem_checkout_root:, min_ruby: nil)
+        # 4a) gemfiles/modular/*.gemfile except style.gemfile (handled below)
+        modular_gemfiles = %w[
+          coverage
+          debug
+          documentation
+          injected
+          optional
+          runtime_heads
+          x_std_libs
+        ]
+        modular_gemfiles.each do |base|
+          modular_gemfile = "#{base}.gemfile"
+          src = helpers.prefer_example(File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, modular_gemfile))
+          dest = File.join(project_root, MODULAR_GEMFILE_DIR, modular_gemfile)
+          helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true)
+        end
+
+        # 4b) gemfiles/modular/style.gemfile with dynamic rubocop constraints
+        modular_gemfile = "style.gemfile"
+        src = helpers.prefer_example(File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, modular_gemfile))
+        dest = File.join(project_root, MODULAR_GEMFILE_DIR, modular_gemfile)
+        if File.basename(src).sub(/\.example\z/, "") == "style.gemfile"
+          helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true) do |content|
+            # Adjust rubocop-lts constraint based on min_ruby
+            version_map = [
+              [Gem::Version.new("1.8"), "~> 0.1"],
+              [Gem::Version.new("1.9"), "~> 2.0"],
+              [Gem::Version.new("2.0"), "~> 4.0"],
+              [Gem::Version.new("2.1"), "~> 6.0"],
+              [Gem::Version.new("2.2"), "~> 8.0"],
+              [Gem::Version.new("2.3"), "~> 10.0"],
+              [Gem::Version.new("2.4"), "~> 12.0"],
+              [Gem::Version.new("2.5"), "~> 14.0"],
+              [Gem::Version.new("2.6"), "~> 16.0"],
+              [Gem::Version.new("2.7"), "~> 18.0"],
+              [Gem::Version.new("3.0"), "~> 20.0"],
+              [Gem::Version.new("3.1"), "~> 22.0"],
+              [Gem::Version.new("3.2"), "~> 24.0"],
+              [Gem::Version.new("3.3"), "~> 26.0"],
+              [Gem::Version.new("3.4"), "~> 28.0"],
+            ]
+            new_constraint = nil
+            rubocop_ruby_gem_version = nil
+            ruby1_8 = version_map.first
+            begin
+              if min_ruby
+                version_map.reverse_each do |min, req|
+                  if min_ruby >= min
+                    new_constraint = req
+                    rubocop_ruby_gem_version = min.segments.join("_")
+                    break
+                  end
+                end
+              end
+              if !new_constraint || !rubocop_ruby_gem_version
+                # A gem with no declared minimum ruby is effectively >= 1.8.7
+                new_constraint = ruby1_8[1]
+                rubocop_ruby_gem_version = ruby1_8[0].segments.join("_")
+              end
+            rescue StandardError => e
+              Kettle::Dev.debug_error(e, __method__) if defined?(Kettle::Dev.debug_error)
+              # ignore, use default
+            ensure
+              new_constraint ||= ruby1_8[1]
+              rubocop_ruby_gem_version ||= ruby1_8[0].segments.join("_")
+            end
+            if new_constraint && rubocop_ruby_gem_version
+              token = "{RUBOCOP|LTS|CONSTRAINT}"
+              content.gsub!(token, new_constraint) if content.include?(token)
+              token = "{RUBOCOP|RUBY|GEM}"
+              content.gsub!(token, "rubocop-ruby#{rubocop_ruby_gem_version}") if content.include?(token)
+            end
+            content
+          end
+        else
+          helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true)
+        end
+
+        # 4c) Copy modular directories with nested/versioned files
+        %w[erb mutex_m stringio x_std_libs].each do |dir|
+          src_dir = File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, dir)
+          dest_dir = File.join(project_root, MODULAR_GEMFILE_DIR, dir)
+          helpers.copy_dir_with_prompt(src_dir, dest_dir)
+        end
+      end
+    end
+  end
+end

data/lib/kettle/dev/setup_cli.rb

@@ -0,0 +1,405 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "shellwords"
+require "open3"
+require "optparse"
+
+module Kettle
+  module Dev
+    # SetupCLI bootstraps a host gem repository to use kettle-dev tooling.
+    # It performs prechecks, syncs development dependencies, ensures bin/setup and
+    # Rakefile templates, runs setup tasks, and invokes kettle:dev:install.
+    #
+    # Usage:
+    #   Kettle::Dev::SetupCLI.new(ARGV).run!
+    #
+    # Options are parsed from argv and passed through to the rake task as
+    # key=value pairs (e.g., --force => force=true).
+    class SetupCLI
+      # @param argv [Array<String>] CLI arguments
+      def initialize(argv)
+        @argv = argv
+        @passthrough = []
+        @options = {}
+        parse!
+      end
+
+      # Execute the full setup workflow.
+      # @return [void]
+      def run!
+        say("Starting kettle-dev setup…")
+        prechecks!
+        ensure_dev_deps!
+        ensure_gemfile_from_example!
+        ensure_modular_gemfiles!
+        ensure_bin_setup!
+        ensure_rakefile!
+        run_bin_setup!
+        run_bundle_binstubs!
+        commit_bootstrap_changes!
+        run_kettle_install!
+        say("kettle-dev setup complete.")
+      end
+
+      private
+
+      def debug(msg)
+        return if ENV.fetch("DEBUG", "false").casecmp("true").nonzero?
+        $stderr.puts("[kettle-dev-setup] DEBUG: #{msg}")
+      end
+
+      # Attempt to derive a funding organization from the git remote 'origin' when
+      # not explicitly provided via env or .opencollective.yml.
+      # This is a soft helper that only sets ENV["FUNDING_ORG"] if a plausible
+      # GitHub org can be parsed from the origin URL.
+      # @return [void]
+      def derive_funding_org_from_git_if_missing!
+        # Respect explicit bypass
+        env_val = ENV["FUNDING_ORG"]
+        return if env_val && env_val.to_s.strip.casecmp("false").zero?
+
+        # If already provided via env, do nothing
+        return if ENV["FUNDING_ORG"].to_s.strip != ""
+        return if ENV["OPENCOLLECTIVE_HANDLE"].to_s.strip != ""
+
+        # If project provides an .opencollective.yml with org, do nothing
+        begin
+          oc_path = File.join(Dir.pwd, ".opencollective.yml")
+          if File.file?(oc_path)
+            txt = File.read(oc_path)
+            return if txt =~ /\borg:\s*([\w\-]+)/i
+          end
+        rescue StandardError => e
+          debug("Reading .opencollective.yml failed: #{e.class}: #{e.message}")
+        end
+
+        # Attempt to get origin URL and parse GitHub org
+        begin
+          ga = Kettle::Dev::GitAdapter.new
+          origin_url = nil
+          origin_url = ga.remote_url("origin") if ga.respond_to?(:remote_url)
+          if origin_url.nil? && ga.respond_to?(:remotes_with_urls)
+            begin
+              urls = ga.remotes_with_urls
+              origin_url = urls["origin"] if urls
+            rescue StandardError => e
+              # graceful fallback if adapter backend errs; keep silent behavior
+              debug("remotes_with_urls failed: #{e.class}: #{e.message}")
+            end
+          end
+          origin_url = origin_url.to_s.strip
+          if (m = origin_url.match(%r{github\.com[/:]([^/]+)/}i))
+            org = m[1].to_s
+            if !org.empty?
+              ENV["FUNDING_ORG"] = org
+              debug("Derived FUNDING_ORG from git origin: #{org}")
+            end
+          end
+        rescue StandardError => e
+          # Be silent; this is a best-effort and shouldn't fail setup
+          debug("Could not derive funding org from git: #{e.class}: #{e.message}")
+        end
+      end
+
+      def parse!
+        parser = OptionParser.new do |opts|
+          opts.banner = "Usage: kettle-dev-setup [options]"
+          opts.on("--allowed=VAL", "Pass through to kettle:dev:install") { |v| @passthrough << "allowed=#{v}" }
+          opts.on("--force", "Pass through to kettle:dev:install") { @passthrough << "force=true" }
+          opts.on("--hook_templates=VAL", "Pass through to kettle:dev:install") { |v| @passthrough << "hook_templates=#{v}" }
+          opts.on("--only=VAL", "Pass through to kettle:dev:install") { |v| @passthrough << "only=#{v}" }
+          opts.on("-h", "--help", "Show help") do
+            puts opts
+            Kettle::Dev::ExitAdapter.exit(0)
+          end
+        end
+        begin
+          parser.parse!(@argv)
+        rescue OptionParser::ParseError => e
+          warn("[kettle-dev-setup] #{e.class}: #{e.message}")
+          puts parser
+          Kettle::Dev::ExitAdapter.exit(2)
+        end
+        @passthrough.concat(@argv)
+      end
+
+      def say(msg)
+        puts "[kettle-dev-setup] #{msg}"
+      end
+
+      def abort!(msg)
+        Kettle::Dev::ExitAdapter.abort("[kettle-dev-setup] ERROR: #{msg}")
+      end
+
+      def sh!(cmd, env: {})
+        say("exec: #{cmd}")
+        stdout_str, stderr_str, status = Open3.capture3(env, cmd)
+        $stdout.print(stdout_str) unless stdout_str.empty?
+        $stderr.print(stderr_str) unless stderr_str.empty?
+        abort!("Command failed: #{cmd}") unless status.success?
+      end
+
+      # 1. Prechecks
+      def prechecks!
+        abort!("Not inside a git repository (missing .git).") unless Dir.exist?(".git")
+
+        # Ensure clean working tree
+        begin
+          if defined?(Kettle::Dev::GitAdapter)
+            dirty = !Kettle::Dev::GitAdapter.new.clean?
+          else
+            stdout, _stderr, _status = Open3.capture3("git status --porcelain")
+            dirty = !stdout.strip.empty?
+          end
+          abort!("Git working tree is not clean. Please commit/stash changes and try again.") if dirty
+        rescue StandardError
+          stdout, _stderr, _status = Open3.capture3("git status --porcelain")
+          abort!("Git working tree is not clean. Please commit/stash changes and try again.") unless stdout.strip.empty?
+        end
+
+        # gemspec
+        gemspecs = Dir["*.gemspec"]
+        abort!("No gemspec found in current directory.") if gemspecs.empty?
+        @gemspec_path = gemspecs.first
+
+        # Gemfile
+        abort!("No Gemfile found; bundler is required.") unless File.exist?("Gemfile")
+
+        # Seed FUNDING_ORG from git remote origin org when not provided elsewhere
+        derive_funding_org_from_git_if_missing!
+      end
+
+      # 3. Sync dev dependencies from this gem's example gemspec into target gemspec
+      def ensure_dev_deps!
+        source_example = installed_path("kettle-dev.gemspec.example")
+        abort!("Internal error: kettle-dev.gemspec.example not found within the installed gem.") unless source_example && File.exist?(source_example)
+
+        example = File.read(source_example)
+        example = example.gsub("{KETTLE|DEV|GEM}", "kettle-dev")
+
+        wanted_lines = example.each_line.map(&:rstrip).select { |line| line =~ /add_development_dependency\s*\(?/ }
+        return if wanted_lines.empty?
+
+        target = File.read(@gemspec_path)
+
+        # Build gem=>desired line map
+        wanted = {}
+        wanted_lines.each do |line|
+          if (m = line.match(/add_development_dependency\s*\(?\s*["']([^"']+)["']/))
+            wanted[m[1]] = line
+          end
+        end
+
+        modified = target.dup
+        wanted.each do |gem_name, desired_line|
+          lines = modified.lines
+          found = false
+          lines.map! do |ln|
+            if ln =~ /add_development_dependency\s*\(?\s*["']#{Regexp.escape(gem_name)}["']/
+              found = true
+              indent = ln[/^\s*/] || ""
+              "#{indent}#{desired_line.strip}\n"
+            else
+              ln
+            end
+          end
+          modified = lines.join
+
+          next if found
+
+          if (idx = modified.rindex(/\nend\s*\z/))
+            before = modified[0...idx]
+            after = modified[idx..-1]
+            insertion = "\n  #{desired_line.strip}\n"
+            modified = before + insertion + after
+          else
+            modified << "\n#{desired_line}\n"
+          end
+        end
+
+        if modified != target
+          File.write(@gemspec_path, modified)
+          say("Updated development dependencies in #{@gemspec_path}.")
+        else
+          say("Development dependencies already up to date.")
+        end
+      end
+
+      # 4. Ensure bin/setup present (copy from gem if missing)
+      def ensure_bin_setup!
+        target = File.join("bin", "setup")
+        return say("bin/setup present.") if File.exist?(target)
+
+        source = installed_path(File.join("bin", "setup"))
+        abort!("Internal error: source bin/setup not found within installed gem.") unless source && File.exist?(source)
+        FileUtils.mkdir_p("bin")
+        FileUtils.cp(source, target)
+        FileUtils.chmod("+x", target)
+        say("Copied bin/setup.")
+      end
+
+      # 3b. Ensure Gemfile contains required lines from example without duplicating directives
+      #    - Copies source, git_source, gemspec, and eval_gemfile lines that are missing
+      #    - Idempotent (running multiple times does not duplicate entries)
+      def ensure_gemfile_from_example!
+        source_path = installed_path("Gemfile.example")
+        abort!("Internal error: Gemfile.example not found within installed gem.") unless source_path && File.exist?(source_path)
+
+        example = File.read(source_path)
+        target_path = "Gemfile"
+        target = File.exist?(target_path) ? File.read(target_path) : ""
+
+        # Extract interesting lines from example
+        ex_sources = []
+        ex_git_sources = [] # names (e.g., :github)
+        ex_git_source_lines = {}
+        ex_has_gemspec = false
+        ex_eval_paths = []
+
+        example.each_line do |ln|
+          s = ln.strip
+          next if s.empty?
+          if s.start_with?("source ")
+            ex_sources << ln.rstrip
+          elsif (m = s.match(/^git_source\(\s*:(\w+)\s*\)/))
+            name = m[1]
+            ex_git_sources << name
+            ex_git_source_lines[name] = ln.rstrip
+          elsif s.start_with?("gemspec")
+            ex_has_gemspec = true
+          elsif (m = s.match(/^eval_gemfile\s+["']([^"']+)["']/))
+            ex_eval_paths << m[1]
+          end
+        end
+
+        # Scan target for presence
+        tg_sources = target.each_line.map(&:rstrip).select { |l| l.strip.start_with?("source ") }
+        tg_git_sources = {}
+        target.each_line do |ln|
+          if (m = ln.strip.match(/^git_source\(\s*:(\w+)\s*\)/))
+            tg_git_sources[m[1]] = true
+          end
+        end
+        tg_has_gemspec = !!target.each_line.find { |l| l.strip.start_with?("gemspec") }
+        tg_eval_paths = target.each_line.map do |ln|
+          if (m = ln.strip.match(/^eval_gemfile\s+["']([^"']+)["']/))
+            m[1]
+          end
+        end.compact
+
+        additions = []
+        # Add missing sources (exact line match)
+        ex_sources.each do |src_line|
+          additions << src_line unless tg_sources.include?(src_line)
+        end
+        # Add missing git_source by name
+        ex_git_sources.each do |name|
+          additions << ex_git_source_lines[name] unless tg_git_sources[name]
+        end
+        # Add gemspec if example has it and target lacks it
+        additions << "gemspec" if ex_has_gemspec && !tg_has_gemspec
+        # Add missing eval_gemfile paths (recreate the exact example line when possible)
+        ex_eval_paths.each do |path|
+          next if tg_eval_paths.include?(path)
+          additions << "eval_gemfile \"#{path}\""
+        end
+
+        return say("Gemfile already contains required entries from example.") if additions.empty?
+
+        # Ensure file ends with a newline
+        target << "\n" unless target.end_with?("\n") || target.empty?
+        new_content = target + additions.join("\n") + "\n"
+        File.write(target_path, new_content)
+        say("Updated Gemfile with entries from Gemfile.example (added #{additions.size}).")
+      end
+
+      # 3c. Ensure gemfiles/modular/* are present (copied like template task)
+      def ensure_modular_gemfiles!
+        helpers = Kettle::Dev::TemplateHelpers
+        project_root = helpers.project_root
+        gem_checkout_root = helpers.gem_checkout_root
+        # Gather min_ruby for style.gemfile adjustments
+        min_ruby = begin
+          md = helpers.gemspec_metadata(project_root)
+          md[:min_ruby]
+        rescue StandardError
+          nil
+        end
+        Kettle::Dev::ModularGemfiles.sync!(
+          helpers: helpers,
+          project_root: project_root,
+          gem_checkout_root: gem_checkout_root,
+          min_ruby: min_ruby,
+        )
+      end
+
+      # 5. Ensure Rakefile matches example (replace or create)
+      def ensure_rakefile!
+        source = installed_path("Rakefile.example")
+        abort!("Internal error: Rakefile.example not found within installed gem.") unless source && File.exist?(source)
+
+        content = File.read(source)
+        if File.exist?("Rakefile")
+          say("Replacing existing Rakefile with kettle-dev Rakefile.example.")
+        else
+          say("Creating Rakefile from kettle-dev Rakefile.example.")
+        end
+        File.write("Rakefile", content)
+      end
+
+      # 6. Run bin/setup
+      def run_bin_setup!
+        sh!(Shellwords.join([File.join("bin", "setup")]))
+      end
+
+      # 7. Run bundle binstubs --all
+      def run_bundle_binstubs!
+        sh!("bundle exec bundle binstubs --all")
+      end
+
+      # 8. Commit template bootstrap changes if any
+      def commit_bootstrap_changes!
+        dirty = begin
+          if defined?(Kettle::Dev::GitAdapter)
+            !Kettle::Dev::GitAdapter.new.clean?
+          else
+            out, _st = Open3.capture2("git", "status", "--porcelain")
+            !out.strip.empty?
+          end
+        rescue StandardError
+          out, _st = Open3.capture2("git", "status", "--porcelain")
+          !out.strip.empty?
+        end
+        unless dirty
+          say("No changes to commit from template bootstrap.")
+          return
+        end
+        sh!(Shellwords.join(["git", "add", "-A"]))
+        msg = "🎨 Template bootstrap by kettle-dev-setup v#{Kettle::Dev::Version::VERSION}"
+        sh!(Shellwords.join(["git", "commit", "-m", msg]))
+        say("Committed template bootstrap changes.")
+      end
+
+      # 9. Invoke rake install task with passthrough
+      def run_kettle_install!
+        cmd = ["bin/rake", "kettle:dev:install"] + @passthrough
+        sh!(Shellwords.join(cmd))
+      end
+
+      # Resolve a path to files shipped within the gem or repo checkout
+      # @param rel [String]
+      # @return [String, nil]
+      def installed_path(rel)
+        if defined?(Gem) && (spec = Gem.loaded_specs["kettle-dev"])
+          path = File.join(spec.full_gem_path, rel)
+          return path if File.exist?(path)
+        end
+        here = File.expand_path(File.join(__dir__, "..", "..", "..")) # lib/kettle/dev/ -> project root
+        path = File.join(here, rel)
+        return path if File.exist?(path)
+        nil
+      end
+    end
+  end
+end

data/lib/kettle/dev/tasks/template_task.rb

@@ -104,91 +104,13 @@ module Kettle
             allow_replace: true,
           )
 
-          # 4a) gemfiles/modular/*.gemfile
-          #     from gem's gemfiles/modular,
-          #     except `style.gemfile` which has special handling below
-          modular_gemfiles = %w[
-            coverage
-            debug
-            documentation
-            injected
-            optional
-            runtime_heads
-            x_std_libs
-          ]
-          modular_gemfiles.each do |base|
-            modular_gemfile = "#{base}.gemfile"
-            src = helpers.prefer_example(File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, modular_gemfile))
-            dest = File.join(project_root, MODULAR_GEMFILE_DIR, modular_gemfile)
-            helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true)
-          end
-
-          # 4b) gemfiles/modular/style.gemfile
-          modular_gemfile = "style.gemfile"
-          src = helpers.prefer_example(File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, modular_gemfile))
-          dest = File.join(project_root, MODULAR_GEMFILE_DIR, modular_gemfile)
-          if File.basename(src).sub(/\.example\z/, "") == "style.gemfile"
-            helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true) do |content|
-              # Adjust rubocop-lts constraint based on min_ruby
-              version_map = [
-                [Gem::Version.new("1.8"), "~> 0.1"],
-                [Gem::Version.new("1.9"), "~> 2.0"],
-                [Gem::Version.new("2.0"), "~> 4.0"],
-                [Gem::Version.new("2.1"), "~> 6.0"],
-                [Gem::Version.new("2.2"), "~> 8.0"],
-                [Gem::Version.new("2.3"), "~> 10.0"],
-                [Gem::Version.new("2.4"), "~> 12.0"],
-                [Gem::Version.new("2.5"), "~> 14.0"],
-                [Gem::Version.new("2.6"), "~> 16.0"],
-                [Gem::Version.new("2.7"), "~> 18.0"],
-                [Gem::Version.new("3.0"), "~> 20.0"],
-                [Gem::Version.new("3.1"), "~> 22.0"],
-                [Gem::Version.new("3.2"), "~> 24.0"],
-                [Gem::Version.new("3.3"), "~> 26.0"],
-                [Gem::Version.new("3.4"), "~> 28.0"],
-              ]
-              new_constraint = nil
-              rubocop_ruby_gem_version = nil
-              ruby1_8 = version_map.first
-              begin
-                if min_ruby
-                  version_map.reverse_each do |min, req|
-                    if min_ruby >= min
-                      new_constraint = req
-                      rubocop_ruby_gem_version = min.segments.join("_")
-                      break
-                    end
-                  end
-                end
-                if !new_constraint || !rubocop_ruby_gem_version
-                  # A gem with no declared minimum ruby is effectively >= 1.8.7
-                  new_constraint = ruby1_8[1]
-                  rubocop_ruby_gem_version = ruby1_8[0].segments.join("_")
-                end
-              rescue StandardError => e
-                Kettle::Dev.debug_error(e, __method__)
-                # ignore, use default
-              ensure
-                new_constraint ||= ruby1_8[1]
-                rubocop_ruby_gem_version ||= ruby1_8[0].segments.join("_")
-              end
-              if new_constraint && rubocop_ruby_gem_version
-                token = "{RUBOCOP|LTS|CONSTRAINT}"
-                content.gsub!(token, new_constraint) if content.include?(token)
-                token = "{RUBOCOP|RUBY|GEM}"
-                content.gsub!(token, "rubocop-ruby#{rubocop_ruby_gem_version}") if content.include?(token)
-              end
-            end
-          else
-            helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true)
-          end
-
-          # 4c) Copy modular directories with nested/versioned files
-          %w[erb mutex_m stringio x_std_libs].each do |dir|
-            src_dir = File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, dir)
-            dest_dir = File.join(project_root, MODULAR_GEMFILE_DIR, dir)
-            helpers.copy_dir_with_prompt(src_dir, dest_dir)
-          end
+          # 4) gemfiles/modular/* and nested directories (delegated for DRYness)
+          Kettle::Dev::ModularGemfiles.sync!(
+            helpers: helpers,
+            project_root: project_root,
+            gem_checkout_root: gem_checkout_root,
+            min_ruby: min_ruby,
+          )
 
           # 5) spec/spec_helper.rb (no create)
           dest_spec_helper = File.join(project_root, "spec/spec_helper.rb")

data/lib/kettle/dev/version.rb

@@ -6,7 +6,7 @@ module Kettle
     module Version
       # The gem version.
       # @return [String]
-      VERSION = "1.1.10"
+      VERSION = "1.1.12"
 
       module_function
 

data/lib/kettle/dev.rb

@@ -24,7 +24,9 @@ module Kettle
     autoload :ReadmeBackers, "kettle/dev/readme_backers"
     autoload :ReleaseCLI, "kettle/dev/release_cli"
     autoload :PreReleaseCLI, "kettle/dev/pre_release_cli"
+    autoload :SetupCLI, "kettle/dev/setup_cli"
     autoload :TemplateHelpers, "kettle/dev/template_helpers"
+    autoload :ModularGemfiles, "kettle/dev/modular_gemfiles"
     autoload :Version, "kettle/dev/version"
     autoload :Versioning, "kettle/dev/versioning"
 

data/sig/kettle/dev/modular_gemfiles.rbs

@@ -0,0 +1,12 @@
+module Kettle
+  module Dev
+    module ModularGemfiles
+      def self.sync!: (
+        helpers: untyped,
+        project_root: String,
+        gem_checkout_root: String,
+        min_ruby: untyped
+      ) -> void
+    end
+  end
+end

data/sig/kettle/dev/setup_cli.rbs

@@ -0,0 +1,8 @@
+module Kettle
+  module Dev
+    class SetupCLI
+      def initialize: (Array[String] argv) -> void
+      def run!: () -> void
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.12
 platform: ruby
 authors:
 - Peter H. Boling
@@ -333,6 +333,7 @@ files:
 - lib/kettle/dev/git_adapter.rb
 - lib/kettle/dev/git_commit_footer.rb
 - lib/kettle/dev/input_adapter.rb
+- lib/kettle/dev/modular_gemfiles.rb
 - lib/kettle/dev/pre_release_cli.rb
 - lib/kettle/dev/rakelib/appraisal.rake
 - lib/kettle/dev/rakelib/bench.rake
@@ -347,6 +348,7 @@ files:
 - lib/kettle/dev/rakelib/yard.rake
 - lib/kettle/dev/readme_backers.rb
 - lib/kettle/dev/release_cli.rb
+- lib/kettle/dev/setup_cli.rb
 - lib/kettle/dev/tasks.rb
 - lib/kettle/dev/tasks/ci_task.rb
 - lib/kettle/dev/tasks/install_task.rb
@@ -366,9 +368,11 @@ files:
 - sig/kettle/dev/git_adapter.rbs
 - sig/kettle/dev/git_commit_footer.rbs
 - sig/kettle/dev/input_adapter.rbs
+- sig/kettle/dev/modular_gemfiles.rbs
 - sig/kettle/dev/pre_release_cli.rbs
 - sig/kettle/dev/readme_backers.rbs
 - sig/kettle/dev/release_cli.rbs
+- sig/kettle/dev/setup_cli.rbs
 - sig/kettle/dev/tasks.rbs
 - sig/kettle/dev/tasks/ci_task.rbs
 - sig/kettle/dev/tasks/install_task.rbs
@@ -381,10 +385,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.1.10
-  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.1.10/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.1.12
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.1.12/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.1.10
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.1.12
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev