From 7409bae0b8e37f4f4b39f0ae0588ed44a1c9fc97 Mon Sep 17 00:00:00 2001 From: vidusheeamoli Date: Tue, 11 Aug 2020 02:28:38 +0530 Subject: [PATCH 1/2] sorbet/files.yaml: add new files, 18 => 23 errors. Add new files to the list of all files in sorbet/files.yaml. following 8 files are added to false: - ./cmd/--caskroom.rb - ./rubocops/cask/mixin/on_desc_stanza.rb - ./rubocops/shared/desc_helper.rb - ./rubocops/shared/helper_functions.rb - ./test/cmd/--caskroom_spec.rb - ./test/dependencies_helpers_spec.rb - ./test/rubocops/cask/desc_spec.rb - ./test/utils/spdx_spec.rb following 6 files are added to true: - ./compat/cli/parser.rb - ./compat/dependencies_helpers.rb - ./context.rb - ./dependencies_helpers.rb - ./rubocops/cask/desc.rb - ./utils/spdx.rb --- Library/Homebrew/sorbet/files.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Library/Homebrew/sorbet/files.yaml b/Library/Homebrew/sorbet/files.yaml index 297977885f..25b5b856dd 100644 --- a/Library/Homebrew/sorbet/files.yaml +++ b/Library/Homebrew/sorbet/files.yaml @@ -82,6 +82,7 @@ false: - ./cleanup.rb - ./cli/parser.rb - ./cmd/--cache.rb + - ./cmd/--caskroom.rb - ./cmd/--cellar.rb - ./cmd/--env.rb - ./cmd/--prefix.rb @@ -489,9 +490,12 @@ false: - ./rubocops/cask/homepage_matches_url.rb - ./rubocops/cask/homepage_url_trailing_slash.rb - ./rubocops/cask/mixin/cask_help.rb + - ./rubocops/cask/mixin/on_desc_stanza.rb - ./rubocops/cask/mixin/on_homepage_stanza.rb - ./rubocops/cask/no_dsl_version.rb - ./rubocops/cask/stanza_order.rb + - ./rubocops/shared/desc_helper.rb + - ./rubocops/shared/helper_functions.rb - ./searchable.rb - ./test/PATH_spec.rb - ./test/bash_spec.rb @@ -512,6 +516,7 @@ false: - ./test/checksum_spec.rb - ./test/cleaner_spec.rb - ./test/cmd/--cache_spec.rb + - ./test/cmd/--caskroom_spec.rb - ./test/cmd/--cellar_spec.rb - ./test/cmd/--env_spec.rb - ./test/cmd/--prefix_spec.rb @@ -555,6 +560,7 @@ false: - ./test/compiler_failure_spec.rb - ./test/cxxstdlib_spec.rb - ./test/dependable_spec.rb + - ./test/dependencies_helpers_spec.rb - ./test/descriptions_spec.rb - ./test/dev-cmd/bottle_spec.rb - ./test/dev-cmd/bump-formula-pr_spec.rb @@ -617,6 +623,7 @@ false: - ./test/requirements/osxfuse_requirement_spec.rb - ./test/requirements_spec.rb - ./test/rubocop_spec.rb + - ./test/rubocops/cask/desc_spec.rb - ./test/rubocops/cask/homepage_matches_url_spec.rb - ./test/rubocops/cask/homepage_url_trailing_slash_spec.rb - ./test/rubocops/cask/no_dsl_version_spec.rb @@ -818,6 +825,7 @@ false: - ./test/utils/github_spec.rb - ./test/utils/popen_spec.rb - ./test/utils/shell_spec.rb + - ./test/utils/spdx_spec.rb - ./test/utils/svn_spec.rb - ./test/utils/tty_spec.rb - ./test/version_spec.rb @@ -837,13 +845,17 @@ true: - ./checksum.rb - ./cleaner.rb - ./cli/args.rb + - ./compat/cli/parser.rb + - ./compat/dependencies_helpers.rb - ./compat/extend/nil.rb - ./compat/extend/string.rb - ./compat/formula.rb - ./compat/os/mac.rb - ./compilers.rb - ./config.rb + - ./context.rb - ./dependable.rb + - ./dependencies_helpers.rb - ./dependency_collector.rb - ./description_cache_store.rb - ./descriptions.rb @@ -883,6 +895,7 @@ true: - ./rubocops/cask/ast/cask_header.rb - ./rubocops/cask/ast/stanza.rb - ./rubocops/cask/constants/stanza.rb + - ./rubocops/cask/desc.rb - ./rubocops/cask/extend/string.rb - ./rubocops/deprecate.rb - ./tap_constants.rb @@ -894,6 +907,7 @@ true: - ./utils/notability.rb - ./utils/shebang.rb - ./utils/shell.rb + - ./utils/spdx.rb - ./utils/svn.rb - ./utils/tty.rb - ./utils/user.rb From c7ce11963333802582b23ab946096df5e78429f0 Mon Sep 17 00:00:00 2001 From: vidusheeamoli Date: Tue, 11 Aug 2020 02:53:10 +0530 Subject: [PATCH 2/2] sorbet: solve typecheck errors. 23 => 15 errors --- Library/Homebrew/sorbet/rbi/cli.rbi | 16 ++++++++++++++++ Library/Homebrew/sorbet/rbi/homebrew.rbi | 10 ++++++++++ Library/Homebrew/sorbet/rbi/utils/spdx.rbi | 11 +++++++++++ 3 files changed, 37 insertions(+) create mode 100644 Library/Homebrew/sorbet/rbi/utils/spdx.rbi diff --git a/Library/Homebrew/sorbet/rbi/cli.rbi b/Library/Homebrew/sorbet/rbi/cli.rbi index c95e13e3c9..f920abb0a5 100644 --- a/Library/Homebrew/sorbet/rbi/cli.rbi +++ b/Library/Homebrew/sorbet/rbi/cli.rbi @@ -17,5 +17,21 @@ module Homebrew::CLI def named_args; end def force_bottle?; end + + def debug?; end + + def quiet?; end + + def verbose?; end + end + + + class Parser + module Compat + include Kernel + module DeprecatedArgs + include Kernel + end + end end end diff --git a/Library/Homebrew/sorbet/rbi/homebrew.rbi b/Library/Homebrew/sorbet/rbi/homebrew.rbi index a92dcd0165..38b6b39e0b 100644 --- a/Library/Homebrew/sorbet/rbi/homebrew.rbi +++ b/Library/Homebrew/sorbet/rbi/homebrew.rbi @@ -20,6 +20,16 @@ module Dependable def tags; end end +module DependenciesHelpers + include Kernel + + module Compat + include Kernel + + def args_includes_ignores(args); end + end +end + class Formula module Compat include Kernel diff --git a/Library/Homebrew/sorbet/rbi/utils/spdx.rbi b/Library/Homebrew/sorbet/rbi/utils/spdx.rbi new file mode 100644 index 0000000000..65203892fc --- /dev/null +++ b/Library/Homebrew/sorbet/rbi/utils/spdx.rbi @@ -0,0 +1,11 @@ +# typed: strict + +module SPDX + include Kernel + + def spdx_data; end + + def download_latest_license_data!(to: JSON_PATH); end + + def curl_download(*args, to: nil, partial: true, **options); end +end