 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 ```
		
			
				
	
	
		
			158 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			158 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # typed: true # rubocop:todo Sorbet/StrictSigil
 | |
| # frozen_string_literal: true
 | |
| 
 | |
| require "resource"
 | |
| require "erb"
 | |
| 
 | |
| # Helper module for creating patches.
 | |
| module Patch
 | |
|   def self.create(strip, src, &block)
 | |
|     case strip
 | |
|     when :DATA
 | |
|       DATAPatch.new(:p1)
 | |
|     when String
 | |
|       StringPatch.new(:p1, strip)
 | |
|     when Symbol
 | |
|       case src
 | |
|       when :DATA
 | |
|         DATAPatch.new(strip)
 | |
|       when String
 | |
|         StringPatch.new(strip, src)
 | |
|       else
 | |
|         ExternalPatch.new(strip, &block)
 | |
|       end
 | |
|     when nil
 | |
|       raise ArgumentError, "nil value for strip"
 | |
|     else
 | |
|       raise ArgumentError, "Unexpected value #{strip.inspect} for strip"
 | |
|     end
 | |
|   end
 | |
| end
 | |
| 
 | |
| # An abstract class representing a patch embedded into a formula.
 | |
| class EmbeddedPatch
 | |
|   attr_writer :owner
 | |
|   attr_reader :strip
 | |
| 
 | |
|   def initialize(strip)
 | |
|     @strip = strip
 | |
|   end
 | |
| 
 | |
|   sig { returns(T::Boolean) }
 | |
|   def external?
 | |
|     false
 | |
|   end
 | |
| 
 | |
|   def contents; end
 | |
| 
 | |
|   def apply
 | |
|     data = contents.gsub("HOMEBREW_PREFIX", HOMEBREW_PREFIX)
 | |
|     args = %W[-g 0 -f -#{strip}]
 | |
|     Utils.safe_popen_write("patch", *args) { |p| p.write(data) }
 | |
|   end
 | |
| 
 | |
|   sig { returns(String) }
 | |
|   def inspect
 | |
|     "#<#{self.class.name}: #{strip.inspect}>"
 | |
|   end
 | |
| end
 | |
| 
 | |
| # A patch at the `__END__` of a formula file.
 | |
| class DATAPatch < EmbeddedPatch
 | |
|   attr_accessor :path
 | |
| 
 | |
|   def initialize(strip)
 | |
|     super
 | |
|     @path = nil
 | |
|   end
 | |
| 
 | |
|   sig { returns(String) }
 | |
|   def contents
 | |
|     data = +""
 | |
|     path.open("rb") do |f|
 | |
|       loop do
 | |
|         line = f.gets
 | |
|         break if line.nil? || /^__END__$/.match?(line)
 | |
|       end
 | |
|       while (line = f.gets)
 | |
|         data << line
 | |
|       end
 | |
|     end
 | |
|     data.freeze
 | |
|   end
 | |
| end
 | |
| 
 | |
| # A string containing a patch.
 | |
| class StringPatch < EmbeddedPatch
 | |
|   def initialize(strip, str)
 | |
|     super(strip)
 | |
|     @str = str
 | |
|   end
 | |
| 
 | |
|   def contents
 | |
|     @str
 | |
|   end
 | |
| end
 | |
| 
 | |
| # A string containing a patch.
 | |
| class ExternalPatch
 | |
|   extend Forwardable
 | |
| 
 | |
|   attr_reader :resource, :strip
 | |
| 
 | |
|   def_delegators :resource,
 | |
|                  :url, :fetch, :patch_files, :verify_download_integrity,
 | |
|                  :cached_download, :downloaded?, :clear_cache
 | |
| 
 | |
|   def initialize(strip, &block)
 | |
|     @strip    = strip
 | |
|     @resource = Resource::PatchResource.new(&block)
 | |
|   end
 | |
| 
 | |
|   sig { returns(T::Boolean) }
 | |
|   def external?
 | |
|     true
 | |
|   end
 | |
| 
 | |
|   def owner=(owner)
 | |
|     resource.owner = owner
 | |
|     resource.version(resource.checksum&.hexdigest || ERB::Util.url_encode(resource.url))
 | |
|   end
 | |
| 
 | |
|   def apply
 | |
|     base_dir = Pathname.pwd
 | |
|     resource.unpack do
 | |
|       patch_dir = Pathname.pwd
 | |
|       if patch_files.empty?
 | |
|         children = patch_dir.children
 | |
|         if children.length != 1 || !children.fetch(0).file?
 | |
|           raise MissingApplyError, <<~EOS
 | |
|             There should be exactly one patch file in the staging directory unless
 | |
|             the "apply" method was used one or more times in the patch-do block.
 | |
|           EOS
 | |
|         end
 | |
| 
 | |
|         patch_files << children.fetch(0).basename
 | |
|       end
 | |
|       dir = base_dir
 | |
|       dir /= resource.directory if resource.directory.present?
 | |
|       dir.cd do
 | |
|         patch_files.each do |patch_file|
 | |
|           ohai "Applying #{patch_file}"
 | |
|           patch_file = patch_dir/patch_file
 | |
|           safe_system "patch", "-g", "0", "-f", "-#{strip}", "-i", patch_file
 | |
|         end
 | |
|       end
 | |
|     end
 | |
|   rescue ErrorDuringExecution => e
 | |
|     f = resource.owner.owner
 | |
|     cmd, *args = e.cmd
 | |
|     raise BuildError.new(f, cmd, args, ENV.to_hash)
 | |
|   end
 | |
| 
 | |
|   sig { returns(String) }
 | |
|   def inspect
 | |
|     "#<#{self.class.name}: #{strip.inspect} #{url.inspect}>"
 | |
|   end
 | |
| end
 |