toys-core 0.9.4 → 0.10.0

data/lib/toys/utils/help_text.rb

@@ -1,26 +1,5 @@
 # frozen_string_literal: true
 
-# Copyright 2019 Daniel Azuma
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-;
-
 module Toys
   module Utils
     ##

data/lib/toys/utils/terminal.rb

@@ -1,26 +1,5 @@
 # frozen_string_literal: true
 
-# Copyright 2019 Daniel Azuma
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-;
-
 require "stringio"
 require "monitor"
 
@@ -146,6 +125,8 @@ module Toys
             styled ? true : false
           end
         @named_styles = BUILTIN_STYLE_NAMES.dup
+        @output_mutex = ::Monitor.new
+        @input_mutex = ::Monitor.new
       end
 
       ##
@@ -164,7 +145,7 @@ module Toys
       # Whether output is styled
       # @return [Boolean]
       #
-      attr_accessor :styled
+      attr_reader :styled
 
       ##
       # Write a partial line without appending a newline.
@@ -175,11 +156,41 @@ module Toys
       # @return [self]
       #
       def write(str = "", *styles)
-        output&.write(apply_styles(str, *styles))
-        output&.flush
+        @output_mutex.synchronize do
+          begin
+            output&.write(apply_styles(str, *styles))
+            output&.flush
+          rescue ::IOError
+            nil
+          end
+        end
         self
       end
 
+      ##
+      # Read a line, blocking until one is available.
+      #
+      # @return [String] the entire string including the temrinating newline
+      # @return [nil] if the input is closed or at eof, or there is no input
+      #
+      def readline
+        @input_mutex.synchronize do
+          begin
+            input&.gets
+          rescue ::IOError
+            nil
+          end
+        end
+      end
+
+      ##
+      # This method is defined so that `::Logger` will recognize a terminal as
+      # a log device target, but it does not actually close anything.
+      #
+      def close
+        nil
+      end
+
       ##
       # Write a line, appending a newline if one is not already present.
       #
@@ -233,7 +244,7 @@ module Toys
           prompt = "#{ptext} #{trailing_text}#{pspaces}"
         end
         write(prompt, *styles)
-        resp = input&.gets.to_s.chomp
+        resp = readline.to_s.chomp
         resp.empty? ? default.to_s : resp
       end
 
@@ -296,13 +307,13 @@ module Toys
         return nil unless block_given?
         frame_length ||= DEFAULT_SPINNER_FRAME_LENGTH
         frames ||= DEFAULT_SPINNER_FRAMES
-        output.write(leading_text) unless leading_text.empty?
+        write(leading_text) unless leading_text.empty?
         spin = SpinDriver.new(self, frames, Array(style), frame_length)
         begin
           yield
         ensure
           spin.stop
-          output.write(final_text) unless final_text.empty?
+          write(final_text) unless final_text.empty?
         end
       end
 
@@ -312,8 +323,8 @@ module Toys
       # @return [Array(Integer,Integer)]
       #
       def size
-        if @output.respond_to?(:tty?) && @output.tty? && @output.respond_to?(:winsize)
-          @output.winsize.reverse
+        if output.respond_to?(:tty?) && output.tty? && output.respond_to?(:winsize)
+          output.winsize.reverse
         else
           [80, 25]
         end
@@ -422,10 +433,8 @@ module Toys
 
       ## @private
       class SpinDriver
-        include ::MonitorMixin
-
         def initialize(terminal, frames, style, frame_length)
-          super()
+          @mutex = ::Monitor.new
           @terminal = terminal
           @frames = frames.map do |f|
             [@terminal.apply_styles(f, *style), Terminal.remove_style_escapes(f).size]
@@ -433,12 +442,12 @@ module Toys
           @frame_length = frame_length
           @cur_frame = 0
           @stopping = false
-          @cond = new_cond
+          @cond = @mutex.new_cond
           @thread = @terminal.output.tty? ? start_thread : nil
         end
 
         def stop
-          synchronize do
+          @mutex.synchronize do
             @stopping = true
             @cond.broadcast
           end
@@ -450,12 +459,12 @@ module Toys
 
         def start_thread
           ::Thread.new do
-            synchronize do
+            @mutex.synchronize do
               until @stopping
-                @terminal.output.write(@frames[@cur_frame][0])
+                @terminal.write(@frames[@cur_frame][0])
                 @cond.wait(@frame_length)
                 size = @frames[@cur_frame][1]
-                @terminal.output.write("\b" * size + " " * size + "\b" * size)
+                @terminal.write("\b" * size + " " * size + "\b" * size)
                 @cur_frame += 1
                 @cur_frame = 0 if @cur_frame >= @frames.size
               end

data/lib/toys/wrappable_string.rb

@@ -1,26 +1,5 @@
 # frozen_string_literal: true
 
-# Copyright 2019 Daniel Azuma
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-;
-
 module Toys
   ##
   # A string intended for word-wrapped display.

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: did_you_mean
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.79.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.22
+        version: 0.9.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.22
+        version: 0.9.24
 description: Toys-Core is the command line tool framework underlying Toys. It can
   be used to create command line executables using the Toys DSL and classes.
 email:
@@ -158,10 +172,12 @@ files:
 - lib/toys/positional_arg.rb
 - lib/toys/source_info.rb
 - lib/toys/standard_middleware/add_verbosity_flags.rb
+- lib/toys/standard_middleware/apply_config.rb
 - lib/toys/standard_middleware/handle_usage_errors.rb
 - lib/toys/standard_middleware/set_default_descriptions.rb
 - lib/toys/standard_middleware/show_help.rb
 - lib/toys/standard_middleware/show_root_version.rb
+- lib/toys/standard_mixins/bundler.rb
 - lib/toys/standard_mixins/exec.rb
 - lib/toys/standard_mixins/fileutils.rb
 - lib/toys/standard_mixins/gems.rb
@@ -182,7 +198,7 @@ metadata:
   changelog_uri: https://github.com/dazuma/toys/blob/master/toys-core/CHANGELOG.md
   source_code_uri: https://github.com/dazuma/toys
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.9.4
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.10.0
 post_install_message: 
 rdoc_options: []
 require_paths: