chef 13

Author: heathsnow

.foodcritic

@@ -0,0 +1,2 @@
+# FC078: Ensure cookbook shared under an OSI-approved open source license
+~FC078

attributes/default.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-#
-# Author:: Shawn Neal (<sneal@sneal.net>)
+
+# Author:: Daptiv Engineering (<cpc_sea_teamengineering@changepoint.com>)
 # Cookbook Name:: dotnetframework
 # Attribute:: default
 #
-# Copyright:: Copyright (c) 2013 Daptiv Solutions LLC.
+# Copyright:: Copyright (c) 2018 Changepoint
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 # limitations under the License.
 #
 
+# rubocop:disable VariableNumber
 # Allows the cookbook the compile without error on Linux
 if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   require 'chef/win32/version'

docker-compose.yml

@@ -1,5 +1,5 @@
 # How to use this file:
-# export COOKBOOK=${PWD##*/} && docker-compose run --rm test chef exec rake
+# export COOKBOOK=${PWD##*/} && docker-compose run --rm test
 
 version: '2'
 services:
@@ -10,13 +10,15 @@ services:
       - ${CHEF_CONFIG_DIR}:/root/.chef
       - ${CHEF_REPO_DIR}:/chef-repo
       - ${AWS_CRED_DIR}:/root/.aws
-      - ${BERKSHELF_PATH}:/root/.berkshelf
+      - ${SSH_KEY_DIR}:/root/.ssh
     working_dir: /${COOKBOOK}
     network_mode: "host"
     environment:
-      COOKBOOK: ${COOKBOOK}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      CHEF_DATA_BAGS: /chef-repo/data_bags
+      CHEF_SECRET_FILE: /root/.chef/${CHEF_SECRET_FILE}
+      COOKBOOK: ${COOKBOOK}
       EC2_ROLE_ARN: ${EC2_ROLE_ARN}
       EC2_SSH_KEY_ID: ${EC2_SSH_KEY_ID}
       EC2_REGION: ${EC2_REGION}
@@ -26,14 +28,7 @@ services:
       EC2_IMAGE_NAME: ${EC2_IMAGE_NAME}
       EC2_SG: ${EC2_SG}
       LATEST_PPM_PACKAGE: ${LATEST_PPM_PACKAGE}
-      CHEF_DATA_BAGS: /chef-repo/data_bags
-      CHEF_SECRET_FILE: /root/.chef/${CHEF_SECRET_FILE}
-      KITCHEN_YAML: ".kitchen_ec2.yml"
-      KNIFE_HOME: /root/.chef
+      REQUIRE_CHEF_OMNIBUS: ${REQUIRE_CHEF_OMNIBUS}
       WIN_USER: ${WIN_USER}
       WIN_PASS: ${WIN_PASS}
-    command: |
-      bash -c 'bash -s <<EOF
-      echo "Please enter the command to execute:"
-      echo "Ex: docker-compose run --rm test chef exec bundle install"
-      EOF'
+    command: "'chef exec rake'"

libraries/matchers.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
-#
-# Author:: Shawn Neal (<sneal@sneal.net>)
+
+# Author:: Daptiv Engineering (<cpc_sea_teamengineering@changepoint.com>)
 # Cookbook Name:: dotnetframework
 #
-# Copyright 2015, Shawn Neal
+# Copyright 2018 Changepoint
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata.rb

@@ -1,11 +1,12 @@
 name 'dotnetframework'
-maintainer 'Daptiv Solutions, LLC'
-maintainer_email 'sneal@sneal.net'
+maintainer 'Changepoint'
+maintainer_email 'cpc_sea_teamengineering@changepoint.com'
 license 'All rights reserved'
 description 'Installs/Configures .NET Framework'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 ver_path = File.join(File.dirname(__FILE__), 'version.txt')
 version File.exist?(ver_path) ? IO.read(ver_path).chomp : '1.1.0'
+chef_version '>= 12.5' if respond_to?(:chef_version)
 issues_url 'https://github.com/daptiv/dotnetframework/issues'
 source_url 'https://github.com/daptiv/dotnetframework/'
 supports 'windows'

rakefile.rb

@@ -1,9 +1,10 @@
-task default: [:version, :rubocop, :foodcritic, :spec, :kitchen, :cleanup]
-task nokitchen: [:version, :rubocop, :foodcritic, :spec]
+# rubocop:disable Metrics/BlockLength
+task default: %i[version rubocop foodcritic spec kitchen cleanup]
+task nokitchen: %i[version rubocop foodcritic spec]
 
 desc 'Set cookbook version.'
 task :version do
-  version = ENV['BUILD_NUMBER'] ? "1.2.#{ENV['BUILD_NUMBER']}" : '1.2.0'
+  version = ENV['BUILD_NUMBER'] ? "1.2.#{ENV['BUILD_NUMBER']}" : '0.0.1'
   IO.write('version.txt', version)
 end
 
@@ -31,11 +32,11 @@
 end
 
 desc 'Test Kitchen.'
-task :kitchen, [:type] => [:check_env_vars, :assume_role] do |_t, args|
+task :kitchen, [:type] => %i[check_env_vars assume_role] do |_t, args|
   task_thread = []
   kitchen_complete = false
   start_time = Time.now
-  %w(kitchen assume_role).each do |task|
+  %w[kitchen assume_role].each do |task|
     task_thread << Thread.new do
       case task
       when 'kitchen'

recipes/default.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-#
-# Author:: Shawn Neal (<sneal@sneal.net>)
+
+# Author:: Daptiv Engineering (<cpc_sea_teamengineering@changepoint.com>)
 # Cookbook Name:: dotnetframework
 # Recipe:: default
 #
-# Copyright:: Copyright (c) 2013 Daptiv Solutions LLC.
+# Copyright:: Copyright (c) 2018 Changepoint
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

recipes/regiis.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Shawn Neal (<sneal@sneal.net>)
+# Author:: Daptiv Engineering (<cpc_sea_teamengineering@changepoint.com>)
 # Cookbook Name:: dotnetframework
 # Recipe:: regiis
 #
-# Copyright:: Copyright (c) 2013 Daptiv Solutions LLC.
+# Copyright:: Copyright (c) 2018 Changepoint
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

resources/version.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-#
-# Author:: Shawn Neal (<sneal@sneal.net>)
+
+# Author:: Daptiv Engineering (<cpc_sea_teamengineering@changepoint.com>)
 # Cookbook Name:: dotnetframework
 # Resource:: edition
 #
-# Copyright 2015, Shawn Neal
+# Copyright 2018 Changepoint
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rspec/expectations'
 require 'chefspec'
 require 'chefspec/berkshelf'