Merge pull request #20463 from Homebrew/gnu-mirror-audit
Re-enable GNU mirror audit
This commit is contained in:
		
						commit
						b0b8e23856
					
				@ -41,11 +41,11 @@ module RuboCop
 | 
			
		||||
          problem "Please use the ASCII (Punycode-encoded host, URL-encoded path and query) version of #{url}."
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        # TODO: Re-add the following audit after homebrew/core migration.
 | 
			
		||||
        # gnu_pattern = %r{^(?:https?|ftp)://ftp\.gnu\.org/(.*)}
 | 
			
		||||
        # audit_urls(urls, gnu_pattern) do |match, url|
 | 
			
		||||
        #   problem "#{url} should be: https://ftpmirror.gnu.org/gnu/#{match[1]}"
 | 
			
		||||
        # end
 | 
			
		||||
        # Prefer ftpmirror.gnu.org as suggested by https://www.gnu.org/prep/ftp.en.html
 | 
			
		||||
        gnu_pattern = %r{^(?:https?|ftp)://ftp\.gnu\.org/(.*)}
 | 
			
		||||
        audit_urls(urls, gnu_pattern) do |match, url|
 | 
			
		||||
          problem "#{url} should be: https://ftpmirror.gnu.org/gnu/#{match[1]}"
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        # Fossies upstream requests they aren't used as primary URLs
 | 
			
		||||
        # https://github.com/Homebrew/homebrew-core/issues/14486#issuecomment-307753234
 | 
			
		||||
 | 
			
		||||
@ -6,14 +6,12 @@ RSpec.describe RuboCop::Cop::FormulaAudit::Urls do
 | 
			
		||||
  subject(:cop) { described_class.new }
 | 
			
		||||
 | 
			
		||||
  let(:offense_list) do
 | 
			
		||||
    # TODO: Re-add the following to the offense list after homebrew/core migration.
 | 
			
		||||
    # {
 | 
			
		||||
    #   "url" => "https://ftpmirror.gnu.org/lightning/lightning-2.1.0.tar.gz",
 | 
			
		||||
    #   "msg" => "https://ftpmirror.gnu.org/lightning/lightning-2.1.0.tar.gz should be: " \
 | 
			
		||||
    #            "https://ftp.gnu.org/gnu/lightning/lightning-2.1.0.tar.gz",
 | 
			
		||||
    #   "col" => 2,
 | 
			
		||||
    # }
 | 
			
		||||
    [{
 | 
			
		||||
      "url" => "https://ftp.gnu.org/lightning/lightning-2.1.0.tar.gz",
 | 
			
		||||
      "msg" => "https://ftp.gnu.org/lightning/lightning-2.1.0.tar.gz should be: " \
 | 
			
		||||
               "https://ftpmirror.gnu.org/gnu/lightning/lightning-2.1.0.tar.gz",
 | 
			
		||||
      "col" => 2,
 | 
			
		||||
    }, {
 | 
			
		||||
      "url" => "https://fossies.org/linux/privat/monit-5.23.0.tar.gz",
 | 
			
		||||
      "msg" => "Please don't use \"fossies.org\" in the `url` (using as a mirror is fine)",
 | 
			
		||||
      "col" => 2,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user