From 1a8f5e413a217e1a13c3b32177325d2b61451110 Mon Sep 17 00:00:00 2001 From: Fernando Aleman Date: Thu, 6 Dec 2018 15:04:58 -0600 Subject: [PATCH] Require chef version >= 14.3 --- README.md | 5 +++-- libraries/chef_asdf_package_helpers.rb | 3 ++- metadata.rb | 15 +++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index cecafcf..cf39489 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Manages [asdf](https://github.com/asdf-vm/asdf) extendable version manager. ### Chef -This cookbook requires Chef 12.9+. +This cookbook requires Chef 14.3+. ### Platforms @@ -27,7 +27,8 @@ Other Debian and RHEL family distributions are assumed to work. ## Dependencies -- build-essential +- ark +- chef-sugar ## Usage diff --git a/libraries/chef_asdf_package_helpers.rb b/libraries/chef_asdf_package_helpers.rb index 8e81fd5..8356157 100644 --- a/libraries/chef_asdf_package_helpers.rb +++ b/libraries/chef_asdf_package_helpers.rb @@ -20,7 +20,8 @@ class Chef module Asdf module PackageHelpers def install_asdf_deps - include_recipe 'build-essential' + build_essential 'asdf' + package %w(automake git grep libtool mlocate unzip) if redhat? || fedora? diff --git a/metadata.rb b/metadata.rb index e17634b..d877425 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,19 +5,14 @@ description 'Installs and configures asdf' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '0.3.0' -chef_version '>= 12.9' if respond_to?(:chef_version) +chef_version '>= 14.3' issues_url 'https://github.com/asdf-chef/asdf/issues' source_url 'https://github.com/asdf-chef/asdf' -supports 'centos' -supports 'debian' -supports 'fedora' -supports 'oracle' -supports 'redhat' -supports 'scientific' -supports 'ubuntu' +%w(centos debian fedora oracle redhat scientific ubuntu).each do |os| + supports os +end -depends 'build-essential' -depends 'chef-sugar' depends 'ark' +depends 'chef-sugar'