mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move cask audit implications into Audit.

Browse Source
This commit is contained in:
Markus Reiter 2020-09-04 04:14:37 +02:00
parent 793ab30bb0
commit e5b56e485f
5 changed files with 71 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/cask/audit.rb
View File

@ -14,22 +14,32 @@ module Cask
class Audit
extend Predicable
attr_reader :cask, :commit_range, :download
attr_reader :cask, :download
attr_predicate :appcast?, :new_cask?, :strict?, :online?
def initialize(cask, appcast: false, download: false, quarantine: nil,
token_conflicts: false, online: false, strict: false,
new_cask: false, commit_range: nil, command: SystemCommand)
def initialize(cask, appcast: nil, download: nil, quarantine: nil,
token_conflicts: nil, online: nil, strict: nil,
new_cask: nil)
# `new_cask` implies `online` and `strict`
online = new_cask if online.nil?
strict = new_cask if strict.nil?
# `online` implies `appcast` and `download`
appcast = online if appcast.nil?
download = online if download.nil?
# `strict` implies `token_conflicts`
token_conflicts = strict if token_conflicts.nil?
@cask = cask
@appcast = appcast
@download = Download.new(cask, quarantine: quarantine) if download
@online = online
@strict = strict
@new_cask = new_cask
@commit_range = commit_range
@token_conflicts = token_conflicts
@command = command
end
def run!

71
Library/Homebrew/cask/auditor.rb
View File

@ -9,33 +9,50 @@ module Cask
class Auditor
extend Predicable
def self.audit(cask, audit_download: false, audit_appcast: false,
audit_online: false, audit_strict: false,
audit_token_conflicts: false, audit_new_cask: false,
quarantine: true, commit_range: nil, language: nil)
new(cask, audit_download: audit_download,
audit_appcast: audit_appcast,
audit_online: audit_online,
audit_new_cask: audit_new_cask,
audit_strict: audit_strict,
audit_token_conflicts: audit_token_conflicts,
quarantine: quarantine, commit_range: commit_range, language: language).audit
def self.audit(
cask,
audit_download: nil,
audit_appcast: nil,
audit_online: nil,
audit_new_cask: nil,
audit_strict: nil,
audit_token_conflicts: nil,
quarantine: nil,
language: nil
)
new(
cask,
audit_download: audit_download,
audit_appcast: audit_appcast,
audit_online: audit_online,
audit_new_cask: audit_new_cask,
audit_strict: audit_strict,
audit_token_conflicts: audit_token_conflicts,
quarantine: quarantine,
language: language,
).audit
end
attr_reader :cask, :commit_range, :language
attr_reader :cask, :language
def initialize(cask, audit_download: false, audit_appcast: false,
audit_online: false, audit_strict: false,
audit_token_conflicts: false, audit_new_cask: false,
quarantine: true, commit_range: nil, language: nil)
def initialize(
cask,
audit_download: nil,
audit_appcast: nil,
audit_online: nil,
audit_strict: nil,
audit_token_conflicts: nil,
audit_new_cask: nil,
quarantine: nil,
language: nil
)
@cask = cask
@audit_download = audit_download
@audit_appcast = audit_appcast
@audit_online = audit_online
@audit_strict = audit_strict
@audit_new_cask = audit_new_cask
@audit_strict = audit_strict
@quarantine = quarantine
@commit_range = commit_range
@audit_token_conflicts = audit_token_conflicts
@language = language
end
@ -76,14 +93,16 @@ module Cask
end
def audit_cask_instance(cask)
audit = Audit.new(cask, appcast: audit_appcast?,
online: audit_online?,
strict: audit_strict?,
new_cask: audit_new_cask?,
token_conflicts: audit_token_conflicts?,
download: audit_download?,
quarantine: quarantine?,
commit_range: commit_range)
audit = Audit.new(
cask,
appcast: audit_appcast?,
online: audit_online?,
strict: audit_strict?,
new_cask: audit_new_cask?,
token_conflicts: audit_token_conflicts?,
download: audit_download?,
quarantine: quarantine?,
)
audit.run!
audit
end

12
Library/Homebrew/cask/cmd/audit.rb
View File

@ -38,16 +38,14 @@ module Cask
require "cask/auditor"
Homebrew.auditing = true
strict = args.new_cask? || args.strict?
online = args.new_cask? || args.online?
options = {
audit_download: online || args.download?,
audit_appcast: online || args.appcast?,
audit_online: online,
audit_strict: strict,
audit_download: args.download?,
audit_appcast: args.appcast?,
audit_online: args.online?,
audit_strict: args.strict?,
audit_new_cask: args.new_cask?,
audit_token_conflicts: strict || args.token_conflicts?,
audit_token_conflicts: args.token_conflicts?,
quarantine: args.quarantine?,
language: args.language,
}.compact

2
Library/Homebrew/test/cask/audit_spec.rb
View File

@ -34,11 +34,9 @@ describe Cask::Audit, :cask do
let(:token_conflicts) { false }
let(:strict) { false }
let(:new_cask) { false }
let(:fake_system_command) { class_double(SystemCommand) }
let(:audit) {
described_class.new(cask, download: download,
token_conflicts: token_conflicts,
command: fake_system_command,
strict: strict,
new_cask: new_cask)
}

17
Library/Homebrew/test/cask/cmd/audit_spec.rb
View File

@ -57,10 +57,10 @@ describe Cask::Cmd::Audit, :cask do
described_class.run("casktoken", "--token-conflicts")
end
it "passes `audit_strict` and `audit_token_conflicts` if the `--strict` flag is specified" do
it "passes `audit_strict` if the `--strict` flag is specified" do
allow(Cask::CaskLoader).to receive(:load).and_return(cask)
expect(Cask::Auditor).to receive(:audit)
.with(cask, audit_strict: true, audit_token_conflicts: true, quarantine: true)
.with(cask, audit_strict: true, quarantine: true)
.and_return(result)
described_class.run("casktoken", "--strict")
@ -69,23 +69,16 @@ describe Cask::Cmd::Audit, :cask do
it "passes `audit_online` if the `--online` flag is specified" do
allow(Cask::CaskLoader).to receive(:load).and_return(cask)
expect(Cask::Auditor).to receive(:audit)
.with(cask, audit_online: true, audit_appcast: true, audit_download: true, quarantine: true)
.with(cask, audit_online: true, quarantine: true)
.and_return(result)
described_class.run("casktoken", "--online")
end
it "passes `audit_appcast`, `audit_download`, `audit_new_cask`, `audit_online`, `audit_strict` " \
"and `audit_token_conflicts` if the `--new-cask` flag is specified" do
it "passes `audit_new_cask` if the `--new-cask` flag is specified" do
allow(Cask::CaskLoader).to receive(:load).and_return(cask)
expect(Cask::Auditor).to receive(:audit)
.with(cask, audit_appcast: true,
audit_download: true,
audit_new_cask: true,
audit_online: true,
audit_strict: true,
audit_token_conflicts: true,
quarantine: true)
.with(cask, audit_new_cask: true, quarantine: true)
.and_return(result)
described_class.run("casktoken", "--new-cask")