rspec-puppet 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e8acfd6bedb13be688133733c083494c88e9a7
-  data.tar.gz: eea4578b689eb7cf0907e0018201ffd41dcd764c
+  metadata.gz: fedfa152ac9857ea6c8546a70342cf148c3f89e9
+  data.tar.gz: ed8fbef4a778aae5e62f2726333013b6a7ebdcf9
 SHA512:
-  metadata.gz: f4907f8744a4a6d789d7516cea4dfe0efb916385850628a2e21a3b1bb8bf5c297ed710793640fd40ba1803663e183dcb40205fdd5ac0d8fcb1ef937a42d3487b
-  data.tar.gz: c32d0f3ce0bd57ae412a192135c93a7806dd4bdf40ab0cd1d05941463784e0a7ea33f1d6247dbe1bf1cfcb9eff294a06dd443c0f304d7c72ab1e95ac47cbc29e
+  metadata.gz: ab88d6b0992c638114272cdfd820a0be3a50e5cfa118ec07b5f39f52a5d4c4b657b9bf9c40a83d1a7cb805bf7d5241e95c1e5dfe3e12910709b5144824ad97f9
+  data.tar.gz: a5a51096595b4074a91626363e01158f14724e9907e2569a5a801e1acfde5d21de9a1be06d6c664d80dbfb1ec87fba0193f0a541f7e49e91fec880dc4c4a390a

data/CHANGELOG.md

@@ -2,6 +2,29 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.2]
+
+### Changed
+
+ * Puppet 5.0.x added to the CI test matrices.
+ * The automatic setup code now checks for the presence of `metadata.json` in
+   the working directory. If not present, it assumes that rspec-puppet is
+   running from inside a control repo instead of a module and skips creating
+   the `spec/fixtures` directory structure and link.
+
+### Added
+
+ * A new configuration option has been added
+   (`RSpec.configuration.setup_fixtures`) that controls whether rspec-puppet
+   will manage the `spec/fixtures` link.
+
+### Fixed
+
+ * A race condition when running rspec-puppet under parallel\_tests causing
+   errors when creating the `spec/fixtures` link.
+ * The contents of the `networking` fact hash is no longer cleared when merging
+   in the facts derived from the node name.
+
 ## [2.6.1]
 
 ### Fixed

data/README.md

@@ -61,36 +61,36 @@ The path to the directory containing your basic manifests like `site.pp`.
 
 #### module\_path
 Type   | Default  | Puppet Version(s)
------- | -------- | -----------------
-String | Required | 2.x, 3.x, 4.x
+------ | -------- | ------------------
+String | Required | 2.x, 3.x, 4.x, 5.x
 
 The path to the directory containing your Puppet modules.
 
 #### default\_facts
 Type | Default | Puppet Version(s)
----- | ------- | -----------------
-Hash | `{}`    | 2.x, 3.x, 4.x
+---- | ------- | ------------------
+Hash | `{}`    | 2.x, 3.x, 4.x, 5.x
 
 A hash of default facts that should be used for all the tests.
 
 #### hiera\_config
 Type   | Default       | Puppet Version(s)
 ------ | ------------- | -----------------
-String | `"/dev/null"` | 3.x, 4.x
+String | `"/dev/null"` | 3.x, 4.x, 5.x
 
 The path to your `hiera.yaml` file (if used).
 
 #### default\_node\_params
 Type | Default | Puppet Version(s)
 ---- | ------- | -----------------
-Hash | `{}`    | 4.x
+Hash | `{}`    | 4.x, 5.x
 
 A hash of default node parameters that should be used for all the tests.
 
 #### default\_trusted\_facts
 Type | Default | Puppet Version(s)
 ---- | ------- | -----------------
-Hash | `{}`    | 4.x
+Hash | `{}`    | 4.x, 5.x
 
 A hash of default trusted facts that should be used for all the tests
 (available in the manifests as the `$trusted` hash). In order to use this, the
@@ -99,22 +99,22 @@ A hash of default trusted facts that should be used for all the tests
 #### trusted\_node\_data
 Type    | Default | Puppet Version(s)
 ------- | ------- | -----------------
-Boolean | `false` | 3.x, 4.x
+Boolean | `false` | 3.x, 4.x, 5.x
 
 Configures rspec-puppet to use the `$trusted` hash when compiling the
 catalogues.
 
 #### confdir
 Type   | Default         | Puppet Version(s)
------- | --------------- | -----------------
-String | `"/etc/puppet"` | 2.x, 3.x, 4.x
+------ | --------------- | ------------------
+String | `"/etc/puppet"` | 2.x, 3.x, 4.x, 5.x
 
 The path to the main Puppet configuration directory.
 
 #### config
 Type   | Default                | Puppet Version(s)
------- | ---------------------- | -----------------
-String | Puppet's default value | 2.x, 3.x, 4.x
+------ | ---------------------- | ------------------
+String | Puppet's default value | 2.x, 3.x, 4.x, 5.x
 
 The path to `puppet.conf`.
 
@@ -136,7 +136,7 @@ stored outside of modules.
 #### environmentpath
 Type   | Default                               | Puppet Version(s)
 ------ | ------------------------------------- | -----------------
-String | `"/etc/puppetlabs/code/environments"` | 4.x
+String | `"/etc/puppetlabs/code/environments"` | 4.x, 5.x
 
 The search path for environment directories.
 
@@ -150,7 +150,7 @@ This switches between the 3.x (`current`) and 4.x (`future`) parsers.
 #### ordering
 Type   | Default        | Puppet Version(s)
 ------ | -------------- | -----------------
-String | `"title-hash"` | 3.x, 4.x
+String | `"title-hash"` | 3.x, 4.x, 5.x
 
 How unrelated resources should be ordered when applying a catalogue.
  * `manifest` - Use the order in which the resources are declared in the
@@ -162,7 +162,7 @@ How unrelated resources should be ordered when applying a catalogue.
 #### strict\_variables
 Type    | Default | Puppet Version(s)
 ------- | ------- | -----------------
-Boolean | `false` | 3.x, 4.x
+Boolean | `false` | 3.x, 4.x, 5.x
 
 Makes Puppet raise an error when it tries to reference a variable that hasn't
 been defined (not including variables that have been explicitly set to
@@ -171,21 +171,29 @@ been defined (not including variables that have been explicitly set to
 #### stringify\_facts
 Type    | Default | Puppet Version(s)
 ------- | ------- | -----------------
-Boolean | `true`  | 3.x, 4.x
+Boolean | `true`  | 3.x, 4.x, 5.x
 
 Makes rspec-puppet coerce all the fact values into strings (matching the
 behaviour of older versions of Puppet).
 
 #### enable\_pathname\_stubbing
 Type    | Default | Puppet Version(s)
-------- | ------- | -----------------
-Boolean |`false`  | 2.x, 3.x, 4.x
+------- | ------- | ------------------
+Boolean |`false`  | 2.x, 3.x, 4.x, 5.x
 
 Configures rspec-puppet to stub out `Pathname#absolute?` with it's own
 implementation. This should only be enabled if you're running into an issue
 running cross-platform tests where you have Ruby code (types, providers,
 functions, etc) that use `Pathname#absolute?`.
 
+#### setup\_fixtures
+Type    | Default | Puppet Version(s)
+------- | ------- | ------------------
+Boolean | `true`  | 2.x, 3.x, 4.x, 5.x
+
+Configures rspec-puppet to automatically create a link from the root of your
+module to `spec/fixtures/<module name>` at the beginning of the test run.
+
 ## Naming conventions
 
 For clarity and consistency, I recommend that you use the following directory

data/lib/rspec-puppet/setup.rb

@@ -20,10 +20,15 @@ module RSpec::Puppet
     end
 
     def self.safe_setup_directories(module_name=nil, verbose=true)
+      if control_repo?
+        $stderr.puts "Unable to setup rspec-puppet automatically in a control repo" if verbose
+        return false
+      end
+
       if module_name.nil?
         module_name = get_module_name
         if module_name.nil?
-          $stderr.puts "Unable to determine module name.  Aborting"
+          $stderr.puts "Unable to determine module name.  Aborting" if verbose
           return false
         end
       end
@@ -58,6 +63,10 @@ module RSpec::Puppet
       end
     end
   protected
+    def self.control_repo?
+      !File.exist?('metadata.json')
+    end
+
     def self.get_module_name
       module_name = nil
       Dir["manifests/*.pp"].entries.each do |manifest|
@@ -97,7 +106,11 @@ module RSpec::Puppet
           $stderr.puts "!! #{dir} already exists and is not a directory"
         end
       else
-        FileUtils.mkdir dir
+        begin
+          FileUtils.mkdir dir
+        rescue Errno::EEXIST => e
+          raise e unless File.directory? dir
+        end
         puts " + #{dir}/" if verbose
       end
     end
@@ -145,7 +158,11 @@ module RSpec::Puppet
             abort
           end
         else
-          FileUtils.ln_s(File.expand_path(source), target)
+          begin
+            FileUtils.ln_s(File.expand_path(source), target)
+          rescue Errno::EEXIST => e
+            raise e unless File.symlink?(target) && File.readlink(target) == File.expand_path(source)
+          end
         end
         puts " + #{target}" if verbose
       end

data/lib/rspec-puppet/support.rb

@@ -214,11 +214,12 @@ module RSpec::Puppet
         'fqdn'          => node,
         'domain'        => node.split('.', 2).last,
         'clientcert'    => node,
-        'networking'    => {
-          'fqdn'          => node,
-          'domain'        => node.split('.', 2).last,
-          'hostname'      => node.split('.').first
-        }
+      }
+
+      networking_facts = {
+        'hostname' => node_facts['hostname'],
+        'fqdn'     => node_facts['fqdn'],
+        'domain'   => node_facts['domain'],
       }
 
       result_facts = if RSpec.configuration.default_facts.any?
@@ -231,6 +232,8 @@ module RSpec::Puppet
       result_facts.merge!(munge_facts(facts)) if self.respond_to?(:facts)
       result_facts.merge!(munge_facts(node_facts))
 
+      (result_facts['networking'] ||= {}).merge!(networking_facts)
+
       # Facter currently supports lower case facts.  Bug FACT-777 has been submitted to support case sensitive
       # facts.
       downcase_facts = Hash[result_facts.map { |k, v| [k.downcase, v] }]

data/lib/rspec-puppet.rb

@@ -38,9 +38,12 @@ RSpec.configure do |c|
   c.add_setting :stringify_facts, :default => true
   c.add_setting :strict_variables, :default => false
   c.add_setting :adapter
+  c.add_setting :setup_fixtures, :default => true
 
   c.before(:all) do
-    RSpec::Puppet::Setup.safe_setup_directories(nil, false)
+    if RSpec.configuration.setup_fixtures?
+      RSpec::Puppet::Setup.safe_setup_directories(nil, false)
+    end
   end
 
   if defined?(Puppet::Test::TestHelper)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec