puppetlabs_spec_helper 2.15.0 → 4.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +15 -0
- data/.rubocop.yml +19 -6
- data/.rubocop_todo.yml +18 -18
- data/.travis.yml +8 -18
- data/CHANGELOG.md +71 -3
- data/Gemfile +9 -13
- data/HISTORY.md +1 -1
- data/README.md +6 -2
- data/Rakefile +1 -1
- data/lib/puppetlabs_spec_helper/module_spec_helper.rb +11 -0
- data/lib/puppetlabs_spec_helper/puppet_spec_helper.rb +4 -2
- data/lib/puppetlabs_spec_helper/puppetlabs_spec/files.rb +2 -0
- data/lib/puppetlabs_spec_helper/puppetlabs_spec/fixtures.rb +7 -2
- data/lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb +4 -2
- data/lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb +5 -2
- data/lib/puppetlabs_spec_helper/puppetlabs_spec_helper.rb +2 -0
- data/lib/puppetlabs_spec_helper/rake_tasks.rb +69 -94
- data/lib/puppetlabs_spec_helper/tasks/check_symlinks.rb +4 -1
- data/lib/puppetlabs_spec_helper/tasks/fixtures.rb +31 -15
- data/lib/puppetlabs_spec_helper/version.rb +3 -1
- data/puppet_spec_helper.rb +2 -0
- data/puppetlabs_spec_helper.gemspec +6 -5
- data/puppetlabs_spec_helper.rb +2 -0
- metadata +43 -52
- data/lib/puppetlabs_spec_helper/tasks/beaker.rb +0 -112
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0f07249eb1b0543bd0a6072bf0658b88024c85c2f10a65bbc93f435866453338
|
4
|
+
data.tar.gz: 3fb65221a13f49fe034e5704132ca06e0adfe29f99c66bda0b9b018564937baa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 80a02ec1ff937f9000cc97c184af53a0844323127d11ab86ec336abbc946b58d5058fe91d11cf23480991a0bf541fd7281980df7f845a80083f81002d1ffcf2c
|
7
|
+
data.tar.gz: 1425436924772050a6834fa3072ce749d185a9feb894fa6488b777b1c2cd82aef25890f06fba3c0df207838094be76f40caa018feda05ecb36e9280255d0b8a8
|
@@ -0,0 +1,15 @@
|
|
1
|
+
version: 2
|
2
|
+
updates:
|
3
|
+
- package-ecosystem: bundler
|
4
|
+
directory: "/"
|
5
|
+
schedule:
|
6
|
+
interval: daily
|
7
|
+
time: "13:00"
|
8
|
+
open-pull-requests-limit: 10
|
9
|
+
ignore:
|
10
|
+
- dependency-name: rubocop
|
11
|
+
versions:
|
12
|
+
- "> 0.49, < 1"
|
13
|
+
- dependency-name: rubocop
|
14
|
+
versions:
|
15
|
+
- ">= 1.a, < 2"
|
data/.rubocop.yml
CHANGED
@@ -2,7 +2,9 @@ require: rubocop-rspec
|
|
2
2
|
inherit_from: .rubocop_todo.yml
|
3
3
|
|
4
4
|
AllCops:
|
5
|
-
TargetRubyVersion:
|
5
|
+
TargetRubyVersion: 2.4
|
6
|
+
# let dependabot find the rough spots for us
|
7
|
+
NewCops: enable
|
6
8
|
Exclude:
|
7
9
|
# binstubs, and other utilities
|
8
10
|
- bin/**/*
|
@@ -14,10 +16,6 @@ AllCops:
|
|
14
16
|
- package-testing/vendor/**/*
|
15
17
|
- package-testing/vendor/**/.*
|
16
18
|
|
17
|
-
Layout/IndentHeredoc:
|
18
|
-
Description: The `squiggly` style would be preferable, but is only available from ruby 2.3. We'll enable this when we can.
|
19
|
-
Enabled: False
|
20
|
-
|
21
19
|
# Metrics, excludes complexity and sizing metrics for now, as ruby's defaults are very strict
|
22
20
|
Metrics/AbcSize:
|
23
21
|
Enabled: False
|
@@ -128,7 +126,11 @@ Style/TrailingCommaInArguments:
|
|
128
126
|
Description: Prefer always trailing comma on multiline argument lists. This makes diffs, and re-ordering nicer.
|
129
127
|
EnforcedStyleForMultiline: comma
|
130
128
|
|
131
|
-
Style/
|
129
|
+
Style/TrailingCommaInArrayLiteral:
|
130
|
+
Description: Prefer always trailing comma on multiline literals. This makes diffs, and re-ordering nicer.
|
131
|
+
EnforcedStyleForMultiline: comma
|
132
|
+
|
133
|
+
Style/TrailingCommaInHashLiteral:
|
132
134
|
Description: Prefer always trailing comma on multiline literals. This makes diffs, and re-ordering nicer.
|
133
135
|
EnforcedStyleForMultiline: comma
|
134
136
|
|
@@ -140,3 +142,14 @@ Style/SymbolArray:
|
|
140
142
|
# Enforce LF line endings, even when on Windows
|
141
143
|
Layout/EndOfLine:
|
142
144
|
EnforcedStyle: lf
|
145
|
+
|
146
|
+
Style/AccessModifierDeclarations:
|
147
|
+
EnforcedStyle: inline
|
148
|
+
|
149
|
+
RSpec/ContextWording:
|
150
|
+
Prefixes:
|
151
|
+
- and
|
152
|
+
- but
|
153
|
+
- when
|
154
|
+
- with
|
155
|
+
- without
|
data/.rubocop_todo.yml
CHANGED
@@ -1,11 +1,19 @@
|
|
1
1
|
# This configuration was generated by
|
2
2
|
# `rubocop --auto-gen-config`
|
3
|
-
# on
|
3
|
+
# on 2021-02-09 10:30:38 +0000 using RuboCop version 0.57.2.
|
4
4
|
# The point is for the user to remove these configuration records
|
5
5
|
# one by one as the offenses are removed from the code base.
|
6
6
|
# Note that changes in the inspected code, or installation of new
|
7
7
|
# versions of RuboCop, may require this file to be generated again.
|
8
8
|
|
9
|
+
# Offense count: 1
|
10
|
+
# Cop supports --auto-correct.
|
11
|
+
# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
|
12
|
+
# SupportedStylesAlignWith: keyword, variable, start_of_line
|
13
|
+
Layout/EndAlignment:
|
14
|
+
Exclude:
|
15
|
+
- 'spec/watchr.rb'
|
16
|
+
|
9
17
|
# Offense count: 4
|
10
18
|
# Configuration parameters: AllowSafeAssignment.
|
11
19
|
Lint/AssignmentInCondition:
|
@@ -14,26 +22,16 @@ Lint/AssignmentInCondition:
|
|
14
22
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/fixtures.rb'
|
15
23
|
- 'lib/puppetlabs_spec_helper/rake_tasks.rb'
|
16
24
|
|
17
|
-
# Offense count:
|
18
|
-
# Cop supports --auto-correct.
|
19
|
-
# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
|
20
|
-
# SupportedStylesAlignWith: keyword, variable, start_of_line
|
21
|
-
Lint/EndAlignment:
|
22
|
-
Exclude:
|
23
|
-
- 'lib/puppetlabs_spec_helper/rake_tasks.rb'
|
24
|
-
- 'spec/watchr.rb'
|
25
|
-
|
26
|
-
# Offense count: 4
|
25
|
+
# Offense count: 7
|
27
26
|
Lint/HandleExceptions:
|
28
27
|
Exclude:
|
29
28
|
- 'lib/puppetlabs_spec_helper/puppet_spec_helper.rb'
|
30
29
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/files.rb'
|
31
30
|
- 'lib/puppetlabs_spec_helper/rake_tasks.rb'
|
32
31
|
|
33
|
-
# Offense count:
|
32
|
+
# Offense count: 1
|
34
33
|
Lint/UselessAssignment:
|
35
34
|
Exclude:
|
36
|
-
- 'lib/puppetlabs_spec_helper/puppet_spec_helper.rb'
|
37
35
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb'
|
38
36
|
|
39
37
|
# Offense count: 2
|
@@ -50,10 +48,11 @@ RSpec/InstanceVariable:
|
|
50
48
|
- 'spec/acceptance/smoke_spec.rb'
|
51
49
|
|
52
50
|
# Offense count: 6
|
51
|
+
# Configuration parameters: AggregateFailuresByDefault.
|
53
52
|
RSpec/MultipleExpectations:
|
54
53
|
Max: 3
|
55
54
|
|
56
|
-
# Offense count:
|
55
|
+
# Offense count: 18
|
57
56
|
RSpec/NamedSubject:
|
58
57
|
Exclude:
|
59
58
|
- 'spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb'
|
@@ -71,7 +70,8 @@ Security/Eval:
|
|
71
70
|
- 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
|
72
71
|
|
73
72
|
# Offense count: 4
|
74
|
-
#
|
73
|
+
# Cop supports --auto-correct.
|
74
|
+
# Configuration parameters: AutoCorrect, EnforcedStyle.
|
75
75
|
# SupportedStyles: nested, compact
|
76
76
|
Style/ClassAndModuleChildren:
|
77
77
|
Exclude:
|
@@ -79,7 +79,7 @@ Style/ClassAndModuleChildren:
|
|
79
79
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb'
|
80
80
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb'
|
81
81
|
|
82
|
-
# Offense count:
|
82
|
+
# Offense count: 14
|
83
83
|
Style/Documentation:
|
84
84
|
Exclude:
|
85
85
|
- 'spec/**/*'
|
@@ -88,8 +88,8 @@ Style/Documentation:
|
|
88
88
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb'
|
89
89
|
- 'lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb'
|
90
90
|
- 'lib/puppetlabs_spec_helper/tasks/beaker.rb'
|
91
|
-
- 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
|
92
91
|
- 'lib/puppetlabs_spec_helper/tasks/check_symlinks.rb'
|
92
|
+
- 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
|
93
93
|
|
94
94
|
# Offense count: 1
|
95
95
|
Style/DoubleNegation:
|
@@ -111,7 +111,7 @@ Style/GuardClause:
|
|
111
111
|
|
112
112
|
# Offense count: 1
|
113
113
|
# Cop supports --auto-correct.
|
114
|
-
# Configuration parameters: AutoCorrect, EnforcedStyle
|
114
|
+
# Configuration parameters: AutoCorrect, EnforcedStyle.
|
115
115
|
# SupportedStyles: predicate, comparison
|
116
116
|
Style/NumericPredicate:
|
117
117
|
Exclude:
|
data/.travis.yml
CHANGED
@@ -3,31 +3,21 @@ dist: xenial
|
|
3
3
|
language: ruby
|
4
4
|
cache: bundler
|
5
5
|
before_install: bundle -v
|
6
|
-
script:
|
6
|
+
script: bundle exec rake
|
7
7
|
jobs:
|
8
8
|
fast_finish: true
|
9
9
|
include:
|
10
10
|
- rvm: '2.7'
|
11
|
-
env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#
|
11
|
+
env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#main'
|
12
|
+
- rvm: '2.7'
|
13
|
+
env: PUPPET_GEM_VERSION='~> 7.0' COVERAGE=yes
|
12
14
|
- rvm: '2.6'
|
13
|
-
env: PUPPET_GEM_VERSION='~> 6.0'
|
15
|
+
env: PUPPET_GEM_VERSION='~> 6.0' COVERAGE=yes
|
14
16
|
- rvm: '2.5'
|
15
|
-
env: PUPPET_GEM_VERSION='~> 6.0'
|
16
|
-
- rvm: '2.4'
|
17
|
-
env: PUPPET_GEM_VERSION='~> 6.0'
|
18
|
-
- rvm: '2.3'
|
19
|
-
env: PUPPET_GEM_VERSION='~> 6.0'
|
17
|
+
env: PUPPET_GEM_VERSION='~> 6.0' COVERAGE=yes
|
20
18
|
- rvm: '2.4'
|
21
|
-
env: PUPPET_GEM_VERSION='~>
|
22
|
-
- rvm: '2.3'
|
23
|
-
env: PUPPET_GEM_VERSION='~> 5.0'
|
24
|
-
- rvm: '2.1'
|
25
|
-
env: PUPPET_GEM_VERSION='~> 5.0'
|
19
|
+
env: PUPPET_GEM_VERSION='~> 6.0' COVERAGE=yes
|
26
20
|
- rvm: '2.4'
|
27
|
-
env: PUPPET_GEM_VERSION='~>
|
28
|
-
- rvm: '2.3'
|
29
|
-
env: PUPPET_GEM_VERSION='~> 4.0'
|
30
|
-
- rvm: '2.1'
|
31
|
-
env: PUPPET_GEM_VERSION='~> 4.0'
|
21
|
+
env: PUPPET_GEM_VERSION='~> 5.0' COVERAGE=yes
|
32
22
|
notifications:
|
33
23
|
email: false
|
data/CHANGELOG.md
CHANGED
@@ -3,7 +3,65 @@
|
|
3
3
|
All significant changes to this repo will be summarized in this file.
|
4
4
|
|
5
5
|
|
6
|
-
## [
|
6
|
+
## [v4.0.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v4.0.1) (2021-08-23)
|
7
|
+
|
8
|
+
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v4.0.0...v4.0.1)
|
9
|
+
|
10
|
+
**Fixed bugs:**
|
11
|
+
|
12
|
+
- \(PDK-1717\) Add guard clause to module path dir enum loop [\#342](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/342) ([sanfrancrisko](https://github.com/sanfrancrisko))
|
13
|
+
|
14
|
+
**Merged pull requests:**
|
15
|
+
|
16
|
+
- Release prep for v4.0.0 [\#341](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/341) ([da-ar](https://github.com/da-ar))
|
17
|
+
|
18
|
+
## [v4.0.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v4.0.0) (2021-07-26)
|
19
|
+
|
20
|
+
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v3.0.0...v4.0.0)
|
21
|
+
|
22
|
+
**Implemented enhancements:**
|
23
|
+
|
24
|
+
- Use Rubocop's Github Actions formatter if possible [\#340](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/340) ([ekohl](https://github.com/ekohl))
|
25
|
+
- Remove beaker integration [\#338](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/338) ([ekohl](https://github.com/ekohl))
|
26
|
+
|
27
|
+
**Merged pull requests:**
|
28
|
+
|
29
|
+
- Upgrade to GitHub-native Dependabot [\#336](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/336) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
|
30
|
+
- \(IAC-1452\) - removal of Inappropriate Terminology [\#335](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/335) ([david22swan](https://github.com/david22swan))
|
31
|
+
- Add gemspec required\_ruby\_version [\#334](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/334) ([alexjfisher](https://github.com/alexjfisher))
|
32
|
+
|
33
|
+
## [v3.0.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v3.0.0) (2021-02-10)
|
34
|
+
|
35
|
+
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.16.0...v3.0.0)
|
36
|
+
|
37
|
+
**Implemented enhancements:**
|
38
|
+
|
39
|
+
- dropping rubies before 2.4 [\#332](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/332) ([DavidS](https://github.com/DavidS))
|
40
|
+
- Remove i18n/gettext task [\#331](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/331) ([DavidS](https://github.com/DavidS))
|
41
|
+
- Restructure PuppetLint rake tasks so they can be configurable [\#330](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/330) ([nmaludy](https://github.com/nmaludy))
|
42
|
+
|
43
|
+
**Merged pull requests:**
|
44
|
+
|
45
|
+
- Release prep for v3.0.0 [\#333](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/333) ([DavidS](https://github.com/DavidS))
|
46
|
+
|
47
|
+
## [v2.16.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.16.0) (2021-01-18)
|
48
|
+
|
49
|
+
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.15.0...v2.16.0)
|
50
|
+
|
51
|
+
**Implemented enhancements:**
|
52
|
+
|
53
|
+
- Add a check task [\#327](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/327) ([ekohl](https://github.com/ekohl))
|
54
|
+
- Update fixtures from forge when the module version doesn't match; fix git \< 2.7 compatibility [\#269](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/269) ([nabertrand](https://github.com/nabertrand))
|
55
|
+
- Add all spec/lib directories from fixtures to LOAD\_PATH [\#233](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/233) ([nabertrand](https://github.com/nabertrand))
|
56
|
+
|
57
|
+
**Merged pull requests:**
|
58
|
+
|
59
|
+
- Release prep for v2.16.0 [\#329](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/329) ([DavidS](https://github.com/DavidS))
|
60
|
+
- Update pathspec requirement from ~\> 0.2.1 to \>= 0.2.1, \< 1.1.0 [\#328](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/328) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
|
61
|
+
- Update rubocop requirement from = 0.49 to 0.57.2; prepare for future move to 1.3.1 [\#322](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/322) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
|
62
|
+
|
63
|
+
## [v2.15.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.15.0) (2020-06-12)
|
64
|
+
|
7
65
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.14.1...v2.15.0)
|
8
66
|
|
9
67
|
**Implemented enhancements:**
|
@@ -19,6 +77,7 @@ All significant changes to this repo will be summarized in this file.
|
|
19
77
|
|
20
78
|
**Merged pull requests:**
|
21
79
|
|
80
|
+
- \(IAC-885\) - Release Prep 2.15.0 [\#318](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/318) ([pmcmaw](https://github.com/pmcmaw))
|
22
81
|
- \(IAC-859\) Update all the gems and ruby to 2.7 [\#316](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/316) ([DavidS](https://github.com/DavidS))
|
23
82
|
- Support git fixture branches containing slashes [\#297](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/297) ([trevor-vaughan](https://github.com/trevor-vaughan))
|
24
83
|
- \(maint\) Require pdk/util in build:pdk rake task [\#295](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/295) ([rodjek](https://github.com/rodjek))
|
@@ -29,6 +88,7 @@ All significant changes to this repo will be summarized in this file.
|
|
29
88
|
- Download forge modules in parallel [\#284](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/284) ([logicminds](https://github.com/logicminds))
|
30
89
|
|
31
90
|
## [v2.14.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.14.1) (2019-03-26)
|
91
|
+
|
32
92
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.14.0...v2.14.1)
|
33
93
|
|
34
94
|
**Fixed bugs:**
|
@@ -40,6 +100,7 @@ All significant changes to this repo will be summarized in this file.
|
|
40
100
|
- \(MODULES-8778\) - Release Prep 2.14.1 [\#287](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/287) ([pmcmaw](https://github.com/pmcmaw))
|
41
101
|
|
42
102
|
## [v2.14.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.14.0) (2019-03-25)
|
103
|
+
|
43
104
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.13.1...v2.14.0)
|
44
105
|
|
45
106
|
**Implemented enhancements:**
|
@@ -57,6 +118,7 @@ All significant changes to this repo will be summarized in this file.
|
|
57
118
|
- \(MODULES-8771\) - Release Prep 2.14.0 [\#282](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/282) ([pmcmaw](https://github.com/pmcmaw))
|
58
119
|
|
59
120
|
## [v2.13.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.13.1) (2019-01-15)
|
121
|
+
|
60
122
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.13.0...v2.13.1)
|
61
123
|
|
62
124
|
**Fixed bugs:**
|
@@ -68,6 +130,7 @@ All significant changes to this repo will be summarized in this file.
|
|
68
130
|
- Release Prep 2.13.1 [\#276](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/276) ([bmjen](https://github.com/bmjen))
|
69
131
|
|
70
132
|
## [v2.13.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.13.0) (2019-01-11)
|
133
|
+
|
71
134
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.12.0...v2.13.0)
|
72
135
|
|
73
136
|
**Implemented enhancements:**
|
@@ -87,6 +150,7 @@ All significant changes to this repo will be summarized in this file.
|
|
87
150
|
- \(MAINT\) Add Plans Path Exclusion [\#270](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/270) ([RandomNoun7](https://github.com/RandomNoun7))
|
88
151
|
|
89
152
|
## [v2.12.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.12.0) (2018-11-08)
|
153
|
+
|
90
154
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.11.0...v2.12.0)
|
91
155
|
|
92
156
|
**Implemented enhancements:**
|
@@ -104,6 +168,7 @@ All significant changes to this repo will be summarized in this file.
|
|
104
168
|
- 2.12.0 Release Prep [\#264](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/264) ([tphoney](https://github.com/tphoney))
|
105
169
|
|
106
170
|
## [v2.11.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.11.0) (2018-09-26)
|
171
|
+
|
107
172
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.10.0...v2.11.0)
|
108
173
|
|
109
174
|
**Implemented enhancements:**
|
@@ -119,6 +184,7 @@ All significant changes to this repo will be summarized in this file.
|
|
119
184
|
- \(MODULES-7858\) - 2.11.0 Release Prep [\#259](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/259) ([pmcmaw](https://github.com/pmcmaw))
|
120
185
|
|
121
186
|
## [v2.10.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.10.0) (2018-08-30)
|
187
|
+
|
122
188
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.9.1...v2.10.0)
|
123
189
|
|
124
190
|
**Implemented enhancements:**
|
@@ -133,6 +199,7 @@ All significant changes to this repo will be summarized in this file.
|
|
133
199
|
- update README [\#252](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/252) ([b4ldr](https://github.com/b4ldr))
|
134
200
|
|
135
201
|
## [v2.9.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.9.1) (2018-06-20)
|
202
|
+
|
136
203
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.9.0...v2.9.1)
|
137
204
|
|
138
205
|
**Fixed bugs:**
|
@@ -145,6 +212,7 @@ All significant changes to this repo will be summarized in this file.
|
|
145
212
|
- \(maint\) - Release prep for 2.9.1 [\#251](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/251) ([pmcmaw](https://github.com/pmcmaw))
|
146
213
|
|
147
214
|
## [v2.9.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.9.0) (2018-06-18)
|
215
|
+
|
148
216
|
[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...v2.9.0)
|
149
217
|
|
150
218
|
**Implemented enhancements:**
|
@@ -608,7 +676,7 @@ compatible yet.
|
|
608
676
|
### Added
|
609
677
|
* Initial release
|
610
678
|
|
611
|
-
[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...
|
679
|
+
[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...main
|
612
680
|
[2.8.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.7.0...v2.8.0
|
613
681
|
[2.7.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.2...v2.7.0
|
614
682
|
[2.6.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.1...v2.6.2
|
@@ -656,4 +724,4 @@ compatible yet.
|
|
656
724
|
[0.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.0.0...0.1.0
|
657
725
|
|
658
726
|
|
659
|
-
\* *This
|
727
|
+
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
|
data/Gemfile
CHANGED
@@ -1,8 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
2
4
|
|
3
5
|
def location_for(place_or_version, fake_version = nil)
|
4
|
-
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(
|
5
|
-
file_url_regex = %r{\Afile
|
6
|
+
git_url_regex = %r{\A(?<url>(?:https?|git)[:@][^#]*)(?:#(?<branch>.*))?}
|
7
|
+
file_url_regex = %r{\Afile://(?<path>.*)}
|
6
8
|
|
7
9
|
if place_or_version && (git_url = place_or_version.match(git_url_regex))
|
8
10
|
[fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
|
@@ -20,9 +22,9 @@ gemspec
|
|
20
22
|
def infer_puppet_version
|
21
23
|
# Infer the Puppet Gem version based on the Ruby Version
|
22
24
|
ruby_ver = Gem::Version.new(RUBY_VERSION.dup)
|
25
|
+
return '~> 7.0' if ruby_ver >= Gem::Version.new('2.7.0')
|
23
26
|
return '~> 6.0' if ruby_ver >= Gem::Version.new('2.5.0')
|
24
|
-
|
25
|
-
'~> 4.0'
|
27
|
+
'~> 5.0'
|
26
28
|
end
|
27
29
|
|
28
30
|
group :development do
|
@@ -31,16 +33,10 @@ group :development do
|
|
31
33
|
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'] || ENV['PUPPET_VERSION'] || infer_puppet_version)
|
32
34
|
gem 'simplecov', '~> 0'
|
33
35
|
gem 'simplecov-console'
|
34
|
-
if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.
|
35
|
-
gem 'rubocop', '
|
36
|
-
gem 'rubocop-rspec'
|
36
|
+
if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.4')
|
37
|
+
gem 'rubocop', '0.57.2'
|
38
|
+
gem 'rubocop-rspec'
|
37
39
|
end
|
38
40
|
end
|
39
41
|
|
40
|
-
# pin some gems for older ruby versions
|
41
|
-
gem 'fakefs', '<= 0.13.3' if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.4.0')
|
42
|
-
gem 'json_pure', '<=2.0.1' if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
|
43
|
-
gem 'puppet-syntax', '<= 3' if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.4.0')
|
44
|
-
gem 'rack', '~> 1' if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.2.0')
|
45
|
-
|
46
42
|
# vim:filetype=ruby
|
data/HISTORY.md
CHANGED
@@ -450,7 +450,7 @@ compatible yet.
|
|
450
450
|
### Added
|
451
451
|
* Initial release
|
452
452
|
|
453
|
-
[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...
|
453
|
+
[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...main
|
454
454
|
[2.8.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.7.0...v2.8.0
|
455
455
|
[2.7.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.2...v2.7.0
|
456
456
|
[2.6.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.1...v2.6.2
|
data/README.md
CHANGED
@@ -102,10 +102,10 @@ This project is intended to serve two purposes:
|
|
102
102
|
To Use this Project
|
103
103
|
===================
|
104
104
|
|
105
|
-
The most common usage scenario is that you will check out the '
|
105
|
+
The most common usage scenario is that you will check out the 'main'
|
106
106
|
branch of this project from github, and install it as a rubygem.
|
107
107
|
There should be few or no cases where you would want to have any other
|
108
|
-
branch of this project besides
|
108
|
+
branch of this project besides main/HEAD.
|
109
109
|
|
110
110
|
Running on non-current ruby versions
|
111
111
|
------------------------------------
|
@@ -335,6 +335,10 @@ fixtures:
|
|
335
335
|
ref: "2.6.0"
|
336
336
|
```
|
337
337
|
|
338
|
+
Fixture Loading
|
339
|
+
---------------
|
340
|
+
Any module that has a `spec/lib` directory will be available on the ruby `LOAD_PATH` for tests to consume. This allows modules to provide additional helper code to be supplied. The [augeasprovider_core](https://github.com/hercules-team/augeasproviders_core) module has [some examples](https://github.com/hercules-team/augeasproviders_core/tree/master/spec/lib).
|
341
|
+
|
338
342
|
Testing Parser Functions
|
339
343
|
========================
|
340
344
|
|