kettle-dev 2.2.13 → 2.2.15

data/lib/kettle/dev/gha_sha_pins_cli.rb

@@ -32,6 +32,9 @@ module Kettle
       COMMENT_REASON = "update_version_comment"
       DEFAULT_UPGRADE_LEVEL = "patch"
       DEFAULT_CACHE_TTL_SECONDS = 24 * 60 * 60
+      DEFAULT_HTTP_OPEN_TIMEOUT_SECONDS = 5
+      DEFAULT_HTTP_READ_TIMEOUT_SECONDS = 10
+      DEFAULT_HTTP_REFRESH_TIMEOUT_SECONDS = 20
       VALID_UPGRADE_LEVELS = %w[major minor patch].freeze
       VERSION_COMMENT_SUFFIX_RE = /\A\s+#\s*v?(?<version>\d+(?:\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)?)/
       VERSION_COMMENT_REPLACEMENT_RE = /\A(?<prefix>\s+#\s*)v?\d+(?:\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)?/
@@ -1100,12 +1103,15 @@ module Kettle
 
       # Lightweight GitHub API client for commit and release SHA resolution.
       class GitHubClient
-        def initialize(token:, api_base:, user_agent:, persistent_cache: nil, refresh_cache: false)
+        def initialize(token:, api_base:, user_agent:, persistent_cache: nil, refresh_cache: false, open_timeout: DEFAULT_HTTP_OPEN_TIMEOUT_SECONDS, read_timeout: DEFAULT_HTTP_READ_TIMEOUT_SECONDS, refresh_timeout: DEFAULT_HTTP_REFRESH_TIMEOUT_SECONDS)
           @token = token
           @api_base = api_base
           @user_agent = user_agent
           @persistent_cache = persistent_cache
           @refresh_cache = refresh_cache
+          @open_timeout = open_timeout
+          @read_timeout = read_timeout
+          @refresh_timeout = refresh_timeout
           @commit_cache = {}
           @release_cache = {}
         end
@@ -1114,58 +1120,31 @@ module Kettle
           return [] if repo_ref.to_s.empty?
           return @release_cache[repo_ref] if @release_cache.key?(repo_ref)
 
+          stale = nil
           unless @refresh_cache
             cached = @persistent_cache&.versions_for_repo(repo_ref, fresh: true)
             if cached
               @release_cache[repo_ref] = cached
               return cached
             end
+            stale = @persistent_cache&.versions_for_repo(repo_ref, fresh: false)
           end
 
-          data = request_json("/repos/#{repo_ref}/releases?per_page=100")
-          unless data.is_a?(Array)
-            fallback = @persistent_cache&.versions_for_repo(repo_ref, fresh: false)
-            return fallback if fallback
+          releases = nil
+          Timeout.timeout(@refresh_timeout) do
+            data = request_json("/repos/#{repo_ref}/releases?per_page=100")
+            return cached_versions(repo_ref, stale) unless data.is_a?(Array)
 
-            return []
-          end
-
-          tag_shas = tag_ref_shas(repo_ref)
-          releases = data.filter_map do |release|
-            next unless release.is_a?(Hash)
-
-            tag = release["tag_name"].to_s
-            parsed = parse_release_version_text(tag)
-            next unless parsed
+            tag_shas = tag_ref_shas(repo_ref)
+            return cached_versions(repo_ref, stale) unless tag_shas
 
-            {
-              tag: tag,
-              version_obj: parsed,
-              version: parsed.to_s,
-              sha: tag_shas[tag]
-            }
+            releases = build_release_versions(data, tag_shas)
           end
-          released_tags = releases.each_with_object({}) { |release, memo| memo[release[:tag]] = true }
-          tag_versions = tag_shas.filter_map do |tag, sha|
-            next if released_tags[tag]
-
-            parsed = parse_release_version_text(tag)
-            next unless parsed
-
-            {
-              tag: tag,
-              version_obj: parsed,
-              version: parsed.to_s,
-              sha: sha
-            }
-          end
-          releases.concat(tag_versions)
-
-          releases.sort_by! { |release| release[:version_obj] }
-          releases.reverse!
           @persistent_cache&.write_versions(repo_ref, releases)
           @release_cache[repo_ref] = releases
           releases
+        rescue Timeout::Error
+          cached_versions(repo_ref, stale)
         end
 
         def commit_sha(repo_ref, ref)
@@ -1203,6 +1182,48 @@ module Kettle
 
         private
 
+        def cached_versions(repo_ref, stale)
+          versions = stale || []
+          @release_cache[repo_ref] = versions
+          versions
+        end
+
+        def build_release_versions(data, tag_shas)
+          releases = data.filter_map do |release|
+            next unless release.is_a?(Hash)
+
+            tag = release["tag_name"].to_s
+            parsed = parse_release_version_text(tag)
+            next unless parsed
+
+            {
+              tag: tag,
+              version_obj: parsed,
+              version: parsed.to_s,
+              sha: tag_shas[tag]
+            }
+          end
+          released_tags = releases.each_with_object({}) { |release, memo| memo[release[:tag]] = true }
+          tag_versions = tag_shas.filter_map do |tag, sha|
+            next if released_tags[tag]
+
+            parsed = parse_release_version_text(tag)
+            next unless parsed
+
+            {
+              tag: tag,
+              version_obj: parsed,
+              version: parsed.to_s,
+              sha: sha
+            }
+          end
+          releases.concat(tag_versions)
+
+          releases.sort_by! { |release| release[:version_obj] }
+          releases.reverse!
+          releases
+        end
+
         def parse_release_version_text(value)
           normalized = value.to_s.sub(/\A[vV]/, "")
           return nil unless normalized.match?(/\A(?:\d+|\d+\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)\z/)
@@ -1214,13 +1235,15 @@ module Kettle
 
         def tag_ref_shas(repo_ref)
           data = request_json("/repos/#{repo_ref}/git/matching-refs/tags/")
-          return {} unless data.is_a?(Array)
+          return nil unless data.is_a?(Array)
 
           data.each_with_object({}) do |entry, memo|
             ref = entry["ref"].to_s
             next unless ref.start_with?("refs/tags/")
 
             tag = ref.sub(%r{\Arefs/tags/}, "")
+            next unless parse_release_version_text(tag)
+
             object = entry["object"]
             next unless object.is_a?(Hash)
 
@@ -1229,8 +1252,7 @@ module Kettle
             when "commit"
               memo[tag] = sha
             when "tag"
-              dereferenced_sha = annotated_tag_commit_sha(repo_ref, sha)
-              memo[tag] = dereferenced_sha if dereferenced_sha
+              memo[tag] = nil
             end
           end
         end
@@ -1259,9 +1281,7 @@ module Kettle
             request["X-GitHub-Api-Version"] = "2022-11-28"
             request["Authorization"] = "Bearer #{@token}" if @token && !@token.empty?
 
-            response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-              http.request(request)
-            end
+            response = http_request(uri, request)
 
             break unless response.code.to_i.between?(300, 399)
             redirects -= 1
@@ -1280,6 +1300,17 @@ module Kettle
           rescue JSON::ParserError
             nil
           end
+        rescue IOError, SystemCallError, Net::OpenTimeout, Net::ReadTimeout
+          nil
+        end
+
+        def http_request(uri, request)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == "https"
+          http.open_timeout = @open_timeout
+          http.read_timeout = @read_timeout
+          http.ssl_timeout = @open_timeout if http.respond_to?(:ssl_timeout=)
+          http.start { |connection| connection.request(request) }
         end
 
         def uri_encode(value)

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

@@ -326,10 +326,10 @@ module Kettle
                 end
               rescue Exception => e # rubocop:disable Lint/RescueException
                 Kettle::Dev.debug_error(e, __method__)
-                # :nocov:
+                # simplecov:disable
                 # Catch all exceptions in the worker thread boundary, including SystemExit
                 status_q << [c, f, "err"]
-                # :nocov:
+                # simplecov:enable
               end
             end
           end

data/lib/kettle/dev/version.rb

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

data/lib/kettle/dev.rb

@@ -19,9 +19,9 @@ end
 # External gems
 
 # It's not reasonable to test this ENV variable
-# :nocov:
+# simplecov:disable
 require "require_bench" if ENV.fetch("REQUIRE_BENCH", "false").casecmp("true").zero?
-# :nocov:
+# simplecov:enable
 
 # Autoload public CLI/APIs so requiring "kettle-dev" exposes them lazily
 # for tests and executables. Files will be loaded on first constant access.
@@ -29,6 +29,7 @@ module Kettle
   autoload :EmojiRegex, "kettle/emoji_regex"
   module Dev
     autoload :ChangelogCLI, "kettle/dev/changelog_cli"
+    autoload :ChangelogEntryAdder, "kettle/dev/changelog_entry_adder"
     autoload :BumpCLI, "kettle/dev/bump_cli"
     autoload :CIHelpers, "kettle/dev/ci_helpers"
     autoload :CIMonitor, "kettle/dev/ci_monitor"
@@ -202,9 +203,9 @@ module Kettle
           Kettle::Soup::Cover.install_tasks
           # NOTE: Coverage on CI is configured independent of this task.
           #       This task is for local development, as it opens results in browser
-          # :nocov:
+          # simplecov:disable
           Kettle::Dev.register_default("coverage") unless Kettle::Dev::IS_CI
-          # :nocov:
+          # simplecov:enable
         rescue LoadError
           # OK, no soup for you.
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.2.15
 platform: ruby
 authors:
 - Peter H. Boling
@@ -66,7 +66,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 1.1.12
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 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
@@ -276,6 +276,7 @@ files:
 - lib/kettle/dev.rb
 - lib/kettle/dev/bump_cli.rb
 - lib/kettle/dev/changelog_cli.rb
+- lib/kettle/dev/changelog_entry_adder.rb
 - lib/kettle/dev/ci_helpers.rb
 - lib/kettle/dev/ci_monitor.rb
 - lib/kettle/dev/commit_msg.rb
@@ -338,10 +339,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.13
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.13/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.15
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.15/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.13
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.15
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev