puppetlabs_spec_helper 0.6.0 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,17 @@
+2014-07-17 - Release 0.7.0
+Summary:
+This feature release adds the ability to test structured facts, manifest
+ordering, and trusted node facts, and check out branches with fixtures.
+
+Features:
+- Add `STRINGIFY_FACTS=no` for structured facts
+- Add `TRUSTED_NODE_DATA=yes` for trusted node data
+- Add `ORDERING=<order>` for manifest ordering
+- Add `:branch` support for fixtures on a branch.
+
+Bugfixes:
+- Fix puppet-lint to ignore spec/fixtures/
+
 2014-07-02 - Release 0.6.0
 Summary:
 This feature release adds the `validate` rake task and the ability to test

data/README.markdown

@@ -94,11 +94,33 @@ NOTE that this is specifically for initializing Puppet's core.  If your project
 not have any dependencies on puppet and you just want to use the utility classes,
 see the next section.
 
-To enable strict-variable or future-parser rspec-puppet failures export the
-`STRICT_VARIABLES=yes` and/or `FUTURE_PARSER=yes` environment variables. Eg:
-
-    FUTURE_PARSER=yes STRICT_VARIABLES=yes rake spec
-
+A number of the Puppet parser features, controlled via configuration during a
+normal puppet run, can be controlled by exporting specific environment
+variables for the spec run. These are:
+
+* ``FUTURE_PARSER`` - set to "yes" to enable the [future parser](http://docs.puppetlabs.com/puppet/latest/reference/experiments_future.html),
+  the equivalent of setting [parser=future](http://docs.puppetlabs.com/references/latest/configuration.html#parser)
+  in puppet.conf.
+* ``STRICT_VARIABLES`` - set to "yes" to enable strict variable checking,
+  the equivalent of setting [strict_variables](http://docs.puppetlabs.com/references/latest/configuration.html#strictvariables)=true
+  in puppet.conf.
+* ``ORDERING`` - set to the desired ordering method ("title-hash", "manifest", or "random")
+  to set the order of unrelated resources when applying a catalog. Leave unset for the default
+  behavior, currently "random". This is equivalent to setting [ordering](http://docs.puppetlabs.com/references/latest/configuration.html#ordering)
+  in puppet.conf.
+* ``STRINGIFY_FACTS`` - set to "no" to enable [structured facts](http://docs.puppetlabs.com/facter/2.0/fact_overview.html#writing-structured-facts),
+  otherwise leave unset to retain the current default behavior. This is equivalent to setting
+  [stringify_facts=false](http://docs.puppetlabs.com/references/latest/configuration.html#stringifyfacts)
+  in puppet.conf.
+* ``TRUSTED_NODE_DATA`` - set to "yes" to enable [the $facts hash and trusted node data](http://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html),
+  which enabled ``$facts`` and ``$trusted`` hashes. This is equivalent to setting
+  [trusted_node_data=true](http://docs.puppetlabs.com/references/latest/configuration.html#trustednodedata)
+  in puppet.conf.
+
+As an example, to run spec tests with the future parser, strict variable checking,
+and manifest ordering, you would:
+
+    FUTURE_PARSER=yes STRICT_VARIABLES=yes ORDERING=manifest rake spec
 
 Using Utility Classes
 =====================

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -24,9 +24,16 @@ RSpec.configure do |c|
   ## These depend on rspec-puppet #209 and #183 being released
   #c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes'
   #c.strict_variables = true if ENV['STRICT_VARIABLES'] == 'yes'
+  ## These depend on rspec-puppet #212 being released
+  #c.stringify_facts = false if ENV['STRINGIFY_FACTS'] == 'no'
+  #c.trusted_node_data = true if ENV['TRUSTED_NODE_DATA'] == 'yes'
+  #c.ordering = ENV['ORDERING'] if ENV['ORDERING']
 
   c.before :each do
     Puppet.settings[:strict_variables] = true if ENV['STRICT_VARIABLES'] == 'yes'
     Puppet.settings[:parser] = 'future' if ENV['FUTURE_PARSER'] == '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

@@ -49,14 +49,14 @@ def fixtures(category)
       elsif opts.instance_of?(Hash)
         target = "spec/fixtures/modules/#{fixture}"
         real_source = eval('"'+opts["repo"]+'"')
-        result[real_source] = { "target" => target, "ref" => opts["ref"], "scm" => opts["scm"] }
+        result[real_source] = { "target" => target, "ref" => opts["ref"], "branch" => opts["branch"], "scm" => opts["scm"] }
       end
     end
   end
   return result
 end
 
-def clone_repo(scm, remote, target, ref=nil)
+def clone_repo(scm, remote, target, ref=nil, branch=nil)
   args = []
   case scm
   when 'hg'
@@ -64,7 +64,9 @@ def clone_repo(scm, remote, target, ref=nil)
     args.push('-u', ref) if ref
     args.push(remote, target)
   when 'git'
-    args.push('clone', remote, target)
+    args.push('clone')
+    args.push('-b', branch) if branch
+    args.push(remote, target)
   else
       fail "Unfortunately #{scm} is not supported yet"
   end
@@ -94,9 +96,10 @@ task :spec_prep do
       target = opts["target"]
       ref = opts["ref"]
       scm = opts["scm"] if opts["scm"]
+      branch = opts["branch"] if opts["branch"]
     end
 
-    unless File::exists?(target) || clone_repo(scm, remote, target, ref)
+    unless File::exists?(target) || clone_repo(scm, remote, target, ref, branch)
       fail "Failed to clone #{scm} repository #{remote} into #{target}"
     end
     revision(scm, target, ref) if ref
@@ -193,7 +196,8 @@ end
 desc "Check puppet manifests with puppet-lint"
 task :lint do
   require 'puppet-lint/tasks/puppet-lint'
-  PuppetLint.configuration.ignore_paths = ["spec/fixtures/**/*.pp"]
+  PuppetLint.configuration.ignore_paths ||= []
+  PuppetLint.configuration.ignore_paths << "spec/fixtures/**/*.pp"
 end
 
 desc "Check puppet manifest syntax"

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '0.6.0'
+    STRING = '0.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake