puppet-spec 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfe83006bafdc547d6c9273c69557da9e14c997b
-  data.tar.gz: d96e02b801e4f3ceb54cef275a0b91a68dec29f5
+  metadata.gz: 235b2bbf4bd9e7d42aff30c8ec7ff5cf64d87189
+  data.tar.gz: 7aebec24c0d8276c6be27af2b746d8884495801a
 SHA512:
-  metadata.gz: f2c2b240d52d96c39bad354306d011fccdc82e002fccb7a34730f12fdca12ce2cc8cd7395464fbd49ef60ad6d4c093074ffef804307f10c60d9ef3ea796ec848
-  data.tar.gz: 6b0cc48d798e60fca66f146c59e59be7b1b6770cf1949e0036a6fc11ca04870ab097c430d70ba646396bc677836380f95f7cc5e0af66026bc078eef74230762b
+  metadata.gz: bdf5de9148748ea6594c57aed746293e0b191233cd4b19a353200aa039ed20316029760927cf6a04e1dd25f311b259f4ec15aac481e3ba23a33a5d6232da443f
+  data.tar.gz: 4da0b54e7ff2e0a58b1a7888857abb315c874adca3227f716b7b6a527ec2c7240487a7788f8e1933a18f31a38bb175d8c049f589ba72a51c77be820563c5d9f0

data/lib/puppet/application/spec.rb

@@ -45,14 +45,9 @@ class Puppet::Application::Spec < Puppet::Application
       # reference provided from the parser. The reference's resource
       # object does not contain any parameters for whatever reason.
       catalog_subject = catalog.resource(res[:subject].to_s)
+      res[:subject] = catalog_subject if catalog_subject
 
-      if catalog_subject
-        res[:subject] = catalog_subject
-        reporter << res.to_ral
-      else
-        reporter.missing_subject(res)
-      end
-
+      reporter << res.to_ral
     end
   end
 

data/lib/puppet/parser/functions/fixture.rb

@@ -0,0 +1,6 @@
+Puppet::Parser::Functions.newfunction(:fixture, :arity => 1, :type => :rvalue) do |values|
+  modulepath = compiler.environment.full_modulepath[0]
+  file = Dir.glob("#{modulepath}/*/spec/fixtures/#{values[0]}")[0]
+
+  return File.read(file)
+end

data/lib/puppet/type/assertion.rb

@@ -4,6 +4,8 @@ Puppet::Type.newtype(:assertion) do
 
   validate do
     fail Puppet::Error, "a subject is required" unless @parameters[:subject]
+    fail Puppet::Error, "an assertion on the absence of a resource cannot have an attribute" if @parameters[:attribute] and @parameters[:ensure].value == 'absent'
+    fail Puppet::Error, "an assertion on the absence of a resource cannot have an expectation" if @parameters[:expectation] and @parameters[:ensure].value == 'absent'
     fail Puppet::Error, "an attribute is required when an expectation is given" if @parameters[:expectation] and not @parameters[:attribute]
     fail Puppet::Error, "an expectation is required when an attribute is given" if @parameters[:attribute] and not @parameters[:expectation]
   end
@@ -35,4 +37,23 @@ Puppet::Type.newtype(:assertion) do
     desc "The expected value of the subject's attribute"
   end
 
+  newparam(:ensure) do
+    desc "If ensure is set to absent, the resource will assert for the absence of the subject in the catalog.
+
+    Defaults to present.
+    "
+
+    defaultto "present"
+
+    validate do |value|
+      fail Puppet::Error, "Ensure only accepts values 'present' or 'absent'" unless value == 'present' or value == 'absent'
+    end
+
+    # Stub out the retrieve method since
+    # the Puppet internals require any param
+    # named ensure to have it. Grr.
+    def retrieve
+    end
+  end
+
 end

data/lib/puppet/util/assertion/reporter.rb

@@ -12,15 +12,31 @@ module Puppet::Util
         @failed = 0
       end
 
-      # Given an assertion resource, evaluate it for success
-      # and send it to .report on failure. Increment the counter
-      # for each resource, and the failed counter for failed resources.
+      # Given an assertion resource, evaluate it for success,
+      # and on failure, call the appropriate method responsible to render the
+      # message, and increment the counter(s).
       def <<(assertion)
         count
+
+        # If ensure is present, and the resource is not in the catalog
+        if assertion[:ensure] == 'present' and not assertion[:subject].catalog
+          fail
+          expected_present(assertion)
+          return
+
+        # If ensure is absent, and the resource is in the catalog
+        elsif assertion[:ensure] == 'absent' and assertion[:subject].catalog
+          fail
+          expected_absent(assertion)
+          return
+        end
+
         if assertion.provider.failed?
           fail
-          report(assertion)
+          inequal_value(assertion)
+          return
         end
+
       end
 
       # Print the summary of evaluated assertions
@@ -48,12 +64,26 @@ module Puppet::Util
       end
 
       # Print the appropriate error message when an assertion's
-      # subject is not found in the catalog. Called by the application
-      # because the resource must be evaluated prior to calling
-      # .to_ral to avoid the validation raising an error.
-      def missing_subject(assertion)
-        fail
+      # subject is found in the catalog but was intended to be
+      # absent.
+      def expected_absent(assertion)
+        # Shim the value of failed into the
+        # local scope in order to access it
+        # from the style proc.
+        failed = @failed
+
+        style do
+          red      "#{failed}) Assertion #{assertion[:name]} failed on #{assertion[:subject].to_s}"
+          newline
+          blue     "  Subject was expected to be absent from the catalog, but was present"
+          newline
+          newline
+        end
+      end
 
+      # Print the appropriate error message when an assertion's
+      # subject is not found in the catalog.
+      def expected_present(assertion)
         # Shim the value of failed into the
         # local scope in order to access it
         # from the style proc.
@@ -62,14 +92,14 @@ module Puppet::Util
         style do
           red      "#{failed}) Assertion #{assertion[:name]} failed on #{assertion[:subject].to_s}"
           newline
-          blue     "  Subject was not in the catalog"
+          blue     "  Subject was expected to be present in the catalog, but was absent"
           newline
           newline
         end
       end
 
       # Pretty print the results of an assertion to the console
-      def report(assertion)
+      def inequal_value(assertion)
         # Shim the value of failed into the
         # local scope in order to access it
         # from the style proc.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-spec
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jordan Olshevski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - lib/puppet-spec/tasks.rb
 - lib/puppet/application/spec.rb
+- lib/puppet/parser/functions/fixture.rb
 - lib/puppet/parser/functions/stub_class.rb
 - lib/puppet/parser/functions/stub_facts.rb
 - lib/puppet/parser/functions/stub_type.rb
@@ -80,3 +81,4 @@ signing_key:
 specification_version: 4
 summary: Test Puppet code with Puppet code
 test_files: []
+has_rdoc: