kettle-dev 2.0.0 → 2.0.1

data/lib/kettle/dev/release_cli.rb

@@ -21,7 +21,7 @@ module Kettle
           # For Bundler-invoked build/release, explicitly prefix SKIP_GEM_SIGNING so
           # the signing step is skipped even when Bundler scrubs ENV.
           # Always do this on CI to avoid interactive prompts; locally only when explicitly requested.
-          if ENV["SKIP_GEM_SIGNING"] && cmd =~ /\Abundle(\s+exec)?\s+rake\s+(build|release)\b/
+          if ENV["SKIP_GEM_SIGNING"] && /\Abundle(\s+exec)?\s+rake\s+(build|release)\b/.match?(cmd)
             cmd = "SKIP_GEM_SIGNING=true #{cmd}"
           end
           puts "$ #{cmd}"
@@ -31,7 +31,7 @@ module Kettle
           # Some commands are interactive (e.g., `bundle exec rake release` prompting for RubyGems MFA).
           # Using capture3 detaches STDIN, preventing prompts from working. For such commands, use system
           # so they inherit the current TTY and can read the user's input.
-          interactive = cmd =~ /\Abundle(\s+exec)?\s+rake\s+release\b/ || cmd =~ /\Agem\s+push\b/
+          interactive = /\Abundle(\s+exec)?\s+rake\s+release\b/.match?(cmd) || /\Agem\s+push\b/.match?(cmd)
           if interactive
             ok = system(env_hash, cmd)
             unless ok
@@ -97,9 +97,9 @@ module Kettle
             gem_name = detect_gem_name
             latest_overall, latest_for_series = latest_released_versions(gem_name, version)
           rescue StandardError => e
-            warn("[kettle-release] RubyGems check failed: #{e.class}: #{e.message}")
-            warn(e.backtrace.first(3).map { |l| "  " + l }.join("\n")) if ENV["DEBUG"]
-            warn("Proceeding without RubyGems latest version info.")
+            warn("[kettle-release] gem.coop release check failed: #{e.class}: #{e.message}")
+            warn(e.backtrace.first(3).map { |l| "  " + l }.join("\n")) if ENV["KETTLE_DEV_DEBUG"]
+            warn("Proceeding without gem.coop latest version info.")
           end
 
           if latest_overall
@@ -121,7 +121,7 @@ module Kettle
               latest_for_series = nil unless lfs_series == cur_series
             end
             # Determine the sanity-check target correctly for the current series.
-            # If RubyGems has a newer overall series than our current series, only compare
+            # If gem.coop has a newer overall series than our current series, only compare
             # against the latest published in our current series. If that cannot be determined
             # (e.g., offline), skip the sanity check rather than treating the overall as target.
             target = if (cur_series <=> overall_series) == -1
@@ -130,10 +130,10 @@ module Kettle
               latest_overall
             end
             # IMPORTANT: Never treat a higher different-series "latest_overall" as a downgrade target.
-            # If our current series is behind overall and RubyGems does not report a latest_for_series,
+            # If our current series is behind overall and gem.coop does not report a latest_for_series,
             # then we cannot determine the correct target for this series and should skip the check.
             if (cur_series <=> overall_series) == -1 && target.nil?
-              puts "Could not determine latest released version from RubyGems (offline?). Proceeding without sanity check."
+              puts "Could not determine latest released version from gem.coop (offline?). Proceeding without sanity check."
             elsif target
               bump = Kettle::Dev::Versioning.classify_bump(target, version)
               case bump
@@ -150,10 +150,10 @@ module Kettle
                 puts "Proposed bump type: #{label} (from #{target} -> #{version})"
               end
             else
-              puts "Could not determine latest released version from RubyGems (offline?). Proceeding without sanity check."
+              puts "Could not determine latest released version from gem.coop (offline?). Proceeding without sanity check."
             end
           else
-            puts "Could not determine latest released version from RubyGems (offline?). Proceeding without sanity check."
+            puts "Could not determine latest released version from gem.coop (offline?). Proceeding without sanity check."
           end
 
           puts "Have you updated lib/**/version.rb and CHANGELOG.md for v#{version}? [y/N]"
@@ -184,15 +184,18 @@ module Kettle
         # 4. bin/rake
         run_cmd!("bin/rake") if @start_step <= 4
 
-        # 5. appraisal:update (optional)
+        # 5. appraisal:update (optional) + canonical docs build
         if @start_step <= 5
           appraisals_path = File.join(@root, "Appraisals")
           if File.file?(appraisals_path)
-            puts "Appraisals detected at #{appraisals_path}. Running: bin/rake appraisal:update"
+            puts "Appraisals detected at #{Kettle::Dev.display_path(appraisals_path)}. Running: bin/rake appraisal:update"
             run_cmd!("bin/rake appraisal:update")
           else
             puts "No Appraisals file found; skipping appraisal:update"
           end
+
+          puts "Generating docs site via canonical task: bin/rake yard"
+          run_cmd!("bin/rake yard")
         end
 
         # 6. git user + commit release prep
@@ -317,7 +320,7 @@ module Kettle
         return unless section
 
         # Example match: "- COVERAGE: 97.70% -- 2125/2175 lines in 20 files"
-        m = section.lines.find { |l| l =~ /-\s*COVERAGE:\s*.+--\s*\d+\/(\d+)\s+lines/i }
+        m = section.lines.find { |l| /-\s*COVERAGE:\s*.+--\s*\d+\/(\d+)\s+lines/i.match?(l) }
         return unless m
 
         denom = m.match(/-\s*COVERAGE:\s*.+--\s*\d+\/(\d+)\s+lines/i)[1].to_i
@@ -408,7 +411,7 @@ module Kettle
         content = File.read(path)
         # Only consider lines that look like copyright notices to reduce false positives
         content.each_line do |line|
-          next unless line =~ /copyright/i
+          next unless /copyright/i.match?(line)
 
           # Expand ranges first (supports hyphen-minus and en dash)
           line.scan(/\b(19\d{2}|20\d{2})\s*[\-–]\s*(19\d{2}|20\d{2})\b/).each do |a, b|
@@ -459,7 +462,7 @@ module Kettle
         changed = false
         canonical_all = collapse_years(years_set)
         new_lines = content.each_line.map do |line|
-          unless line =~ /copyright/i
+          unless /copyright/i.match?(line)
             next line
           end
 
@@ -483,7 +486,7 @@ module Kettle
         content = File.read(path)
         changed = false
         new_lines = content.each_line.map do |line|
-          unless line =~ /copyright/i
+          unless /copyright/i.match?(line)
             next line
           end
 
@@ -556,7 +559,7 @@ module Kettle
         when "ask"
           print("Run local CI with 'act' before pushing? [Y/n] ")
           ans = Kettle::Dev::InputAdapter.gets&.strip
-          ans.nil? || ans.empty? || ans =~ /\Ay(es)?\z/i
+          ans.nil? || ans.empty? || /\Ay(es)?\z/i.match?(ans)
         else
           false
         end
@@ -579,7 +582,7 @@ module Kettle
 
         chosen = (ENV["K_RELEASE_LOCAL_CI_WORKFLOW"] || "").strip
         if !chosen.empty?
-          chosen = "#{chosen}.yml" unless chosen =~ /\.ya?ml\z/
+          chosen = "#{chosen}.yml" unless /\.ya?ml\z/.match?(chosen)
         else
           chosen = if candidates.include?("locked_deps.yml")
             "locked_deps.yml"
@@ -597,7 +600,7 @@ module Kettle
 
         file_path = File.join(workflows_dir, chosen)
         unless File.file?(file_path)
-          puts "Skipping local CI: selected workflow not found: #{file_path}"
+          puts "Skipping local CI: selected workflow not found: #{Kettle::Dev.display_path(file_path)}"
           return
         end
 
@@ -625,18 +628,18 @@ module Kettle
         path = gemspecs.min
         content = File.read(path)
         m = content.match(/spec\.name\s*=\s*(["'])([^"']+)\1/)
-        abort("Could not determine gem name from #{path}.") unless m
+        abort("Could not determine gem name from #{Kettle::Dev.display_path(path)}.") unless m
         m[2]
       end
 
       def latest_released_versions(gem_name, current_version)
-        uri = URI("https://rubygems.org/api/v1/versions/#{gem_name}.json")
+        uri = URI("https://gem.coop/api/v1/versions/#{gem_name}.json")
         res = Net::HTTP.get_response(uri)
         return [nil, nil] unless res.is_a?(Net::HTTPSuccess)
 
         data = JSON.parse(res.body)
         versions = data.map { |h| h["number"] }.compact
-        versions.reject! { |v| v.to_s.include?("-pre") || v.to_s.include?(".pre") || v.to_s =~ /[a-zA-Z]/ }
+        versions.reject! { |v| v.to_s.include?("-pre") || v.to_s.include?(".pre") || /[a-zA-Z]/.match?(v.to_s) }
         gversions = versions.map { |s| Gem::Version.new(s) }.sort
         latest_overall = gversions.last&.to_s
 
@@ -924,11 +927,11 @@ module Kettle
         unless File.exist?(cert_path)
           abort(<<~MSG)
             Gem signing appears enabled but no public cert found at:
-              #{cert_path}
+              #{Kettle::Dev.display_path(cert_path)}
             Add your public key to certs/<USER>.pem (or set GEM_CERT_USER), or set SKIP_GEM_SIGNING to build unsigned.
           MSG
         end
-        puts "Found signing cert: #{cert_path}"
+        puts "Found signing cert: #{Kettle::Dev.display_path(cert_path)}"
         puts "When prompted during build/release, enter the PEM password for ~/.ssh/gem-private_key.pem"
       end
 

data/lib/kettle/dev/version.rb

@@ -2,94 +2,9 @@
 
 module Kettle
   module Dev
-    # Version namespace for kettle-dev.
     module Version
-      # The gem version.
-      # @return [String]
-      VERSION = "2.0.0"
-
-      module_function
-
-      # rubocop:disable ThreadSafety/ClassInstanceVariable
-      #
-      # The logic below, through the end of the file, comes from version_gem.
-      # Extracted because version_gem depends on this gem, and circular dependencies are bad.
-      #
-      # A Gem::Version for this version string
-      #
-      # Useful when you need to compare versions or pass a Gem::Version instance
-      # to APIs that expect it. This is equivalent to `Gem::Version.new(to_s)`.
-      #
-      # @return [Gem::Version]
-      def gem_version
-        @gem_version ||= ::Gem::Version.new(to_s)
-      end
-
-      # The version number as a string
-      #
-      # @return [String]
-      def to_s
-        self::VERSION
-      end
-
-      # The major version
-      #
-      # @return [Integer]
-      def major
-        @major ||= _to_a[0].to_i
-      end
-
-      # The minor version
-      #
-      # @return [Integer]
-      def minor
-        @minor ||= _to_a[1].to_i
-      end
-
-      # The patch version
-      #
-      # @return [Integer]
-      def patch
-        @patch ||= _to_a[2].to_i
-      end
-
-      # The pre-release version, if any
-      #
-      # @return [String, NilClass]
-      def pre
-        @pre ||= _to_a[3]
-      end
-
-      # The version number as a hash
-      #
-      # @return [Hash]
-      def to_h
-        @to_h ||= {
-          major: major,
-          minor: minor,
-          patch: patch,
-          pre: pre,
-        }
-      end
-
-      # The version number as an array of cast values
-      #
-      # @return [Array<[Integer, String, NilClass]>]
-      def to_a
-        @to_a ||= [major, minor, patch, pre]
-      end
-
-      private
-
-      module_function
-
-      # The version number as an array of strings
-      #
-      # @return [Array<String>]
-      def _to_a
-        @_to_a = self::VERSION.split(".")
-      end
-      # rubocop:enable ThreadSafety/ClassInstanceVariable
+      VERSION = "2.0.1"
     end
+    VERSION = Version::VERSION # Traditional Constant Location
   end
 end

data/lib/kettle/dev.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+require "version_gem"
+require_relative "dev/version"
+
+Kettle::Dev::Version.class_eval do
+  extend VersionGem::Basic
+end
 # External gems
 
 # It's not reasonable to test this ENV variable
@@ -38,9 +44,9 @@ module Kettle
     class Error < StandardError; end
 
     # Whether debug logging is enabled for kettle-dev internals.
-    # KETTLE_DEV_DEBUG overrides DEBUG.
+    # Controlled by KETTLE_DEV_DEBUG=true.
     # @return [Boolean]
-    DEBUGGING = ENV.fetch("KETTLE_DEV_DEBUG", ENV.fetch("DEBUG", "false")).casecmp("true").zero?
+    DEBUGGING = ENV.fetch("KETTLE_DEV_DEBUG", "false").casecmp("true").zero?
     # Whether we are running on CI.
     # @return [Boolean]
     IS_CI = ENV.fetch("CI", "false").casecmp("true") == 0
@@ -70,23 +76,39 @@ module Kettle
     @defaults = [].freeze
 
     class << self
+      VAR_HOME_PREFIX = %r{\A/var/home(?=/|\z)}
+      VAR_HOME_TEXT = %r{/var/home(?=/|\z)}
+
+      def display_path(path)
+        return path if path.nil?
+
+        path.to_s.sub(VAR_HOME_PREFIX, "/home")
+      end
+
+      def display_text(text)
+        return text if text.nil?
+
+        text.to_s.gsub(VAR_HOME_TEXT, "/home")
+      end
+
       # Emit a debug warning for rescued errors when kettle-dev debugging is enabled.
-      # Controlled by KETTLE_DEV_DEBUG=true (or DEBUG=true as fallback).
+      # Controlled by KETTLE_DEV_DEBUG=true.
       # @param error [Exception]
       # @param context [String, Symbol, nil] optional label, often __method__
+      # @param backtrace [Boolean] whether to emit the rescued error backtrace
       # @return [void]
-      def debug_error(error, context = nil)
+      def debug_error(error, context = nil, backtrace: true)
         return unless DEBUGGING
 
         ctx = context ? context.to_s : "KETTLE-DEV-RESCUE"
         Kernel.warn("[#{ctx}] #{error.class}: #{error.message}")
-        Kernel.warn(error.backtrace.first(5).join("\n")) if error.respond_to?(:backtrace) && error.backtrace
+        Kernel.warn(Array(error.backtrace).first(5).join("\n")) if backtrace && error.respond_to?(:backtrace) && error.backtrace
       rescue StandardError
         # never raise from debug logging
       end
 
       # Emit a debug log line when kettle-dev debugging is enabled.
-      # Controlled by KETTLE_DEV_DEBUG=true (or DEBUG=true as fallback).
+      # Controlled by KETTLE_DEV_DEBUG=true.
       # @param msg [String]
       # @return [void]
       def debug_log(msg, context = nil)

data/sig/kettle/dev/version.rbs

@@ -0,0 +1,8 @@
+module Kettle
+  module Dev
+    module Version
+      VERSION: String
+    end
+    VERSION: String
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Peter H. Boling
@@ -37,6 +37,46 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: kettle-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: version_gem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -92,33 +132,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: kettle-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 3.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +208,7 @@ email:
 - floss@galtzo.com
 executables:
 - kettle-changelog
+- kettle-check-eof
 - kettle-commit-msg
 - kettle-dev-setup
 - kettle-dvcs
@@ -196,9 +223,8 @@ extra_rdoc_files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - FUNDING.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
-- REEK
 - RUBOCOP.md
 - SECURITY.md
 files:
@@ -207,13 +233,14 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - FUNDING.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
-- REEK
 - RUBOCOP.md
 - SECURITY.md
-- bin/setup
+- certs/pboling.pem
 - exe/kettle-changelog
+- exe/kettle-check-eof
+- exe/kettle-check-eof.sh
 - exe/kettle-commit-msg
 - exe/kettle-dev-setup
 - exe/kettle-dvcs
@@ -282,13 +309,13 @@ files:
 - sig/kettle/emoji_regex.rbs
 homepage: https://github.com/kettle-rb/kettle-dev
 licenses:
-- MIT
+- AGPL-3.0-only
 metadata:
-  homepage_uri: https://kettle-dev.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v2.0.0
-  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v2.0.0/CHANGELOG.md
+  homepage_uri: https://kettle-dev.galtzo.com
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v2.0.1
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v2.0.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.0.0
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.0.1
   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
@@ -310,14 +337,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.10
 specification_version: 4
 summary: "\U0001F372 A kettle-rb meta tool to streamline development and testing"
 test_files: []

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023, 2025 Peter Boling
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here