puppet-spec 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1b2a6f102ca870df851cd6b7e8b3fe181466d71
-  data.tar.gz: fbf64c3b18cda7e63ffd17261dae625ecd7dab38
+  metadata.gz: dfe83006bafdc547d6c9273c69557da9e14c997b
+  data.tar.gz: d96e02b801e4f3ceb54cef275a0b91a68dec29f5
 SHA512:
-  metadata.gz: f14eb73db5ebfe8cf67ff076159ef9ba3dc1bd9fe6ff0082a0780be50475316e799a7c9108db91e51ee0130cd2bf23193894550f4a658b882045a4eab61ff6ff
-  data.tar.gz: 656f782afe6f0ce5b44b57a5cc77e0a7a60dbd0565885a884bf10c7012fa218e5389a3832497f7a77af1e3710541dccd9794c5545266d86f84d93a56264e4c27
+  metadata.gz: f2c2b240d52d96c39bad354306d011fccdc82e002fccb7a34730f12fdca12ce2cc8cd7395464fbd49ef60ad6d4c093074ffef804307f10c60d9ef3ea796ec848
+  data.tar.gz: 6b0cc48d798e60fca66f146c59e59be7b1b6770cf1949e0036a6fc11ca04870ab097c430d70ba646396bc677836380f95f7cc5e0af66026bc078eef74230762b

data/lib/puppet/application/spec.rb

@@ -38,15 +38,21 @@ class Puppet::Application::Spec < Puppet::Application
 
   def process_spec(path)
     catalog = catalog(path)
-    assertions = catalog.resources.select {|res| res.type == 'Assertion' }
 
+    assertions = catalog.resources.select {|res| res.type == 'Assertion' }
     assertions.each do |res|
       # Get the subject resource from the catalog rather than the
       # reference provided from the parser. The reference's resource
       # object does not contain any parameters for whatever reason.
-      res[:subject] = catalog.resource(res[:subject].to_s)
+      catalog_subject = catalog.resource(res[:subject].to_s)
+
+      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/type/assertion.rb

@@ -1,10 +1,6 @@
 Puppet::Type.newtype(:assertion) do
 
-  @doc = "Makes assertions on the state of a resource in the catalog.
-
-  The assertion type defines an assertion that will be evaluated by the
-  spec application.
-  "
+  @doc = "An assertion on the state of a resource in the catalog"
 
   validate do
     fail Puppet::Error, "a subject is required" unless @parameters[:subject]
@@ -13,7 +9,7 @@ Puppet::Type.newtype(:assertion) do
   end
 
   newparam(:name) do
-    desc "A plain text message describing what the assertion is intended to prove.
+    desc "A plain text message describing what the assertion is attempting to prove.
 
     The given text should form a sentence using the type's name.
     Example: assertion { 'that the configuration file has the correct contents': }

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

@@ -30,9 +30,11 @@ module Puppet::Util
 
         style do
           if reporter.evaluated == 1
-            yellow "Evaluated 1 assertion\n"
+            yellow "Evaluated 1 assertion"
+            newline
           else
-            yellow "Evaluated #{reporter.evaluated} assertions\n"
+            yellow "Evaluated #{reporter.evaluated} assertions"
+            newline
           end
         end
       end
@@ -41,6 +43,28 @@ module Puppet::Util
         fail #Mark an assertion so the application exits 1
         style do
           red err.message
+          newline
+        end
+      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
+
+        # 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 not in the catalog"
+          newline
+          newline
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-spec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jordan Olshevski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet