Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moving line into the define case due to failure of puppet when line is outside #246

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
4cb6dfe
moving line into the define case due to failure of puppet when line i…
ppouliot Nov 8, 2018
e8c1e58
trying to fix stdlib bits
primeministerp Dec 18, 2018
1e4568f
updating to modern stdlib conventions
primeministerp Dec 18, 2018
59b2a7b
updating
primeministerp Dec 19, 2018
e06b406
updating
primeministerp Dec 19, 2018
a5a46e6
fixing mismatched type
primeministerp Dec 19, 2018
5a5dd55
updating
primeministerp Dec 19, 2018
0820dc4
Puppetfile
primeministerp Dec 19, 2018
414dc7c
fixing assert_types
primeministerp Dec 19, 2018
f7805bc
more cleanup and transition to modern Stdlib functions from depreciat…
primeministerp Dec 19, 2018
ba1b108
more stdlib conversions for different record types
primeministerp Dec 19, 2018
fd3b5f5
more stdlib cleanup
primeministerp Dec 19, 2018
ed1253c
updating
primeministerp Dec 19, 2018
379b0aa
fixing wrong use of stdlib
primeministerp Dec 19, 2018
6705c37
Proper working Stdlib integrations up to this point
primeministerp Dec 19, 2018
fc6000c
migrating to pdk for validation
Dec 19, 2018
09c2718
migrating to pdk for validation
ppouliot Dec 19, 2018
791545c
Merge branch 'master' of github.com:ppouliot/puppet-dns
ppouliot Dec 19, 2018
3447ed5
lint cleanup for pdk validation
ppouliot Dec 19, 2018
96f8d11
minimal Puppetfile
primeministerp Dec 19, 2018
c72227f
attempting to fix spec test
primeministerp Dec 19, 2018
0eee214
cleanup of unit tests
primeministerp Dec 19, 2018
c9bd889
trying to fix spec tests
primeministerp Jan 2, 2019
1cef8c0
Lint cleanup for readability
ppouliot Jan 3, 2019
4964889
updating
ppouliot Jan 3, 2019
e4178e6
reverting params
primeministerp Jan 3, 2019
92753ae
fixing param
primeministerp Jan 3, 2019
233e13b
fixing curly brackets that were not needed
primeministerp Jan 3, 2019
49acbd7
Some rspec formatting changes
ppouliot Jan 3, 2019
0b404eb
reverting typo
ppouliot Jan 3, 2019
0ec4d60
updating bits
ppouliot Jan 3, 2019
38dfcb6
operatingsystemmajrelease was being reported as an integer, modified …
ppouliot Jan 3, 2019
5928c59
refactor of original spec tests and manual cleanup
ppouliot Jan 4, 2019
33e9df3
updating spec formatting
ppouliot Jan 9, 2019
0bf738e
spec updates
ppouliot Jan 11, 2019
257f387
updating
ppouliot Jan 11, 2019
3e6a89d
fixing spec tests
ppouliot Jan 11, 2019
106a0d3
more attempts to fix spec
ppouliot Jan 11, 2019
f9e0bd8
fixing bits
ppouliot Jan 11, 2019
d26089a
updating spec tests and other realated bits
ppouliot Jan 14, 2019
d8c3841
more spec and class cleanup to get pdk unit tests working
ppouliot Jan 15, 2019
98ec81d
reverting to validate_absolute_path until I can replace it
ppouliot Jan 15, 2019
44c3c79
more reverting to clear rspec errors until i can build clean
ppouliot Jan 15, 2019
d527b11
Adding of Data types, to classes and other cleanup of spec testing
ppouliot Jan 17, 2019
7c86c15
adding MIT license and anything missing
ppouliot Jan 18, 2019
d0d8438
updating readme
ppouliot Jan 18, 2019
4906e9d
fixing lint issues
ppouliot Jan 18, 2019
161b7cc
updating docummentation to support pdk changes
ppouliot Jan 18, 2019
6638d78
pinning beaker-vagrant to 0.5.0
ppouliot Jan 22, 2019
717930d
updating Jenkinsfile
ppouliot Jan 22, 2019
085dcc4
updating Jenkinsfile
ppouliot Jan 22, 2019
66fee7b
updating typo in spec_helper_acceptance.rb
ppouliot Jan 22, 2019
f4ab7bc
fixing spacing
ppouliot Jan 22, 2019
2b8d9f7
Updating pool
ppouliot Jan 22, 2019
b82c94c
fixing missing }
ppouliot Jan 22, 2019
f4494cf
Updating Jenkinsfile to add Gem Deps
ppouliot Jan 22, 2019
2dcd8ce
trying to fix errors
ppouliot Jan 22, 2019
15a8f8c
more Jenkinsfile Updates
ppouliot Jan 22, 2019
a09f843
fixing typo in job
ppouliot Jan 22, 2019
edef461
restrict jenkinsfile job to get basic testing working
ppouliot Feb 5, 2019
ed29de4
adding workspace cleaning to jenkinsfile
ppouliot Feb 8, 2019
6f9ea62
adding .sync.yml to help with pdksync
ppouliot Feb 11, 2019
06a828b
adding missing gem versions requirements from Gemfile
ppouliot Feb 11, 2019
c56e63c
catching missing bits
ppouliot Feb 11, 2019
ec588ed
Fixing jenkinsfile typo
ppouliot Feb 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
fixtures:
forge_modules:
stdlib: "puppetlabs/stdlib"
concat:
repo: "puppetlabs/concat"
ref: "2.2.0"
translate: "puppetlabs/translate"
concat: "puppetlabs/concat"
symlinks:
dns: "#{source_dir}"
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
*.epp eol=lf
34 changes: 24 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
vendor/
.bundle
.*.sw?
pkg
.rspec_system
.vagrant
/.project
log/
spec/fixtures/modules/
/*.lock
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
42 changes: 42 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
stages:
- syntax
- unit

cache:
paths:
- vendor/bundle

before_script:
- bundle -v
- rm Gemfile.lock || true
- gem update --system $RUBYGEMS_VERSION
- gem --version
- bundle -v
- bundle install --without system_tests --path vendor/bundle --jobs $(nproc)

parallel_spec-Ruby 2.1.9-Puppet ~> 4.0:
stage: unit
image: ruby:2.1.9
script:
- bundle exec rake parallel_spec
variables:
PUPPET_GEM_VERSION: '~> 4.0'
RUBYGEMS_VERSION: '2.7.8'

syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.4.4-Puppet ~> 5.5:
stage: syntax
image: ruby:2.4.4
script:
- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
variables:
PUPPET_GEM_VERSION: '~> 5.5'

parallel_spec-Ruby 2.4.4-Puppet ~> 5.5:
stage: unit
image: ruby:2.4.4
script:
- bundle exec rake parallel_spec
variables:
PUPPET_GEM_VERSION: '~> 5.5'

37 changes: 37 additions & 0 deletions .pdkignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
/appveyor.yml
/.fixtures.yml
/Gemfile
/.gitattributes
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/Rakefile
/.rspec
/.rubocop.yml
/.travis.yml
/.yardopts
/spec/
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--relative
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--format documentation
122 changes: 122 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
---
require: rubocop-rspec
AllCops:
DisplayCopNames: true
TargetRubyVersion: '2.1'
Include:
- "./**/*.rb"
Exclude:
- bin/*
- ".vendor/**/*"
- "**/Gemfile"
- "**/Rakefile"
- pkg/**/*
- spec/fixtures/**/*
- vendor/**/*
- "**/Puppetfile"
- "**/Vagrantfile"
- "**/Guardfile"
Metrics/LineLength:
Description: People have wide screens, use them.
Max: 200
GetText/DecorateString:
Description: We don't want to decorate test output.
Exclude:
- spec/*
RSpec/BeforeAfterAll:
Description: Beware of using after(:all) as it may cause state to leak between tests.
A necessary evil in acceptance testing.
Exclude:
- spec/acceptance/**/*.rb
RSpec/HookArgument:
Description: Prefer explicit :each argument, matching existing module's style
EnforcedStyle: each
Style/BlockDelimiters:
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
be consistent then.
EnforcedStyle: braces_for_chaining
Style/ClassAndModuleChildren:
Description: Compact style reduces the required amount of indentation.
EnforcedStyle: compact
Style/EmptyElse:
Description: Enforce against empty else clauses, but allow `nil` for clarity.
EnforcedStyle: empty
Style/FormatString:
Description: Following the main puppet project's style, prefer the % format format.
EnforcedStyle: percent
Style/FormatStringToken:
Description: Following the main puppet project's style, prefer the simpler template
tokens over annotated ones.
EnforcedStyle: template
Style/Lambda:
Description: Prefer the keyword for easier discoverability.
EnforcedStyle: literal
Style/RegexpLiteral:
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
EnforcedStyle: percent_r
Style/TernaryParentheses:
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
on complex expressions for better readability, but seriously consider breaking
it up.
EnforcedStyle: require_parentheses_when_complex
Style/TrailingCommaInArguments:
Description: Prefer always trailing comma on multiline argument lists. This makes
diffs, and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/TrailingCommaInLiteral:
Description: Prefer always trailing comma on multiline literals. This makes diffs,
and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/SymbolArray:
Description: Using percent style obscures symbolic intent of array's contents.
EnforcedStyle: brackets
RSpec/MessageSpies:
EnforcedStyle: receive
Style/Documentation:
Exclude:
- lib/puppet/parser/functions/**/*
- spec/**/*
Style/WordArray:
EnforcedStyle: brackets
Style/CollectionMethods:
Enabled: true
Style/MethodCalledOnDoEndBlock:
Enabled: true
Style/StringMethods:
Enabled: true
Layout/EndOfLine:
Enabled: false
Layout/IndentHeredoc:
Enabled: false
Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/CyclomaticComplexity:
Enabled: false
Metrics/MethodLength:
Enabled: false
Metrics/ModuleLength:
Enabled: false
Metrics/ParameterLists:
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false
RSpec/DescribeClass:
Enabled: false
RSpec/ExampleLength:
Enabled: false
RSpec/MessageExpectation:
Enabled: false
RSpec/MultipleExpectations:
Enabled: false
RSpec/NestedGroups:
Enabled: false
Style/AsciiComments:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Style/SymbolProc:
Enabled: false
19 changes: 19 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---

Gemfile:
required:
':acceptance':
- gem: 'rspec-puppet-facts'
- gem: 'optimist'
- gem: 'beaker'
version: '~>4.0'
- gem: 'beaker-puppet'
- gem: 'beaker-docker'
- gem: 'beaker-module_install_helper'
- gem: 'beaker-puppet_install_helper'
- gem: 'beaker-pe'
- gem: 'beaker-rspec'
- gem: 'beaker-task_helper'
- gem: 'beaker-vagrant'
version: '0.5.0'
- gem: 'vagrant-wrapper'
74 changes: 38 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@
---
dist: trusty
language: ruby
bundler_args: --without development --jobs=3 --retry=3

sudo: false

cache: bundler
before_install:
- bundle -v
- rm -f Gemfile.lock
- gem update --system $RUBYGEMS_VERSION
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 1.9.3
- 2.0.0
- 2.1

- 2.5.1
env:
- PUPPET_VERSION="~> 2.7.0"
- PUPPET_VERSION="~> 3.1.0"
- PUPPET_VERSION="~> 3.2.0"
- PUPPET_VERSION="~> 3.3.0"
- PUPPET_VERSION="~> 3.4.0"
- PUPPET_VERSION="~> 3.5.0"

before_install: rm Gemfile.lock || true

script: bundle exec rake test

global:
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
matrix:
exclude:
- rvm: 1.9.3
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_VERSION="~> 3.1.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.1.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.2.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.3.0"
- rvm: 2.1
env: PUPPET_VERSION="~> 3.4.0"
fast_finish: true
include:
-
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
-
env: CHECK=parallel_spec
-
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
rvm: 2.4.4
branches:
only:
- master
- /^v\d/
notifications:
email: false
deploy:
provider: puppetforge
user: puppet
password:
secure: ""
on:
tags: true
all_branches: true
condition: "$DEPLOY_TO_FORGE = yes"
1 change: 1 addition & 0 deletions .yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--markup markdown
Loading