Skip to content

Commit

Permalink
Merge pull request #134 from jyaworski/modulesync
Browse files Browse the repository at this point in the history
Update from puppet-community modulesync_configs
  • Loading branch information
nibalizer committed Oct 18, 2015
2 parents 5668ff4 + e5244c7 commit a48ad3f
Show file tree
Hide file tree
Showing 44 changed files with 1,971 additions and 2,034 deletions.
14 changes: 5 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
pkg/
.*.sw?
pkg
spec/fixtures
.rspec_system
.vagrant
Gemfile.lock
vendor/
spec/fixtures/
.vagrant/
.bundle/
coverage/
*.iml
.idea/
log/
51 changes: 51 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
AllCops:
Exclude:
- vendor/**/*
- pkg/**/*
- spec/fixtures/**/*

# Configuration parameters: AllowURI, URISchemes.
Metrics/LineLength:
Max: 328

# 'Complexity' is very relative
Metrics/PerceivedComplexity:
Enabled: false

# 'Complexity' is very relative
Metrics/CyclomaticComplexity:
Enabled: false

# 'Complexity' is very relative
Metrics/AbcSize:
Enabled: false

# Method length is not necessarily an indicator of code quality
Metrics/MethodLength:
Enabled: false

# Class length is not necessarily an indicator of code quality
Metrics/ClassLength:
Enabled: false

# dealbreaker:
Style/TrailingComma:
Enabled: false
Style/ClosingParenthesisIndentation:
Enabled: false

# we still support ruby 1.8
Style/HashSyntax:
Enabled: false

Lint/AmbiguousRegexpLiteral:
Enabled: true
Style/RegexpLiteral:
Enabled: true
Style/WordArray:
Enabled: true

# this catches the cases of using `module` for parser functions, types, or
# providers
Style/ClassAndModuleChildren:
Enabled: false
35 changes: 22 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
---
notifications:
email: false
language: ruby
bundler_args: --without development system_tests
sudo: false
language: ruby
cache: bundler
bundler_args: --without system_tests
addons:
apt:
packages:
- libaugeas-dev
before_install: rm Gemfile.lock || true
script: bundle exec rake test
script:
- 'bundle exec rake $CHECK'
matrix:
fast_finish: true
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES=yes FUTURE_PARSER="yes"

env: PUPPET_VERSION="~> 3.4" CHECK=test
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.1.6
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.1.6
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.2.3
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.2.3
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
deploy:
provider: puppetforge
user: puppet
Expand Down
Loading

0 comments on commit a48ad3f

Please sign in to comment.