Commit 9f24897a authored by Tim Smith's avatar Tim Smith
Browse files

Cookstyle fixes


Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 3d831d6d
# This gemfile provides additional gems for testing and releasing this cookbook
# It is meant to be installed on top of ChefDK / Chef Workstationo which provide 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
......
......@@ -2,7 +2,7 @@
# Cookbook:: apt
# Attributes:: default
#
# Copyright:: 2009-2017, Chef Software, Inc.
# Copyright:: 2009-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.
......
......@@ -2,7 +2,7 @@
# Cookbook:: apt
# Library:: helpers
#
# Copyright:: 2013-2017, 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.
......@@ -44,6 +44,6 @@ module Apt
end
end
Chef::Recipe.send(:include, ::Apt::Helpers)
Chef::Resource.send(:include, ::Apt::Helpers)
Chef::Provider.send(:include, ::Apt::Helpers)
Chef::Recipe.include ::Apt::Helpers
Chef::Resource.include ::Apt::Helpers
Chef::Provider.include ::Apt::Helpers
......@@ -3,7 +3,6 @@ maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io'
license 'Apache-2.0'
description 'Configures apt and apt caching.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '7.2.0'
%w(ubuntu debian).each do |os|
......
......@@ -2,7 +2,7 @@
# Cookbook:: apt
# Recipe:: cacher-client
#
# Copyright:: 2011-2017, 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.
......@@ -49,4 +49,4 @@ else
t.run_action(:create) if node['apt']['compiletime']
end
include_recipe 'apt::default'
include_recipe 'apt::default' # rubocop: disable ChefModernize/IncludingAptDefaultRecipe
......@@ -2,7 +2,7 @@
# Cookbook:: apt
# Recipe:: cacher-ng
#
# Copyright:: 2008-2017, Chef Software, Inc.
# Copyright:: 2008-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.
......
......@@ -2,8 +2,8 @@
# Cookbook:: apt
# Recipe:: default
#
# Copyright:: 2008-2017, Chef Software, Inc.
# Copyright:: 2009-2017, Bryan McLellan <btm@loftninjas.org>
# Copyright:: 2008-2019, Chef Software, Inc.
# Copyright:: 2009-2019, Bryan McLellan <btm@loftninjas.org>
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
......@@ -42,7 +42,7 @@ apt_update 'periodic' do
end
# For other recipes to call to force an update
execute 'apt-get update' do
execute 'apt-get update' do # rubocop: disable ChefModernize/ExecuteAptUpdate
command 'apt-get update'
ignore_failure true
action :nothing
......
......@@ -2,7 +2,7 @@
# Cookbook:: apt
# Recipe:: unattended-upgrades
#
# Copyright:: 2014-2017, Chef Software, Inc.
# Copyright:: 2014-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.
......
......@@ -16,7 +16,7 @@ describe 'apt::cacher-client' do
context 'server provided' do
let(:chef_run) do
runner = ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
runner.node.normal['apt']['cacher_client']['cacher_server'] = {
runner.node.override['apt']['cacher_client']['cacher_server'] = {
host: 'localhost',
port: 9876,
proxy_ssl: true,
......
......@@ -4,7 +4,7 @@ describe 'apt::cacher-ng' do
context 'server' do
let(:chef_run) do
runner = ChefSpec::ServerRunner.new
runner.node.normal['apt']['cacher_port'] = '9876'
runner.node.override['apt']['cacher_port'] = '9876'
runner.converge('apt::cacher-ng')
end
......
......@@ -2,7 +2,7 @@
# Cookbook:: test
# Recipe:: base
#
# Copyright:: 2016-2017, Chef Software, Inc.
# Copyright:: 2016-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.
......@@ -31,4 +31,4 @@ if platform?('debian')
end
end
include_recipe 'apt::default'
include_recipe 'apt::default' # rubocop: disable ChefModernize/IncludingAptDefaultRecipe
......@@ -2,7 +2,7 @@
# Cookbook:: test
# Recipe:: cacher
#
# Copyright:: 2013-2017, 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.
......
......@@ -2,7 +2,7 @@
# Cookbook:: test
# Recipe:: unattended-upgrades
#
# Copyright:: 2016-2017, Chef Software, Inc.
# Copyright:: 2016-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.
......
......@@ -2,7 +2,7 @@
# Cookbook:: test
# Recipe:: cacher-ng-client_test.rb
#
# Copyright:: 2013-2017, 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.
......
......@@ -2,7 +2,7 @@
# Cookbook:: test
# Recipe:: resources
#
# Copyright:: 2012-2017, Chef Software, Inc.
# Copyright:: 2012-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.
......
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