Merge pull request #2623 from rednoah/master

Support GPG (signed data) container in Homebrew Cask
This commit is contained in:
Markus Reiter 2017-05-19 20:48:35 +02:00 committed by GitHub
commit 3139383fe6
5 changed files with 68 additions and 0 deletions

View File

@ -6,6 +6,7 @@ require "hbc/container/criteria"
require "hbc/container/dmg" require "hbc/container/dmg"
require "hbc/container/executable" require "hbc/container/executable"
require "hbc/container/generic_unar" require "hbc/container/generic_unar"
require "hbc/container/gpg"
require "hbc/container/gzip" require "hbc/container/gzip"
require "hbc/container/lzma" require "hbc/container/lzma"
require "hbc/container/naked" require "hbc/container/naked"
@ -40,6 +41,7 @@ module Hbc
Gzip, # pure gzip Gzip, # pure gzip
Lzma, # pure lzma Lzma, # pure lzma
Xz, # pure xz Xz, # pure xz
Gpg, # GnuPG signed data
Executable, Executable,
] ]
# for explicit use only (never autodetected): # for explicit use only (never autodetected):

View File

@ -0,0 +1,41 @@
require "tmpdir"
require "hbc/container/base"
module Hbc
class Container
class Gpg < Base
def self.me?(criteria)
criteria.extension(/^(gpg)$/)
end
def import_key
if @cask.gpg.nil?
raise CaskError, "Expected to find gpg public key in formula. Cask '#{@cask}' must add: 'gpg :embedded, key_id: [Public Key ID]' or 'gpg :embedded, key_url: [Public Key URL]'"
end
args = if @cask.gpg.key_id
["--recv-keys", @cask.gpg.key_id]
elsif @cask.gpg.key_url
["--fetch-key", @cask.gpg.key_url.to_s]
end
@command.run!("gpg", args: args)
end
def extract
if (gpg = which("gpg")).nil?
raise CaskError, "Expected to find gpg executable. Cask '#{@cask}' must add: depends_on formula: 'gpg'"
end
import_key
Dir.mktmpdir do |unpack_dir|
@command.run!(gpg, args: ["--batch", "--yes", "--output", Pathname(unpack_dir).join(@path.basename(".gpg")), "--decrypt", @path])
extract_nested_inside(unpack_dir)
end
end
end
end
end

View File

@ -161,6 +161,19 @@ describe Hbc::Installer, :cask do
expect(Hbc.appdir.join("container-lzma--#{asset.version}")).to be_a_file expect(Hbc.appdir.join("container-lzma--#{asset.version}")).to be_a_file
end end
it "works with gpg-based Casks" do
skip("gpg not installed") if which("gpg").nil?
asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-gpg.rb")
allow(asset).to receive(:depends_on).and_return(empty_depends_on_stub)
shutup do
Hbc::Installer.new(asset).install
end
expect(Hbc.caskroom.join("container-gpg", asset.version)).to be_a_directory
expect(Hbc.appdir.join("container")).to be_a_file
end
it "blows up on a bad checksum" do it "blows up on a bad checksum" do
bad_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/bad-checksum.rb") bad_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/bad-checksum.rb")
expect { expect {

View File

@ -0,0 +1,12 @@
cask 'container-gpg' do
version '1.2.3'
sha256 :no_check
url "file://#{TEST_FIXTURE_DIR}/cask/container.tar.xz.gpg"
gpg :embedded, key_id: 'B0976E51E5C047AD0FD051294E402EBF7C3C6A71'
homepage 'https://example.com/container-gpg'
depends_on formula: 'gpg'
app 'container'
end