toys 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93df1335be3b4e82bc30602ed8e78d8a04e99e1df6eecadb1a13430107c761c0
-  data.tar.gz: 448add98c695e182efcd00dd3995f4c62a8533f47dc8d80a915399a17ec584d5
+  metadata.gz: 063c28a7b9b7d3bc5f7ada761beb8623ff144b92847f2a9424889ca953d27cee
+  data.tar.gz: a1bcdb384d7592a0a43760aab7cd6da0e4afa4b6a1fd1ad59bb74ed6a6eeef73
 SHA512:
-  metadata.gz: '014558969bf84b3f37a8e1948eaeaa7a4acfc0a07b4cfda1a0ec50f1fc11691219fa659a81ed73a0470e1f04ba85311810a3a151d2f5422042c983e969560584'
-  data.tar.gz: 5fdb203c6b967e554bc16aeadd4d5e8dcccc931f11d04bca0e22d9b635727f7891b4a80363f4ac60b4e0d80ebdc39188595b3dce6e6a3dce72d9e27c83c14e86
+  metadata.gz: 50596ee8741422c0e186c7c2b63b52410a0afa1de04dfbea43e06acbf52c8b56f46c54c86471a80bae451c004d238ea94b58d666e7c39742de80bf9c95f95106
+  data.tar.gz: 1230cf4acb2414f378be58279a3017cd897a101a7c715e4db88394a8490fdb46dee7d0d9a617196698c034dddf3c6ac88b3855ba19262785dd4989dcf253d409

data/CHANGELOG.md

@@ -1,6 +1,31 @@
 # Release History
 
-### 0.11.0 / 2020-08-21
+### v0.11.5 / 2021-03-28
+
+* BREAKING CHANGE: The exit_on_nonzero_status option to exec now exits on signals and failures to spawn, in addition to error codes.
+* ADDED: Support retries in the bundler integration.
+* FIXED: Fix a bundler 2.2 integration issue that fails install in certain cases when an update is needed.
+* FIXED: Eliminate Rubygems warning on toys system update.
+
+### v0.11.4 / 2020-10-11
+
+* FIXED: Doesn't modify bundler lockfiles when adding Toys to a bundle
+* FIXED: Rdoc template now works on Ruby 3
+
+### v0.11.3 / 2020-09-13
+
+* FIXED: The Exec mixin recognizes the argv0 option, and logs it appropriately
+
+### v0.11.2 / 2020-09-06
+
+* FIXED: Don't get confused when running toys from within a toys directory
+* FIXED: Fix a JRuby-specific race condition when capturing exec streams
+
+### v0.11.1 / 2020-08-24
+
+* FIXED: The `.lib` directory actually works as advertised.
+
+### v0.11.0 / 2020-08-21
 
 * ADDED: The toys search path can be truncated using the `truncate_load_path!` directive.
 * ADDED: The `:clean` template recognizes `:gitignore` as a path indicating all gitignored files.
@@ -12,7 +37,7 @@
 * FIXED: Fixed a rare Exec capture failure that resulted from a race condition when closing streams.
 * DOCS: The Toys user guide now covers static bundle loading and `truncate_load_path!`.
 
-### 0.10.5 / 2020-07-18
+### v0.10.5 / 2020-07-18
 
 * IMPROVED: The bundler mixin silences bundler output during bundle setup.
 * IMPROVED: The bundler mixin allows toys and toys-core to be in the Gemfile. It checks their version requirements against the running Toys version, and either adds the corret version to the bundle or raises IncompatibleToysError.
@@ -20,24 +45,24 @@
 * FIXED: Some cases of transitive dependency handling by the bundler mixin.
 * FIXED: Fixed a crash when computing suggestions, when running with a bundle on Ruby 2.6 or earlier.
 
-### 0.10.4 / 2020-07-11
+### v0.10.4 / 2020-07-11
 
 * IMPROVED: Bundler integration can now handle Toys itself being in the bundle, as long as the version requirements cover the running Toys version.
 * IMPROVED: Passing `static: true` to the `:bundler` mixin installs the bundle at definition rather than execution time.
 
-### 0.10.3 / 2020-07-04
+### v0.10.3 / 2020-07-04
 
 * FIXED: The `exec_separate_tool` method in the `:exec` mixin no longer throws ENOEXEC on Windows.
 
-### 0.10.2 / 2020-07-03
+### v0.10.2 / 2020-07-03
 
 * FIXED: The load path no longer loses the toys and toys-core directories after a bundle install.
 
-### 0.10.1 / 2020-03-07
+### v0.10.1 / 2020-03-07
 
 * FIXED: Setting `:exit_on_nonzero_status` explicitly to false now works as expected.
 
-### 0.10.0 / 2020-02-24
+### v0.10.0 / 2020-02-24
 
 * ADDED: `:bundler` mixin that installs and sets up a bundle for the tool
 * ADDED: `bundler` options in the standard templates, to run those tools in a bundle
@@ -53,26 +78,26 @@
 * FIXED: `rdoc` template crashed if any nonstandard options were given.
 * FIXED: `rubocop` template would abort prematurely if standard streams were redirected.
 
-### 0.9.4 / 2020-01-26
+### v0.9.4 / 2020-01-26
 
 * FIXED: Crash in the loader when a non-ruby file appears in a toys directory
 
-### 0.9.3 / 2020-01-05
+### v0.9.3 / 2020-01-05
 
 * FIXED: `delegate_to` directive could crash if an overriding tool has already been defined.
 * FIXED: A Ruby 2.7 warning when reporting a Toys file syntax error.
 
-### 0.9.2 / 2020-01-03
+### v0.9.2 / 2020-01-03
 
 * IMPROVED: Mixins can now take real keyword arguments, and will pass them on properly to `on_initialize` and `on_include` blocks.
 * CHANGED: `Toys::Utils::Exec` and the `:exec` mixin methods now take real keyword arguments rather than an `opts` hash. This means you should use keywords (or the double-splat operator) to avoid a deprecation warning on Ruby 2.7.
 
-### 0.9.1 / 2019-12-22
+### v0.9.1 / 2019-12-22
 
 * IMPROVED: `delegate_to` and `alias_tool` can take symbols as well as strings.
 * DOCS: Fixed user guide internal links on rubydoc.info.
 
-### 0.9.0 / 2019-12-02
+### v0.9.0 / 2019-12-02
 
 * ADDED: The `delegate_to` directive causes the tool to delegate execution to another tool. This means it takes the same arguments and has the same execution behavior.
 * ADDED: The `delegate_to` argument to the `tool` directive causes the tool to delegate to another tool. (Note: the `alias_tool` directive is now just shorthand for creating a tool with a delegate, and as such is mildly deprecated.)
@@ -83,12 +108,12 @@
 * IMPROVED: JRuby is now supported for most operations. However, JRuby is generally not recommended because of JVM boot latency, lack of Kernel#fork support, and other issues.
 * FIXED: The the `tool` directive no longer crashes if not passed a block.
 
-### 0.8.1 / 2019-11-19
+### v0.8.1 / 2019-11-19
 
 * FIXED: Listing subtools would crash if a broken alias was present.
 * DOCUMENTATION: Switched from redcarpet to kramdown, and tried to make some structural fixes.
 
-### 0.8.0 / 2019-06-20
+### v0.8.0 / 2019-06-20
 
 This is a major update with significant new features and a bunch of fixes.
 It does include a few minor backward-incompatible changes. All signifiant
@@ -142,18 +167,18 @@ Details:
 
 Additionally, a significant amount of internal reorganization and cleanup happened in the toys-core gem. See the changelog for toys-core for more details.
 
-### 0.7.0 / 2019-01-23
+### v0.7.0 / 2019-01-23
 
 * ADDED: A template for creating tools that invoke RSpec.
 * ADDED: Flag groups, which enforce policies around which flags are required.
 * CHANGED: Flags within a group are sorted in the help screens.
 * IMPROVED: The minitest template now honors all standard minitest flags.
 
-### 0.6.1 / 2019-01-07
+### v0.6.1 / 2019-01-07
 
 * FIXED: The presence of aliases caused subtool listing to crash.
 
-### 0.6.0 / 2018-10-22
+### v0.6.0 / 2018-10-22
 
 * FIXED: Build tools cd into the context directory when running.
 * FIXED: Rakefiles are evaluated and tasks are run in the Rakefile's directory.
@@ -165,7 +190,7 @@ Additionally, a significant amount of internal reorganization and cleanup happen
 * IMPROVED: Non-runnable namespaces are no longer displayed in recursive subtool
   lists if their children are already displayed.
 
-### 0.5.0 / 2018-10-07
+### v0.5.0 / 2018-10-07
 
 * ADDED: Period and colon are recognized as tool path delimiters.
 * ADDED: New rake template that supports loading rake tasks as tools.
@@ -176,31 +201,31 @@ Additionally, a significant amount of internal reorganization and cleanup happen
 * IMPROVED: The tool directive can now take an `if_defined` argument.
 * FIXED: Template instantiation was failing if the hosting tool was priority-masked.
 
-### 0.4.5 / 2018-08-05
+### v0.4.5 / 2018-08-05
 
 * CHANGED: Dropped preload file feature
 
-### 0.4.4 / 2018-07-21
+### v0.4.4 / 2018-07-21
 
 * FIXED: Utils::Exec wasn't closing streams after copying.
 * IMPROVED: Utils::Exec::Controller can capture or redirect the remainder of a controlled stream.
 * ADDED: Terminal#ask
 
-### 0.4.3 / 2018-07-13
+### v0.4.3 / 2018-07-13
 
 * IMPROVED: Exec mixin methods can now spawn subprocesses in the background
 * IMPROVED: Exec mixin capture methods can now yield a controller
 
-### 0.4.2 / 2018-07-08
+### v0.4.2 / 2018-07-08
 
 * FIXED: Raise an error rather than cause unexpected behavior if a mixin is included twice.
 * IMPROVED: The `include?` method extended to support mixin names in a tool dsl.
 
-### 0.4.1 / 2018-07-03
+### v0.4.1 / 2018-07-03
 
 * FIXED: Terminal#confirm uppercased "N" for the wrong default.
 
-### 0.4.0 / 2018-07-03
+### v0.4.0 / 2018-07-03
 
 Now declaring this alpha quality. Backward-incompatible changes are still
 possible from this point, but I'll try to avoid them.
@@ -210,24 +235,24 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Toys::Utils::Gems can suppress the confirmation prompt
 * IMPROVED: Magic comments are now honored in toys files.
 
-### 0.3.11 / 2018-07-02
+### v0.3.11 / 2018-07-02
 
 * CHANGED: Require Ruby 2.3 or later
 * CHANGED: Renamed "set" directive to "static" to reduce confusion with Tool#set.
 * ADDED: Convenience methods for getting option values
 
-### 0.3.10 / 2018-06-30
+### v0.3.10 / 2018-06-30
 
 * CHANGED: Dropped Tool#option. Use Tool#get instead.
 * CHANGED: "run" directive renamed to "to_run"
 * CHANGED: Highline mixin now uses Highline 2.0
 * ADDED: Mixins can provide initializers
 
-### 0.3.9.1 / 2018-06-24
+### v0.3.9.1 / 2018-06-24
 
 * FIXED: Built-in flags were interfering with disable_argument_parsing
 
-### 0.3.9 / 2018-06-24
+### v0.3.9 / 2018-06-24
 
 * CHANGED: Removed alias_as directive since it's incompatible with selective loading.
 * ADDED: Ability to define named templates in Toys files
@@ -237,18 +262,18 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Acceptors can be looked up recursively in the same way as mixins and templates
 * FIXED: Templates were not activating needed gems
 
-### 0.3.8 / 2018-06-10
+### v0.3.8 / 2018-06-10
 
 * CHANGED: Renamed helpers to mixins.
 * CHANGED: Renamed :in_from, :out_to, and :err_to exec options to :in, :out, :err
 * IMPROVED: Exec raises an error if passed an unknown option.
 * IMPROVED: Exec now accepts nearly all the same stream specifications as Process#spawn.
 
-### 0.3.7.1 / 2018-05-30
+### v0.3.7.1 / 2018-05-30
 
 * FIXED: Fix crash in system update.
 
-### 0.3.7 / 2018-05-30
+### v0.3.7 / 2018-05-30
 
 * CHANGED: Execution runs in the same scope as the DSL, which lets us use normal methods instead of helper-blocks.
 * CHANGED: Renamed "script" to "run", and allow setting of runnable by defining a "run" method
@@ -257,7 +282,7 @@ possible from this point, but I'll try to avoid them.
 * CHANGED: Removed spinner helper and added terminal helper.
 * ADDED: Helper modules scoped to the tool hierarchy
 
-### 0.3.6 / 2018-05-21
+### v0.3.6 / 2018-05-21
 
 * CHANGED: Removed Context#new_cli and exposed Context#cli instead.
 * CHANGED: Raises ToolDefinitionError if you declare a duplicate flag.
@@ -266,13 +291,13 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Support custom acceptors.
 * IMPROVED: Highline helper automatically sets use_color based on the type of stdout.
 
-### 0.3.5 / 2018-05-15
+### v0.3.5 / 2018-05-15
 
 * CHANGED: Flag and arg blocks in the DSL have an interface more similar to the rest of the DSL.
 * CHANGED: Renamed `execute do` to `script do`.
 * IMPROVED: Help display uses `less` if available.
 
-### 0.3.4 / 2018-05-14
+### v0.3.4 / 2018-05-14
 
 * CHANGED: Renamed switch to flag
 * CHANGED: Renamed docs: parameter again, to desc: and long_desc: to match tool desc.
@@ -289,7 +314,7 @@ possible from this point, but I'll try to avoid them.
 * FIXED: Subtools with no desc now properly pick up the default
 * FIXED: Usage errors and show-help now interact in the right way
 
-### 0.3.3 / 2018-05-09
+### v0.3.3 / 2018-05-09
 
 * CHANGED: Renamed file_utils helper to fileutils.
 * CHANGED: Renamed doc: parameter to docs:
@@ -299,7 +324,7 @@ possible from this point, but I'll try to avoid them.
 * ADDED: WrappableString for descriptions and docs
 * IMPROVED: Descriptions can have multiple lines
 
-### 0.3.2 / 2018-05-07
+### v0.3.2 / 2018-05-07
 
 * CHANGED: Split core engine out into separate "toys-core" gem. See the
   toys-core changelog for additional changes in core.
@@ -310,7 +335,7 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Help shows the config file path on "--verbose".
 * IMPROVED: You can now run a sub-instance of toys from an executor.
 
-### 0.3.1 / 2018-05-02
+### v0.3.1 / 2018-05-02
 
 * CHANGED: Subcommand display is now recursive by default.
 * IMPROVED: Improved error messaging for bad switch syntax.
@@ -319,6 +344,6 @@ possible from this point, but I'll try to avoid them.
 * DOCS: Completed a first pass on class and method documentation.
 * INTERNAL: Adjusted naming of switch-related methods.
 
-### 0.3.0 / 2018-04-30
+### v0.3.0 / 2018-04-30
 
 * Initial generally usable release

data/builtins/system.rb

@@ -28,7 +28,7 @@ tool "update" do
     configure_exec(exit_on_nonzero_status: true)
     version_info = spinner(leading_text: "Checking rubygems for the latest release... ",
                            final_text: "Done.\n") do
-      capture(["gem", "query", "-q", "-r", "-e", "toys"])
+      capture(["gem", "list", "-q", "-r", "-e", "toys"])
     end
     if version_info =~ /toys\s\((.+)\)/
       latest_version = ::Gem::Version.new(::Regexp.last_match(1))

data/lib/toys/standard_cli.rb

@@ -42,6 +42,12 @@ module Toys
     #
     DATA_DIR_NAME = ".data"
 
+    ##
+    # Standard lib directory name in a toys configuration.
+    # @return [String]
+    #
+    LIB_DIR_NAME = ".lib"
+
     ##
     # Name of the standard toys executable.
     # @return [String]
@@ -99,11 +105,12 @@ module Toys
         preload_file_name: PRELOAD_FILE_NAME,
         preload_dir_name: PRELOAD_DIR_NAME,
         data_dir_name: DATA_DIR_NAME,
+        lib_dir_name: LIB_DIR_NAME,
         extra_delimiters: EXTRA_DELIMITERS,
         middleware_stack: default_middleware_stack,
         template_lookup: default_template_lookup
       )
-      add_standard_paths(cur_dir: cur_dir)
+      add_standard_paths(cur_dir: cur_dir, toys_dir_name: CONFIG_DIR_NAME)
     end
 
     private
@@ -125,8 +132,9 @@ module Toys
     #     directories, or `nil` to use the defaults.
     # @return [self]
     #
-    def add_standard_paths(cur_dir: nil, global_dirs: nil)
+    def add_standard_paths(cur_dir: nil, global_dirs: nil, toys_dir_name: nil)
       cur_dir ||= ::Dir.pwd
+      cur_dir = skip_toys_dir(cur_dir, toys_dir_name) if toys_dir_name
       global_dirs ||= default_global_dirs
       add_search_path_hierarchy(start: cur_dir, terminate: global_dirs)
       global_dirs.each { |path| add_search_path(path) }
@@ -135,6 +143,20 @@ module Toys
       self
     end
 
+    # Step out of any toys dir
+    def skip_toys_dir(dir, toys_dir_name)
+      cur_dir = dir
+      loop do
+        parent = ::File.dirname(dir)
+        return cur_dir if parent == dir
+        if ::File.basename(dir) == toys_dir_name
+          cur_dir = dir = parent
+        else
+          dir = parent
+        end
+      end
+    end
+
     # rubocop:disable Metrics/MethodLength
 
     ##

data/lib/toys/templates/rdoc.rb

@@ -12,7 +12,7 @@ module Toys
       # Default version requirements for the rdoc gem.
       # @return [Array<String>]
       #
-      DEFAULT_GEM_VERSION_REQUIREMENTS = ["~> 6.1.0"].freeze
+      DEFAULT_GEM_VERSION_REQUIREMENTS = [">= 6.1.0"].freeze
 
       ##
       # Default tool name

data/lib/toys/version.rb

@@ -5,5 +5,5 @@ module Toys
   # Current version of the Toys command line executable.
   # @return [String]
   #
-  VERSION = "0.11.0"
+  VERSION = "0.11.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toys-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 description: Toys is a configurable command line tool. Write commands in Ruby using
   a simple DSL, and Toys will provide the command line executable and take care of
   all the details such as argument parsing, online help, and error reporting. Toys
@@ -63,10 +63,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys/v0.11.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/dazuma/toys
+  changelog_uri: https://dazuma.github.io/toys/gems/toys/v0.11.5/file.CHANGELOG.html
+  source_code_uri: https://github.com/dazuma/toys/tree/main/toys
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys/v0.11.0
+  documentation_uri: https://dazuma.github.io/toys/gems/toys/v0.11.5
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A configurable command line tool