From 7538b8c24221158c373983e738ff26898c108e81 Mon Sep 17 00:00:00 2001
From: Alexander Popov <alex.wayfer@gmail.com>
Date: Thu, 3 Dec 2020 02:10:00 +0300
Subject: [PATCH] Drop `rspec` and `rubocop` toys, just use `bundle exec`

---
 .cirrus.yaml |  4 ++--
 .toys.rb     | 23 -----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/.cirrus.yaml b/.cirrus.yaml
index ee9c62d..daf0294 100644
--- a/.cirrus.yaml
+++ b/.cirrus.yaml
@@ -33,7 +33,7 @@ rubocop_task:
     image: ruby:latest
   <<: *bundle_cache
 
-  lint_script: toys rubocop --format=json --out=rubocop.json
+  lint_script: bundle exec rubocop --format=json --out=rubocop.json
 
   always:
     rubocop_artifacts:
@@ -62,7 +62,7 @@ rspec_task:
   environment:
     CODECOV_TOKEN: ENCRYPTED[b26ecd3e49540f09f5c9bf830caa29f5daedaf6769d6b1ba1a650eb6e81432ffb857f19421aed8e8dfddf21724fb57b6]
 
-  test_script: toys rspec --format=json --out=rspec.json
+  test_script: bundle exec rspec --format=json --out=rspec.json
 
   always:
     rspec_artifacts:
diff --git a/.toys.rb b/.toys.rb
index 3b978c6..7c5c925 100644
--- a/.toys.rb
+++ b/.toys.rb
@@ -2,30 +2,7 @@
 
 include :bundler, static: true
 
-subtool_apply do
-	include :exec, exit_on_nonzero_status: true, log_level: Logger::UNKNOWN unless include? :exec
-end
-
 require 'gem_toys'
 expand GemToys::Template
 
 alias_tool :g, :gem
-
-tool :rspec do
-	disable_argument_parsing
-
-	def run
-		exec ['rspec', *args]
-	end
-end
-
-alias_tool :spec, :rspec
-alias_tool :test, :rspec
-
-tool :rubocop do
-	disable_argument_parsing
-
-	def run
-		exec ['rubocop', *args]
-	end
-end