Skip to content

Commit acf3c91

Browse files
authored
v2.1.0 (#3)
* Working with amzn1 base * CircleCI WIP * CircleCI WIP * CircleCI WIP * CircleCI WIP * 2.1.0 versioning added * 2.1.0 uncommented gem_source control
1 parent 8636fdb commit acf3c91

23 files changed

Lines changed: 959 additions & 124 deletions

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ timezone:
55
jobs:
66
style_ruby:
77
docker:
8-
- image: chef/chefdk:4.3.13
8+
- image: circleci/ruby:2.6.5
99
working_directory: ~/circulate
1010
environment:
1111
GEM_HOME: /opt/chefdk/embedded/lib/ruby/gems/2.6.0/gems
1212
GEM_PATH: /opt/chefdk/embedded/lib/ruby/gems/2.6.0
1313
GEM_ROOT: /opt/chefdk/embedded/lib/ruby/gems/2.6.0
1414
steps:
1515
- checkout
16-
#- run:
17-
# name: Install Rspec Junit Formatter Gem
18-
# command: gem install rspec_junit_formatter -v 0.4.1
19-
- run:
20-
name: Run Rake Task
21-
command: /opt/chefdk/embedded/bin/rake style:ruby --trace
2216
- run:
2317
name: Create Reports Directory
2418
command: mkdir reports
19+
- run:
20+
name: Bundle Gems
21+
command: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
22+
- run:
23+
name: Run Rake Task
24+
command: bundle exec rake style:ruby --trace
2525
- store_test_results:
2626
path: reports/
2727

CHANGELOG.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
# CHANGE LOG
22

3-
## 2.0.1 - TODO List - Levon Becker
3+
## x.x.x - TODO List - Levon Becker
44
* Get jUnit test results working for rubocop rake task
5+
* Add logic to packages control to test that packages aren't installed if chef attribute package install is false
56

6-
## 2.0.0 - 10/11/2019 - Levon Becker
7+
## 2.1.0 - 01/06/2019 - Levon Becker
8+
* Removed string to boolean input syntax. Found it was giving odd false positive results.
9+
* Switched to ruby 2.6.5 container instead of chefdk for CircleCI
10+
* I tried combining all the logic to one call for the json node attributes, but the converge order is screwy and couldn't get it to work reliably.
11+
* Added gem_source control
12+
* Added bash_profile control
13+
* Added chef control
14+
15+
## 2.0.0 - 12/09/2019 - Levon Becker
716
* Updated CircleCI Config to v2.1
8-
* Updated Gemfile to ChefDK v4.3.13 Gems
17+
* Updated Gemfile to ChefDK v4.5.0 Gems
18+
* Switched attributes to inputs (new syntax & backwards breaking)
19+
* Added node_attributes methods (requires writing chef attributes to json done by bonusbits_base)
920
* Updated default to value attributes
1021
* Remove yum_cron
1122
* Wrapped logic with control syntax. Can now call specific controls and ignore inspec attributes.
@@ -16,6 +27,9 @@
1627
* Removed Windows support
1728
* Added Inspec Version check to inspec.yml
1829
* Updated os method calls to work with newer version and discover Amazon Linux correctly again
30+
* Merged inspec_bootstrap inspec profile into this profile to deprecate bootstrap profile (chef control)
31+
* Added bash_profile control
32+
* Added gem_source control (not tested yet)
1933

2034
## 1.1.0 - 10/27/2017 - Levon Becker
2135
* Added Backups Tests

Gemfile

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
source 'https://rubygems.org'
22

3+
gem 'aws-sdk-core', '3.68.1'
4+
gem 'berkshelf', '7.0.8'
35
gem 'bundler', '1.17.2'
4-
gem 'rake', '12.3.2'
5-
# gem 'rspec_junit_formatter', '0.4.1'
6-
gem 'rubocop', '0.72.0'
6+
gem 'chef', '15.4.45'
7+
gem 'chef-dk', '4.5.0'
8+
gem 'rake'
9+
10+
group :style do
11+
gem 'foodcritic', '16.1.1'
12+
gem 'rubocop', '0.72.0'
13+
end
14+
15+
group :unit do
16+
gem 'chefspec', '7.4.0'
17+
gem 'rspec_junit_formatter', '0.4.1'
18+
end
19+
20+
group :integration do
21+
gem 'inspec', '4.18.0'
22+
gem 'kitchen-docker', '2.9.0'
23+
gem 'test-kitchen', '2.3.3'
24+
end

0 commit comments

Comments
 (0)