cli-ui 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1edd90ccd15771c59e43d39ad0004ed99d20b0ff1b68a63cc73b9beea480cb30
-  data.tar.gz: '096a40c20c1e2fb8e0bcf68b6fb0f8542d5b0d5c578c11e4b6248507efaeace2'
+  metadata.gz: 140781de33cc19ef1c5bc946a0a887b3707e54475823affad8f5568e98fbc0dd
+  data.tar.gz: b754caad8da6b0d37ea17d807aef78351518c4f17d511a39decbfb29b0512791
 SHA512:
-  metadata.gz: ebd356d3f38fa275e66180f3c621a408b36fc4f1ad9965e7bd7b6b2dfef0768364e9175cbeefe5b4964d26c44b3e95cf2e2825a007e1e6a78eeb537704ee024c
-  data.tar.gz: 40da4c348dd7aa86ab14697abc1172947c63fedc8b1b40b7938fdc65c24e63c71b4d40819f8e6f925059444a33d689e906edd66c68b26c6bd454735436c7c935
+  metadata.gz: 8d841fb206c3de7427c4903aa5bb350241c5fe10bbf39c04cb1980eada288deda4b235bf1d5d99a293ebaa6cd78482dd2f49849d65ddd3e7929d63d2f35894bc
+  data.tar.gz: 6a99dc71d996abbff3fccdda8ce9ede069a7868ba467d86296bed3575e5726f50f76b65d4d427757f5ddaea211b7926d25045402ae5304e1593ae2fb6bc656fb

data/lib/cli/ui/stdout_router.rb

@@ -16,12 +16,12 @@ module CLI
           @name = name
         end
 
-        sig { params(args: String).void }
+        sig { params(args: Object).returns(Integer) }
         def write(*args)
           args = args.map do |str|
             if auto_frame_inset?
               str = str.dup # unfreeze
-              str = str.force_encoding(Encoding::UTF_8)
+              str = str.to_s.force_encoding(Encoding::UTF_8)
               apply_line_prefix(str, CLI::UI::Frame.prefix)
             else
               @pending_newline = false
@@ -31,10 +31,10 @@ module CLI
 
           # hook return of false suppresses output.
           if (hook = Thread.current[:cliui_output_hook])
-            return if hook.call(args.map(&:to_s).join, @name) == false
+            return 0 if hook.call(args.map(&:to_s).join, @name) == false
           end
 
-          T.unsafe(@stream).write_without_cli_ui(*prepend_id(@stream, args))
+          ret = T.unsafe(@stream).write_without_cli_ui(*prepend_id(@stream, args))
           if (dup = StdoutRouter.duplicate_output_to)
             begin
               T.unsafe(dup).write(*prepend_id(dup, args))
@@ -42,6 +42,7 @@ module CLI
               # Ignore
             end
           end
+          ret
         end
 
         private
@@ -92,7 +93,7 @@ module CLI
         extend T::Sig
 
         @capture_mutex = Mutex.new
-        @stdin_mutex = ReentrantMutex.new
+        @stdin_mutex = CLI::UI::ReentrantMutex.new
         @active_captures = 0
         @saved_stdin = nil
 
@@ -262,7 +263,7 @@ module CLI
           sig { params(stream: IO).void }
           def initialize(stream)
             @stream = stream
-            @m = ReentrantMutex.new
+            @m = CLI::UI::ReentrantMutex.new
           end
 
           sig { type_parameters(:T).params(block: T.proc.returns(T.type_parameter(:T))).returns(T.type_parameter(:T)) }

data/lib/cli/ui/version.rb

@@ -2,6 +2,6 @@
 
 module CLI
   module UI
-    VERSION = '2.2.1'
+    VERSION = '2.2.3'
   end
 end

data/vendor/reentrant_mutex.rb

@@ -22,54 +22,57 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # Sourced from https://github.com/dotboris/reentrant_mutex
+module CLI
+  module UI
+    class ReentrantMutex < Mutex
+      def initialize
+        @count_mutex = Mutex.new
+        @counts = Hash.new(0)
 
-class ReentrantMutex < Mutex
-  def initialize
-    @count_mutex = Mutex.new
-    @counts = Hash.new(0)
+        super
+      end
 
-    super
-  end
+      def synchronize
+        raise ThreadError, 'Must be called with a block' unless block_given?
 
-  def synchronize
-    raise ThreadError, 'Must be called with a block' unless block_given?
+        begin
+          lock
+          yield
+        ensure
+          unlock
+        end
+      end
 
-    begin
-      lock
-      yield
-    ensure
-      unlock
-    end
-  end
+      def lock
+        c = increase_count Thread.current
+        super if c <= 1
+      end
 
-  def lock
-    c = increase_count Thread.current
-    super if c <= 1
-  end
+      def unlock
+        c = decrease_count Thread.current
+        if c <= 0
+          super
+          delete_count Thread.current
+        end
+      end
 
-  def unlock
-    c = decrease_count Thread.current
-    if c <= 0
-      super
-      delete_count Thread.current
-    end
-  end
+      def count
+        @count_mutex.synchronize { @counts[Thread.current] }
+      end
 
-  def count
-    @count_mutex.synchronize { @counts[Thread.current] }
-  end
+      private
 
-  private
+      def increase_count(thread)
+        @count_mutex.synchronize { @counts[thread] += 1 }
+      end
 
-  def increase_count(thread)
-    @count_mutex.synchronize { @counts[thread] += 1 }
-  end
+      def decrease_count(thread)
+        @count_mutex.synchronize { @counts[thread] -= 1 }
+      end
 
-  def decrease_count(thread)
-    @count_mutex.synchronize { @counts[thread] -= 1 }
-  end
-
-  def delete_count(thread)
-    @count_mutex.synchronize { @counts.delete(thread) }
+      def delete_count(thread)
+        @count_mutex.synchronize { @counts.delete(thread) }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cli-ui
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Burke Libbey
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest