2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.21.3'
modulesync_config_version: '1.1.0'
77 changes: 37 additions & 40 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Lint/AmbiguousOperator:
Lint/AssignmentInCondition:
Enabled: True

Style/SpaceBeforeComment:
Layout/SpaceBeforeComment:
Enabled: True

Style/AndOr:
Expand Down Expand Up @@ -119,7 +119,7 @@ Lint/UselessAssignment:
Lint/Void:
Enabled: True

Style/AccessModifierIndentation:
Layout/AccessModifierIndentation:
Enabled: True

Style/AccessorMethodName:
Expand All @@ -128,13 +128,13 @@ Style/AccessorMethodName:
Style/Alias:
Enabled: True

Style/AlignArray:
Layout/AlignArray:
Enabled: True

Style/AlignHash:
Layout/AlignHash:
Enabled: True

Style/AlignParameters:
Layout/AlignParameters:
Enabled: True

Metrics/BlockNesting:
Expand All @@ -152,7 +152,7 @@ Style/BracesAroundHashParameters:
Style/CaseEquality:
Enabled: True

Style/CaseIndentation:
Layout/CaseIndentation:
Enabled: True

Style/CharacterLiteral:
Expand Down Expand Up @@ -186,64 +186,64 @@ Style/WordArray:
Style/UnneededPercentQ:
Enabled: True

Style/Tab:
Layout/Tab:
Enabled: True

Style/SpaceBeforeSemicolon:
Layout/SpaceBeforeSemicolon:
Enabled: True

Style/TrailingBlankLines:
Layout/TrailingBlankLines:
Enabled: True

Style/SpaceInsideBlockBraces:
Layout/SpaceInsideBlockBraces:
Enabled: True

Style/SpaceInsideBrackets:
Layout/SpaceInsideBrackets:
Enabled: True

Style/SpaceInsideHashLiteralBraces:
Layout/SpaceInsideHashLiteralBraces:
Enabled: True

Style/SpaceInsideParens:
Layout/SpaceInsideParens:
Enabled: True

Style/LeadingCommentSpace:
Layout/LeadingCommentSpace:
Enabled: True

Style/SpaceBeforeFirstArg:
Layout/SpaceBeforeFirstArg:
Enabled: True

Style/SpaceAfterColon:
Layout/SpaceAfterColon:
Enabled: True

Style/SpaceAfterComma:
Layout/SpaceAfterComma:
Enabled: True

Style/SpaceAfterMethodName:
Layout/SpaceAfterMethodName:
Enabled: True

Style/SpaceAfterNot:
Layout/SpaceAfterNot:
Enabled: True

Style/SpaceAfterSemicolon:
Layout/SpaceAfterSemicolon:
Enabled: True

Style/SpaceAroundEqualsInParameterDefault:
Layout/SpaceAroundEqualsInParameterDefault:
Enabled: True

Style/SpaceAroundOperators:
Layout/SpaceAroundOperators:
Enabled: True

Style/SpaceBeforeBlockBraces:
Layout/SpaceBeforeBlockBraces:
Enabled: True

Style/SpaceBeforeComma:
Layout/SpaceBeforeComma:
Enabled: True

Style/CollectionMethods:
Enabled: True

Style/CommentIndentation:
Layout/CommentIndentation:
Enabled: True

Style/ColonMethodCall:
Expand All @@ -268,7 +268,7 @@ Style/DefWithParentheses:
Style/PreferredHashMethods:
Enabled: True

Style/DotPosition:
Layout/DotPosition:
EnforcedStyle: trailing

Style/DoubleNegation:
Expand All @@ -277,25 +277,25 @@ Style/DoubleNegation:
Style/EachWithObject:
Enabled: True

Style/EmptyLineBetweenDefs:
Layout/EmptyLineBetweenDefs:
Enabled: True

Style/IndentArray:
Layout/IndentArray:
Enabled: True

Style/IndentHash:
Layout/IndentHash:
Enabled: True

Style/IndentationConsistency:
Layout/IndentationConsistency:
Enabled: True

Style/IndentationWidth:
Layout/IndentationWidth:
Enabled: True

Style/EmptyLines:
Layout/EmptyLines:
Enabled: True

Style/EmptyLinesAroundAccessModifier:
Layout/EmptyLinesAroundAccessModifier:
Enabled: True

Style/EmptyLiteral:
Expand All @@ -314,7 +314,7 @@ Style/MethodDefParentheses:
Style/LineEndConcatenation:
Enabled: True

Style/TrailingWhitespace:
Layout/TrailingWhitespace:
Enabled: True

Style/StringLiterals:
Expand Down Expand Up @@ -466,9 +466,6 @@ Metrics/ParameterLists:
Lint/RequireParentheses:
Enabled: True

Style/SpaceBeforeFirstArg:
Enabled: True

Style/ModuleFunction:
Enabled: True

Expand All @@ -484,7 +481,7 @@ Style/Encoding:
Style/BlockDelimiters:
Enabled: True

Style/MultilineBlockLayout:
Layout/MultilineBlockLayout:
Enabled: True

# 'Complexity' is very relative
Expand All @@ -498,7 +495,7 @@ Metrics/PerceivedComplexity:
Lint/UselessAssignment:
Enabled: True

Style/ClosingParenthesisIndentation:
Layout/ClosingParenthesisIndentation:
Enabled: True

# RSpec
Expand Down Expand Up @@ -527,7 +524,7 @@ RSpec/NestedGroups:
Enabled: False

# this is broken on ruby1.9
Style/IndentHeredoc:
Layout/IndentHeredoc:
Enabled: False

# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Expand Down
12 changes: 3 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@ matrix:
- rvm: 2.1.9
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.2.7
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.3.4
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
env: PUPPET_VERSION="~> 5.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
branches:
only:
- master
Expand Down
43 changes: 0 additions & 43 deletions CHANGELOG

This file was deleted.

Loading