Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

actually require all required stanzas #8324

Merged
merged 2 commits into from
Dec 22, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions lib/cask/audit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def initialize(cask)
end

def run!(download = false)
_check_required_fields
_check_required_stanzas
_check_no_string_version_latest
_check_checksums
_check_sha256_no_check_if_latest
Expand All @@ -25,17 +25,22 @@ def summary_header
end


def _check_required_fields
odebug "Auditing required fields"
add_error "url is required" unless cask.url
add_error "version is required" unless cask.version
add_error "homepage is required" unless cask.homepage
def _check_required_stanzas
odebug "Auditing required stanzas"
%i{version url homepage}.each do |sym|
add_error "a #{sym} stanza is required" unless cask.send(sym)
end
add_error 'a license value is required (:unknown is OK)' unless cask.license
# todo: specific DSL knowledge should not be spread around in various files like this
# todo: nested_container should not still be a pseudo-artifact at this point
installable_artifacts = cask.artifacts.reject{ |k,v| [:uninstall, :zap, :nested_container].include?(k)}
add_error 'at least one activatable artifact stanza is required' unless installable_artifacts.size > 0
end

def _check_checksums
odebug "Auditing checksums"
return if cask.sums == :no_check
add_error "sha256 is required" unless cask.sums.is_a?(Array) && cask.sums.length > 0
add_error 'a sha256 stanza is required' unless cask.sums.is_a?(Array) && cask.sums.length > 0
end

def _check_no_string_version_latest
Expand Down
6 changes: 3 additions & 3 deletions spec/cask/audit_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ class CaskVersionLatestWithChecksum < Cask
it "adds an error if url is missing" do
audit = Cask::Audit.new(CaskMissingUrl.new)
audit.run!
expect(audit.errors).to include('url is required')
expect(audit.errors).to include('a url stanza is required')
end

it "adds an error if version is missing" do
audit = Cask::Audit.new(CaskMissingVersion.new)
audit.run!
expect(audit.errors).to include('version is required')
expect(audit.errors).to include('a version stanza is required')
end

it "adds an error if homepage is missing" do
audit = Cask::Audit.new(CaskMissingHomepage.new)
audit.run!
expect(audit.errors).to include('homepage is required')
expect(audit.errors).to include('a homepage stanza is required')
end

it "adds an error if version is latest and using sha256" do
Expand Down
1 change: 1 addition & 0 deletions test/support/Casks/with-suite.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

url TestHelper.local_binary_url('caffeine_suite.zip')
homepage 'http://example.com/with-suite'
license :unknown

suite 'caffeine_suite'
end