kettle-dev 2.0.5 → 2.0.7

data/lib/kettle/dev/pre_release_cli.rb

@@ -102,7 +102,7 @@ module Kettle
           urls = []
 
           # Inline image syntax
-          text.scan(/!\[[^\]]*\]\(([^\s)]+)(?:\s+\"[^\"]*\")?\)/) { |m| urls << m[0] }
+          text.scan(/!\[[^\]]*\]\(([^\s)]+)(?:\s+"[^"]*")?\)/) { |m| urls << m[0] }
 
           # Reference definitions
           ref_defs = {}
@@ -116,8 +116,8 @@ module Kettle
           end
 
           # HTML <img src="...">
-          text.scan(/<img\b[^>]*\bsrc\s*=\s*\"([^\"]+)\"[^>]*>/i) { |m| urls << m[0] }
-          text.scan(/<img\b[^>]*\bsrc\s*=\s*\'([^\']+)\'[^>]*>/i) { |m| urls << m[0] }
+          text.scan(/<img\b[^>]*\bsrc\s*=\s*"([^"]+)"[^>]*>/i) { |m| urls << m[0] }
+          text.scan(/<img\b[^>]*\bsrc\s*=\s*'([^']+)'[^>]*>/i) { |m| urls << m[0] }
 
           urls.reject! { |u| u.nil? || u.strip.empty? }
           urls.select! { |u| u =~ %r{^https?://}i }
@@ -132,7 +132,7 @@ module Kettle
           urls = files.flat_map do |f|
             begin
               extract_image_urls_from_text(File.read(f))
-            rescue StandardError => e
+            rescue => e
               warn("[kettle-pre-release] Could not read #{Kettle::Dev.display_path(f)}: #{e.class}: #{e.message}")
               []
             end
@@ -178,7 +178,7 @@ module Kettle
         files.each do |file|
           begin
             original = File.read(file)
-          rescue StandardError => e
+          rescue => e
             warn("[kettle-pre-release] Could not read #{Kettle::Dev.display_path(file)}: #{e.class}: #{e.message}")
             next
           end
@@ -206,7 +206,7 @@ module Kettle
             begin
               File.write(file, updated)
               changed << file
-            rescue StandardError => e
+            rescue => e
               warn("[kettle-pre-release] Could not write #{Kettle::Dev.display_path(file)}: #{e.class}: #{e.message}")
             end
           end
@@ -222,7 +222,7 @@ module Kettle
         puts "[kettle-pre-release] Check 2: Validate Markdown image links (HTTP HEAD)"
         urls = [
           Markdown.extract_image_urls_from_files("**/*.md"),
-          Markdown.extract_image_urls_from_files("**/*.md.example"),
+          Markdown.extract_image_urls_from_files("**/*.md.example")
         ].flatten.uniq
         puts "[kettle-pre-release] Found #{urls.size} unique image URL(s)."
         failures = []

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

@@ -101,7 +101,7 @@ begin
             File.delete(f)
           rescue Errno::ENOENT
             # Ignore if already gone
-          rescue StandardError => e
+          rescue => e
             failures << [f, e]
           end
         end

data/lib/kettle/dev/readme_backers.rb

@@ -76,10 +76,10 @@ module Kettle
           else
             "https://github.com/organizations/YOUR_ORG/settings/secrets/actions"
           end
-          $stderr.puts "ERROR: README_UPDATER_TOKEN is not set."
-          $stderr.puts "Please create an organization-level Actions secret named README_UPDATER_TOKEN at:"
-          $stderr.puts "  #{org_url}"
-          $stderr.puts "Then update the workflow to reference it, or provide README_UPDATER_TOKEN in the environment."
+          warn "ERROR: README_UPDATER_TOKEN is not set."
+          warn "Please create an organization-level Actions secret named README_UPDATER_TOKEN at:"
+          warn "  #{org_url}"
+          warn "Then update the workflow to reference it, or provide README_UPDATER_TOKEN in the environment."
           raise 'Missing ENV["README_UPDATER_TOKEN"]'
         end
         nil
@@ -250,7 +250,7 @@ module Kettle
               from_yml = from_yml.to_s if from_yml
               return from_yml unless from_yml.nil? || from_yml.strip.empty?
             end
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
           end
         end
@@ -265,7 +265,7 @@ module Kettle
           individuals_start: "<!-- #{base}-INDIVIDUALS:START -->",
           individuals_end: "<!-- #{base}-INDIVIDUALS:END -->",
           orgs_start: "<!-- #{base}-ORGANIZATIONS:START -->",
-          orgs_end: "<!-- #{base}-ORGANIZATIONS:END -->",
+          orgs_end: "<!-- #{base}-ORGANIZATIONS:END -->"
         }
       end
 
@@ -301,7 +301,7 @@ module Kettle
         warn("Error parsing #{api_path} JSON: #{e.message}")
         debug_log("Body that failed to parse (truncated 500): #{response&.body.to_s[0, 500]}")
         []
-      rescue StandardError => e
+      rescue => e
         warn("Error fetching #{api_path}: #{e.class}: #{e.message}")
         debug_log(e.backtrace.join("\n"))
         []
@@ -378,7 +378,7 @@ module Kettle
             website: (h["website"].to_s.strip.empty? ? nil : h["website"]),
             profile: (h["profile"].to_s.strip.empty? ? nil : h["profile"]),
             oc_type: oc_type,
-            oc_index: oc_index,
+            oc_index: oc_index
           )
         end
       end
@@ -427,7 +427,7 @@ module Kettle
               name: m.name,
               image: m.image,
               website: m.website,
-              profile: m.profile,
+              profile: m.profile
             )
           end
           # Build a single, well-formed block per tier with deterministic spacing:
@@ -437,7 +437,7 @@ module Kettle
           block = [
             "### Open Collective for #{tier}",
             "",
-            generate_markdown(members_plain, empty_message: "", default_name: tier),
+            generate_markdown(members_plain, empty_message: "", default_name: tier)
           ].join("\n")
           blocks << block
         end
@@ -497,17 +497,17 @@ module Kettle
         block = content[(start_index + start_tag.length)...end_index]
         identities = Set.new
         # 1) Image-style link wrappers: [![ALT](IMG)](HREF)
-        block.to_s.scan(/\[!\[[^\]]*\]\([^\)]*\)\]\(([^\)]+)\)/) do |m|
+        block.to_s.scan(/\[!\[[^\]]*\]\([^)]*\)\]\(([^)]+)\)/) do |m|
           href = (m[0] || "").strip
           identities << href.downcase unless href.empty?
         end
         # 2) Capture ALT text from image-style wrappers for name identity
-        block.to_s.scan(/\[!\[([^\]]*)\]\([^\)]*\)\]\([^\)]*\)/) do |m|
+        block.to_s.scan(/\[!\[([^\]]*)\]\([^)]*\)\]\([^)]*\)/) do |m|
           alt = (m[0] || "").strip
           identities << alt.downcase unless alt.empty?
         end
         # 3) Plain markdown links: [TEXT](HREF)
-        block.to_s.scan(/\[([^!][^\]]*)\]\(([^\)]+)\)/) do |m|
+        block.to_s.scan(/\[([^!][^\]]*)\]\(([^)]+)\)/) do |m|
           text = (m[0] || "").strip
           href = (m[1] || "").strip
           identities << href.downcase unless href.empty?
@@ -610,8 +610,7 @@ module Kettle
         handle = github_handle_from_urls(m.profile, m.website)
         return "@#{handle}" if handle
 
-        name = (m.name && !m.name.strip.empty?) ? m.name.strip : default_name
-        name
+        (m.name && !m.name.strip.empty?) ? m.name.strip : default_name
       end
 
       def github_handle_from_urls(*urls)
@@ -667,7 +666,7 @@ module Kettle
               from_yml = from_yml.to_s if from_yml
               return from_yml unless from_yml.nil? || from_yml.strip.empty?
             end
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
           end
         end

data/lib/kettle/dev/release_cli.rb

@@ -96,7 +96,7 @@ module Kettle
           begin
             gem_name = detect_gem_name
             latest_overall, latest_for_series = latest_released_versions(gem_name, version)
-          rescue StandardError => e
+          rescue => e
             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.")
@@ -167,14 +167,14 @@ module Kettle
           # Ensure README KLOC badge reflects current CHANGELOG coverage denominator
           begin
             update_readme_kloc_badge!
-          rescue StandardError => e
+          rescue => e
             warn("Failed to update KLOC badge in README: #{e.class}: #{e.message}")
           end
 
           # Update Rakefile.example header banner with current version and date
           begin
             update_rakefile_example_header!(version)
-          rescue StandardError => e
+          rescue => e
             warn("Failed to update Rakefile.example header: #{e.class}: #{e.message}")
           end
         end
@@ -297,7 +297,7 @@ module Kettle
           version ||= detect_version
           gem_name = detect_gem_name
           puts "\n🚀 Release #{gem_name} v#{version} Complete 🚀"
-        rescue StandardError => e
+        rescue => e
           Kettle::Dev.debug_error(e, __method__)
           # Fallback if detection fails for any reason
           puts "\n🚀 Release v#{version || "unknown"} Complete 🚀"
@@ -414,7 +414,7 @@ module Kettle
           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|
+          line.scan(/\b(19\d{2}|20\d{2})\s*[-–]\s*(19\d{2}|20\d{2})\b/).each do |a, b|
             s = a.to_i
             e = b.to_i
             if e < s
@@ -466,7 +466,7 @@ module Kettle
             next line
           end
 
-          m = line.match(/\A(?<pre>.*?copyright[^0-9]*)(?<years>(?:\b(?:19|20)\d{2}\b(?:\s*[\-–]\s*\b(?:19|20)\d{2}\b)?)(?:\s*,\s*\b(?:19|20)\d{2}\b(?:\s*[\-–]\s*\b(?:19|20)\d{2}\b)?)*)(?<post>.*)\z/i)
+          m = line.match(/\A(?<pre>.*?copyright[^0-9]*)(?<years>(?:\b(?:19|20)\d{2}\b(?:\s*[-–]\s*\b(?:19|20)\d{2}\b)?)(?:\s*,\s*\b(?:19|20)\d{2}\b(?:\s*[-–]\s*\b(?:19|20)\d{2}\b)?)*)(?<post>.*)\z/i)
           unless m
             next line
           end
@@ -491,7 +491,7 @@ module Kettle
           end
 
           # Capture three parts: prefix up to first year, the year blob, and the rest
-          m = line.match(/\A(?<pre>.*?copyright[^0-9]*)(?<years>(?:\b(?:19|20)\d{2}\b(?:\s*[\-–]\s*\b(?:19|20)\d{2}\b)?)(?:\s*,\s*\b(?:19|20)\d{2}\b(?:\s*[\-–]\s*\b(?:19|20)\d{2}\b)?)*)(?<post>.*)\z/i)
+          m = line.match(/\A(?<pre>.*?copyright[^0-9]*)(?<years>(?:\b(?:19|20)\d{2}\b(?:\s*[-–]\s*\b(?:19|20)\d{2}\b)?)(?:\s*,\s*\b(?:19|20)\d{2}\b(?:\s*[-–]\s*\b(?:19|20)\d{2}\b)?)*)(?<post>.*)\z/i)
           unless m
             # No parsable year sequence on this line; leave as-is
             next line
@@ -500,7 +500,7 @@ module Kettle
           years_blob = m[:years]
           # Reuse extraction logic on just the years blob
           years = []
-          years_blob.scan(/\b(19\d{2}|20\d{2})\s*[\-–]\s*(19\d{2}|20\d{2})\b/).each do |a, b|
+          years_blob.scan(/\b(19\d{2}|20\d{2})\s*[-–]\s*(19\d{2}|20\d{2})\b/).each do |a, b|
             s = a.to_i
             e = b.to_i
             s, e = e, s if e < s
@@ -567,7 +567,7 @@ module Kettle
 
         act_ok = begin
           system("act", "--version", out: File::NULL, err: File::NULL)
-        rescue StandardError => e
+        rescue => e
           Kettle::Dev.debug_error(e, __method__)
           false
         end
@@ -648,7 +648,7 @@ module Kettle
         series_versions = gversions.select { |gv| gv.segments[0, 2] == series }
         latest_series = series_versions.last&.to_s
         [latest_overall, latest_series]
-      rescue StandardError => e
+      rescue => e
         Kettle::Dev.debug_error(e, __method__)
         [nil, nil]
       end
@@ -957,7 +957,7 @@ module Kettle
         pkg = File.join(@root, "pkg")
         pattern = File.join(pkg, "*.gem")
         gems = Dir[pattern].select { |p| File.basename(p).include?("-#{version}.gem") }
-        gems.sort.last
+        gems.max
       end
 
       def compute_sha256(path)
@@ -1042,7 +1042,7 @@ module Kettle
         compare_ref = compare_ref&.end_with?("\n") ? compare_ref : (compare_ref && compare_ref + "\n")
         tag_ref = tag_ref&.end_with?("\n") ? tag_ref : (tag_ref && tag_ref + "\n")
         [section, compare_ref, tag_ref]
-      rescue StandardError => e
+      rescue => e
         warn("Failed to parse CHANGELOG.md: #{e.class}: #{e.message}")
         [nil, nil, nil]
       end
@@ -1063,7 +1063,7 @@ module Kettle
         # Normalize: trim trailing whitespace but keep internal formatting
         block = block.lstrip # drop leading newline/space
         block.rstrip
-      rescue StandardError => e
+      rescue => e
         warn("[kettle-release] Failed to extract release notes footer from FUNDING.md: #{e.class}: #{e.message}")
         nil
       end
@@ -1081,7 +1081,7 @@ module Kettle
           name: title,
           body: body,
           draft: false,
-          prerelease: false,
+          prerelease: false
         })
 
         res = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
@@ -1099,7 +1099,7 @@ module Kettle
             [false, "HTTP #{res.code}: #{res.body}"]
           end
         end
-      rescue StandardError => e
+      rescue => e
         [false, "#{e.class}: #{e.message}"]
       end
     end

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

@@ -84,7 +84,7 @@ module Kettle
               else
                 puts "GHA status: request failed (#{res.code})"
               end
-            rescue StandardError => e
+            rescue => e
               puts "GHA status: error #{e.class}: #{e.message}"
             end
           end
@@ -130,7 +130,7 @@ module Kettle
               else
                 puts "Latest GL (#{branch}) pipeline: none"
               end
-            rescue StandardError => e
+            rescue => e
               puts "GL status: error #{e.class}: #{e.message}"
             end
           end
@@ -174,7 +174,6 @@ module Kettle
           end
 
           # Interactive menu
-          require "thread"
           tty = $stdout.tty?
           options = mapping.to_a + dynamic_files.map { |f| [f, f] }
           quit_code = "q"
@@ -190,14 +189,14 @@ module Kettle
           upstream = begin
             out, status = Open3.capture2("git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}")
             status.success? ? out.strip : nil
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
             nil
           end
           sha = begin
             out, status = Open3.capture2("git", "rev-parse", "--short", "HEAD")
             status.success? ? out.strip : nil
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
             nil
           end
@@ -235,7 +234,7 @@ module Kettle
                 end
               end
             end
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
           end
 
@@ -263,18 +262,20 @@ module Kettle
           sleep(0.2)
 
           selected = nil
-          # Create input thread always so specs that assert its cleanup/exception behavior can exercise it,
-          # but guard against non-interactive stdin by rescuing 'bad tty' and similar errors immediately.
-          input_thread = Thread.new do # rubocop:disable ThreadSafety/NewThread
+          input_thread = nil
+          read_input = proc do
             begin
               selected = Kettle::Dev::InputAdapter.gets&.strip
             rescue StandardError, SystemExit, Interrupt => error
-              # Catch exceptions in background thread, including SystemExit
-              # NOTE: look into refactoring to minimize potential SystemExit.
-              puts "Error in background thread: #{error.class}: #{error.message}" if Kettle::Dev::DEBUGGING
+              puts "Error reading input: #{error.class}: #{error.message}" if Kettle::Dev::DEBUGGING
               selected = :input_error
             end
           end
+          if tty
+            input_thread = Thread.new(&read_input) # rubocop:disable ThreadSafety/NewThread
+          else
+            read_input.call
+          end
 
           status_q = Queue.new
           workers = []
@@ -381,12 +382,12 @@ module Kettle
 
           begin
             workers.each { |t| t.kill if t&.alive? }
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
           end
           begin
             input_thread.kill if input_thread&.alive?
-          rescue StandardError => e
+          rescue => e
             Kettle::Dev.debug_error(e, __method__)
           end
 

data/lib/kettle/dev/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Dev
     module Version
-      VERSION = "2.0.5"
+      VERSION = "2.0.7"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/lib/kettle/dev/versioning.rb

@@ -6,12 +6,13 @@ module Kettle
     module Versioning
       module_function
 
-      # Detects a unique VERSION constant declared under lib/**/version.rb
+      # Detects a unique VERSION constant declared under lib/**/version.rb,
+      # or in K_CHANGELOG_VERSION_FILE when a monorepo/root changelog needs
+      # to point at a representative package version file.
       # @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?
+        candidates = version_file_candidates(root)
         versions = candidates.map do |path|
           content = File.read(path)
           m = content.match(/VERSION\s*=\s*(["'])([^"']+)\1/)
@@ -24,6 +25,20 @@ module Kettle
         versions.first
       end
 
+      def version_file_candidates(root)
+        override = ENV.fetch("K_CHANGELOG_VERSION_FILE", "").to_s.strip
+        unless override.empty?
+          path = File.expand_path(override, root)
+          abort!("K_CHANGELOG_VERSION_FILE does not exist: #{override}") unless File.file?(path)
+
+          return [path]
+        end
+
+        candidates = Dir[File.join(root, "lib", "**", "version.rb")]
+        abort!("Could not find version.rb under lib/**.") if candidates.empty?
+        candidates
+      end
+
       # Classify the bump type from prev -> cur.
       # EPIC is a MAJOR > 1000.
       # @param prev [String] previous released version

data/lib/kettle/dev.rb

@@ -103,7 +103,7 @@ module Kettle
         ctx = context ? context.to_s : "KETTLE-DEV-RESCUE"
         Kernel.warn("[#{ctx}] #{error.class}: #{error.message}")
         Kernel.warn(Array(error.backtrace).first(5).join("\n")) if backtrace && error.respond_to?(:backtrace) && error.backtrace
-      rescue StandardError
+      rescue
         # never raise from debug logging
       end
 
@@ -116,7 +116,7 @@ module Kettle
 
         ctx = context ? context.to_s : "KETTLE-DEV-DEBUG"
         Kernel.warn("[#{ctx}] #{msg}")
-      rescue StandardError
+      rescue
         # never raise from debug logging
       end
 
@@ -146,7 +146,7 @@ module Kettle
           if defined?(Rake) && Rake::Task.task_defined?(:default)
             begin
               Rake::Task[:default].enhance([task_name])
-            rescue StandardError => e
+            rescue => e
               Kernel.warn("kettle-dev: failed to enhance :default with #{task_name}: #{e.message}") if DEBUGGING
             end
           end

data/lib/kettle-dev.rb

@@ -1,4 +1,4 @@
-# rubocop:disable Naming/FileName# USAGE:
+# rubocop:disable Naming/FileName -- USAGE:
 # In your `spec/spec_helper.rb`,
 # just prior to loading the library under test:
 #

data.tar.gz.sig

@@ -1,2 +1 @@
-��ٌM��,��B�t2�-�m���EC�;O;��mV�D�맱���Ü�e�섂p`� od��=�b"1�'�]�F]�y����"���F��Af��z�}r�QՃĩ�oPH�d�d��do�c#Q?d���MK����g����+�ZB�wJ�1aV�Z���b�)�:\Lw��Sgz��v��h�G�龃�^�9�In��{�ڳ%����s>
-��
+z/��$Qr�m�$(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -198,7 +198,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 description: "\U0001F372 Kettle::Dev is a meta tool from kettle-rb to streamline development
   and testing. Acts as a shim dependency, pulling in many other dependencies, to give
   you OOTB productivity with a RubyGem, or Ruby app project. Configures a complete
@@ -312,10 +312,10 @@ licenses:
 - 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.5
-  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v2.0.5/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v2.0.7
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v2.0.7/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.0.5
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.0.7
   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