 45978435e7
			
		
	
	
		45978435e7
		
			
		
	
	
	
	
		
			
			- Previously I thought that comments were fine to discourage people from wasting their time trying to bump things that used `undef` that Sorbet didn't support. But RuboCop is better at this since it'll complain if the comments are unnecessary. - Suggested in https://github.com/Homebrew/brew/pull/18018#issuecomment-2283369501. - I've gone for a mixture of `rubocop:disable` for the files that can't be `typed: strict` (use of undef, required before everything else, etc) and `rubocop:todo` for everything else that should be tried to make strictly typed. There's no functional difference between the two as `rubocop:todo` is `rubocop:disable` with a different name. - And I entirely disabled the cop for the docs/ directory since `typed: strict` isn't going to gain us anything for some Markdown linting config files. - This means that now it's easier to track what needs to be done rather than relying on checklists of files in our big Sorbet issue: ```shell $ git grep 'typed: true # rubocop:todo Sorbet/StrictSigil' | wc -l 268 ``` - And this is confirmed working for new files: ```shell $ git status On branch use-rubocop-for-sorbet-strict-sigils Untracked files: (use "git add <file>..." to include in what will be committed) Library/Homebrew/bad.rb Library/Homebrew/good.rb nothing added to commit but untracked files present (use "git add" to track) $ brew style Offenses: bad.rb:1:1: C: Sorbet/StrictSigil: Sorbet sigil should be at least strict got true. ^^^^^^^^^^^^^ 1340 files inspected, 1 offense detected ```
		
			
				
	
	
		
			87 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # typed: true # rubocop:todo Sorbet/StrictSigil
 | |
| # frozen_string_literal: true
 | |
| 
 | |
| require "delegate"
 | |
| 
 | |
| require "requirements/macos_requirement"
 | |
| 
 | |
| module Cask
 | |
|   class DSL
 | |
|     # Class corresponding to the `depends_on` stanza.
 | |
|     class DependsOn < SimpleDelegator
 | |
|       VALID_KEYS = Set.new([
 | |
|         :formula,
 | |
|         :cask,
 | |
|         :macos,
 | |
|         :arch,
 | |
|       ]).freeze
 | |
| 
 | |
|       VALID_ARCHES = {
 | |
|         intel:  { type: :intel, bits: 64 },
 | |
|         # specific
 | |
|         x86_64: { type: :intel, bits: 64 },
 | |
|         arm64:  { type: :arm, bits: 64 },
 | |
|       }.freeze
 | |
| 
 | |
|       attr_reader :arch, :cask, :formula, :macos
 | |
| 
 | |
|       def initialize
 | |
|         super({})
 | |
|         @cask ||= []
 | |
|         @formula ||= []
 | |
|       end
 | |
| 
 | |
|       def load(**pairs)
 | |
|         pairs.each do |key, value|
 | |
|           raise "invalid depends_on key: '#{key.inspect}'" unless VALID_KEYS.include?(key)
 | |
| 
 | |
|           __getobj__[key] = send(:"#{key}=", *value)
 | |
|         end
 | |
|       end
 | |
| 
 | |
|       def formula=(*args)
 | |
|         @formula.concat(args)
 | |
|       end
 | |
| 
 | |
|       def cask=(*args)
 | |
|         @cask.concat(args)
 | |
|       end
 | |
| 
 | |
|       sig { params(args: T.any(String, Symbol)).returns(T.nilable(MacOSRequirement)) }
 | |
|       def macos=(*args)
 | |
|         raise "Only a single 'depends_on macos' is allowed." if defined?(@macos)
 | |
| 
 | |
|         # workaround for https://github.com/sorbet/sorbet/issues/6860
 | |
|         first_arg = args.first&.to_s
 | |
| 
 | |
|         begin
 | |
|           @macos = if args.count > 1
 | |
|             MacOSRequirement.new([args], comparator: "==")
 | |
|           elsif MacOSVersion::SYMBOLS.key?(args.first)
 | |
|             MacOSRequirement.new([args.first], comparator: "==")
 | |
|           elsif (md = /^\s*(?<comparator><|>|[=<>]=)\s*:(?<version>\S+)\s*$/.match(first_arg))
 | |
|             MacOSRequirement.new([T.must(md[:version]).to_sym], comparator: md[:comparator])
 | |
|           elsif (md = /^\s*(?<comparator><|>|[=<>]=)\s*(?<version>\S+)\s*$/.match(first_arg))
 | |
|             MacOSRequirement.new([md[:version]], comparator: md[:comparator])
 | |
|           else # rubocop:disable Lint/DuplicateBranch
 | |
|             MacOSRequirement.new([args.first], comparator: "==")
 | |
|           end
 | |
|         rescue MacOSVersion::Error, TypeError => e
 | |
|           raise "invalid 'depends_on macos' value: #{e}"
 | |
|         end
 | |
|       end
 | |
| 
 | |
|       def arch=(*args)
 | |
|         @arch ||= []
 | |
|         arches = args.map do |elt|
 | |
|           elt.to_s.downcase.sub(/^:/, "").tr("-", "_").to_sym
 | |
|         end
 | |
|         invalid_arches = arches - VALID_ARCHES.keys
 | |
|         raise "invalid 'depends_on arch' values: #{invalid_arches.inspect}" unless invalid_arches.empty?
 | |
| 
 | |
|         @arch.concat(arches.map { |arch| VALID_ARCHES[arch] })
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| end
 |