kettle-dev 1.1.32 → 1.1.34

data/lib/kettle/dev/gem_spec_reader.rb

@@ -99,29 +99,30 @@ module Kettle
 
           # Funding org (Open Collective handle) detection.
           # Precedence:
-          #   1) ENV["FUNDING_ORG"] when set:
-          #        - value "false" (any case) disables funding (nil)
-          #        - otherwise use the value verbatim
-          #   2) OpenCollectiveConfig.handle(required: false)
+          #   1) TemplateHelpers.opencollective_disabled? - when true, funding_org is nil
+          #   2) ENV["FUNDING_ORG"] when set and non-empty (unless already disabled above)
+          #   3) OpenCollectiveConfig.handle(required: false)
           # Be lenient: allow nil when not discoverable, with a concise warning.
           begin
-            env_funding = ENV["FUNDING_ORG"]
-            if env_funding && !env_funding.to_s.strip.empty?
-              funding_org = if env_funding.to_s.strip.casecmp("false").zero?
-                nil
-              else
-                env_funding.to_s
-              end
+            # Check if Open Collective is explicitly disabled via environment variables
+            if TemplateHelpers.opencollective_disabled?
+              funding_org = nil
             else
-              # Preflight: if a YAML exists under the provided root, attempt to read it here so
-              # unexpected file IO errors surface within this rescue block (see specs).
-              oc_path = OpenCollectiveConfig.yaml_path(root)
-              File.read(oc_path) if File.file?(oc_path)
+              env_funding = ENV["FUNDING_ORG"]
+              if env_funding && !env_funding.to_s.strip.empty?
+                # FUNDING_ORG is set and non-empty; use it as-is (already filtered by opencollective_disabled?)
+                funding_org = env_funding.to_s
+              else
+                # Preflight: if a YAML exists under the provided root, attempt to read it here so
+                # unexpected file IO errors surface within this rescue block (see specs).
+                oc_path = OpenCollectiveConfig.yaml_path(root)
+                File.read(oc_path) if File.file?(oc_path)
 
-              funding_org = OpenCollectiveConfig.handle(required: false, root: root)
-              if funding_org.to_s.strip.empty?
-                Kernel.warn("kettle-dev: Could not determine funding org.\n  - Options:\n    * Set ENV['FUNDING_ORG'] to your funding handle, or 'false' to disable.\n    * Or set ENV['OPENCOLLECTIVE_HANDLE'].\n    * Or add .opencollective.yml with: collective: <handle> (or org: <handle>).\n    * Or proceed without funding if not applicable.")
-                funding_org = nil
+                funding_org = OpenCollectiveConfig.handle(required: false, root: root)
+                if funding_org.to_s.strip.empty?
+                  Kernel.warn("kettle-dev: Could not determine funding org.\n  - Options:\n    * Set ENV['FUNDING_ORG'] to your funding handle, or 'false' to disable.\n    * Or set ENV['OPENCOLLECTIVE_HANDLE'].\n    * Or add .opencollective.yml with: collective: <handle> (or org: <handle>).\n    * Or proceed without funding if not applicable.")
+                  funding_org = nil
+                end
               end
             end
           rescue StandardError => error

data/lib/kettle/dev/git_adapter.rb

@@ -104,6 +104,36 @@ module Kettle
         end
       end
 
+      # Push all tags to a remote.
+      # Notes:
+      # - The ruby-git gem does not provide a stable API for pushing all tags across
+      #   versions, so we intentionally shell out to `git push --tags` for both
+      #   backends. Tests should stub this method in higher-level code to avoid
+      #   mutating any repositories.
+      #
+      # @param remote [String, nil] The remote name. When nil or empty, uses the
+      #   repository's default remote (same behavior as running `git push --tags`)
+      #   which typically uses the current branch's upstream.
+      # @return [Boolean] true if the system call reports success; false on failure
+      def push_tags(remote)
+        if @backend == :gem
+          # The ruby-git gem does not expose a dedicated API for "--tags" consistently across versions.
+          # Use a shell fallback even when the gem backend is active. Tests should stub this method.
+          if remote && !remote.to_s.empty?
+            system("git", "push", remote.to_s, "--tags")
+          else
+            system("git", "push", "--tags")
+          end
+        elsif remote && !remote.to_s.empty?
+          system("git", "push", remote.to_s, "--tags")
+        else
+          system("git", "push", "--tags")
+        end
+      rescue StandardError => e
+        Kettle::Dev.debug_error(e, __method__)
+        false
+      end
+
       # @return [String, nil] current branch name, or nil on error
       def current_branch
         if @backend == :gem

data/lib/kettle/dev/rakelib/appraisal.rake

@@ -6,14 +6,14 @@ begin
 
   desc("Install Appraisal gemfiles (initial setup for projects that didn't previously use Appraisal)")
   task("appraisal:install") do
-    bundle = Gem.bindir ? File.join(Gem.bindir, "bundle") : "bundle"
+    bundle = "bundle"
 
     run_in_unbundled = proc do
       env = {"BUNDLE_GEMFILE" => "Appraisal.root.gemfile"}
 
-      # 1) bundle install --gemfile Appraisal.root.gemfile
-      ok = system(bundle, "install", "--gemfile", "Appraisal.root.gemfile")
-      abort("appraisal:install failed: bundle install --gemfile Appraisal.root.gemfile") unless ok
+      # 1) BUNDLE_GEMFILE=Appraisal.root.gemfile bundle install
+      ok = system(env, bundle, "install")
+      abort("appraisal:install failed: BUNDLE_GEMFILE=Appraisal.root.gemfile bundle install") unless ok
 
       # 2) BUNDLE_GEMFILE=Appraisal.root.gemfile bundle exec appraisal install
       ok = system(env, bundle, "exec", "appraisal", "install")
@@ -33,22 +33,22 @@ begin
 
   desc("Update Appraisal gemfiles and run RuboCop Gradual autocorrect")
   task("appraisal:update") do
-    bundle = Gem.bindir ? File.join(Gem.bindir, "bundle") : "bundle"
+    bundle = "bundle"
 
     run_in_unbundled = proc do
       env = {"BUNDLE_GEMFILE" => "Appraisal.root.gemfile"}
 
       # 1) BUNDLE_GEMFILE=Appraisal.root.gemfile bundle update --bundler
       ok = system(env, bundle, "update", "--bundler")
-      abort("appraisal:update failed: bundle update --bundler under Appraisal.root.gemfile") unless ok
+      abort("appraisal:update failed: BUNDLE_GEMFILE=Appraisal.root.gemfile bundle update --bundler") unless ok
 
-      # 2) BUNDLE_GEMFILE=Appraisal.root.gemfile bundle (install)
-      ok = system(env, bundle)
-      abort("appraisal:update failed: bundler install under Appraisal.root.gemfile") unless ok
+      # 2) BUNDLE_GEMFILE=Appraisal.root.gemfile bundle install
+      ok = system(env, bundle, "install")
+      abort("appraisal:update failed: BUNDLE_GEMFILE=Appraisal.root.gemfile bundle install") unless ok
 
       # 3) BUNDLE_GEMFILE=Appraisal.root.gemfile bundle exec appraisal update
       ok = system(env, bundle, "exec", "appraisal", "update")
-      abort("appraisal:update failed: bundle exec appraisal update") unless ok
+      abort("appraisal:update failed: BUNDLE_GEMFILE=Appraisal.root.gemfile bundle exec appraisal update") unless ok
 
       # 4) bundle exec rake rubocop_gradual:autocorrect
       ok = system(bundle, "exec", "rake", "rubocop_gradual:autocorrect")

data/lib/kettle/dev/rakelib/bench.rake

@@ -22,7 +22,7 @@ namespace :bench do
     end
 
     ruby = RbConfig.ruby
-    bundle = Gem.bindir ? File.join(Gem.bindir, "bundle") : "bundle"
+    bundle = "bundle"
     bench_files = Dir[File.join(__dir__, "benchmarks", "*.rb")].sort
     if bench_files.empty?
       puts "No benchmark scripts found under benchmarks/."

data/lib/kettle/dev/rakelib/reek.rake

@@ -15,7 +15,7 @@ begin
   desc("Run reek and store the output into the REEK file")
   task("reek:update") do
     # Run via Bundler if available to ensure the right gem version is used
-    cmd = [Gem.bindir ? File.join(Gem.bindir, "bundle") : "bundle", "exec", "reek"]
+    cmd = %w[bundle exec reek]
 
     output, status = Open3.capture2e(*cmd)
 

data/lib/kettle/dev/release_cli.rb

@@ -269,22 +269,25 @@ module Kettle
         # 16. generate checksums
         #    Checksums are generated after release to avoid including checksums/ in gem package
         #    Rationale: Running gem_checksums before release may commit checksums/ and cause Bundler's
-        #    release build to include them in the gem, altering the artifact.
+        #    release build to include them in the gem, thus altering the artifact, and invalidating the checksums.
         if @start_step <= 16
-          # Generate checksums for the just-built artifact, then validate
+          # Generate checksums for the just-built artifact, commit them, then validate
           run_cmd!("bin/gem_checksums")
           version ||= detect_version
           validate_checksums!(version, stage: "after release")
         end
 
-        # 17. create GitHub release (optional)
-        if @start_step <= 17
+        # 17. push checksum commit (gem_checksums already commits)
+        push! if @start_step <= 17
+
+        # 18. create GitHub release (optional)
+        if @start_step <= 18
           version ||= detect_version
           maybe_create_github_release!(version)
         end
 
-        # 18. push tags to remotes (new final step)
-        push_tags! if @start_step <= 18
+        # 19. push tags to remotes (final step)
+        push_tags! if @start_step <= 19
 
         # Final success message
         begin
@@ -708,17 +711,20 @@ module Kettle
         # 2) Otherwise, if other remotes exist, push tags to each of them.
         # 3) If no remotes are configured, push tags using default remote.
         if has_remote?("all")
-          run_cmd!("git push all --tags")
+          ok = @git.push_tags("all")
+          warn("Push tags to 'all' reported failure.") unless ok
           return
         end
 
         remotes = list_remotes
         remotes -= ["all"] if remotes
         if remotes.nil? || remotes.empty?
-          run_cmd!("git push --tags")
+          ok = @git.push_tags(nil)
+          warn("Push tags (default remote) reported failure.") unless ok
         else
           remotes.each do |remote|
-            run_cmd!("git push #{Shellwords.escape(remote)} --tags")
+            ok = @git.push_tags(remote)
+            warn("Push tags to #{remote} reported failure.") unless ok
           end
         end
       end

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

@@ -120,11 +120,17 @@ module Kettle
             end
 
             selected.values.each do |orig_src|
-              src = helpers.prefer_example(orig_src)
+              src = helpers.prefer_example_with_osc_check(orig_src)
               # Destination path should never include the .example suffix.
               rel = orig_src.sub(/^#{Regexp.escape(gem_checkout_root)}\/?/, "").sub(/\.example\z/, "")
               dest = File.join(project_root, rel)
 
+              # Skip opencollective-specific files when Open Collective is disabled
+              if helpers.skip_for_disabled_opencollective?(rel)
+                puts "Skipping #{rel} (Open Collective disabled)"
+                next
+              end
+
               # Optional file: .github/workflows/discord-notifier.yml should NOT be copied by default.
               # Only copy when --include matches it.
               if rel == ".github/workflows/discord-notifier.yml"
@@ -422,7 +428,13 @@ module Kettle
           end
 
           files_to_copy.each do |rel|
-            src = helpers.prefer_example(File.join(gem_checkout_root, rel))
+            # Skip opencollective-specific files when Open Collective is disabled
+            if helpers.skip_for_disabled_opencollective?(rel)
+              puts "Skipping #{rel} (Open Collective disabled)"
+              next
+            end
+
+            src = helpers.prefer_example_with_osc_check(File.join(gem_checkout_root, rel))
             dest = File.join(project_root, rel)
             next unless File.exist?(src)
 

data/lib/kettle/dev/template_helpers.rb

@@ -76,6 +76,51 @@ module Kettle
         File.exist?(example) ? example : src_path
       end
 
+      # Check if Open Collective is disabled via environment variable.
+      # Returns true when OPENCOLLECTIVE_HANDLE or FUNDING_ORG is explicitly set to a falsey value.
+      # @return [Boolean]
+      def opencollective_disabled?
+        oc_handle = ENV["OPENCOLLECTIVE_HANDLE"]
+        funding_org = ENV["FUNDING_ORG"]
+
+        # Check if either variable is explicitly set to false
+        [oc_handle, funding_org].any? do |val|
+          val && val.to_s.strip.match(Kettle::Dev::ENV_FALSE_RE)
+        end
+      end
+
+      # Prefer a .no-osc.example variant when Open Collective is disabled.
+      # Otherwise, falls back to prefer_example behavior.
+      # For a given source path, this will return:
+      #   - "path.no-osc.example" if opencollective_disabled? and it exists
+      #   - Otherwise delegates to prefer_example
+      # @param src_path [String]
+      # @return [String]
+      def prefer_example_with_osc_check(src_path)
+        if opencollective_disabled?
+          # Try .no-osc.example first
+          base = src_path.sub(/\.example\z/, "")
+          no_osc = base + ".no-osc.example"
+          return no_osc if File.exist?(no_osc)
+        end
+        prefer_example(src_path)
+      end
+
+      # Check if a file should be skipped when Open Collective is disabled.
+      # Returns true for opencollective-specific files when opencollective_disabled? is true.
+      # @param relative_path [String] relative path from gem checkout root
+      # @return [Boolean]
+      def skip_for_disabled_opencollective?(relative_path)
+        return false unless opencollective_disabled?
+
+        opencollective_files = [
+          ".opencollective.yml",
+          ".github/workflows/opencollective.yml",
+        ]
+
+        opencollective_files.include?(relative_path)
+      end
+
       # Record a template action for a destination path
       # @param dest_path [String]
       # @param action [Symbol] one of :create, :replace, :skip, :dir_create, :dir_replace

data/lib/kettle/dev/version.rb

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

data/lib/kettle/dev.rb

@@ -62,6 +62,11 @@ module Kettle
     # Accepts 1, true, y, yes (any case).
     # @return [Regexp]
     ENV_TRUE_RE = /\A(1|true|y|yes)\z/i
+
+    # A case-insensitive regular expression that matches common falsy ENV values.
+    # Accepts false, n, no, 0 (any case).
+    # @return [Regexp]
+    ENV_FALSE_RE = /\A(false|n|no|0)\z/i
     # Absolute path to the root of the kettle-dev gem (repository root when working from source)
     # @return [String]
     GEM_ROOT = File.expand_path("../..", __dir__)

data/sig/kettle/dev.rbs

@@ -12,6 +12,7 @@ module Kettle
     REQUIRE_BENCH: bool
     RUNNING_AS: String
     ENV_TRUE_RE: Regexp
+    ENV_FALSE_RE: Regexp
     GEM_ROOT: String
 
     # Singleton methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 1.1.32
+  version: 1.1.34
 platform: ruby
 authors:
 - Peter H. Boling
@@ -222,8 +222,10 @@ files:
 - "./.simplecov.example"
 - "./Appraisals.example"
 - "./CHANGELOG.md.example"
+- "./FUNDING.md.no-osc.example"
 - "./Gemfile.example"
 - "./README.md.example"
+- "./README.md.no-osc.example"
 - "./Rakefile.example"
 - "./kettle-dev.gemspec.example"
 - ".aiignore.example"
@@ -237,6 +239,7 @@ files:
 - ".git-hooks/prepare-commit-msg.example"
 - ".github/.codecov.yml.example"
 - ".github/FUNDING.yml"
+- ".github/FUNDING.yml.no-osc.example"
 - ".github/dependabot.yml"
 - ".github/workflows/ancient.yml"
 - ".github/workflows/ancient.yml.example"
@@ -288,11 +291,13 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - FUNDING.md
+- FUNDING.md.no-osc.example
 - Gemfile
 - Gemfile.example
 - LICENSE.txt
 - README.md
 - README.md.example
+- README.md.no-osc.example
 - REEK
 - RUBOCOP.md
 - Rakefile.example
@@ -404,10 +409,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.1.32
-  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.1.32/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.1.34
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.1.34/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.1.32
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.1.34
   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