Merge pull request #68 from voxpupuli/modulesync

Breaking: modulesync 1.1.0 with backwards-incompatible changes

.fixtures.yml

@@ -3,6 +3,6 @@ fixtures:
  stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
  nodejs: 'https://github.com/voxpupuli/puppet-nodejs.git'
  forge_modules:
- supervisor: "proletaryo-supervisor"
+ supervisor: 'proletaryo-supervisor'
  symlinks:
  ghost: "#{source_dir}"

.github/CONTRIBUTING.md

@@ -98,3 +98,7 @@ If you don't want to have to recreate the virtual machine every time you
 can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
 at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
 for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
+
+The easiest way to debug in a docker container is to open a shell:
+
+ docker exec -it -u root ${container_id_or_name} bash

.gitignore

@@ -17,3 +17,4 @@ Puppetfile.lock
 *.iml
 .*.sw?
 .yardoc/
+Guardfile

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '0.20.1'
+modulesync_config_version: '1.1.0'

.overcommit.yml

@@ -0,0 +1,63 @@
+# Managed by https://github.com/voxpupuli/modulesync_configs
+#
+# Hooks are only enabled if you take action.
+#
+# To enable the hooks run:
+#
+# ```
+# bundle exec overcommit --install
+# # ensure .overcommit.yml does not harm to you and then
+# bundle exec overcommit --sign
+# ```
+#
+# (it will manage the .git/hooks directory):
+#
+# Examples howto skip a test for a commit or push:
+#
+# ```
+# SKIP=RuboCop git commit
+# SKIP=PuppetLint git commit
+# SKIP=RakeTask git push
+# ```
+#
+# Don't invoke overcommit at all:
+#
+# ```
+# OVERCOMMIT_DISABLE=1 git commit
+# ```
+#
+# Read more about overcommit: https://github.com/brigade/overcommit
+#
+# To manage this config yourself in your module add
+#
+# ```
+# .overcommit.yml:
+# unmanaged: true
+# ```
+#
+# to your modules .sync.yml config
+---
+PreCommit:
+ RuboCop:
+ enabled: true
+ description: 'Runs rubocop on modified files only'
+ command: ['bundle', 'exec', 'rubocop']
+ PuppetLint:
+ enabled: true
+ description: 'Runs puppet-lint on modified files only'
+ command: ['bundle', 'exec', 'puppet-lint']
+ YamlSyntax:
+ enabled: true
+ JsonSyntax:
+ enabled: true
+ TrailingWhitespace:
+ enabled: true
+
+PrePush:
+ RakeTarget:
+ enabled: true
+ description: 'Run rake targets'
+ targets:
+ - 'test'
+ - 'rubocop'
+ command: [ 'bundle', 'exec', 'rake' ]

.rspec_parallel

@@ -0,0 +1 @@
+--format progress

.rubocop.yml

@@ -9,6 +9,9 @@ AllCops:
  - .vendor/**/*
  - pkg/**/*
  - spec/fixtures/**/*
+ - Gemfile
+ - Rakefile
+ - Guardfile
 Lint/ConditionPosition:
  Enabled: True
 
@@ -48,7 +51,7 @@ Lint/AmbiguousOperator:
 Lint/AssignmentInCondition:
  Enabled: True
 
-Style/SpaceBeforeComment:
+Layout/SpaceBeforeComment:
  Enabled: True
 
 Style/AndOr:
@@ -116,7 +119,7 @@ Lint/UselessAssignment:
 Lint/Void:
  Enabled: True
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
  Enabled: True
 
 Style/AccessorMethodName:
@@ -125,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:
@@ -149,7 +152,7 @@ Style/BracesAroundHashParameters:
 Style/CaseEquality:
  Enabled: True
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
  Enabled: True
 
 Style/CharacterLiteral:
@@ -183,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:
@@ -265,7 +268,7 @@ Style/DefWithParentheses:
 Style/PreferredHashMethods:
  Enabled: True
 
-Style/DotPosition:
+Layout/DotPosition:
  EnforcedStyle: trailing
 
 Style/DoubleNegation:
@@ -274,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:
@@ -311,7 +314,7 @@ Style/MethodDefParentheses:
 Style/LineEndConcatenation:
  Enabled: True
 
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
  Enabled: True
 
 Style/StringLiterals:
@@ -463,9 +466,6 @@ Metrics/ParameterLists:
 Lint/RequireParentheses:
  Enabled: True
 
-Style/SpaceBeforeFirstArg:
- Enabled: True
-
 Style/ModuleFunction:
  Enabled: True
 
@@ -481,7 +481,7 @@ Style/Encoding:
 Style/BlockDelimiters:
  Enabled: True
 
-Style/MultilineBlockLayout:
+Layout/MultilineBlockLayout:
  Enabled: True
 
 # 'Complexity' is very relative
@@ -495,11 +495,15 @@ Metrics/PerceivedComplexity:
 Lint/UselessAssignment:
  Enabled: True
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
  Enabled: True
 
 # RSpec
 
+RSpec/BeforeAfterAll:
+ Exclude:
+ - spec/acceptance/**/*
+
 # We don't use rspec in this way
 RSpec/DescribeClass:
  Enabled: False
@@ -519,6 +523,10 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
  Enabled: False
 
+# this is broken on ruby1.9
+Layout/IndentHeredoc:
+ Enabled: False
+
 # disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
 Security/YAMLLoad:
  Enabled: false

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 dist: trusty
 language: ruby
 cache: bundler
-bundler_args: --without system_tests development
 before_install:
  - bundle -v
  - rm Gemfile.lock || true
@@ -17,17 +16,17 @@ matrix:
  fast_finish: true
  include:
  - rvm: 2.1.9
+ bundler_args: --without system_tests development
  env: PUPPET_VERSION="~> 4.0" CHECK=test
- - rvm: 2.2.6
- env: PUPPET_VERSION="~> 4.0" CHECK=test
- - rvm: 2.3.3
- env: PUPPET_VERSION="~> 4.0" CHECK=test
- - rvm: 2.4.0
- env: PUPPET_VERSION="~> 4.0" CHECK=test
- - rvm: 2.4.0
- env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
- - rvm: 2.4.0
- env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
+ - rvm: 2.4.1
+ bundler_args: --without system_tests development
+ env: PUPPET_VERSION="~> 5.0" CHECK=test
+ - rvm: 2.4.1
+ bundler_args: --without system_tests development
+ env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
+ - rvm: 2.4.1
+ bundler_args: --without system_tests development
+ env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
 branches:
  only:
  - master