toys-core 0.14.5 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f37d61c7aa836f0cf61b8f16c3276cfb75b8aa0984f95e646ce4b5f0f75b434
-  data.tar.gz: 8030abe70c882204c75f0dc2098da59318e9c514bbb1fd1efdffcb28857e2410
+  metadata.gz: af0d0ca4cb5ad8e29460fbb43a4a2d1466375c5346a4e5ea311075650945b83b
+  data.tar.gz: a2ee5cff31d49d7c028add28d8c64520e2dba5633d4cc01f8b97c5b26b2667d3
 SHA512:
-  metadata.gz: b3e7f4918dc4ea6ed9b77506b0f298be2268264d3f4468378c4953f805bb7a9715af09d95fa0b0638bc5b9098e1919cee875beb6af549d70d9d4988e37307219
-  data.tar.gz: 1d71d7991acbfbc37e65c25f8507da1d6ed2e26798d2dbfd1117606983d647df8e4b8baac2887022374cf6b7a2fa31fa6e40e1085976acf27a19de1d9a495d0a
+  metadata.gz: 4fdc394813c50de79636b0146f9c163de53479212555d5a34e0b7138fe5d385b08c531419677f1e8bbf3174b01b4c23e9413eaa826e0528173e207ef4babb304
+  data.tar.gz: 6d31d318b0a910c61a61ef1eccf4ca0086aaa67f6d8ed085096cd18b1f1a483fa0dcf9e9386d7260ec5dd94b27e1af55ffaa816a22c345ec99d7cb4c6598ef9c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History
 
+### v0.14.7 / 2023-07-19
+
+* FIXED: Fixed an exception when passing a non-string to puts in the terminal mixin
+
+### v0.14.6 / 2023-06-29
+
+* FIXED: Fixed a GitCache exception when loading a repository containing a broken symlink
+
 ### v0.14.5 / 2023-03-20
 
 * FIXED: Rescue broken pipe errors by default when running a pager

data/lib/toys/core.rb

@@ -9,7 +9,7 @@ module Toys
     # Current version of Toys core.
     # @return [String]
     #
-    VERSION = "0.14.5"
+    VERSION = "0.14.7"
   end
 
   ##

data/lib/toys/standard_mixins/git_cache.rb

@@ -8,16 +8,16 @@ module Toys
     # This mixin provides an instance of {Toys::Utils::GitCache}, providing
     # cached access to files from a remote git repo.
     #
-    # Example usage:
+    # @example
     #
-    #     include :git_cache
+    #   include :git_cache
     #
-    #     def run
-    #       # Pull and cache the HEAD commit from the Toys repo.
-    #       dir = git_cache.find("https://github.com/dazuma/toys.git")
-    #       # Display the contents of the readme file.
-    #       puts File.read(File.join(dir, "README.md"))
-    #     end
+    #   def run
+    #     # Pull and cache the HEAD commit from the Toys repo.
+    #     dir = git_cache.get("https://github.com/dazuma/toys.git")
+    #     # Display the contents of the readme file.
+    #     puts File.read(File.join(dir, "README.md"))
+    #   end
     #
     module GitCache
       include Mixin

data/lib/toys/utils/git_cache.rb

@@ -402,7 +402,7 @@ module Toys
         Array(remotes).map do |remote|
           dir = repo_base_dir_for(remote)
           if ::File.directory?(dir)
-            ::FileUtils.chmod_R("u+w", dir)
+            ::FileUtils.chmod_R("u+w", dir, force: true)
             ::FileUtils.rm_rf(dir)
             remote
           end
@@ -568,9 +568,9 @@ module Toys
         source_path = ::File.join(dir, sha)
         unless repo_lock.source_exists?(sha, path)
           ::FileUtils.mkdir_p(source_path)
-          ::FileUtils.chmod_R("u+w", source_path)
+          ::FileUtils.chmod_R("u+w", source_path, force: true)
           copy_from_repo(repo_path, source_path, sha, path)
-          ::FileUtils.chmod_R("a-w", source_path)
+          ::FileUtils.chmod_R("a-w", source_path, force: true)
         end
         repo_lock.access_source!(sha, path)
         path == "." ? source_path : ::File.join(source_path, path)
@@ -579,7 +579,7 @@ module Toys
       def copy_files(dir, sha, path, repo_lock, into)
         repo_path = ::File.join(dir, REPO_DIR_NAME)
         ::FileUtils.mkdir_p(into)
-        ::FileUtils.chmod_R("u+w", into)
+        ::FileUtils.chmod_R("u+w", into, force: true)
         Compat.dir_children(into).each { |child| ::FileUtils.rm_rf(::File.join(into, child)) }
         result = copy_from_repo(repo_path, into, sha, path)
         repo_lock.access_repo!
@@ -594,7 +594,7 @@ module Toys
             to_path = ::File.join(into, entry)
             unless ::File.exist?(to_path)
               from_path = ::File.join(repo_dir, entry)
-              ::FileUtils.cp_r(from_path, to_path)
+              ::FileUtils.copy_entry(from_path, to_path)
             end
           end
           into
@@ -603,7 +603,7 @@ module Toys
           unless ::File.exist?(to_path)
             from_path = ::File.join(repo_dir, path)
             ::FileUtils.mkdir_p(::File.dirname(to_path))
-            ::FileUtils.cp_r(from_path, to_path)
+            ::FileUtils.copy_entry(from_path, to_path)
           end
           to_path
         end

data/lib/toys/utils/terminal.rb

@@ -104,7 +104,7 @@ module Toys
       # @return [String] String with styles removed
       #
       def self.remove_style_escapes(str)
-        str.gsub(/\e\[\d+(;\d+)*m/, "")
+        str.to_s.gsub(/\e\[\d+(;\d+)*m/, "")
       end
 
       ##
@@ -158,7 +158,7 @@ module Toys
       def write(str = "", *styles)
         @output_mutex.synchronize do
           begin
-            output&.write(apply_styles(str, *styles))
+            output&.write(apply_styles(str.to_s, *styles))
             output&.flush
           rescue ::IOError
             nil
@@ -200,7 +200,7 @@ module Toys
       # @return [self]
       #
       def puts(str = "", *styles)
-        str = "#{str}\n" unless str.end_with?("\n")
+        str = "#{str}\n" unless str.to_s.end_with?("\n")
         write(str, *styles)
       end
       alias say puts
@@ -240,7 +240,7 @@ module Toys
           trailing_text = default.nil? ? nil : "[#{default}]"
         end
         if trailing_text
-          ptext, pspaces, = prompt.partition(/\s+$/)
+          ptext, pspaces, = prompt.to_s.partition(/\s+$/)
           prompt = "#{ptext} #{trailing_text}#{pspaces}"
         end
         write(prompt, *styles)
@@ -307,13 +307,13 @@ module Toys
         return nil unless block_given?
         frame_length ||= DEFAULT_SPINNER_FRAME_LENGTH
         frames ||= DEFAULT_SPINNER_FRAMES
-        write(leading_text) unless leading_text.empty?
+        write(leading_text) unless leading_text.to_s.empty?
         spin = SpinDriver.new(self, frames, Array(style), frame_length)
         begin
           yield
         ensure
           spin.stop
-          write(final_text) unless final_text.empty?
+          write(final_text) unless final_text.to_s.empty?
         end
       end
 
@@ -377,7 +377,7 @@ module Toys
       def apply_styles(str, *styles)
         if styled
           prefix = escape_styles(*styles)
-          suffix = prefix.empty? || str.end_with?(CLEAR_CODE) ? "" : CLEAR_CODE
+          suffix = prefix.empty? || str.to_s.end_with?(CLEAR_CODE) ? "" : CLEAR_CODE
           "#{prefix}#{str}#{suffix}"
         else
           Terminal.remove_style_escapes(str)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.7
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies: []
 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.
@@ -78,10 +78,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.5/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.7/file.CHANGELOG.html
   source_code_uri: https://github.com/dazuma/toys/tree/main/toys-core
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.5
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.7
 post_install_message: 
 rdoc_options: []
 require_paths: