Skip to content

Commit 9cf17d0

Browse files
authored
Tidy and test (sous-chefs#245)
* Remove reinstall action as it does nothing * Tidy up changelog * Add custom group test * Update CircleCI orb to 1.0.1 * Remove Gemfile * Fix stage names in CircleCI
1 parent b292d9a commit 9cf17d0

File tree

9 files changed

+150
-131
lines changed

9 files changed

+150
-131
lines changed

.circleci/config.yml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
---
12
version: 2.1
2-
33
orbs:
4-
kitchen: sous-chefs/[email protected].0
4+
kitchen: sous-chefs/[email protected].1
55

66
workflows:
77
kitchen:
@@ -11,57 +11,63 @@ workflows:
1111
context: Danger
1212
- kitchen/lint:
1313
name: lint
14-
1514
- kitchen/dokken-single:
1615
suite: global
1716
platform: debian-8
18-
requires: [ lint, danger ]
17+
name: global-debian-8
18+
requires: [lint, danger]
1919
- kitchen/dokken-single:
2020
suite: global
2121
platform: debian-9
22-
requires: [ lint, danger ]
22+
name: global-debian-9
23+
requires: [lint, danger]
2324
- kitchen/dokken-single:
2425
suite: global
2526
platform: centos-6
26-
requires: [ lint, danger ]
27+
name: global-centos-6
28+
requires: [lint, danger]
2729
- kitchen/dokken-single:
2830
suite: global
2931
platform: centos-7
30-
requires: [ lint, danger ]
31-
- kitchen/dokken-single:
32-
suite: global
33-
platform: fedora-latest
34-
requires: [ lint, danger ]
32+
name: global-centos-7
33+
requires: [lint, danger]
3534
- kitchen/dokken-single:
3635
suite: global
3736
platform: ubuntu-1604
38-
requires: [ lint, danger ]
37+
name: global-ubuntu-1604
38+
requires: [lint, danger]
3939
- kitchen/dokken-single:
4040
suite: global
4141
platform: ubuntu-1804
42-
requires: [ lint, danger ]
42+
name: global-ubuntu-1804
43+
requires: [lint, danger]
4344
- kitchen/dokken-single:
4445
suite: global
4546
platform: opensuse-leap
46-
requires: [ lint, danger ]
47-
47+
name: global-opensuse-leap
48+
requires: [lint, danger]
4849
- kitchen/dokken-single:
4950
name: system-install
5051
suite: system-install
5152
platform: centos-7
52-
requires: [ lint, danger ]
53+
requires: [lint, danger]
5354
- kitchen/dokken-single:
5455
name: user-install
5556
suite: user-install
5657
platform: centos-7
57-
requires: [ lint, danger ]
58+
requires: [lint, danger]
5859
- kitchen/dokken-single:
5960
name: gem
6061
suite: gem
6162
platform: centos-7
62-
requires: [ lint, danger ]
63+
requires: [lint, danger]
6364
- kitchen/dokken-single:
6465
name: ruby-uninstall
6566
suite: ruby-uninstall
6667
platform: ubuntu-1804
67-
requires: [ lint, danger ]
68+
requires: [lint, danger]
69+
- kitchen/dokken-single:
70+
name: custom-group
71+
suite: custom-group-install
72+
platform: centos-7
73+
requires: [lint, danger]

.kitchen.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ suites:
3535
- name: user_install
3636
run_list: recipe[test::user_install]
3737
includes: [centos-7]
38+
- name: custom_group_install
39+
run_list: recipe[test::custom_group_install]
40+
includes: [centos-7]

CHANGELOG.md

Lines changed: 38 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
1-
# 2.1.2 (2018-11-09)
1+
# ruby_rbenv Cookbook Changelog
2+
3+
This file is used to list changes made in each version of the ruby_rbenv cookbook.
4+
5+
## 2.1.2 (2018-11-09)
26

37
- Fix `TypeError: no implicit conversion of nil into String` for `mac_os_x` platforms
48

5-
# 2.1.1 (2018-10-08)
9+
## 2.1.1 (2018-10-08)
610

711
- Fixed `rbenv_action` to support actions like `uninstall` (#189)
812

9-
# 2.1.0 (2018-08-28)
13+
## 2.1.0 (2018-08-28)
1014

1115
- Drop support for Chef 12
1216

13-
# 2.0.9 (2018-06-12)
17+
## 2.0.9 (2018-06-12)
1418

1519
- Fix verbose option (#220)
1620

17-
# 2.0.8 (2018-06-09)
21+
## 2.0.8 (2018-06-09)
1822

1923
- Install the git package rather than the git-core package (#217)
2024

21-
# 2.0.7 (2018-03-11)
25+
## 2.0.7 (2018-03-11)
2226

2327
- Adding Ubuntu 18.04 support
2428
- Move all helpers into the helper file
2529
- Remove rubinius support, that never worked anyway.
2630

27-
# 2.0.6 (2018-01-08)
31+
## 2.0.6 (2018-01-08)
2832

2933
- Fix rubinius install
3034
- Add tests for rubinius
3135

32-
# 2.0.5 (2017-10-17)
36+
## 2.0.5 (2017-10-17)
3337

3438
- Add missing jruby deps #191
3539
- Update README for general usage
3640

37-
# 2.0.4 (2017-08-17)
41+
## 2.0.4 (2017-08-17)
3842

3943
- Group support on user install #183
4044

41-
# 2.0.3 (2017-08-04)
45+
## 2.0.3 (2017-08-04)
4246

4347
- Fix rehash resource #179
4448

45-
# 2.0.2 (2017-08-02)
49+
## 2.0.2 (2017-08-02)
4650

4751
- Fix gem_install resource so it can install gems to a non-global ruby gem.
4852

49-
# 2.0.1 (2017-08-02)
53+
## 2.0.1 (2017-08-02)
5054

5155
- Fix user_install resource bug where the script wasn't being called with the correct environment. Fixes #175
5256

53-
# 2.0.0 (2017-07-24)
57+
## 2.0.0 (2017-07-24)
5458

5559
- Switch libraries to custom resources
5660
- Use gem install from core Chef
@@ -62,18 +66,18 @@
6266
- Remove Arch Linux support in README. We never really supported this, and it isn't tested
6367
- Update required chef-version to the one we test with (Chef 12.19+)
6468

65-
## Known Current Bugs
69+
### Known Current Bugs
6670

6771
- Installing Ruby 2.3.1 on Fedora requires a patched version of 2.3.1\. As patching is currently unavailable please pin to a prior version if you need this installing.
6872

69-
# 1.2.1 (2017-06-23)
73+
## 1.2.1 (2017-06-23)
7074

7175
- Fixed resource failures on Chef 13
7276
- Updated the Apache license string to a SPDX compliant string
7377
- Added Travis testing for Chef 12 and 13
7478
- Switched testing from Rake to local delivery
7579

76-
# 1.2.0 (2017-04-11)
80+
## 1.2.0 (2017-04-11)
7781

7882
- Migrated maintenance of this cookbook to Sous Chefs
7983
- Remove the check to see if the homebrew provider exists since this always exists in Chef 12 and the code failed on Chef 13
@@ -82,7 +86,7 @@
8286
- Removed the "suggests 'java'" metadata as suggests was never implemented in Chef and has been removed from Chef 13
8387
- Bumped the required Chef release from 12.0 to 12.1
8488

85-
# 1.1.0 (2016-06-17)
89+
## 1.1.0 (2016-06-17)
8690

8791
- Restored compatibility for platforms that don't yet support multipackage installs in Chef (BSD and OS X in particular)
8892
- Updated to Grab rbenv from the new repo URL and use https vs. git for compatibility
@@ -95,18 +99,18 @@
9599
- Added a chefignore file to limit the files uploaded to the chef server
96100
- Switched linting from Rubocop to Cookstyle (rubocop wrapper by Chef)
97101

98-
# 1.0.1 (2015-10-24)
102+
## 1.0.1 (2015-10-24)
99103

100104
- Fixed failure with rehashing after the cookbook was renamed
101105

102-
# 1.0.0 (2015-10-12)
106+
## 1.0.0 (2015-10-12)
103107

104-
## WARNING: Cookbook has been renamed
108+
### WARNING: Cookbook has been renamed
105109

106110
- Renamed to ruby_rbenv and uploaded to Supermarket (all attributes rename in the rbenv cookbook). If you wrap this cookbook you're going to need to update the recipes you include. All providers have been updated to keep their existing rbenv_xyz names for backwards compatibility and attributes still maintain the rbenv namespace.
107111
- Updated Travis config to run integration tests in Travis using kitchen-docker
108112

109-
# 0.9.0 (2015-10-12)
113+
## 0.9.0 (2015-10-12)
110114

111115
- Fixed base platform case statement in the cookbook that set install_pkgs and user_home_root attributes. This has been converted to a platform_family statement to better support derivitive operating systems and the attributes are set at default levels so they can be overwritten in wrapper cookbooks
112116
- Updated Travis to test using Chef DK vs. Gem installs
@@ -117,138 +121,93 @@
117121
- Removed the empty Vagrant recipe
118122
- Actually depend on ruby_version vs. suggests since suggests isn't implemented in Chef
119123

120-
# 0.8.1 (2015-08-28)
124+
## 0.8.1 (2015-08-28)
121125

122126
- Add rbenv_action attribute to rbenv_ruby LWRP so to allow using rvm-download rbenv plugin to download ruby vs. installing ruby
123127
- Fix the ability to install gems to a specific version of ruby
124128
- Remove Chef version checks around use_inline_resources since we require Chef 12
125129
- Use default_action method in the LWRPs
126130
- Fix various rubocop warnings
127131

128-
# 0.8.0 (2015-07-27)
132+
## 0.8.0 (2015-07-27)
129133

130134
- Drop support for Chef versions prior to 12
131135
- Add Arch linux support
132136
- Add Linux mint support
133137

134-
# 0.7.3 (2015-07-8)
135-
136-
## Bug Fixes
138+
## 0.7.3 (2015-07-8)
137139

138140
- Issue [#91](https://github.com/fnichol/chef-rbenv/issues/91) [#79](https://github.com/fnichol/chef-rbenv/issues/79) [#92](https://github.com/fnichol/chef-rbenv/pull/92): Add matchers for rbenv_gem and rbenv_ruby. ([@tduffield](https://github.com/tduffield) and many others)
139141
- Issue [#107](https://github.com/fnichol/chef-rbenv/issues/107): "Option name must be a kind of String!" when installing gems.
140142
- Issue [#101](https://github.com/fnichol/chef-rbenv/issues/101): Use full class name for rbenv_rehash resource
141143
- Fix undefined method `timeout' for LWRP resource rbenv_gem. ([@nathantsoi](https://github.com/nathantsoi) and others)
142144
- Issue [#110](https://github.com/fnichol/chef-rbenv/issues/110): Chef 12.3.0 - undefined method `clear_sources' for Chef::Resource::RbenvGem. ([@tatat](https://github.com/tatat) and others)
143-
144-
## Improvements
145-
146145
- Fork from <https://github.com/fnichol/chef-rbenv>
147146

148-
# 0.7.2 (2012-12-31)
149-
150-
## Bug Fixes
147+
## 0.7.2 (2012-12-31)
151148

152149
- Pull request [#26](https://github.com/fnichol/chef-rbenv/pull/26): Don't call libexec commands directly. ([@mhoran])
153-
154-
## Improvements
155-
156150
- Add integration tests for a system Ruby version. ([@fnichol])
157151

158-
# 0.7.1 (unreleased)
159-
160-
## Bug Fixes
152+
## 0.7.1 (unreleased)
161153

162154
- Pull request [#36](https://github.com/fnichol/chef-rbenv/pull/36): Use the ruby name as the definition to install ([@gsandie])
163155
- Pull request [#55](https://github.com/fnichol/chef-rbenv/pull/55): Fix some CHEF-3694 warnings when using with ruby_build ([@trinitronx])
164156

165-
## New features
157+
### New features
166158

167159
- Pull request [#26](https://github.com/fnichol/chef-rbenv/pull/26): Allow setting environment vars per ruby install ([@jasherai])
168160
- Pull request [#37](https://github.com/fnichol/chef-rbenv/pull/37): Allows use `include_recipe("ruby_build")` instead of having to put it in the `run_list` ([@tjwallace])
169161
- Pull request [#42](https://github.com/fnichol/chef-rbenv/pull/42): Load rbenv environment after install ([@msaffitz])
170162
- Pull request [#62](https://github.com/fnichol/chef-rbenv/pull/62): Add Gentoo as supported platform ([@gentooboontoo])
171-
172-
## Improvements
173-
174163
- Pull request [#46](https://github.com/fnichol/chef-rbenv/pull/46): Add a `definition_file` attribute to the `rbenv_ruby` resource to prevent continually trying to build a custom ruby when passed a build file name instead of a built-in definition ([@jf647])
175164
- Pull request [#60](https://github.com/fnichol/chef-rbenv/pull/60): Support `definition_file` in rubies definition ([@cyu])
176165
- Pull request [#75](https://github.com/fnichol/chef-rbenv/pull/75): Update testing support and add unit tests for existing resources ([@fnichol])
177166
- Pull request [#70](https://github.com/fnichol/chef-rbenv/pull/70): Support ruby 2.1.0 ([@WhyEee])
178167

179-
# 0.7.0 (2012-11-21)
180-
181-
## Bug Fixes
168+
## 0.7.0 (2012-11-21)
182169

183170
- Issue [#14](https://github.com/fnichol/chef-rbenv/pull/14): Create /etc/profile.d on system-wide and add note for Mac. ([@fnichol])
184-
185-
## New features
186-
187171
- Pull request [#20](https://github.com/fnichol/chef-rbenv/pull/20): Set an attribute to create profile.d for user install. ([@jtimberman])
188-
189-
## Improvements
190-
191172
- Pull request [#12](https://github.com/fnichol/chef-rbenv/pull/12): Add name attribute to metadata. ([@jtimberman])
192173
- Update foodcritic configuration and update .travis.yml. ([@fnichol])
193174
- Update Installation section of README (welcome Berkshelf). ([@fnichol])
194175

195-
# 0.6.10 (2012-05-18)
196-
197-
## New features
176+
## 0.6.10 (2012-05-18)
198177

199178
- Pull request [#11](https://github.com/fnichol/chef-rbenv/pull/11): Add FreeBSD support. ([@jssjr])
200-
201-
## Improvements
202-
203179
- Add other platform supports in metadata.rb and README. ([@fnichol])
204180

205-
# 0.6.8 (2012-05-06)
206-
207-
## Improvements
181+
## 0.6.8 (2012-05-06)
208182

209183
- Add official hook resource `log[rbenv-post-init-*]` for inter-cookbook integration. ([@fnichol])
210184

211-
# 0.6.6 (2012-05-04)
212-
213-
## Bug Fixes
185+
## 0.6.6 (2012-05-04)
214186

215187
- Fix FC022: Resource condition within loop may not behave as expected. ([@fnichol])
216188
- Add plaform equivalents in default attrs (FC024). ([@fnichol])
217189
- Ensure update-java-alternatives is called before JRuby is built. ([@fnichol])
218190
- Pull request [#8](https://github.com/fnichol/chef-rbenv/pull/8): Add /etc/profile.d/rbenv.sh support for user installs. ([@thoughtless])
219-
220-
## Improvements
221-
222191
- Add TravisCI to run Foodcritic linter. ([@fnichol])
223192
- Pull request [#10](https://github.com/fnichol/chef-rbenv/pull/10): README proofreading. ([@jdsiegel])
224193
- README updates. ([@fnichol])
225194
- Confirm debian platform support. ([@fnichol])
226195

227-
# 0.6.4 (2012-02-23)
228-
229-
## Bug Fixes
196+
## 0.6.4 (2012-02-23)
230197

231198
- Set `root_path` on rbenv_rehash in rbenv_gem provider. ([@fnichol])
232-
233-
## Improvements
234-
235199
- Foodcritic lint-driven code updates. ([@fnichol])
236200
- Update Git URL in README. ([@hedgehog])
237201

238-
# 0.6.2 (2012-02-22)
239-
240-
## Bug Fixes
202+
## 0.6.2 (2012-02-22)
241203

242204
- Issues [#1](https://github.com/fnichol/chef-rbenv/issues/1), [#2](https://github.com/fnichol/chef-rbenv/issues/2): Stub mixins in RbenvRubygems to avoid libraries load ordering issues. ([@fnichol])
243205
- Pull request [#5](https://github.com/fnichol/chef-rbenv/pull/5): Include user setting in rehash calls. ([@magnetised])
244206
- Issue [#4](https://github.com/fnichol/chef-rbenv/issues/4): Fix rbenv/gems hash parsing. ([@fnichol])
245-
246-
## Improvements
247-
248207
- Large formatting updates to README. ([@fnichol])
249208
- Add gh-pages branch for sectioned README at <https://fnichol.github.com/chef-rbenv>
250209

251-
# 0.6.0 (2011-12-21)
210+
## 0.6.0 (2011-12-21)
252211

253212
The initial release.
254213

Gemfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)