Get rid of compat_resource and mariadb

cookbooks/homebrew/resources/cask.rb

@@ -1,14 +1,68 @@
-actions :cask, :uncask, :install, :uninstall
-default_action :install
+#
+# Author:: Joshua Timberman (<jtimberman@chef.io>)
+# Author:: Graeme Mathieson (<mathie@woss.name>)
+# Cookbook:: homebrew
+# Resources:: cask
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
-attribute :name,
-  name_attribute: true,
-  kind_of: String,
-  regex: /^[\w-]+$/
+chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
 
-attribute :options,
-  kind_of: String
+property :cask_name, String, regex: %r{^[\w/-]+$}, name_property: true
+property :options, String
+property :install_cask, [true, false], default: true
+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
 
-def casked?
-  shell_out('/usr/local/bin/brew cask list 2>/dev/null').stdout.split.include?(name)
+action :install do
+  homebrew_tap 'homebrew/cask' if new_resource.install_cask
+
+  unless casked?
+    converge_by("install cask #{new_resource.name} #{new_resource.options}") do
+      shell_out!("#{new_resource.homebrew_path} install --cask #{new_resource.name} #{new_resource.options}",
+          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 :remove do
+  homebrew_tap 'homebrew/cask' if new_resource.install_cask
+
+  if casked?
+    converge_by("uninstall cask #{new_resource.name}") do
+      shell_out!("#{new_resource.homebrew_path} uninstall --cask #{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
+
+action_class do
+  alias_method :action_cask, :action_install
+  alias_method :action_uncask, :action_remove
+  alias_method :action_uninstall, :action_remove
+
+  def casked?
+    unscoped_name = new_resource.name.split('/').last
+    shell_out!("#{new_resource.homebrew_path} list --cask 2>/dev/null",
+      user: new_resource.owner,
+      env: { 'HOME' => ::Dir.home(new_resource.owner), 'USER' => new_resource.owner },
+      cwd: ::Dir.home(new_resource.owner)).stdout.split.include?(unscoped_name)
+  end
 end

cookbooks/homebrew/resources/tap.rb

@@ -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