puppetlabs_spec_helper 0.10.2 → 0.10.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU1NDkwYzEzMzYxY2Q5NGJiMzEwY2FhMjU2MmM5YjU1NzA3YWNmYw==
+    ODRhM2NjMmRkMTA5ZTMxMzEwMjdhZDI0MmE3MzRiMmM3Y2NkMWFjZg==
   data.tar.gz: !binary |-
-    NzZmZTRiYWY2OTAxODZkM2E1ODRhMjkxMDNmYmVkYWIxYWMyY2NhNA==
+    MDhkZjY5NmZlY2FhMjAzY2E4YWZlODlmMzEyNWVjZDRjMjFkNGFmYg==
 SHA512:
   metadata.gz: !binary |-
-    YTlmMDA3MTY5ZDBhYjEwMjgzZWFmMDliNzM5NmZhZDhhYTc5ZTIyYjYzM2Ni
-    OWZhNjM3M2JhYjhiMjJjYzUyZjZiZTEyNTU3YmE1OTMxZThiYTcyMjczODdm
-    NDRiNTQ0MWU2ZDlmMjM4M2JkMmZjOTJmMzI2YzY0Njg1NzgzNGM=
+    YmI3NzE2Njk0ODMyZGRkMzMyZTM3NzI4MGFjNzBiNjJhYzJlNjZmNDMzZTU2
+    NThmMWYwOWU4NDFkMzU4YzQ1YzBlY2NmZjFkMjk5YjFiNTkzZDYwMjRjNDk3
+    ZDlkM2E4NzllZDNhMWZlMjJlMmJmMzUyOWNjN2I0NjMyMjJkYmM=
   data.tar.gz: !binary |-
-    Y2E3N2U3ZDYxODgzMmM5MmM1NWUzNTZjZWZkN2VhYThmMTk3MzdkNjUxYTJj
-    ZDgwNGI0ZTQ5NTA0ZTc3YjJiZTBkYWFiNDczMzRjZDUyZjU4Y2Y4MzU4ODM5
-    OTYwY2MzNDY3N2EyNWNkZmY2ODBjMTA4ZmUwODUwNTk4NDFlOWI=
+    NDlhNGU0OTIxZmNlM2I3MjJjMDY0MDEwNDhiOGE5ZjAyZGNjNmYzMjAyYWZh
+    YzVlY2M5N2IzN2Q3YTQ0OGMyZTgzNDE5MWZkN2FkMjI4YWU3NzM0MDZmZDVl
+    YThkMWM3NmUwODQ0ZmVjYzhmMWE2NTg2YjkzMzMxMzg4YzdjNzE=

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.10.3] - 2015-05-11
+### Summary:
+A bugfix for puppet 3 and puppet 4 tests being able to run with the same environment variables.
+
+### Fixed:
+- Allow `STRINGIFY_FACTS` and `TRUSTED_NODE_DATA` to be set on Puppet 4 as noop instead of fail
+- Fix linting to be more like approved module criteria
+
 ## [0.10.2] - 2015-04-14
 ### Summary:
 A bugfix for puppet 4 coming out, which manages modulepath and environments differently.

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -33,9 +33,12 @@ RSpec.configure do |c|
 
   c.before :each do
     Puppet.features.stubs(:root?).returns(true)
+    # stringify_facts and trusted_node_data were removed in puppet4
+    if Puppet.version.to_f < 4.0
+      Puppet.settings[:stringify_facts] = false if ENV['STRINGIFY_FACTS'] == 'no'
+      Puppet.settings[:trusted_node_data] = true if ENV['TRUSTED_NODE_DATA'] == 'yes'
+    end
     Puppet.settings[:strict_variables] = true if ENV['STRICT_VARIABLES'] == 'yes'
-    Puppet.settings[:stringify_facts] = false if ENV['STRINGIFY_FACTS'] == 'no'
-    Puppet.settings[:trusted_node_data] = true if ENV['TRUSTED_NODE_DATA'] == 'yes'
     Puppet.settings[:ordering] = ENV['ORDERING'] if ENV['ORDERING']
   end
 end

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -210,15 +210,21 @@ task :clean do
   FileUtils.rm_rf("pkg/")
 end
 
-desc "Check puppet manifests with puppet-lint"
-task :lint do
-  require 'puppet-lint/tasks/puppet-lint'
-  PuppetLint.configuration.relative = true
-  PuppetLint.configuration.disable_class_inherits_from_params_class
-  PuppetLint.configuration.ignore_paths ||= []
-  PuppetLint.configuration.ignore_paths << "spec/fixtures/**/*.pp"
-  PuppetLint.configuration.ignore_paths << "pkg/**/*.pp"
-  PuppetLint.configuration.ignore_paths << "vendor/**/*.pp"
+require 'puppet-lint/tasks/puppet-lint'
+# Must clear as it will not override the existing puppet-lint rake task since we require to import for
+# the PuppetLint::RakeTask
+Rake::Task[:lint].clear
+# Relative is not able to be set within the context of PuppetLint::RakeTask
+PuppetLint.configuration.relative = true
+PuppetLint::RakeTask.new(:lint) do |config|
+  config.fail_on_warnings = true
+  config.disable_checks = [
+      '80chars',
+      'class_inherits_from_params_class',
+      'class_parameter_defaults',
+      'documentation',
+      'single_quote_string_with_variables']
+  config.ignore_paths = ["tests/**/*.pp", "vendor/**/*.pp","examples/**/*.pp" "spec/**/*.pp", "pkg/**/*.pp"]
 end
 
 require 'puppet-syntax/tasks/puppet-syntax'

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '0.10.2'
+    STRING = '0.10.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake