Get rid of compat_resource and mariadb
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
# Cookbook:: homebrew
|
||||
# Resources:: tap
|
||||
#
|
||||
# Copyright:: 2011-2016, Chef Software, Inc.
|
||||
# Copyright:: 2011-2019, Chef Software, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -19,13 +19,37 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
actions :tap, :untap
|
||||
default_action :tap
|
||||
chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
|
||||
|
||||
attribute :name,
|
||||
name_attribute: true,
|
||||
kind_of: String,
|
||||
regex: %r{^[\w-]+(?:\/[\w-]+)+$}
|
||||
property :tap_name, String, name_property: true, regex: %r{^[\w-]+(?:\/[\w-]+)+$}
|
||||
property :url, String
|
||||
property :full, [true, false], default: false
|
||||
property :homebrew_path, String, default: lazy { "#{HomebrewWrapper.new.install_path}/bin/brew" }
|
||||
property :owner, String, default: lazy { Homebrew.owner } # lazy to prevent breaking compilation on non-macOS platforms
|
||||
|
||||
attribute :tapped,
|
||||
kind_of: [TrueClass, FalseClass]
|
||||
action :tap do
|
||||
unless tapped?(new_resource.name)
|
||||
converge_by("tap #{new_resource.name}") do
|
||||
shell_out!("#{new_resource.homebrew_path} tap #{new_resource.full ? '--full' : ''} #{new_resource.name} #{new_resource.url || ''}",
|
||||
user: new_resource.owner,
|
||||
env: { 'HOME' => ::Dir.home(new_resource.owner), 'USER' => new_resource.owner },
|
||||
cwd: ::Dir.home(new_resource.owner))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
action :untap do
|
||||
if tapped?(new_resource.name)
|
||||
converge_by("untap #{new_resource.name}") do
|
||||
shell_out!("#{new_resource.homebrew_path} untap #{new_resource.name}",
|
||||
user: new_resource.owner,
|
||||
env: { 'HOME' => ::Dir.home(new_resource.owner), 'USER' => new_resource.owner },
|
||||
cwd: ::Dir.home(new_resource.owner))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def tapped?(name)
|
||||
tap_dir = name.gsub('/', '/homebrew-')
|
||||
::File.directory?("#{HomebrewWrapper.new.repository_path}/Library/Taps/#{tap_dir}")
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user