toys-core 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcf2b7517a237c398d900d9635fcb1cd95b00afff0df2e1e87253274ce038109
-  data.tar.gz: 291eb95c1deaeae4056f553f43dae8af016e89269c6c3f3d8e7e1872ce73c777
+  metadata.gz: a4e68c02b974a63603b2e00c96bb93484390bbca133fd79d9e9ef32426d6cf3c
+  data.tar.gz: ab1840233b668c04fa55e03e56e2f4286130ae55a31de704edc93db5fd5c4f15
 SHA512:
-  metadata.gz: 82c2f97733439d9af71c3636a01b972c5ac890160fd67a7b6cd5959efd3f30d4eeac8fc72b01e93c179d02f21cfbb60e4e21d5978633e79ce07972719ade80a6
-  data.tar.gz: 696580a980190abc08686545f0ed44d8b145508aa3fc8094fbacb941125df312a0848819ce608515a481753edeb4c0924b5b8c5af872c2c81f08db605394b18c
+  metadata.gz: 425bbb60804098f4bc8d356412c8d42ed4360efb35db009dd96597da25fe067c623b4a8c2e1106e88016628fb3897513057889731fb737fe94fbd661e96e528a
+  data.tar.gz: 463e6463a86a1caca4f8e42dab90998711d573b79ccc221d3074e9a8a6f056ba13df67f23493e0ebee6c43fa157fd65abbf83ea2127cd537076f82f0bef7dd7d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+### v0.15.1 / 2023-10-15
+
+* FIXED: Clean up some internal requires, which may improve performance with built-in gems.
+
 ### v0.15.0 / 2023-10-12
 
 Toys-Core 0.15.0 is a major release that overhauls error and signal handling, cleans up some warts around entrypoint and method definition, and fixes a few long-standing issues.

data/lib/toys/cli.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "rbconfig"
-require "logger"
-require "toys/completion"
-
 module Toys
   ##
   # A Toys-based CLI.
@@ -566,6 +562,7 @@ module Toys
       # @return [Proc]
       #
       def default_logger_factory
+        require "logger"
         proc do
           logger = ::Logger.new($stderr)
           logger.level = ::Logger::WARN

data/lib/toys/core.rb

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

data/lib/toys/loader.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "monitor"
-
 module Toys
   ##
   # The Loader service loads tools from configuration files, and finds the
@@ -55,6 +53,7 @@ module Toys
       if index_file_name && ::File.extname(index_file_name) != ".rb"
         raise ::ArgumentError, "Illegal index file name #{index_file_name.inspect}"
       end
+      require "monitor"
       @mutex = ::Monitor.new
       @mixin_lookup = mixin_lookup || ModuleLookup.new
       @template_lookup = template_lookup || ModuleLookup.new
@@ -477,7 +476,7 @@ module Toys
       end
     end
 
-    @git_cache_mutex = ::Monitor.new
+    @git_cache_mutex = ::Mutex.new
     @default_git_cache = nil
 
     ##

data/lib/toys/module_lookup.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "monitor"
-
 module Toys
   ##
   # A helper module that provides methods to do module lookups. This is
@@ -56,6 +54,7 @@ module Toys
     # Create an empty ModuleLookup
     #
     def initialize
+      require "monitor"
       @mutex = ::Monitor.new
       @paths = []
       @paths_locked = false

data/lib/toys/settings.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "date"
-
 module Toys
   ##
   # A settings class defines the structure of application settings, i.e. the
@@ -488,7 +486,7 @@ module Toys
         def convert(val, klass)
           return val if val.is_a?(klass)
           begin
-            CONVERTERS[klass].call(val)
+            CONVERTERS[klass.name].call(val)
           rescue ::StandardError
             ILLEGAL_VALUE
           end
@@ -564,13 +562,13 @@ module Toys
       # @private
       #
       CONVERTERS = {
-        ::Date => date_converter,
-        ::DateTime => datetime_converter,
-        ::Float => float_converter,
-        ::Integer => integer_converter,
-        ::Regexp => regexp_converter,
-        ::Symbol => symbol_converter,
-        ::Time => time_converter,
+        "Date" => date_converter,
+        "DateTime" => datetime_converter,
+        "Float" => float_converter,
+        "Integer" => integer_converter,
+        "Regexp" => regexp_converter,
+        "Symbol" => symbol_converter,
+        "Time" => time_converter,
       }.freeze
     end
 

data/lib/toys/standard_middleware/show_help.rb

@@ -248,8 +248,10 @@ module Toys
       private
 
       def terminal
-        require "toys/utils/terminal"
-        @terminal ||= Utils::Terminal.new(output: @stream, styled: @styled_output)
+        @terminal ||= begin
+          require "toys/utils/terminal"
+          Utils::Terminal.new(output: @stream, styled: @styled_output)
+        end
       end
 
       def show_usage(context)

data/lib/toys/standard_mixins/exec.rb

@@ -830,6 +830,8 @@ module Toys
       end
 
       on_initialize do |**opts|
+        require "rbconfig"
+        require "shellwords"
         require "toys/utils/exec"
         context = self
         opts = Exec._setup_exec_opts(opts, context)

data/lib/toys/standard_mixins/fileutils.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "fileutils"
-
 module Toys
   module StandardMixins
     ##
@@ -20,6 +18,7 @@ module Toys
       # @private
       #
       def self.included(mod)
+        require "fileutils"
         mod.include(::FileUtils)
       end
     end

data/lib/toys/standard_mixins/gems.rb

@@ -65,9 +65,11 @@ module Toys
         # @private
         #
         def self.gems
-          require "toys/utils/gems"
           # rubocop:disable Naming/MemoizedInstanceVariableName
-          @__gems ||= Utils::Gems.new(**@__gems_opts)
+          @__gems ||= begin
+            require "toys/utils/gems"
+            Utils::Gems.new(**@__gems_opts)
+          end
           # rubocop:enable Naming/MemoizedInstanceVariableName
         end
 

data/lib/toys/standard_mixins/highline.rb

@@ -131,7 +131,7 @@ module Toys
 
       on_initialize do |*args|
         require "toys/utils/gems"
-        Toys::Utils::Gems.activate("highline", "~> 2.0")
+        ::Toys::Utils::Gems.activate("highline", "~> 2.0")
         require "highline"
         self[KEY] = ::HighLine.new(*args)
         self[KEY].use_color = $stdout.tty?

data/lib/toys/standard_mixins/xdg.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "fileutils"
-
 module Toys
   module StandardMixins
     ##

data/lib/toys/tool_definition.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module Toys
   ##
   # A ToolDefinition describes a single command that can be invoked using Toys.
@@ -284,7 +282,7 @@ module Toys
     ##
     # Settings for this tool
     #
-    # @return [Toys::Tool::Settings]
+    # @return [Toys::ToolDefinition::Settings]
     #
     attr_reader :settings
 

data/lib/toys/utils/completion_engine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "shellwords"
-
 module Toys
   module Utils
     ##
@@ -21,6 +19,7 @@ module Toys
         # @param cli [Toys::CLI] The CLI.
         #
         def initialize(cli)
+          require "shellwords"
           @cli = cli
         end
 

data/lib/toys/utils/exec.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "rbconfig"
-require "logger"
-require "shellwords"
-
 module Toys
   module Utils
     ##
@@ -266,6 +262,9 @@ module Toys
       #     for a description of the options.
       #
       def initialize(**opts, &block)
+        require "rbconfig"
+        require "logger"
+        require "stringio"
         @default_opts = Opts.new(&block).add(opts)
       end
 

data/lib/toys/utils/gems.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "monitor"
-require "rubygems"
 
 module Toys
   module Utils
@@ -123,6 +122,7 @@ module Toys
                      output: nil,
                      suppress_confirm: nil,
                      default_confirm: nil)
+        require "rubygems"
         @default_confirm = default_confirm || default_confirm.nil? ? true : false
         @on_missing = on_missing ||
                       if suppress_confirm

data/lib/toys/utils/git_cache.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require "digest"
-require "fileutils"
-require "json"
-require "toys/compat"
-require "toys/utils/exec"
-require "toys/utils/xdg"
-
 module Toys
   module Utils
     ##
@@ -288,6 +281,11 @@ module Toys
       #     a specific directory in the user's XDG cache.
       #
       def initialize(cache_dir: nil)
+        require "digest"
+        require "fileutils"
+        require "json"
+        require "toys/compat"
+        require "toys/utils/exec"
         @cache_dir = ::File.expand_path(cache_dir || default_cache_dir)
         @exec = Utils::Exec.new(out: :capture, err: :capture)
       end
@@ -485,6 +483,7 @@ module Toys
       end
 
       def default_cache_dir
+        require "toys/utils/xdg"
         ::File.join(XDG.new.cache_home, "toys", "git")
       end
 

data/lib/toys/utils/help_text.rb

@@ -351,6 +351,7 @@ module Toys
         def initialize(tool, executable_name, delegates, subtools, search_term,
                        show_source_path, separate_sources, indent, indent2, wrap_width, styled)
           require "toys/utils/terminal"
+          require "stringio"
           @tool = tool
           @executable_name = executable_name
           @delegates = delegates
@@ -667,6 +668,7 @@ module Toys
         def initialize(tool, subtools, recursive, search_term, separate_sources,
                        indent, wrap_width, styled)
           require "toys/utils/terminal"
+          require "stringio"
           @tool = tool
           @subtools = subtools
           @recursive = recursive

data/lib/toys/utils/pager.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "toys/utils/exec"
-
 module Toys
   module Utils
     ##
@@ -150,7 +148,10 @@ module Toys
         # @private
         #
         def default_exec_service
-          @default_exec_service ||= Exec.new
+          @default_exec_service ||= begin
+            require "toys/utils/exec"
+            Utils::Exec.new
+          end
         end
       end
     end

data/lib/toys/utils/standard_ui.rb

@@ -28,8 +28,9 @@ module Toys
       #     terminal output. Default is `$stderr`.
       #
       def initialize(output: nil)
-        @terminal = output || $stderr
+        require "logger"
         require "toys/utils/terminal"
+        @terminal = output || $stderr
         @terminal = Terminal.new(output: @terminal) unless @terminal.is_a?(Terminal)
         @log_header_severity_styles = {
           "FATAL" => [:bright_magenta, :bold, :underline],

data/lib/toys/utils/terminal.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "stringio"
-require "monitor"
-
 begin
   require "io/console"
 rescue ::LoadError
@@ -116,6 +113,7 @@ module Toys
       #     setting is inferred from whether the output has a tty.
       #
       def initialize(input: $stdin, output: $stdout, styled: nil)
+        require "monitor"
         @input = input
         @output = output
         @styled =

data/lib/toys/utils/xdg.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "toys/compat"
-
 module Toys
   module Utils
     ##
@@ -50,6 +48,8 @@ module Toys
       #     you can omit this argument, as it will default to `::ENV`.
       #
       def initialize(env: ::ENV)
+        require "fileutils"
+        require "toys/compat"
         @env = env
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-15 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.
@@ -79,10 +79,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.15.0/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.15.1/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.15.0
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.15.1
 post_install_message: 
 rdoc_options: []
 require_paths: