Skip to content

Commit

Permalink
Conversion with PDK 1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Helen Campbell committed Feb 26, 2018
1 parent 2bcf0eb commit 1ae5bf7
Show file tree
Hide file tree
Showing 8 changed files with 269 additions and 152 deletions.
37 changes: 18 additions & 19 deletions .gitignore
@@ -1,23 +1,22 @@
# This file is generated by ModuleSync, do not edit.
*.iml
.*.sw[op]
.DS_Store
.bundle/
.idea/
.metadata
.vagrant/
.yardoc
.yardwarns
Gemfile.local
Gemfile.lock
bin/
coverage/
doc/
junit/
log/
pkg/
spec/fixtures/manifests/
spec/fixtures/modules/
tmp/
vendor/

*.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
.DS_Store
13 changes: 10 additions & 3 deletions .rubocop.yml
@@ -1,7 +1,7 @@
---
require:
- rubocop-rspec
require: rubocop-rspec
AllCops:
DisplayCopNames: true
TargetRubyVersion: '2.1'
Include:
- "./**/*.rb"
Expand All @@ -13,7 +13,6 @@ AllCops:
- pkg/**/*
- spec/fixtures/**/*
- vendor/**/*
inherit_from: .rubocop_todo.yml
Metrics/LineLength:
Description: People have wide screens, use them.
Max: 200
Expand Down Expand Up @@ -70,6 +69,8 @@ Style/MethodCalledOnDoEndBlock:
Enabled: true
Style/StringMethods:
Enabled: true
Layout/EndOfLine:
Enabled: false
Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Expand All @@ -88,8 +89,14 @@ 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:
Expand Down
36 changes: 36 additions & 0 deletions .sync.yml
Expand Up @@ -3,8 +3,34 @@ Gemfile:
optional:
':system_tests':
- gem: rspec-retry
required:
':system_tests':
- gem: 'puppet-module-posix-system-r#{minor_version}'
platforms: ruby
- gem: 'puppet-module-win-system-r#{minor_version}'
platforms:
- mswin
- mingw
- x64_mingw
- gem: beaker-abs
from_env: BEAKER_ABS_VERSION
version: '~> 0.1'
- gem: beaker-pe
- gem: beaker-hostgenerator
from_env: BEAKER_HOSTGENERATOR_VERSION
':development':
- gem: puppet-blacksmith
version: '~> 3.4'
- gem: beaker-rspec
from_env: BEAKER_RSPEC_VERSION
- gem: beaker
version: '~> 3.13'
from_env: BEAKER_VERSION
- gem: beaker-puppet_install_helper

appveyor.yml:
delete: true

# only run a minimal subset of tests on travis, running all the tests can cause travis to timeout
.travis.yml:
docker_sets:
Expand All @@ -17,5 +43,15 @@ appveyor.yml:
extras:
- rvm: 2.1.9
script: bundle exec rake rubocop
branches:
- release
extras:
- env: CHECK=release_checks
rvm: 2.1.9

spec/spec_helper.rb:
allow_deprecations: true

Rakefile:
requires:
- puppet_blacksmith/rake_tasks
75 changes: 53 additions & 22 deletions .travis.yml
@@ -1,31 +1,62 @@
#This file is generated by ModuleSync, do not edit.
---
sudo: false
dist: trusty
language: ruby
cache: bundler
script: "bundle exec rake release_checks"
before_install:
- bundle -v
- rm Gemfile.lock || true
- gem update --system
- gem update bundler
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
rvm:
- 2.4.1
- 2.1.9
env:
- PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
matrix:
fast_finish: true
include:
- rvm: 2.3.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 SPEC_OPTS="--tag docker"
script: bundle exec rake beaker
services: docker
sudo: required
- rvm: 2.3.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 SPEC_OPTS="--tag docker"
script: bundle exec rake beaker
services: docker
sudo: required
- rvm: 2.4.1
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 5.0"
- rvm: 2.1.9
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 4.0"
- rvm: 2.1.9
script: bundle exec rake rubocop
-
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 SPEC_OPTS="--tag docker"
rvm: 2.4.1
script: bundle exec rake beaker
services: docker
sudo: required
-
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 SPEC_OPTS="--tag docker"
rvm: 2.4.1
script: bundle exec rake beaker
services: docker
sudo: required
-
env: CHECK=rubocop
-
env: CHECK="syntax lint"
-
env: CHECK=metadata_lint
-
env: CHECK=release_checks
rvm: 2.1.9
branches:
only:
- master
- /^v\d/
- release
notifications:
email: false
deploy:
provider: puppetforge
user: puppet
password:
secure: ""
on:
tags: true
all_branches: true
condition: "$DEPLOY_TO_FORGE = yes"

0 comments on commit 1ae5bf7

Please sign in to comment.