toys 0.7.0 → 0.8.0

data/lib/toys/templates/gem_build.rb

@@ -1,81 +1,97 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# 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:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# 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 Templates
     ##
-    # A template for tools that build and release gems
+    # A template for tools that build, install, and release gems
     #
     class GemBuild
       include Template
 
       ##
-      # Default tool name
+      # Default tool name.
       # @return [String]
       #
       DEFAULT_TOOL_NAME = "build"
 
+      ##
+      # Default output flags. If `output_flags` is set to `true`, this is the
+      # value used.
+      # @return [Array<String>]
+      #
+      DEFAULT_OUTPUT_FLAGS = ["-o", "--output"].freeze
+
       ##
       # Create the template settings for the GemBuild template.
       #
-      # @param [String] name Name of the tool to create. Defaults to
+      # @param name [String] Name of the tool to create. Defaults to
       #     {DEFAULT_TOOL_NAME}.
-      # @param [String] gem_name Name of the gem to build. If not provided,
+      # @param gem_name [String] Name of the gem to build. If not provided,
       #     defaults to the first gemspec file it finds.
-      # @param [Boolean] push_gem If true, pushes the built gem to rubygems.
-      # @param [Boolean] tag If true, tags the git repo with the gem version.
-      # @param [Boolean,String] push_tag If truthy, pushes the new tag to
+      # @param output [String] Path to the gem package to generate. Optional.
+      #     If not provided, generates a default file name based on the gem
+      #     name and version, under the "pkg" directory.
+      # @param output_flags [Array<String>,true] Provide flags on the tool that
+      #     set the output path. Optional. If not provided, no flags are
+      #     created. You may set this to an array of flags (e.g. `["-o"]`) or
+      #     set to `true` to choose {DEFAULT_OUTPUT_FLAGS}.
+      # @param push_gem [Boolean] If true, pushes the built gem to rubygems.
+      # @param install_gem [Boolean] If true, installs the built gem locally.
+      # @param tag [Boolean] If true, tags the git repo with the gem version.
+      # @param push_tag [Boolean,String] If truthy, pushes the new tag to
       #     a git remote. You may specify which remote by setting the value to
       #     a string. Otherwise, if the value is simply `true`, the "origin"
       #     remote is used by default.
       #
       def initialize(name: DEFAULT_TOOL_NAME,
                      gem_name: nil,
+                     output: nil,
+                     output_flags: nil,
                      push_gem: false,
+                     install_gem: false,
                      tag: false,
                      push_tag: false)
         @name = name
         @gem_name = gem_name
+        @output = output
+        @output_flags = output_flags == true ? DEFAULT_OUTPUT_FLAGS : output_flags
         @push_gem = push_gem
+        @install_gem = install_gem
         @tag = tag
         @push_tag = push_tag
       end
 
       attr_accessor :name
       attr_accessor :gem_name
+      attr_accessor :output
+      attr_accessor :output_flags
       attr_accessor :push_gem
+      attr_accessor :install_gem
       attr_accessor :tag
       attr_accessor :push_tag
 
-      to_expand do |template|
+      on_expand do |template|
         unless template.gem_name
           candidates = ::Dir.chdir(context_directory || ::Dir.getwd) do
             ::Dir.glob("*.gemspec")
@@ -85,12 +101,25 @@ module Toys
           end
           template.gem_name = candidates.first.sub(/\.gemspec$/, "")
         end
-        task_type = template.push_gem ? "Release" : "Build"
+        task_names = []
+        task_names << "Install" if template.install_gem
+        task_names << "Release" if template.push_gem
+        task_names = task_names.empty? ? "Build" : task_names.join(" and ")
 
         tool(template.name) do
-          desc "#{task_type} the gem: #{template.gem_name}"
+          desc "#{task_names} the gem: #{template.gem_name}"
 
           flag :yes, "-y", "--yes", desc: "Do not ask for interactive confirmation"
+          if template.output_flags
+            flag :output do
+              flags(Array(template.output_flags).map { |f| "#{f} VAL" })
+              desc "output gem with the given filename"
+              default template.output
+              complete_values :file_system
+            end
+          else
+            static :output, template.output
+          end
 
           include :exec, exit_on_nonzero_status: true
           include :fileutils
@@ -99,19 +128,27 @@ module Toys
           to_run do
             require "rubygems/package"
             ::Dir.chdir(context_directory || ::Dir.getwd) do
-              gemspec = ::Gem::Specification.load("#{template.gem_name}.gemspec")
-              version = gemspec.version
-              gemfile = "#{template.gem_name}-#{version}.gem"
+              gem_name = template.gem_name
+              gemspec = ::Gem::Specification.load("#{gem_name}.gemspec")
               ::Gem::Package.build(gemspec)
-              mkdir_p("pkg")
-              mv(gemfile, "pkg")
+              version = gemspec.version
+              archive_name = "#{gem_name}-#{version}.gem"
+              archive_path = output || "pkg/#{archive_name}"
+              if archive_name != archive_path
+                mkdir_p(::File.dirname(archive_path))
+                mv(archive_name, archive_path)
+              end
+              if template.install_gem
+                exit(1) unless yes || confirm("Install #{gem_name} #{version}? ", default: true)
+                exec ["gem", "install", archive_path]
+              end
               if template.push_gem
                 if ::File.directory?(".git") && capture("git status -s").strip != ""
                   logger.error "Cannot push the gem when there are uncommited changes"
                   exit(1)
                 end
-                exit(1) unless yes || confirm("Release #{gemfile}?", default: true)
-                exec(["gem", "push", "pkg/#{gemfile}"])
+                exit(1) unless yes || confirm("Release #{gem_name} #{version}? ", default: true)
+                exec(["gem", "push", archive_path])
                 if template.tag
                   exec(["git", "tag", "v#{version}"])
                   if template.push_tag

data/lib/toys/templates/minitest.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# 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:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# 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
@@ -64,15 +56,15 @@ module Toys
       ##
       # Create the template settings for the Minitest template.
       #
-      # @param [String] name Name of the tool to create. Defaults to
+      # @param name [String] Name of the tool to create. Defaults to
       #     {DEFAULT_TOOL_NAME}.
-      # @param [String,Array<String>] gem_version Version requirements for
+      # @param gem_version [String,Array<String>] Version requirements for
       #     the minitest gem. Defaults to {DEFAULT_GEM_VERSION_REQUIREMENTS}.
-      # @param [Array<String>] libs An array of library paths to add to the
+      # @param libs [Array<String>] An array of library paths to add to the
       #     ruby require path. Defaults to {DEFAULT_LIBS}.
-      # @param [Array<String>] files An array of globs indicating the test
+      # @param files [Array<String>] An array of globs indicating the test
       #     files to load. Defaults to {DEFAULT_FILES}.
-      # @param [Boolean] warnings If true, runs tests with Ruby warnings.
+      # @param warnings [Boolean] If true, runs tests with Ruby warnings.
       #     Defaults to true.
       #
       def initialize(name: nil,
@@ -99,7 +91,7 @@ module Toys
       attr_accessor :verbose
       attr_accessor :warnings
 
-      to_expand do |template|
+      on_expand do |template|
         tool(template.name) do
           desc "Run minitest on the current project."
 
@@ -116,7 +108,9 @@ module Toys
           flag :exclude, "-e", "--exclude PATTERN",
                desc: "Exclude /regexp/ or string from run."
 
-          remaining_args :tests, desc: "Paths to the tests to run (defaults to all tests)"
+          remaining_args :tests,
+                         complete: :file_system,
+                         desc: "Paths to the tests to run (defaults to all tests)"
 
           to_run do
             gem "minitest", *Array(template.gem_version)

data/lib/toys/templates/rake.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# 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:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# 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
@@ -46,13 +38,13 @@ module Toys
       ##
       # Create the template settings for the rake template.
       #
-      # @param [String,Array<String>,nil] gem_version Version requirements for
+      # @param gem_version [String,Array<String>,nil] Version requirements for
       #     the rake gem. Defaults to nil, indicating no version requirement.
-      # @param [String] rakefile_path Path to the Rakefile. Defaults to
+      # @param rakefile_path [String] Path to the Rakefile. Defaults to
       #     {DEFAULT_RAKEFILE_PATH}.
-      # @param [Boolean] only_described If true, tools are generated only for
+      # @param only_described [Boolean] If true, tools are generated only for
       #     rake tasks with descriptions. Default is false.
-      # @param [Boolean] use_flags Generated tools use flags instead of
+      # @param use_flags [Boolean] Generated tools use flags instead of
       #     positional arguments to pass arguments to rake tasks. Default is
       #     false.
       #
@@ -71,7 +63,7 @@ module Toys
       attr_accessor :only_described
       attr_accessor :use_flags
 
-      to_expand do |template|
+      on_expand do |template|
         gem "rake", *Array(template.gem_version)
         require "rake"
         rakefile_path = Templates::Rake.find_rakefile(template.rakefile_path, context_directory)

data/lib/toys/templates/rdoc.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# 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:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# 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
@@ -58,25 +50,25 @@ module Toys
       ##
       # Create the template settings for the Rdoc template.
       #
-      # @param [String] name Name of the tool to create. Defaults to
+      # @param name [String] Name of the tool to create. Defaults to
       #     {DEFAULT_TOOL_NAME}.
-      # @param [String,Array<String>] gem_version Version requirements for
+      # @param gem_version [String,Array<String>] Version requirements for
       #     the rdoc gem. Defaults to {DEFAULT_GEM_VERSION_REQUIREMENTS}.
-      # @param [Array<String>] files An array of globs indicating the files
+      # @param files [Array<String>] An array of globs indicating the files
       #     to document.
-      # @param [String] output_dir Name of directory to receive html output
+      # @param output_dir [String] Name of directory to receive html output
       #     files. Defaults to {DEFAULT_OUTPUT_DIR}.
-      # @param [String,nil] markup Markup format. Allowed values include
+      # @param markup [String,nil] Markup format. Allowed values include
       #     "rdoc", "rd", and "tomdoc". Default is "rdoc".
-      # @param [String,nil] title Title of RDoc documentation. If `nil`, RDoc
+      # @param title [String,nil] Title of RDoc documentation. If `nil`, RDoc
       #     will use a default title.
-      # @param [String,nil] main Name of the file to use as the main top level
+      # @param main [String,nil] Name of the file to use as the main top level
       #     document. Default is none.
-      # @param [String,nil] template Name of the template to use. If `nil`,
+      # @param template [String,nil] Name of the template to use. If `nil`,
       #     RDoc will use its default template.
-      # @param [String,nil] generator Name of the format generator. If `nil`,
+      # @param generator [String,nil] Name of the format generator. If `nil`,
       #     RDoc will use its default generator.
-      # @param [Array<String>] options Additional options to pass to RDoc.
+      # @param options [Array<String>] Additional options to pass to RDoc.
       #
       def initialize(name: nil,
                      gem_version: nil,
@@ -111,7 +103,7 @@ module Toys
       attr_accessor :generator
       attr_accessor :options
 
-      to_expand do |template|
+      on_expand do |template|
         tool(template.name) do
           desc "Run rdoc on the current project."
 

data/lib/toys/templates/rspec.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# 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:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# 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
@@ -70,21 +62,21 @@ module Toys
       ##
       # Create the template settings for the RSpec template.
       #
-      # @param [String] name Name of the tool to create. Defaults to
+      # @param name [String] Name of the tool to create. Defaults to
       #     {DEFAULT_TOOL_NAME}.
-      # @param [String,Array<String>] gem_version Version requirements for
+      # @param gem_version [String,Array<String>] Version requirements for
       #     the rspec gem. Defaults to {DEFAULT_GEM_VERSION_REQUIREMENTS}.
-      # @param [Array<String>] libs An array of library paths to add to the
+      # @param libs [Array<String>] An array of library paths to add to the
       #     ruby require path. Defaults to {DEFAULT_LIBS}.
-      # @param [String] options The path to a custom options file.
-      # @param [String] order The order in which to run examples. Default is
+      # @param options [String] The path to a custom options file.
+      # @param order [String] The order in which to run examples. Default is
       #     {DEFAULT_ORDER}.
-      # @param [String] format Choose a formatter code. Default is `p`.
-      # @param [String] out Write output to a file instead of stdout.
-      # @param [Boolean] backtrace Enable full backtrace (default is false).
-      # @param [String] pattern A glob indicating the spec files to load.
+      # @param format [String] Choose a formatter code. Default is `p`.
+      # @param out [String] Write output to a file instead of stdout.
+      # @param backtrace [Boolean] Enable full backtrace (default is false).
+      # @param pattern [String] A glob indicating the spec files to load.
       #     Defaults to {DEFAULT_PATTERN}.
-      # @param [Boolean] warnings If true, runs specs with Ruby warnings.
+      # @param warnings [Boolean] If true, runs specs with Ruby warnings.
       #     Defaults to true.
       #
       def initialize(name: nil,
@@ -120,7 +112,7 @@ module Toys
       attr_accessor :pattern
       attr_accessor :warnings
 
-      to_expand do |template|
+      on_expand do |template|
         tool(template.name) do
           desc "Run rspec on the current project."
 
@@ -154,7 +146,9 @@ module Toys
                desc: "Run examples with the specified tag, or exclude" \
                      " examples by adding ~ before the tag."
 
-          remaining_args :files, desc: "Paths to the specs to run (defaults to all specs)"
+          remaining_args :files,
+                         complete: :file_system,
+                         desc: "Paths to the specs to run (defaults to all specs)"
 
           to_run do
             gem "rspec", *Array(template.gem_version)