hanami-cli 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6939575ae1e35a1e103d2d439b73080cb033f837ece81f4652e539dd7cf413fc
-  data.tar.gz: 9d94856acc062c3bdc0924a4c7dcfbf4badcd862b7d428a7e0e68e52aac8d46e
+  metadata.gz: 18df4c9818297413281e7b30d10542d2e73ad589ad04bb46c85d7ed91bb6e4c1
+  data.tar.gz: 9952a97ba448f0be44e7671793e1ec3303a0af29073bbd7e3203fc0f39feb28e
 SHA512:
-  metadata.gz: 5f7d591b5fbf9dd4bcaf1cbc3bf942fa93bb1f90526d05e72c5f21251ec402c9f536059184aab555ee5c80c6d51504f9c61b5a44d119fcc13e48f41149161276
-  data.tar.gz: becdd694c75f85bca07452647a67241cd9ca03a8d1095b23dd8e6202f41de41ec693332de1c1b7ea2ee434e7b3e4d9291bcb434adfea84b5d58db7f37b3d7ff0
+  metadata.gz: 8b9835e00aa1afeb93e83c9dcff1505e68acec33a11cb311f741b8df45011bd0aa241cc6ab98c120040124e8b1e84cf4daa5b2dd6f8cd70b24e9ddff276480a3
+  data.tar.gz: aa4ed60caa2e0c08728fa6e692a9b5718ee01070874454f2b1e67269573ad5422c6a4da60e34f02c42b08bce56b7f33145a1d212f94144721a3a663b0fe06049

data/CHANGELOG.md

@@ -4,6 +4,13 @@ Hanami Command Line Interface
 
 ## Unreleased
 
+## v2.3.2 - 2025-11-16
+
+### Fixed
+
+- Fix potential deadlocks with `db structure dump` for large structure files. (@timriley in #370, report from @pat in #369)
+- Decouple the hanami-assets npm package version from the current Hanami version in generated `package.json`, using the stable minor version (e.g. `^2.3.0`) instead of the exact version (e.g. `^2.3.1`). This allows Hanami patch releases without requiring a corresponding hanami-assets npm package release. (@timriley in #270)
+
 ## v2.3.1 - 2025-11-14
 
 ### Fixed

data/lib/hanami/cli/generators/version.rb

@@ -3,31 +3,23 @@
 module Hanami
   module CLI
     module Generators
-      # @since 2.0.0
       # @api private
       module Version
-        # @since 2.0.0
-        # @api private
         def self.version
           return Hanami::VERSION if Hanami.const_defined?(:VERSION)
 
           Hanami::CLI::VERSION
         end
 
-        # @since 2.0.0
-        # @api private
         def self.gem_requirement
-          result = if prerelease?
-                     prerelease_version
-                   else
-                     stable_version
-                   end
+          result = prerelease? ? prerelease_version : stable_version
 
           "~> #{result}"
         end
 
         def self.npm_package_requirement
-          result = version
+          result = prerelease? ? prerelease_version : stable_version
+
           # Change "2.1.0.beta2.1" to "2.1.0-beta.2" (the only format tolerable by `npm install`)
           if prerelease?
             result = result
@@ -38,7 +30,6 @@ module Hanami
           "^#{result}"
         end
 
-        # @api private
         def self.prerelease?
           version.match?(/alpha|beta|rc/)
         end
@@ -46,8 +37,6 @@ module Hanami
         # @example
         #   Hanami::VERSION # => 2.3.1
         #   Hanami::CLI::Generators::Version.stable_version # => "2.3.0"
-        #
-        # @api private
         def self.stable_version
           major_minor = version.scan(/\A\d{1,2}\.\d{1,2}/).first
           "#{major_minor}.0"
@@ -56,8 +45,6 @@ module Hanami
         # @example
         #   Hanami::VERSION # => 2.0.0.alpha8.1
         #   Hanami::CLI::Generators::Version.prerelease_version # => "2.0.0.alpha"
-        #
-        # @api private
         def self.prerelease_version
           version.sub(/[[[:digit:]].]*\Z/, "")
         end

data/lib/hanami/cli/system_call.rb

@@ -86,7 +86,7 @@ module Hanami
       # @since 2.0.0
       # @api public
       def call(cmd, *args, env: {})
-        exitstatus = nil
+        exit_code = nil
         out = nil
         err = nil
 
@@ -96,13 +96,17 @@ module Hanami
 
             stdin.close
 
-            exitstatus = wait_thr&.value&.exitstatus
+            # Read output before waiting on the process, to prevent deadlock. If we wait on the
+            # process first, and the process writes enough data to fill the limited OS pipe buffers,
+            # then the process will block waiting for us to read, while _we're_ blocked waiting for
+            # it to finish. Reading first allows us to drain the buffers as output arrives.
             out = Thread.new { stdout.read }.value.strip
             err = Thread.new { stderr.read }.value.strip
+            exit_code = wait_thr&.value&.exitstatus
           end
         end
 
-        Result.new(exit_code: exitstatus, out: out, err: err)
+        Result.new(exit_code:, out:, err:)
       end
 
       # @since 2.1.0

data/lib/hanami/cli/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @api public
     # @since 2.0.0
-    VERSION = "2.3.1"
+    VERSION = "2.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-cli
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Hanakai team