puppetlabs_spec_helper 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79eb8d2954c3b43ed29ccb3bdd2fca85afbf8c1
-  data.tar.gz: bdb47de10fdf30f10b53b24de7dcc8f32f785406
+  metadata.gz: cc3386df61b1fedabba7e20fcbf2d7e19d588210
+  data.tar.gz: c892ab82a4647c84f728f31ed22c49b2821c7ea8
 SHA512:
-  metadata.gz: 56ae5af8748e67cf71ddf3aa20cef6b178a35bd3e3eb291e67ec172746a8f73c3f2bb846b6323066b92a3dca82b11edc407da47974f4b7042f39fe567cf4c37b
-  data.tar.gz: 73d6d63c354f70e3977823dcdcd16a05862f5775371b0132f7d3a19063433e408cc692968d3bd80ee016b85c2b178c63304607ae6355fd76123c3dd98c83a205
+  metadata.gz: 35f46e0d7db0fad995e00e8f6e7ea029f4fc91c1a187855eb1d76a27d1ef898a2fcf6daa713260f792ad1aace5bd6d169abece553f9c612ce521c3ef5fb64436
+  data.tar.gz: 366b7962fd0794271799a36c29889a502af326099ad410546f730f8d87786a26608842f719f16a7cfb03d8caec5730f3e2f25bfa9d47d044eac27579843a6787

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.rubocop.yml

@@ -0,0 +1,504 @@
+require: rubocop-rspec
+AllCops:
+  TargetRubyVersion: 1.9
+  Include:
+    - ./**/*.rb
+
+Lint/ConditionPosition:
+  Enabled: True
+
+Lint/ElseLayout:
+  Enabled: True
+
+Lint/UnreachableCode:
+  Enabled: True
+
+Lint/UselessComparison:
+  Enabled: True
+
+Lint/EnsureReturn:
+  Enabled: True
+
+Lint/HandleExceptions:
+  Enabled: True
+
+Lint/LiteralInCondition:
+  Enabled: True
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: True
+
+Lint/LiteralInInterpolation:
+  Enabled: True
+
+Style/HashSyntax:
+  Enabled: True
+
+Style/RedundantReturn:
+  Enabled: True
+
+Lint/AmbiguousOperator:
+  Enabled: True
+
+Lint/AssignmentInCondition:
+  Enabled: True
+
+Style/SpaceBeforeComment:
+  Enabled: True
+
+Style/AndOr:
+  Enabled: True
+
+Style/RedundantSelf:
+  Enabled: True
+
+# Method length is not necessarily an indicator of code quality
+Metrics/MethodLength:
+  Enabled: False
+
+# Module length is not necessarily an indicator of code quality
+Metrics/ModuleLength:
+  Enabled: False
+
+Style/WhileUntilModifier:
+  Enabled: True
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: True
+
+Lint/Eval:
+  Enabled: True
+
+Lint/BlockAlignment:
+  Enabled: True
+
+Lint/DefEndAlignment:
+  Enabled: True
+
+Lint/EndAlignment:
+  Enabled: True
+
+Lint/DeprecatedClassMethods:
+  Enabled: True
+
+Lint/Loop:
+  Enabled: True
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: True
+
+Lint/RescueException:
+  Enabled: True
+
+Lint/StringConversionInInterpolation:
+  Enabled: True
+
+Lint/UnusedBlockArgument:
+  Enabled: True
+
+Lint/UnusedMethodArgument:
+  Enabled: True
+
+Lint/UselessAccessModifier:
+  Enabled: True
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Lint/Void:
+  Enabled: True
+
+Style/AccessModifierIndentation:
+  Enabled: True
+
+Style/AccessorMethodName:
+  Enabled: True
+
+Style/Alias:
+  Enabled: True
+
+Style/AlignArray:
+  Enabled: True
+
+Style/AlignHash:
+  Enabled: True
+
+Style/AlignParameters:
+  Enabled: True
+
+Metrics/BlockNesting:
+  Enabled: True
+
+Style/AsciiComments:
+  Enabled: True
+
+Style/Attr:
+  Enabled: True
+
+Style/BracesAroundHashParameters:
+  Enabled: True
+
+Style/CaseEquality:
+  Enabled: True
+
+Style/CaseIndentation:
+  Enabled: True
+
+Style/CharacterLiteral:
+  Enabled: True
+
+Style/ClassAndModuleCamelCase:
+  Enabled: True
+
+Style/ClassAndModuleChildren:
+  Enabled: False
+
+Style/ClassCheck:
+  Enabled: True
+
+# Class length is not necessarily an indicator of code quality
+Metrics/ClassLength:
+  Enabled: False
+
+Style/ClassMethods:
+  Enabled: True
+
+Style/ClassVars:
+  Enabled: True
+
+Style/WhenThen:
+  Enabled: True
+
+Style/WordArray:
+  Enabled: True
+
+Style/UnneededPercentQ:
+  Enabled: True
+
+Style/Tab:
+  Enabled: True
+
+Style/SpaceBeforeSemicolon:
+  Enabled: True
+
+Style/TrailingBlankLines:
+  Enabled: True
+
+Style/SpaceInsideBlockBraces:
+  Enabled: True
+
+Style/SpaceInsideBrackets:
+  Enabled: True
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: True
+
+Style/SpaceInsideParens:
+  Enabled: True
+
+Style/LeadingCommentSpace:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/SpaceAfterColon:
+  Enabled: True
+
+Style/SpaceAfterComma:
+  Enabled: True
+
+Style/SpaceAfterMethodName:
+  Enabled: True
+
+Style/SpaceAfterNot:
+  Enabled: True
+
+Style/SpaceAfterSemicolon:
+  Enabled: True
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: True
+
+Style/SpaceAroundOperators:
+  Enabled: True
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: True
+
+Style/SpaceBeforeComma:
+  Enabled: True
+
+Style/CollectionMethods:
+  Enabled: True
+
+Style/CommentIndentation:
+  Enabled: True
+
+Style/ColonMethodCall:
+  Enabled: True
+
+Style/CommentAnnotation:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/CyclomaticComplexity:
+  Enabled: False
+
+Style/ConstantName:
+  Enabled: True
+
+Style/Documentation:
+  Enabled: False
+
+Style/DefWithParentheses:
+  Enabled: True
+
+Style/PreferredHashMethods:
+  Enabled: True
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: True
+
+Style/EachWithObject:
+  Enabled: True
+
+Style/EmptyLineBetweenDefs:
+  Enabled: True
+
+Style/IndentArray:
+  Enabled: True
+
+Style/IndentHash:
+  Enabled: True
+
+Style/IndentationConsistency:
+  Enabled: True
+
+Style/IndentationWidth:
+  Enabled: True
+
+Style/EmptyLines:
+  Enabled: True
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: True
+
+Style/EmptyLiteral:
+  Enabled: True
+
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Enabled: False
+
+Style/MethodCallParentheses:
+  Enabled: True
+
+Style/MethodDefParentheses:
+  Enabled: True
+
+Style/LineEndConcatenation:
+  Enabled: True
+
+Style/TrailingWhitespace:
+  Enabled: True
+
+Style/StringLiterals:
+  Enabled: True
+
+Style/TrailingCommaInArguments:
+  Enabled: True
+
+Style/TrailingCommaInLiteral:
+  Enabled: True
+
+Style/GlobalVars:
+  Enabled: True
+
+Style/GuardClause:
+  Enabled: True
+
+Style/IfUnlessModifier:
+  Enabled: True
+
+Style/MultilineIfThen:
+  Enabled: True
+
+Style/NegatedIf:
+  Enabled: True
+
+Style/NegatedWhile:
+  Enabled: True
+
+Style/Next:
+  Enabled: True
+
+Style/SingleLineBlockParams:
+  Enabled: True
+
+Style/SingleLineMethods:
+  Enabled: True
+
+Style/SpecialGlobalVars:
+  Enabled: True
+
+Style/TrivialAccessors:
+  Enabled: True
+
+Style/UnlessElse:
+  Enabled: True
+
+Style/VariableInterpolation:
+  Enabled: True
+
+Style/VariableName:
+  Enabled: True
+
+Style/WhileUntilDo:
+  Enabled: True
+
+Style/EvenOdd:
+  Enabled: True
+
+Style/FileName:
+  Enabled: True
+
+Style/For:
+  Enabled: True
+
+Style/Lambda:
+  Enabled: True
+
+Style/MethodName:
+  Enabled: True
+
+Style/MultilineTernaryOperator:
+  Enabled: True
+
+Style/NestedTernaryOperator:
+  Enabled: True
+
+Style/NilComparison:
+  Enabled: True
+
+Style/FormatString:
+  Enabled: True
+
+Style/MultilineBlockChain:
+  Enabled: True
+
+Style/Semicolon:
+  Enabled: True
+
+Style/SignalException:
+  Enabled: True
+
+Style/NonNilCheck:
+  Enabled: True
+
+Style/Not:
+  Enabled: True
+
+Style/NumericLiterals:
+  Enabled: True
+
+Style/OneLineConditional:
+  Enabled: True
+
+Style/OpMethod:
+  Enabled: True
+
+Style/ParenthesesAroundCondition:
+  Enabled: True
+
+Style/PercentLiteralDelimiters:
+  Enabled: True
+
+Style/PerlBackrefs:
+  Enabled: True
+
+Style/PredicateName:
+  Enabled: True
+
+Style/RedundantException:
+  Enabled: True
+
+Style/SelfAssignment:
+  Enabled: True
+
+Style/Proc:
+  Enabled: True
+
+Style/RaiseArgs:
+  Enabled: True
+
+Style/RedundantBegin:
+  Enabled: True
+
+Style/RescueModifier:
+  Enabled: True
+
+# based on https://github.com/voxpupuli/modulesync_config/issues/168
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+  Enabled: True
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: True
+
+Metrics/ParameterLists:
+  Enabled: False
+
+Lint/RequireParentheses:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/ModuleFunction:
+  Enabled: True
+
+Lint/Debugger:
+  Enabled: True
+
+Style/IfWithSemicolon:
+  Enabled: True
+
+Style/Encoding:
+  Enabled: True
+
+Style/BlockDelimiters:
+  Enabled: True
+
+Style/MultilineBlockLayout:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/AbcSize:
+  Enabled: False
+
+# 'Complexity' is very relative
+Metrics/PerceivedComplexity:
+  Enabled: False
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Style/ClosingParenthesisIndentation:
+  Enabled: False
+
+# RSpec
+
+# We don't use rspec in this way
+RSpec/DescribeClass:
+  Enabled: False
+
+# Example length is not necessarily an indicator of code quality
+RSpec/ExampleLength:
+  Enabled: False
+
+RSpec/NamedSubject:
+  Enabled: False

data/.travis.yml

@@ -1,11 +1,22 @@
+sudo: false
 language: ruby
-before_install: 
+cache: bundler
+before_install:
   # https://github.com/bundler/bundler/issues/3558
   gem update bundler
-script: bundle exec rake spec 
-rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
+script: bundle exec rake spec
+matrix:
+  fast_finish: true
+  include:
+  - rvm: 2.3.1
+    env: PUPPET_GEM_VERSION='~> 4.0'
+  - rvm: 2.1
+    env: PUPPET_GEM_VERSION='~> 4.0'
+  - rvm: 2.1
+    env: PUPPET_GEM_VERSION='~> 3.0'
+  - rvm: 2.0
+    env: PUPPET_GEM_VERSION='~> 3.0'
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION='~> 3.0'
 notifications:
   email: false

data/CHANGELOG.md

@@ -2,11 +2,53 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.1.1] - 2015-03-02
+## [1.2.1]
+### Summary:
+
+The previous release was taken down, as some optional gem dependencies slipped through into the gemspec, breaking builds using ruby 2.2 and earlier. This release updates the gem build process, so this should not happen again.
+
+## [1.2.0] - 2016-08-23
+### Summary:
+
+Add a bunch of new features, and fix a bunch of annoying bugs: parallel test execution, default to strict variable checking on Puppet 4, code coverage, and rubocop tasks.
+
+Thanks to all community contributors: Alexander Fisher, Alex Harvey, Chris Tessmer, David Moreno García, Dmitry Ilyin, Dominic Cleal, Federico Voges, Garrett Honeycutt, Leo Arnold, Matthew Haughton, Mickaël Canévet, and Rob Nelson.
+
+### Added:
+
+New tasks:
+* Add code coverage for Ruby >= 1.9 using SimpleCov.
+* Add a rubocop rake task.
+* Use beaker:ssh to log into your running beaker machines.
+
+Spec parallelization
+* Add `parallel_spec` task to run specs in parallel.
+* Use CI_NODE_TOTAL and CI_NODE_INDEX to split tests across nodes.
+
+Fixtures improvements:
+* Automatically symlink the module directory, if no symlink fixtures are specified.
+* Add the `subdir` key to repository fixtures to only use a part of that repository.
+* Set `FIXTURES_YML` environment variable to load fixtures from somewhere else than `.fixtures.yml`.
+
+## Changed:
+* Updated default excludes and rspec patterns.
+* Updated default disabled lint checks to work with puppet-lint 2.0.0.
+* Testing on Puppet 4 will now default to strict variable checking. Set STRICT_VARIABLES=no to disable.
+* `PuppetInternals.scope` is now deprecated. Use the new `scope` property from rspec-puppet.
+* beaker_nodes is now called beaker:sets.
+
+### Fixed:
+* Ignore symlinks inside .git when running check:symlinks rake task.
+* Allow multiple invocations of spec_prep to run in parallel.
+* Address a race condition when cloning multiple git fixtures.
+* Restrict gem dependencies to work with ruby 1.9.
+* Update verify_contents() to work with duplicates in the arguments.
+
+## [1.1.1] - 2016-03-02
 ### Fixed:
-Readded and properly deprecated the `matadata` rake task. Use the `metadata_lint` task from metadata-json-lint directly instead.
+Readded and properly deprecated the `metadata` rake task. Use the `metadata_lint` task from metadata-json-lint directly instead.
 
-## [1.1.0] - 2015-02-25
+## [1.1.0] - 2016-02-25
 ### Summary:
 This release adds the ability to clone fixtures from git in parallel, speeding
 up the spec\_prep rake task.
@@ -234,6 +276,8 @@ compatible yet.
  * Initial release
 
 [unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.1...master
+[1.2.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.2.0...1.2.1
+[1.2.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.1...1.2.0
 [1.1.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.1...1.1.0
 [1.0.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/1.0.0...1.0.1

data/CONTRIBUTING.md

@@ -1,55 +1,14 @@
 # DEVELOPMENT NOTES
 
 ## Building Gemspec
-The Rakefile includes all the info that the gemspec file will contain. You have to update
-the Rakefile instead of the gemspec.
-To regenerate the gemspec just run `rake gemspec` and a new gemspec will be created
-with everything required.
-
-Running `rake build` will build out the gemspec according to the Rakefile parameters.
-
-```ruby
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "puppetlabs_spec_helper"
-  gem.version = "#{PuppetlabsSpecHelper::Version::STRING}"
-  gem.homepage = "http://github.com/puppetlabs/puppetlabs_spec_helper"
-  gem.license = "Apache-2.0"
-  gem.summary = %Q{Standard tasks and configuration for module spec tests}
-  gem.description = %Q{Contains rake tasks and a standard spec_helper for running spec tests on puppet modules}
-  gem.email = ["modules-dept@puppetlabs.com"]
-  gem.authors = ["Puppet Labs"]
-  # dependencies defined in Gemfile
-end
-
-```
-
-## Version file
-As part of the `rake gemspec` task, the gemspec will reference the version that is
-defined in the `lib/puppetlabs_spec_helper/version.rb` file.  
 
+To keep the gem accessible to people running older rubies, the gemspec may only contain dependencies on gems that are available to all supported rubies. Features that need gems compatible only to some versions of ruby need to be coded in a way that is optional, and specify their gem dependencies in the Gemfile, conditional on the ruby version. Add a note to the README about those.
 
 ## Releasing
-To release the gem just run the following things.
+To release the gem run the following things.
 
 ### 1. Update the version
-update the version file : `lib/puppetlabs_spec_helper/version.rb`
-
-```ruby
-module PuppetlabsSpecHelper
-  module Version
-    STRING = '1.0.1'
-  end
-end
-```
-
-### 2. Generate and push the release to git
-rake gemspec:release
-
-### 3. Tag and release to git
-Since the default behavior of jewler is to use tags like `v1.0.1` we cannot use
-the `git:release` task and will need to use `git:pl_release` which creates a tag
-without the `v` and pushes to master.
+update the version file: `lib/puppetlabs_spec_helper/version.rb`
 
-### 4. Release to rubygems
-rake release
+### 2. Release the gem
+    rake release[remote]

data/Gemfile

@@ -1,16 +1,22 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'rspec-puppet'
-gem 'puppet-lint'
-gem 'puppet-syntax'
-gem 'mocha'
+# Specify the global dependencies in puppetlabs_spec_helper.gemspec
+# Note that only ruby 1.9 compatible dependencies may go there, everything else needs to be documented and pulled in manually, and optionally by everyone who wants to use the extended features.
+gemspec
 
 group :development do
-  gem 'yard'
-  gem 'pry'
-  gem 'jeweler'
-  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.3'
+  gem "puppet", ENV['PUPPET_GEM_VERSION'] || ENV['PUPPET_VERSION'] || '~> 4.0'
+  if RUBY_VERSION =~ /^1\./
+    gem 'rubocop', '0.41.2'
+  else
+    gem 'rubocop'
+    gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
+  end
 end
 
+# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
+# if using ruby 1.x
+gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+gem 'rack', '~> 1'
+
 # vim:filetype=ruby