Commit d26177f4 authored by Tim Smith's avatar Tim Smith
Browse files

Resolve Cookstyle 5.8 warnings



Fix the latest cookbook warnings
Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 5b2844bc
......@@ -6,7 +6,6 @@ addons:
packages:
- chef-workstation
# Don't `bundle install` which takes about 1.5 mins
install: echo "skip bundle install"
env:
......@@ -51,8 +50,6 @@ before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)"
- chef --version
- cookstyle --version
- foodcritic --version
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=${CHEF_VERSION} kitchen verify ${INSTANCE}
......
# This gemfile provides additional gems for testing and releasing this cookbook
# It is meant to be installed on top of ChefDK which provides the majority
# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority
# of the necessary gems for testing this cookbook
#
# Run 'chef exec bundle install' to install these dependencies
......
......@@ -3,7 +3,7 @@
# Cookbook:: erlang
# Attributes:: default
#
# Copyright:: 2012-2016, Chef Software, Inc. <legal@chef.io>
# Copyright:: 2012-2019, Chef Software, Inc. <legal@chef.io>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......
......@@ -45,22 +45,19 @@ a.out
# Testing #
###########
.watchr
.rspec
spec/*
spec/fixtures/*
test/*
features/*
examples/*
Guardfile
Procfile
kitchen*
.kitchen*
.rubocop.yml
spec/*
Rakefile
.travis.yml
.foodcritic
.codeclimate.yml
appveyor.yml
# SCM #
#######
......@@ -82,20 +79,14 @@ Berksfile.lock
cookbooks/*
tmp
# Policyfile #
##############
Policyfile.rb
Policyfile.lock.json
# Cookbooks #
#############
CONTRIBUTING*
CHANGELOG*
TESTING*
# Strainer #
############
Colanderfile
Strainerfile
.colander
.strainer
# Vagrant #
###########
.vagrant
Vagrantfile
......@@ -2,6 +2,7 @@ driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
chef_license: accept-no-persist
transport:
name: dokken
......
......@@ -11,11 +11,11 @@ platforms:
box: mvbcoding/awslinux
- name: centos-6
- name: centos-7
- name: debian-8
- name: debian-10
run_list: apt::default
- name: debian-9
- name: debian-10
run_list: apt::default
- name: fedora-28
- name: fedora-29
- name: opensuse-leap-42
- name: ubuntu-16.04
run_list: apt::default
......
......@@ -3,18 +3,12 @@ maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io'
license 'Apache-2.0'
description 'Installs erlang, optionally install GUI tools.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '7.0.1'
depends 'yum-epel'
depends 'yum-erlang_solutions', '>= 1.0.3'
depends 'build-essential', '>= 5.0'
recipe 'erlang', 'Installs Erlang via native package, source, or Erlang Solutions package'
recipe 'erlang::package', 'Installs Erlang via native package'
recipe 'erlang::source', 'Installs Erlang via source'
recipe 'erlang::esl', "Installs Erlang from Erlang Solutions' package repositories"
%w( amazon centos debian oracle redhat scientific ubuntu zlinux ).each do |os|
supports os
end
......
......@@ -4,8 +4,8 @@
# Author:: Matt Ray <matt@chef.io>
# Author:: Hector Castro <hector@basho.com>
#
# Copyright:: 2008-2016, Joe Williams
# Copyright:: 2011-2016, Chef Software Inc.
# Copyright:: 2008-2019, Joe Williams
# 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.
......
......@@ -3,7 +3,7 @@
# Recipe:: esl
#
# Author:: Christopher Maier (<cm@chef.io>)
# Copyright:: 2013-2016, Chef Software, Inc.
# Copyright:: 2013-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.
......
......@@ -5,8 +5,8 @@
# Author:: Matt Ray <matt@chef.io>
# Author:: Hector Castro <hector@basho.com>
#
# Copyright:: 2008-2016, Joe Williams
# Copyright:: 2011-2016, Chef Software Inc.
# Copyright:: 2008-2019, Joe Williams
# 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.
......@@ -45,7 +45,7 @@ when 'rhel', 'suse', 'fedora'
end
end
include_recipe 'yum-epel' if node['platform_family'] == 'rhel' && node['erlang']['package']['install_epel_repository']
include_recipe 'yum-epel' if platform_family?('rhel') && node['erlang']['package']['install_epel_repository']
package 'erlang' do
version node['erlang']['package']['version'] if node['erlang']['package']['version']
end
......
......@@ -4,8 +4,8 @@
# Author:: Matt Ray <matt@chef.io>
# Author:: Hector Castro <hector@basho.com>
#
# Copyright:: 2008-2016, Joe Williams
# Copyright:: 2011-2016, Chef Software Inc.
# Copyright:: 2008-2019, Joe Williams
# 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.
......
......@@ -29,7 +29,7 @@ describe 'erlang::package' do
context 'gui_tools is true' do
it 'installs erlang-x11 package' do
chef_run_debian.node.normal['erlang']['gui_tools'] = true
chef_run_debian.node.override['erlang']['gui_tools'] = true
gui_tools_run = chef_run_debian.converge('erlang::package')
expect(gui_tools_run).to install_package('erlang-x11')
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment