kettle-dev 1.1.3 → 1.1.5

data/lib/kettle/dev/template_helpers.rb

@@ -12,6 +12,8 @@ module Kettle
       # Values: Hash with keys: :action (Symbol, one of :create, :replace, :skip, :dir_create, :dir_replace), :timestamp (Time)
       @@template_results = {}
 
+      EXECUTABLE_GIT_HOOKS_RE = %r{[\\/]\.git-hooks[\\/](commit-msg|prepare-commit-msg)\z}
+
       module_function
 
       # Root of the host project where Rake was invoked
@@ -119,9 +121,11 @@ module Kettle
         end
 
         if clean.nil?
-          # Fallback to shelling out to get both status and preview
+          # Fallback to using the GitAdapter to get both status and preview
           status_output = begin
-            IO.popen(["git", "-C", root.to_s, "status", "--porcelain"], &:read).to_s
+            ga = Kettle::Dev::GitAdapter.new
+            out, ok = ga.capture(["-C", root.to_s, "status", "--porcelain"]) # adapter can use CLI safely
+            ok ? out.to_s : ""
           rescue StandardError => e
             Kettle::Dev.debug_error(e, __method__)
             ""
@@ -130,9 +134,11 @@ module Kettle
           preview = status_output.lines.take(10).map(&:rstrip)
         else
           return if clean
-          # For messaging, provide a small preview via porcelain even when using the adapter
+          # For messaging, provide a small preview using GitAdapter even when using the adapter
           status_output = begin
-            IO.popen(["git", "-C", root.to_s, "status", "--porcelain"], &:read).to_s
+            ga = Kettle::Dev::GitAdapter.new
+            out, ok = ga.capture(["-C", root.to_s, "status", "--porcelain"]) # read-only query
+            ok ? out.to_s : ""
           rescue StandardError => e
             Kettle::Dev.debug_error(e, __method__)
             ""
@@ -221,6 +227,15 @@ module Kettle
           # If replacement fails unexpectedly, proceed with content as-is
         end
         write_file(dest_path, content)
+        begin
+          # Ensure executable bit for git hook scripts when writing under .git-hooks
+          if EXECUTABLE_GIT_HOOKS_RE =~ dest_path.to_s
+            File.chmod(0o755, dest_path) if File.exist?(dest_path)
+          end
+        rescue StandardError => e
+          Kettle::Dev.debug_error(e, __method__)
+          # ignore permission issues
+        end
         record_template_result(dest_path, dest_exists ? :replace : :create)
         puts "Wrote #{dest_path}"
       end
@@ -316,6 +331,16 @@ module Kettle
                   end
                 end
                 FileUtils.cp(path, target)
+                begin
+                  # Ensure executable bit for git hook scripts when copying under .git-hooks
+                  if target.end_with?("/.git-hooks/commit-msg", "/.git-hooks/prepare-commit-msg") ||
+                      EXECUTABLE_GIT_HOOKS_RE =~ target
+                    File.chmod(0o755, target)
+                  end
+                rescue StandardError => e
+                  Kettle::Dev.debug_error(e, __method__)
+                  # ignore permission issues
+                end
               end
             end
             puts "Updated #{dest_dir}"
@@ -354,6 +379,16 @@ module Kettle
                 end
               end
               FileUtils.cp(path, target)
+              begin
+                # Ensure executable bit for git hook scripts when copying under .git-hooks
+                if target.end_with?("/.git-hooks/commit-msg", "/.git-hooks/prepare-commit-msg") ||
+                    EXECUTABLE_GIT_HOOKS_RE =~ target
+                  File.chmod(0o755, target)
+                end
+              rescue StandardError => e
+                Kettle::Dev.debug_error(e, __method__)
+                # ignore permission issues
+              end
             end
           end
           puts "Created #{dest_dir}"
@@ -368,30 +403,34 @@ module Kettle
       # @param namespace [String]
       # @param namespace_shield [String]
       # @param gem_shield [String]
+      # @param funding_org [String, nil]
       # @return [String]
-      def apply_common_replacements(content, org:, gem_name:, namespace:, namespace_shield:, gem_shield:)
-        c = content.dup
-        c = c.gsub("kettle-rb", org.to_s) if org && !org.empty?
-        if gem_name && !gem_name.empty?
-          # Special-case: yard-head link uses the gem name as a subdomain and must be dashes-only.
-          # Apply this BEFORE other generic replacements so it isn't altered incorrectly.
-          begin
-            dashed = gem_name.tr("_", "-")
-            c = c.gsub("[🚎yard-head]: https://kettle-dev.galtzo.com", "[🚎yard-head]: https://#{dashed}.galtzo.com")
-          rescue StandardError
-            # ignore
-          end
+      def apply_common_replacements(content, org:, gem_name:, namespace:, namespace_shield:, gem_shield:, funding_org: nil)
+        raise Error, "Org could not be derived" unless org && !org.empty?
+        raise Error, "Gem name could not be derived" unless gem_name && !gem_name.empty?
 
-          # Replace occurrences of the template gem name in text, including inside
-          # markdown reference labels like [🖼️kettle-dev] and identifiers like kettle-dev-i
-          c = c.gsub("kettle-dev", gem_name)
-          c = c.gsub(/\bKettle::Dev\b/u, namespace) unless namespace.empty?
-          c = c.gsub("Kettle%3A%3ADev", namespace_shield) unless namespace_shield.empty?
-          c = c.gsub("kettle--dev", gem_shield)
-          # Replace require and path structures with gem_name, modifying - to / if needed
-          c = c.gsub("kettle/dev", gem_name.tr("-", "/"))
+        funding_org ||= org
+        c = content.dup
+        c = c.gsub("kettle-rb", org.to_s)
+        c = c.gsub("{OPENCOLLECTIVE|ORG_NAME}", funding_org)
+        # Special-case: yard-head link uses the gem name as a subdomain and must be dashes-only.
+        # Apply this BEFORE other generic replacements so it isn't altered incorrectly.
+        begin
+          dashed = gem_name.tr("_", "-")
+          c = c.gsub("[🚎yard-head]: https://kettle-dev.galtzo.com", "[🚎yard-head]: https://#{dashed}.galtzo.com")
+        rescue StandardError => e
+          Kettle::Dev.debug_error(e, __method__)
+          # ignore
         end
-        c
+
+        # Replace occurrences of the template gem name in text, including inside
+        # markdown reference labels like [🖼️kettle-dev] and identifiers like kettle-dev-i
+        c = c.gsub("kettle-dev", gem_name)
+        c = c.gsub(/\bKettle::Dev\b/u, namespace) unless namespace.empty?
+        c = c.gsub("Kettle%3A%3ADev", namespace_shield) unless namespace_shield.empty?
+        c = c.gsub("kettle--dev", gem_shield)
+        # Replace require and path structures with gem_name, modifying - to / if needed
+        c.gsub("kettle/dev", gem_name.tr("-", "/"))
       end
 
       # Parse gemspec metadata and derive useful strings

data/lib/kettle/dev/version.rb

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

data/lib/kettle/dev.rb

@@ -23,6 +23,7 @@ module Kettle
     autoload :InputAdapter, "kettle/dev/input_adapter"
     autoload :ReadmeBackers, "kettle/dev/readme_backers"
     autoload :ReleaseCLI, "kettle/dev/release_cli"
+    autoload :PreReleaseCLI, "kettle/dev/pre_release_cli"
     autoload :TemplateHelpers, "kettle/dev/template_helpers"
     autoload :Version, "kettle/dev/version"
     autoload :Versioning, "kettle/dev/versioning"
@@ -54,6 +55,10 @@ module Kettle
     # auto-install tasks when invoked via the rake executable.
     # @return [String]
     RUNNING_AS = File.basename($PROGRAM_NAME)
+    # A case-insensitive regular expression that matches common truthy ENV values.
+    # Accepts 1, true, y, yes (any case).
+    # @return [Regexp]
+    ENV_TRUE_RE = /\A(1|true|y|yes)\z/i
 
     @defaults = []
 

data/sig/kettle/dev/ci_monitor.rbs

@@ -1,8 +1,14 @@
 module Kettle
   module Dev
     module CIMonitor
+      def self.status_emoji: (String? status, String? conclusion) -> String
       def self.monitor_all!: (?restart_hint: String) -> void
       def self.monitor_gitlab!: (?restart_hint: String) -> bool
+      def self.collect_all: () -> { github: Array[untyped], gitlab: untyped? }
+      def self.summarize_results: ({ github: Array[untyped], gitlab: untyped? }) -> bool
+      def self.monitor_and_prompt_for_release!: (?restart_hint: String) -> void
+      def self.collect_github: () -> Array[untyped]?
+      def self.collect_gitlab: () -> { status: String, url: String? }?
     end
   end
 end

data/sig/kettle/dev/gem_spec_reader.rbs

@@ -1,13 +1,15 @@
 module Kettle
   module Dev
     class GemSpecReader
+      DEFAULT_MINIMUM_RUBY: Gem::Version
+
       def self.load: (String root) -> {
         gemspec_path: String?,
         gem_name: String,
-        min_ruby: String,
+        min_ruby: Gem::Version,
         homepage: String,
-        gh_org: String?,
-        forge_org: String?,
+        gh_org: String,
+        forge_org: String,
         funding_org: String?,
         gh_repo: String?,
         namespace: String,
@@ -18,13 +20,14 @@ module Kettle
         email: Array[String],
         summary: String,
         description: String,
-        license: String,
         licenses: Array[String],
-        required_ruby_version: String,
+        required_ruby_version: Gem::Requirement?,
         require_paths: Array[String],
         bindir: String,
         executables: Array[String],
       }
+
+      def self.derive_forge_and_origin_repo: (String? homepage_val) -> { forge_org: String?, origin_repo: String? }
     end
   end
 end

data/sig/kettle/dev/pre_release_cli.rbs

@@ -0,0 +1,20 @@
+module Kettle
+  module Dev
+    class PreReleaseCLI
+      module HTTP
+        def self.parse_http_uri: (String url_str) -> ::URI
+        def self.head_ok?: (String url_str, ?limit: Integer, ?timeout: Integer) -> bool
+      end
+
+      module Markdown
+        def self.extract_image_urls_from_text: (String text) -> Array[String]
+        def self.extract_image_urls_from_files: (?String glob_pattern) -> Array[String]
+      end
+
+      def initialize: (?check_num: Integer) -> void
+      def run: () -> void
+      def check_markdown_uri_normalization!: () -> void
+      def check_markdown_images_http!: () -> void
+    end
+  end
+end

data/sig/kettle/dev/template_helpers.rbs

@@ -77,6 +77,8 @@ module Kettle
         bindir: String,
         executables: Array[String],
       }
+
+      def apply_common_replacements: () -> untyped
     end
   end
 end

data/sig/kettle/dev.rbs

@@ -11,6 +11,7 @@ module Kettle
     IS_CI: bool
     REQUIRE_BENCH: bool
     RUNNING_AS: String
+    ENV_TRUE_RE: Regexp
 
     # Singleton methods
     def self.install_tasks: () -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Peter H. Boling
@@ -51,6 +51,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +219,7 @@ executables:
 - kettle-commit-msg
 - kettle-dev-setup
 - kettle-dvcs
+- kettle-pre-release
 - kettle-readme-backers
 - kettle-release
 extensions: []
@@ -221,6 +242,7 @@ files:
 - ".git-hooks/commit-subjects-goalie.txt"
 - ".git-hooks/footer-template.erb.txt"
 - ".git-hooks/prepare-commit-msg"
+- ".git-hooks/prepare-commit-msg.example"
 - ".github/FUNDING.yml"
 - ".github/dependabot.yml"
 - ".github/workflows/ancient.yml"
@@ -249,6 +271,7 @@ files:
 - ".junie/guidelines-rbs.md"
 - ".junie/guidelines.md"
 - ".opencollective.yml"
+- ".opencollective.yml.example"
 - ".qlty/qlty.toml"
 - ".rspec"
 - ".rubocop.yml"
@@ -275,10 +298,12 @@ files:
 - RUBOCOP.md
 - Rakefile.example
 - SECURITY.md
+- bin/setup
 - exe/kettle-changelog
 - exe/kettle-commit-msg
 - exe/kettle-dev-setup
 - exe/kettle-dvcs
+- exe/kettle-pre-release
 - exe/kettle-readme-backers
 - exe/kettle-release
 - gemfiles/modular/coverage.gemfile
@@ -301,6 +326,7 @@ files:
 - lib/kettle/dev/git_adapter.rb
 - lib/kettle/dev/git_commit_footer.rb
 - lib/kettle/dev/input_adapter.rb
+- lib/kettle/dev/pre_release_cli.rb
 - lib/kettle/dev/rakelib/appraisal.rake
 - lib/kettle/dev/rakelib/bench.rake
 - lib/kettle/dev/rakelib/bundle_audit.rake
@@ -333,6 +359,7 @@ files:
 - sig/kettle/dev/git_adapter.rbs
 - sig/kettle/dev/git_commit_footer.rbs
 - sig/kettle/dev/input_adapter.rbs
+- sig/kettle/dev/pre_release_cli.rbs
 - sig/kettle/dev/readme_backers.rbs
 - sig/kettle/dev/release_cli.rbs
 - sig/kettle/dev/tasks.rbs
@@ -347,10 +374,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.1.3
-  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.1.3/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.1.5
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.1.5/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.1.3
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.1.5
   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